From ae28f9db9fa0ebe24b9c21cb37daf23bafee7e92 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期一, 13 三月 2023 18:06:26 +0800
Subject: [PATCH] 修改禁言和取消禁言
---
miniprogram/pages/user/group/message/index.wxml | 2
miniprogram/pages/manager/group/message/Speech/index.wxml | 14 +++-
miniprogram/pages/manager/group/message/index.wxss | 2
miniprogram/pages/manager/group/index.ts | 8 +-
miniprogram/pages/manager/group/message/Speech/index.ts | 26 +++++++-
miniprogram/pages/user/loginInfo/index.ts | 3
miniprogram/app.json | 101 +++++++++++++++++----------------
7 files changed, 91 insertions(+), 65 deletions(-)
diff --git a/miniprogram/app.json b/miniprogram/app.json
index 9178aef..822460a 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -1,52 +1,53 @@
{
- "pages": [
- "pages/index/index",
- "pages/manager/index",
- "pages/manager/report/index",
- "pages/manager/report/detail/index",
- "pages/manager/group/index",
- "pages/manager/cause/index",
- "pages/manager/cause/detail/index",
- "pages/manager/myself/index",
- "pages/user/index",
- "pages/user/pubulicty/index",
- "pages/user/myself/index",
- "pages/user/report/index",
- "pages/user/report/submitReport/index",
- "pages/user/report/detail/index",
- "pages/user/myself/detail/index",
- "pages/user/loginInfo/index",
- "pages/manager/group/message/index",
- "pages/manager/group/message/publicty/index",
- "pages/manager/group/message/cause/index",
- "pages/manager/group/message/member/index",
- "pages/manager/group/message/member/detail/index",
- "pages/manager/group/message/Speech/index",
- "pages/manager/group/message/records/index",
- "pages/manager/group/message/records/detail/index",
- "pages/user/group/index",
- "pages/user/group/message/index",
- "pages/user/group/message/publicty/index"
- ],
- "usingComponents": {
- "van-button": "@vant/weapp/button/index",
- "van-empty": "@vant/weapp/empty/index",
- "van-cell": "@vant/weapp/cell/index",
- "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-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",
- "navigationBarBackgroundColor": "#fff",
- "navigationBarTitleText": "闈掔緤鍒嗗眬缁忎睛澶ч槦",
- "navigationBarTextStyle": "black"
- },
-
- "sitemapLocation": "sitemap.json"
+ "pages": [
+ "pages/index/index",
+ "pages/manager/index",
+ "pages/manager/report/index",
+ "pages/manager/report/detail/index",
+ "pages/manager/group/index",
+ "pages/manager/cause/index",
+ "pages/manager/cause/detail/index",
+ "pages/manager/myself/index",
+ "pages/user/index",
+ "pages/user/pubulicty/index",
+ "pages/user/myself/index",
+ "pages/user/report/index",
+ "pages/user/report/submitReport/index",
+ "pages/user/report/detail/index",
+ "pages/user/myself/detail/index",
+ "pages/user/loginInfo/index",
+ "pages/manager/group/message/index",
+ "pages/manager/group/message/publicty/index",
+ "pages/manager/group/message/cause/index",
+ "pages/manager/group/message/member/index",
+ "pages/manager/group/message/member/detail/index",
+ "pages/manager/group/message/Speech/index",
+ "pages/manager/group/message/records/index",
+ "pages/manager/group/message/records/detail/index",
+ "pages/user/group/index",
+ "pages/user/group/message/index",
+ "pages/user/group/message/publicty/index"
+ ],
+ "usingComponents": {
+ "van-button": "@vant/weapp/button/index",
+ "van-empty": "@vant/weapp/empty/index",
+ "van-cell": "@vant/weapp/cell/index",
+ "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-row": "@vant/weapp/row/index",
+ "van-col": "@vant/weapp/col/index",
+ "van-notify": "@vant/weapp/notify/index",
+ "van-toast": "@vant/weapp/toast/index",
+ "van-checkbox": "@vant/weapp/checkbox/index",
+ "van-checkbox-group": "@vant/weapp/checkbox-group/index"
+ },
+ "window": {
+ "backgroundTextStyle": "light",
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTitleText": "闈掔緤鍒嗗眬缁忎睛澶ч槦",
+ "navigationBarTextStyle": "black"
+ },
+ "sitemapLocation": "sitemap.json"
}
\ No newline at end of file
diff --git a/miniprogram/pages/manager/group/index.ts b/miniprogram/pages/manager/group/index.ts
index a3c9f54..22a67e2 100644
--- a/miniprogram/pages/manager/group/index.ts
+++ b/miniprogram/pages/manager/group/index.ts
@@ -51,10 +51,12 @@
header: { 'token': wx.getStorageSync('token') },
success: (res) => {
console.log(res.data.data)
- res.data.data.map(item=>{
- item.time = item.time.substr(-8)
+ res.data.data.map(item => {
+ if (item.time) {
+ item.time = item.time.substr(-8)
+ }
})
- this.setData({
+ this.setData({
groupList: res.data.data
})
}
diff --git a/miniprogram/pages/manager/group/message/Speech/index.ts b/miniprogram/pages/manager/group/message/Speech/index.ts
index 59790f0..217c046 100644
--- a/miniprogram/pages/manager/group/message/Speech/index.ts
+++ b/miniprogram/pages/manager/group/message/Speech/index.ts
@@ -8,7 +8,8 @@
memberConut: null,
managerList: [],
memberList: [],
- groupId: null
+ groupId: null,
+ checkedAll:false
},
seach(e) {
console.log(e.detail.value)
@@ -78,6 +79,12 @@
icon: "none",
title: '绂佽█鎴愬姛!',
})
+
+ this.setData({
+ checkedAll : !this.data.checkedAll
+ })
+ console.log(this.data.checkedAll);
+
wx.request(
{
url: groupBanSpeech.globalData.url + "/wx/group/member",
@@ -105,22 +112,31 @@
})
},
pick(e) {
+ console.log(e);
wx.request(
{
- url: groupBanSpeech.globalData.url + "/wx/group/member/banSpeech",
+ url:e.currentTarget.dataset.checked==1?groupBanSpeech.globalData.url + "/wx/group/member/allowSpeech" :groupBanSpeech.globalData.url + "/wx/group/member/banSpeech",
method: "GET",
data: {
- id: e.detail.value,
+ id: e.currentTarget.dataset.value,
groupId: this.data.groupId
},
header: { 'token': wx.getStorageSync('token') },
success: (res) => {
+ var temp_str='.memberList['+e.currentTarget.dataset.index+'].banSpeech';
+ // this.data.memberList[e.currentTarget.dataset.index].banSpeech=0
this.setData({
- chencked: false
+ [temp_str]:e.currentTarget.dataset.checked==1?0:1
})
+ console.log(this.data.memberList);
+
+ // this.setData({
+ // chencked: false
+ // })
wx.showToast({
icon: "none",
- title: '绂佽█鎴愬姛!',
+ title:this.data.memberList[e.currentTarget.dataset.index].banSpeech==0?'宸插厑璁稿彂瑷�!':'绂佽█鎴愬姛!'
+ // title: e.currentTarget.dataset.chencked==0?'宸插厑璁稿彂瑷�!':'绂佽█鎴愬姛!'
})
}
})
diff --git a/miniprogram/pages/manager/group/message/Speech/index.wxml b/miniprogram/pages/manager/group/message/Speech/index.wxml
index 4ebe926..ea9f28f 100644
--- a/miniprogram/pages/manager/group/message/Speech/index.wxml
+++ b/miniprogram/pages/manager/group/message/Speech/index.wxml
@@ -12,7 +12,8 @@
<view class="manager">
<view>
<view class="wenzi">缇ゆ垚鍛� ({{memberConut}})浜�</view>
- <radio bindtap="allPick" color="red" class="radio">鍏ㄩ��</radio>
+ <van-checkbox value="{{ checkedAll }}" bind:change="allPick" class="radio">鍏ㄩ��</van-checkbox>
+ <!-- <radio bindtap="allPick" color="red" class="radio">鍏ㄩ��</radio> -->
</view>
<view class="list" wx:for="{{memberList}}" wx:key="index" >
@@ -20,9 +21,16 @@
<image class="managerIcon" src="{{item.pic}}"></image>
<view class="name">{{item.realName}}</view>
<!-- <button class="button" wx:if="{{item.banSpeech==0}}" id="{{item.id}}" bindtap="memberDetail" size="mini">绂佽█</button> -->
- <radio-group bindchange="pick" >
+ <van-checkbox
+ class="button"
+ value="{{ item.banSpeech==1 }}"
+ bind:change="pick"
+ data-value="{{item.id}}"
+ data-index="{{index}}"
+ data-checked="{{item.banSpeech}}"></van-checkbox>
+ <!-- <radio-group bindchange="pick" >
<radio checked="{{item.banSpeech==1}}" value="{{item.id}}" bindtap="cancel" color="red" class="button"></radio>
- </radio-group>
+ </radio-group> -->
</view>
</view>
</view>
diff --git a/miniprogram/pages/manager/group/message/index.wxss b/miniprogram/pages/manager/group/message/index.wxss
index 8aa7b3a..e7a78ed 100644
--- a/miniprogram/pages/manager/group/message/index.wxss
+++ b/miniprogram/pages/manager/group/message/index.wxss
@@ -62,7 +62,7 @@
}
.low{
position: fixed;
- bottom: 1.5rem;
+ bottom: 0rem;
width: 100%;
background-color: white;
/* height: 7%; */
diff --git a/miniprogram/pages/user/group/message/index.wxml b/miniprogram/pages/user/group/message/index.wxml
index ca3d57a..3528e92 100644
--- a/miniprogram/pages/user/group/message/index.wxml
+++ b/miniprogram/pages/user/group/message/index.wxml
@@ -23,7 +23,7 @@
<view class="low" style="height: {{height}}px;">
<image wx:if="{{isInput==1}}" class="more" src="../../../icon/more.png" bindtap="more"></image>
<button bindtap="sendMsg" size="mini" wx:if="{{isInput==2}}" class="button">鍙戦��</button>
- <input disabled="{{ban==1}}" value="{{value}}" class="input" bindinput="inputWenzi" />
+ <input disabled="{{ban==1}}" value="{{ban==1?'鎮ㄥ凡琚瑷�':value}}" class="input" bindinput="inputWenzi" />
<view class="moreList" wx:if="{{isShow}}" >
<!-- <view class="view-0" bindtap="groupMenber">
<image src="../../../icon/groupmembers.png" class="bottom-icon"></image>
diff --git a/miniprogram/pages/user/loginInfo/index.ts b/miniprogram/pages/user/loginInfo/index.ts
index 60efc9a..edf9ae9 100644
--- a/miniprogram/pages/user/loginInfo/index.ts
+++ b/miniprogram/pages/user/loginInfo/index.ts
@@ -22,7 +22,6 @@
},
getName(e){
- console.log(e.detail.value)
if(e.detail.value){
this.setData({'viewData.style': myStyle})
}
@@ -56,7 +55,7 @@
})
return
}
- console.log("meizhic")
+
wx.request({
url:loginInfo.globalData.url+"/wx/user/add",
method:"POST",
--
Gitblit v1.8.0