From a7a28c10e6a6d756c00e2bd4a590e785b87f1331 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期三, 08 三月 2023 15:37:54 +0800
Subject: [PATCH] 样式反馈调整
---
miniprogram/pages/manager/report/detail/index.wxml | 2
miniprogram/pages/manager/group/index.wxss | 11 +-
miniprogram/pages/manager/group/message/index.ts | 15 +++
miniprogram/pages/manager/group/index.wxml | 23 ++++-
miniprogram/pages/user/report/index.wxml | 3
miniprogram/pages/manager/group/message/publicty/index.wxss | 14 ++-
miniprogram/pages/manager/group/message/publicty/index.wxml | 8 +
miniprogram/pages/manager/group/message/index.wxss | 35 ++++----
miniprogram/pages/manager/group/message/index.wxml | 10 +-
miniprogram/pages/manager/cause/index.wxml | 3
miniprogram/pages/manager/group/index.ts | 35 ++++----
miniprogram/pages/user/loginInfo/index.ts | 34 ++++++++
miniprogram/pages/manager/report/index.wxml | 3
miniprogram/pages/user/loginInfo/index.wxss | 17 +++
miniprogram/pages/user/pubulicty/index.wxml | 4
miniprogram/app.json | 6 +
miniprogram/pages/user/loginInfo/index.wxml | 11 ++
17 files changed, 165 insertions(+), 69 deletions(-)
diff --git a/miniprogram/app.json b/miniprogram/app.json
index 10fbb05..9178aef 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -35,7 +35,11 @@
"van-cell-group": "@vant/weapp/cell-group/index",
"van-grid": "@vant/weapp/grid/index",
"van-grid-item": "@vant/weapp/grid-item/index",
- "van-icon": "@vant/weapp/icon/index"
+ "van-icon": "@vant/weapp/icon/index",
+ "van-row": "@vant/weapp/row/index",
+ "van-col": "@vant/weapp/col/index",
+ "van-notify": "@vant/weapp/notify/index",
+ "van-toast": "@vant/weapp/toast/index"
},
"window": {
"backgroundTextStyle": "light",
diff --git a/miniprogram/pages/manager/cause/index.wxml b/miniprogram/pages/manager/cause/index.wxml
index 4d15a50..2c74acb 100644
--- a/miniprogram/pages/manager/cause/index.wxml
+++ b/miniprogram/pages/manager/cause/index.wxml
@@ -1,6 +1,9 @@
<!--index.wxml-->
<view>
<view class="icon">
+ <van-empty class="empty" description="鏆傛棤鏁版嵁" wx:if="{{causeList.length === 0}}">
+
+ </van-empty>
<view wx:for="{{causeList}}" wx:key="id">
<view class="conter" data-cause="{{item}}" bindtap="getDetail">
<view class="font-name">{{item.name}} {{item.reportNumber}}浜�</view>
diff --git a/miniprogram/pages/manager/group/index.ts b/miniprogram/pages/manager/group/index.ts
index 6380cb1..a3c9f54 100644
--- a/miniprogram/pages/manager/group/index.ts
+++ b/miniprogram/pages/manager/group/index.ts
@@ -6,19 +6,19 @@
data: {
groupList: []
},
- openGroup(e){
+ openGroup(e) {
wx.navigateTo({
- url:"../../manager/group/message/index?id="+e.currentTarget.id
+ url: "../../manager/group/message/index?id=" + e.currentTarget.id
})
},
onLoad() {
var date = new Date()
var month = date.getMonth() + 1
var day = date.getDate()
- var hours=date.getHours()
- var minutes=date.getMinutes()
- var secends=date.getSeconds()
+ var hours = date.getHours()
+ var minutes = date.getMinutes()
+ var secends = date.getSeconds()
var time
if (month < 10) {
month = "0" + month
@@ -35,27 +35,30 @@
if (secends < 10) {
secends = "0" + secends
}
- time = date.getFullYear() + "-" + month + "-" + day + " " + hours+":"+minutes+":"+secends
-console.log(time)
-console.log("lastDate",wx.getStorageSync('time'))
-var lastTime=wx.getStorageSync('time')
+ time = date.getFullYear() + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + secends
+ console.log(time)
+ console.log("lastDate", wx.getStorageSync('time'))
+ var lastTime = wx.getStorageSync('time')
wx.request(
{
url: managerGroup.globalData.url + "/wx/manager/group/list",
method: "GET",
- data:{
- id:wx.getStorageSync('id'),
- newDate:time,
- lastDate:lastTime
+ data: {
+ id: wx.getStorageSync('id'),
+ newDate: time,
+ lastDate: lastTime
},
header: { 'token': wx.getStorageSync('token') },
success: (res) => {
- console.log(res.data.data)
- this.setData({
+ console.log(res.data.data)
+ res.data.data.map(item=>{
+ item.time = item.time.substr(-8)
+ })
+ this.setData({
groupList: res.data.data
})
}
-
+
})
diff --git a/miniprogram/pages/manager/group/index.wxml b/miniprogram/pages/manager/group/index.wxml
index 8ff2cfc..af4d874 100644
--- a/miniprogram/pages/manager/group/index.wxml
+++ b/miniprogram/pages/manager/group/index.wxml
@@ -1,15 +1,28 @@
<!--index.wxml-->
<view>
+
<view class="icon">
+ <van-empty class="empty" description="鏆傛棤鏁版嵁" wx:if="{{groupList.length === 0}}">
+
+ </van-empty>
<view wx:for="{{groupList}}" wx:key="index" class="list">
<view class="conter" id="{{item.id}}" bindtap="openGroup">
<view class="inGroup" wx:if="{{item.isInGroup==1}}">宸茶繘缇�</view>
<view class="noInGroup" wx:if="{{item.isInGroup==0}}">鏈繘缇�</view>
- <image class="icon1" src="../../icon/缇よ亰.png"></image>
- <view class="font-name"> {{item.groupName}} </view>
- <view class="font-wenzi">{{item.time}}</view>
- <view wx:if="{{item.count!=0&&item.count!=null}}" class="count">{{item.count}}</view>
- <view wx:if="{{item.message!=''&&item.message!=null}}" class="font-qita">{{item.name}}:{{item.message}}</view>
+
+ <van-row class="van-row-view">
+ <van-col span="4">
+ <image class="icon1" src="../../icon/缇よ亰.png"></image>
+ </van-col>
+ <van-col span="16">
+ <view class="font-name"> {{item.groupName}} </view>
+ <view wx:if="{{item.message!=''&&item.message!=null}}" class="font-qita">{{item.name}}:{{item.message}}</view>
+ </van-col>
+ <van-col span="4">
+ <view class="font-wenzi">{{item.time}}</view>
+ <view wx:if="{{item.count!=0&&item.count!=null}}" class="count">{{item.count}}</view>
+ </van-col>
+ </van-row>
</view>
</view>
</view>
diff --git a/miniprogram/pages/manager/group/index.wxss b/miniprogram/pages/manager/group/index.wxss
index 4d03c3e..5d19355 100644
--- a/miniprogram/pages/manager/group/index.wxss
+++ b/miniprogram/pages/manager/group/index.wxss
@@ -6,10 +6,7 @@
margin: 0.5rem 0;
}
.font-wenzi{
- float: right;
font-size: 13px;
- margin-right: 20px;
- margin-top: -15px;
color:rgba(0,0,0,0.4);
}
.font-name{
@@ -19,7 +16,7 @@
.font-qita{
font-size: 13px;
margin-bottom: 2%;
- margin-left: 15%;
+ /* margin-left: 15%; */
}
.conter{
@@ -27,20 +24,22 @@
align-items: center;
border-bottom:1px solid rgba(0,0,0,0.1);
}
+.van-row-view{
+ width: 100%;
+}
.icon1{
width: 35px;
height: 35px;
}
.count{
+ margin: auto;
width: 15px;
height: 15px;
- float: right;
font-size: 13px;
background-color: red;
text-align:center;
color:white;
border-radius: 50%;
margin-top: 1%;
- margin-right: -30%;
}
\ No newline at end of file
diff --git a/miniprogram/pages/manager/group/message/index.ts b/miniprogram/pages/manager/group/message/index.ts
index 8deaeb6..23f7e9f 100644
--- a/miniprogram/pages/manager/group/message/index.ts
+++ b/miniprogram/pages/manager/group/message/index.ts
@@ -44,7 +44,7 @@
url:'../message/records/index?id='+this.data.groupId
})
},
- more() {
+more() {
console.log("杩涙潵浜�", this.data.scrollTop)
if (this.data.isShow == false) {
this.setData({
@@ -91,10 +91,21 @@
value:""
})
console.log(this.data.messageList)
- wx.setStorageSync('time',time)
+ try {
+ wx.setStorageSync('time', 'time')
+ } catch (e) { }
+ // wx.setStorageSync('time','time')
+ this.setData({
+ isInput : 1
+ })
+
+
+
wx.createSelectorQuery().select('#chat')
+
.boundingClientRect(function(rect){
console.log('rectheight',rect);
+
/* 灏嗛〉闈㈢Щ鍔ㄥ埌鏈�搴曢儴锛堢敤xxx鐨刪eight瀹氫綅锛� */
wx.pageScrollTo({
scrollTop: rect.height
diff --git a/miniprogram/pages/manager/group/message/index.wxml b/miniprogram/pages/manager/group/message/index.wxml
index b38be9d..eca87c5 100644
--- a/miniprogram/pages/manager/group/message/index.wxml
+++ b/miniprogram/pages/manager/group/message/index.wxml
@@ -12,9 +12,9 @@
</view>
<!--a - 鑷繁鐨勪俊鎭�-->
<view class="chat-right" wx:if="{{item.id==uid}}">
+ <view class="chat-context-right">{{item.text}}</view>
<image class="face-right" src="../../../icon/鍏畨灞�.png"></image>
<!-- <view class="chat-message-right" >{{item.name}}-{{item.mobile}}</view> -->
- <view class="chat-context-right">{{item.text}}</view>
</view>
</view>
<view class="list1"></view>
@@ -29,19 +29,19 @@
<image src="../../../icon/缇ゆ垚鍛�-01.png" class="bottom-icon"></image>
<view class="wenzi-wenzi">缇ゆ垚鍛�</view>
</view>
- <view class="view-1" bindtap="publicty">
+ <view class="view-0" bindtap="publicty">
<image src="../../../icon/鍏憡.png" class="bottom-icon"></image>
<view class="wenzi-wenzi">缇ゅ叕鍛�</view>
</view>
- <view class="view-2" bindtap="banSpeech">
+ <view class="view-0" bindtap="banSpeech">
<image src="../../../icon/绂佽█.png" class="bottom-icon"></image>
<view class="wenzi-wenzi">绂佽█</view>
</view>
- <view class="view-3" bindtap="cause">
+ <view class="view-0" bindtap="cause">
<image src="../../../icon/鐩稿叧妗堜欢.png" class="bottom-icon"></image>
<view class="wenzi-wenzi">妗堜欢</view>
</view>
- <view class="view-4" bindtap="chatRecords">
+ <view class="view-0" bindtap="chatRecords">
<image src="../../../icon/鑱婂ぉ璁板綍.png" class="bottom-icon"></image>
<view class="wenzi-wenzi">鑱婂ぉ璁板綍</view>
</view>
diff --git a/miniprogram/pages/manager/group/message/index.wxss b/miniprogram/pages/manager/group/message/index.wxss
index 625077b..8aa7b3a 100644
--- a/miniprogram/pages/manager/group/message/index.wxss
+++ b/miniprogram/pages/manager/group/message/index.wxss
@@ -12,9 +12,7 @@
.chat-left{
margin-top: 4%;
}
-.chat-right{
- margin-right: 50%;
-}
+
.chat-item{
background-color: #F5F5F9;
margin-bottom: 20%;
@@ -38,11 +36,13 @@
}
.chat-right{
margin-top: 8%;
+ display: flex;
+ padding: 0 0.5rem;
}
.face-right{
width: 40px;
height: 40px;
- margin-left: 170%;
+
}
.chat-message-right{
margin-left: 15%;
@@ -52,19 +52,17 @@
color: rgba(0,0,0,0.4);
}
.chat-context-right{
- margin-left: 30%;
font-size: 15px;
padding: 10px ;
- width: 130%;
font-weight: normal;
text-align: right;
- margin-top: -20%;
background-color: #ffffff;
- margin-bottom: 8%;
+ margin-left: auto;
+ margin-right: 0.5rem;
}
.low{
position: fixed;
- bottom: 0px;
+ bottom: 1.5rem;
width: 100%;
background-color: white;
/* height: 7%; */
@@ -99,9 +97,11 @@
/* height: 30px; */
/* position: fixed;
bottom: 0px; */
+ display: flex;
+ justify-content: space-around;
width: 100%;
height: 70px;
- margin-top: 2%;
+ margin-top: 1rem;
background-color: #F5F5F9;
/* height: 50%; */
}
@@ -122,6 +122,7 @@
.wenzi-wenzi{
font-size: 13px;
margin-left: 1%;
+ white-space: nowrap;
}
.bottom-icon1{
float: right;
@@ -134,21 +135,17 @@
font-size: 13px;
}
.view-0{
- margin-left: 4%;
+ margin-top: 0.5rem;
}
.view-1{
- margin-left: 24%;
- margin-top: -14%;
+
}
.view-2{
- margin-left: 44%;
- margin-top: -14%;
+
}
.view-3{
- margin-left: 64%;
- margin-top: -13%;
+
}
.view-4{
- margin-left: 84%;
- margin-top: -13%;
+
}
diff --git a/miniprogram/pages/manager/group/message/publicty/index.wxml b/miniprogram/pages/manager/group/message/publicty/index.wxml
index 2738fe2..f9f0bd9 100644
--- a/miniprogram/pages/manager/group/message/publicty/index.wxml
+++ b/miniprogram/pages/manager/group/message/publicty/index.wxml
@@ -1,7 +1,11 @@
<view class="content">
<view class="lists" wx:for="{{causeList}}" wx:key="id">
- <view class="item2"><image class="icon" src="../../../../icon/鍏憡 (1).png"></image>缇ゅ叕鍛�</view>
- <view class="item">{{item.ctime}}</view>
+ <view class="item2">
+ <image class="icon" src="../../../../icon/鍏憡 (1).png"></image>
+ <span class="content">缇ゅ叕鍛�</span>
+ <view class="item">{{item.ctime}}</view>
+ </view>
+
<view class="item3">{{item.text}}</view>
</view>
</view>
\ No newline at end of file
diff --git a/miniprogram/pages/manager/group/message/publicty/index.wxss b/miniprogram/pages/manager/group/message/publicty/index.wxss
index de6692c..ecec931 100644
--- a/miniprogram/pages/manager/group/message/publicty/index.wxss
+++ b/miniprogram/pages/manager/group/message/publicty/index.wxss
@@ -15,26 +15,30 @@
/* margin-top: 50% ; */
border-top: 3px solid rgba(0,0,0,0.1);
width: 100%;
- margin-left: 2%;
+ padding: 0 0.5rem;
}
.item{
font-size: 13px;
- margin-left: 20%;
- margin-top: -4%;
+
}
+
.icon{
- margin-top: 2%;
+ /* margin-top: 2%; */
height: 25px;
width: 25px;
- margin-right: 2%;
+ /* margin-right: 2%; */
}
.item2{
+ display: flex;
+ align-items: center;
font-size: 13px;
+ margin-top: 0.5rem;
/* float: right; */
/* margin-right: 40%; */
/* color:rgba(0,0,0,0.5); */
}
.item3{
+ margin-top: 0.5rem;
font-size: 14px;
margin-bottom: 2%;
}
diff --git a/miniprogram/pages/manager/report/detail/index.wxml b/miniprogram/pages/manager/report/detail/index.wxml
index 68b8f42..5f34055 100644
--- a/miniprogram/pages/manager/report/detail/index.wxml
+++ b/miniprogram/pages/manager/report/detail/index.wxml
@@ -59,7 +59,7 @@
<view class="font-wenzi">鍏宠仈妗堜欢</view>
</view>
<view class="button">
- <button size="mini" class="button3" bindtap="deny">椹� 鍥�</button>
+ <!-- <button size="mini" class="button3" bindtap="deny">椹� 鍥�</button> -->
<button class="button2" size="mini" bindtap="pass">閫� 杩�</button>
<button class="button1" size="mini" bindtap="cancel">鍙� 娑�</button>
</view>
diff --git a/miniprogram/pages/manager/report/index.wxml b/miniprogram/pages/manager/report/index.wxml
index 04f430e..ee9f53d 100644
--- a/miniprogram/pages/manager/report/index.wxml
+++ b/miniprogram/pages/manager/report/index.wxml
@@ -1,6 +1,9 @@
<!--index.wxml-->
<view>
<view class="icon">
+ <van-empty class="empty" description="鏆傛棤鏁版嵁" wx:if="{{reportList.length === 0}}">
+
+ </van-empty>
<view wx:for="{{reportList}}" wx:key="id">
<view class="conter" id="{{item.id}}" bindtap="getDetail">
<view class="font-name"> {{item.reporterName}} {{item.mobile}}</view>
diff --git a/miniprogram/pages/user/loginInfo/index.ts b/miniprogram/pages/user/loginInfo/index.ts
index 432b492..60efc9a 100644
--- a/miniprogram/pages/user/loginInfo/index.ts
+++ b/miniprogram/pages/user/loginInfo/index.ts
@@ -1,22 +1,52 @@
// index.ts
// 鑾峰彇搴旂敤瀹炰緥
const loginInfo = getApp()
+import Toast from '../../../miniprogram_npm/@vant/weapp/toast/toast';
+import Notify from '../../../miniprogram_npm/@vant/weapp/notify/notify';
+let myStyle = `
+--color:black;
+`
+let chageStyle = `
+--color:red;
+`
Page({
data: {
user:{},
isShow:false,
- pic:null
+ pic:null,
+ viewData: {
+ style: myStyle,
+ styleId:myStyle
+ }
},
getName(e){
console.log(e.detail.value)
+ if(e.detail.value){
+ this.setData({'viewData.style': myStyle})
+ }
this.data.user.realName=e.detail.value
},
getIdcard(e){
+ if(e.detail.value){
+ this.setData({'viewData.styleId': myStyle})
+ }
this.data.user.userIdcard=e.detail.value
},
submit(){
+ if(!/^[\u4e00-\u9fa5]{2,4}$/.test(this.data.user.realName)){
+ // Toast.fail('璇疯緭鍏ユ纭殑濮撳悕');
+ Notify({ type: 'warning', message: '璇疯緭鍏ユ纭殑濮撳悕' });
+ this.setData({'viewData.style': chageStyle})
+ return
+ }
+ if(!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.data.user.userIdcard)){
+ // Toast.fail('璇疯緭鍏ユ纭殑韬唤璇佸彿');
+ Notify({ type: 'warning', message: '璇疯緭鍏ユ纭殑韬唤璇佸彿' });
+ this.setData({'viewData.styleId': chageStyle})
+ return
+ }
this.data.user.pic=this.data.pic
this.data.user.id=wx.getStorageSync('id')
if ( this.data.user.pic == null||this.data.user.realName==null|| this.data.user.realName==null) {
@@ -58,6 +88,8 @@
'content-type': 'application/json'
},
success:(res)=>{
+ // 鎴愬姛閫氱煡
+ Notify({ type: 'primary', message: '閲囬泦鎴愬姛' });
const result = JSON.parse(res.data)
this.setData({
pic:result.data,
diff --git a/miniprogram/pages/user/loginInfo/index.wxml b/miniprogram/pages/user/loginInfo/index.wxml
index ef16d86..1e1b84e 100644
--- a/miniprogram/pages/user/loginInfo/index.wxml
+++ b/miniprogram/pages/user/loginInfo/index.wxml
@@ -1,15 +1,17 @@
<!--index.wxml-->
<view>
+ <van-notify id="van-notify" />
+ <van-toast id="van-toast" />
<view class="home">
<image class="icon" src="../../icon/home.png"></image>
<form>
<view class="div">
<image class="icon1" src="../../icon/鐢ㄦ埛.png"></image>
- <input bindinput="getName" class="weui-input" name="input" placeholder="璇疯緭鍏ュ鍚�" />
+ <input bindinput="getName" class="weui-input" style="{{viewData.style}}" name="input" placeholder="璇疯緭鍏ュ鍚�" />
</view>
<view class="div1">
<image class="icon1" src="../../icon/韬唤璇�.png"></image>
- <input bindinput="getIdcard" class="weui-input" name="input" placeholder="璇疯緭鍏ヨ韩浠借瘉" />
+ <input bindinput="getIdcard" class="weui-input" style="{{viewData.styleId}}" name="input" placeholder="璇疯緭鍏ヨ韩浠借瘉" />
</view>
<view class="div1">
<image class="icon1" src="../../icon/鐓х墖.png"></image>
@@ -18,5 +20,8 @@
</view>
</form>
</view>
- <button class="button1" bindtap="submit">鎻� 浜�</button>
+ <view class="foot">
+ <button class="button1" bindtap="submit">鎻� 浜�</button>
+ </view>
+
</view>
\ No newline at end of file
diff --git a/miniprogram/pages/user/loginInfo/index.wxss b/miniprogram/pages/user/loginInfo/index.wxss
index 46ebacd..51fc3b8 100644
--- a/miniprogram/pages/user/loginInfo/index.wxss
+++ b/miniprogram/pages/user/loginInfo/index.wxss
@@ -26,8 +26,9 @@
.weui-input{
float: right;
margin-top: 3%;
+ color: var(--color);
/* margin-right:10% ; */
-width: 90%;
+ width: 83%;
}
.button{
float: right;
@@ -38,9 +39,21 @@
float: right;
margin-top: 2%;
}
+.foot{
+ position: absolute;
+ bottom: 1rem;
+ padding: 0 1rem;
+ width: -webkit-fill-available;
+}
.button1{
font-weight: normal;
background-color:#6699ff;
color: #ffffff;
- margin-top: 50%;
+
}
+/* .van-toast__text{
+ white-space: nowrap;
+}
+.van-transition{
+ width: auto;
+} */
\ No newline at end of file
diff --git a/miniprogram/pages/user/pubulicty/index.wxml b/miniprogram/pages/user/pubulicty/index.wxml
index ad895bb..c21ffce 100644
--- a/miniprogram/pages/user/pubulicty/index.wxml
+++ b/miniprogram/pages/user/pubulicty/index.wxml
@@ -4,8 +4,10 @@
<image style="width:100%;" class="indexImage" src="../../../image/test3.jpg"></image>
<!-- <text class="font-name">闈掗槼缁忎睛</text> -->
</view>
+ <van-empty class="empty" description="鏆傛棤鏁版嵁" wx:if="{{causeList.length === 0}}">
+
+ </van-empty>
<view class="content" style="width:100%;">
-
<view class="lists" wx:for="{{causeList}}" wx:key="id">
<swiper indicator-dots autoplay wx:if="{{item.photoStr!=null}}" current="{{swcurrent}}">
<block wx:for="{{item.photoStr}}" wx:for-item="i" wx:for-index="indexs" wx:key="indexs">
diff --git a/miniprogram/pages/user/report/index.wxml b/miniprogram/pages/user/report/index.wxml
index beddc40..8c80d3f 100644
--- a/miniprogram/pages/user/report/index.wxml
+++ b/miniprogram/pages/user/report/index.wxml
@@ -1,6 +1,9 @@
<!--index.wxml-->
<view>
<view class="icon">
+ <van-empty class="empty" description="鏆傛棤鏁版嵁" wx:if="{{reportList.length === 0}}">
+
+ </van-empty>
<view wx:for="{{reportList}}" wx:key="id">
<view class="conter" id="{{item.id}}" bindtap="getDetail">
<view class="inGroup" wx:if="{{item.isInGroup==1}}">宸茶繘缇�</view>
--
Gitblit v1.8.0