From 397f66b39c34ed63700c680dfe3ba6d7d7814e49 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期五, 07 四月 2023 13:11:21 +0800
Subject: [PATCH] 修改报案人删除
---
miniprogram/pages/manager/myself/index.wxml | 9
miniprogram/pages/user/index.wxss | 4
miniprogram/pages/manager/group/message/member/index.ts | 51 ++++++
miniprogram/pages/manager/group/message/index.ts | 235 +++++++++++++++++++--------------
miniprogram/pages/manager/group/message/member/index.wxss | 16 +
miniprogram/pages/user/index.wxml | 4
miniprogram/pages/manager/group/message/member/index.wxml | 17 +
miniprogram/pages/user/group/index.ts | 12 +
miniprogram/pages/manager/group/message/publicty/index.wxml | 3
miniprogram/pages/manager/group/message/publicty/index.ts | 3
miniprogram/pages/manager/group/message/index.wxml | 10 +
miniprogram/pages/user/group/message/index.ts | 3
miniprogram/pages/user/index.ts | 5
miniprogram/pages/manager/myself/index.ts | 4
miniprogram/app.json | 5
15 files changed, 257 insertions(+), 124 deletions(-)
diff --git a/miniprogram/app.json b/miniprogram/app.json
index 778664f..f0d55d7 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -50,7 +50,10 @@
"van-notice-bar": "@vant/weapp/notice-bar/index",
"van-overlay": "@vant/weapp/overlay/index",
"van-image": "@vant/weapp/image/index",
- "van-dialog": "@vant/weapp/dialog/index"
+ "van-dialog": "@vant/weapp/dialog/index",
+ "van-swipe-cell": "@vant/weapp/swipe-cell/index",
+ "van-action-sheet": "@vant/weapp/action-sheet/index"
+
},
"window": {
"backgroundTextStyle": "light",
diff --git a/miniprogram/pages/manager/group/message/index.ts b/miniprogram/pages/manager/group/message/index.ts
index af5a021..1e7e9a3 100644
--- a/miniprogram/pages/manager/group/message/index.ts
+++ b/miniprogram/pages/manager/group/message/index.ts
@@ -4,9 +4,17 @@
Page({
data: {
- inter:1,
- overLayList:{},
- showOverlay:false,
+ messageId: '',
+ sheetShow: false,
+ actions: [
+ {
+ name: '娓呴櫎姝ゆ潯娑堟伅',
+ color: '#ee0a24',
+ },
+ ],
+ inter: 1,
+ overLayList: {},
+ showOverlay: false,
messageList: [],
isShow: false,
height: null,
@@ -14,7 +22,7 @@
scrollTop: 0,
isInput: 1,
value: "",
- groupId:null,
+ groupId: null,
},
// getDetail(e) {
// console.log(e)
@@ -22,55 +30,80 @@
// url: '../cause/detail/index?id=' + e.currentTarget.id,
// })
// },
-
- onClickHide(e){
+ onCloseSheet() {
+ this.setData({ sheetShow: false });
+ },
+ onSelectSheet(event) {
+ console.log(this.data.messageId,event);
+ if (event.detail.name) {
+ wx.request({
+ url: message.globalData.url +'/message/deleteById',
+ method: "GET",
+ header: { 'token': wx.getStorageSync('token') },
+ data: {id:this.data.messageId},
+ success: (res) => {
+ console.log(res);
+ this.getmessage()
+ }
+ })
+ }
+ },
+ onSheetText(e) {
+ console.log(e);
+ this.setData({ sheetShow: true,
+ messageId:e.target.dataset.id
+ })
+ this.data.messageId = e.target.dataset.id
+ this.onSelectSheet(e.target.dataset.id)
+ },
+ onClickHide(e) {
console.log(e)
this.setData({
- showOverlay:false
+ showOverlay: false
})
},
- onClickShow(e){
+ onClickShow(e) {
console.log(e);
this.setData({
- overLayList:e
+ overLayList: e
})
this.setData({
- showOverlay:true
+ showOverlay: true
})
},
-groupMenber(){
- wx.navigateTo({
- url:'../message/member/index?id='+this.data.groupId
- })
-},
-publicty(){
-wx.navigateTo({
- url:'../message/publicty/index?id='+this.data.groupId
-})
-},
-banSpeech(){
- wx.navigateTo({
- url:'../message/Speech/index?id='+this.data.groupId
- })
-},
-cause(){
- wx.navigateTo({
- url:'../message/cause/index?id='+this.data.groupId
- })
-},
-chatRecords(){
- wx.navigateTo({
- url:'../message/records/index?id='+this.data.groupId
- })
-},
-more() {
+ groupMenber() {
+ wx.navigateTo({
+ url: '../message/member/index?id=' + this.data.groupId
+ })
+ },
+ publicty() {
+ wx.navigateTo({
+ url: '../message/publicty/index?id=' + this.data.groupId
+ })
+ },
+ banSpeech() {
+ wx.navigateTo({
+ url: '../message/Speech/index?id=' + this.data.groupId
+ })
+ },
+ cause() {
+ wx.navigateTo({
+ url: '../message/cause/index?id=' + this.data.groupId
+ })
+ },
+ chatRecords() {
+ wx.navigateTo({
+ url: '../message/records/index?id=' + this.data.groupId
+ })
+ },
+ more() {
console.log("杩涙潵浜�", this.data.scrollTop)
if (this.data.isShow == false) {
this.setData({
isShow: true,
height: 110
})
-
+
} else {
this.setData({
isShow: false,
@@ -79,8 +112,8 @@
}
},
- sendMsg(){
-
+ sendMsg() {
+
wx.request(
{
url: message.globalData.url + "/wx/group/manager/sendMsg",
@@ -88,8 +121,8 @@
header: { 'token': wx.getStorageSync('token') },
data: {
groupId: this.data.groupId,
- id:wx.getStorageSync("id"),
- msg:this.data.value
+ id: wx.getStorageSync("id"),
+ msg: this.data.value
},
success: (res) => {
wx.request(
@@ -108,33 +141,33 @@
}
this.setData({
messageList: res.data.data,
- value:""
+ value: ""
})
console.log(this.data.messageList)
try {
wx.setStorageSync('time', 'time')
- } catch (e) { }
+ } catch (e) { }
// wx.setStorageSync('time','time')
this.setData({
- isInput : 1
+ isInput: 1
})
-
-
-
+
+
+
wx.createSelectorQuery().select('#chat')
-
- .boundingClientRect(function(rect){
- console.log('rectheight',rect);
-
- /* 灏嗛〉闈㈢Щ鍔ㄥ埌鏈�搴曢儴锛堢敤xxx鐨刪eight瀹氫綅锛� */
- wx.pageScrollTo({
- scrollTop: rect.height
- })
- }).exec()
+
+ .boundingClientRect(function (rect) {
+ console.log('rectheight', rect);
+
+ /* 灏嗛〉闈㈢Щ鍔ㄥ埌鏈�搴曢儴锛堢敤xxx鐨刪eight瀹氫綅锛� */
+ wx.pageScrollTo({
+ scrollTop: rect.height
+ })
+ }).exec()
}
})
}
- })
+ })
},
inputWenzi: function (e) {
this.setData({
@@ -151,7 +184,10 @@
})
}
},
- getmessage(){
+ getmessageList(){
+
+ },
+ getmessage() {
wx.request(
{
url: message.globalData.url + "/wx/message",
@@ -168,53 +204,56 @@
}
this.setData({
messageList: res.data.data,
-
+
})
console.log(this.data.messageList)
try {
wx.setStorageSync('time', 'time')
- } catch (e) { }
+ } catch (e) { }
// wx.setStorageSync('time','time')
this.setData({
- isInput : 2
+ isInput: 2
})
-
-
-
+
+
+
wx.createSelectorQuery().select('#chat')
-
- .boundingClientRect(function(rect){
- console.log('rectheight',rect);
-
- /* 灏嗛〉闈㈢Щ鍔ㄥ埌鏈�搴曢儴锛堢敤xxx鐨刪eight瀹氫綅锛� */
- wx.pageScrollTo({
- scrollTop: rect.height
- })
- }).exec()
+
+ .boundingClientRect(function (rect) {
+ console.log('rectheight', rect);
+
+ /* 灏嗛〉闈㈢Щ鍔ㄥ埌鏈�搴曢儴锛堢敤xxx鐨刪eight瀹氫綅锛� */
+ wx.pageScrollTo({
+ scrollTop: rect.height
+ })
+ }).exec()
}
})
},
- endInter(){
+ endInter() {
let thit = this
clearInterval(thit.data.inter)
- },
- onUnload () {
+ },
+ onUnload() {
+ console.log('娓呴櫎瀹氭椂鍣�');
+
this.endInter()
- },
- onHide(){
+ },
+ onHide() {
+ console.log('娓呴櫎瀹氭椂鍣�');
this.endInter()
- },
+ },
onLoad(e) {
this.setData({
- uid:wx.getStorageSync('id')
+ uid: wx.getStorageSync('id')
})
-
+
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
@@ -231,9 +270,9 @@
if (secends < 10) {
secends = "0" + secends
}
- time = date.getFullYear() + "-" + month + "-" + day + " " + hours+":"+minutes+":"+secends
- wx.setStorageSync('time',time)
- this.data.groupId=e.id
+ time = date.getFullYear() + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + secends
+ wx.setStorageSync('time', time)
+ this.data.groupId = e.id
wx.request(
{
url: message.globalData.url + "/wx/message",
@@ -253,18 +292,18 @@
})
console.log(this.data.messageList)
wx.createSelectorQuery().select('#chat')
- .boundingClientRect(function(rect){
- console.log('rectheight',rect);
- /* 灏嗛〉闈㈢Щ鍔ㄥ埌鏈�搴曢儴锛堢敤xxx鐨刪eight瀹氫綅锛� */
- wx.pageScrollTo({
- scrollTop: rect.height
- })
- }).exec()
+ .boundingClientRect(function (rect) {
+ console.log('rectheight', rect);
+ /* 灏嗛〉闈㈢Щ鍔ㄥ埌鏈�搴曢儴锛堢敤xxx鐨刪eight瀹氫綅锛� */
+ wx.pageScrollTo({
+ scrollTop: rect.height
+ })
+ }).exec()
}
})
- let that = this
- that.data.inter = setInterval(function(){
- that.getmessage()
- },10000)
+ let that = this
+ that.data.inter = setInterval(function () {
+ that.getmessage()
+ }, 10000)
}
})
diff --git a/miniprogram/pages/manager/group/message/index.wxml b/miniprogram/pages/manager/group/message/index.wxml
index caab3ec..96656bf 100644
--- a/miniprogram/pages/manager/group/message/index.wxml
+++ b/miniprogram/pages/manager/group/message/index.wxml
@@ -15,6 +15,14 @@
</view>
</view>
</van-overlay>
+<van-action-sheet
+ show="{{ sheetShow }}"
+ actions="{{ actions }}"
+ bind:close="onCloseSheet"
+ bind:select="onSelectSheet"
+ cancel-text="鍙栨秷"
+ bind:cancel="onCloseSheet"
+/>
<view class="chat-item" id="chat">
<view wx:for="{{messageList}}" wx:key="index">
@@ -26,7 +34,7 @@
<image wx:if="{{item.pic&&item.sex=='濂�'}}" class="face" bindtap="onClickShow" data-smile='{{item}}' src="../../../../image/userlady.jpg"></image>
<image wx:if="{{item.pic==undefined}}" class="face" bindtap="onClickShow" data-smile='{{item}}' src="../../../../image/userman.jpg"></image>
<view class="chat-message-left">{{item.name}}-{{item.mobile}}</view>
- <view class="chat-context-left">{{item.text}}</view>
+ <view class="chat-context-left" bindtap="onSheetText" data-id="{{item.messageId}}">{{item.text}}</view>
<view class="chat-site-left"></view>
</view>
<!--a - 鑷繁鐨勪俊鎭�-->
diff --git a/miniprogram/pages/manager/group/message/member/index.ts b/miniprogram/pages/manager/group/message/member/index.ts
index fde14fd..3d94fd3 100644
--- a/miniprogram/pages/manager/group/message/member/index.ts
+++ b/miniprogram/pages/manager/group/message/member/index.ts
@@ -1,7 +1,7 @@
// index.ts
// 鑾峰彇搴旂敤瀹炰緥
const groupMember = getApp()
-
+import Dialog from '@vant/weapp/dialog/dialog';
Page({
data: {
managerCount: null,
@@ -68,15 +68,51 @@
url:'../member/detail/index?id='+e.currentTarget.id
})
},
- onLoad(e) {
- console.log(e.id)
- this.data.groupId=e.id
+ onClose(event) {
+ let that=this
+ const { position, instance } = event.detail;
+ switch (position) {
+ case 'left':
+ case 'cell':
+ instance.close();
+ break;
+ case 'right':
+ Dialog.confirm({
+ message: '纭畾鍒犻櫎鍚楋紵',
+ }).then(() => {
+ that.delMember(event)
+ instance.close();
+ }).catch(() => {
+ instance.close();
+ });
+ break;
+ }
+ },
+ delMember(event){
+ console.log(event);
+ let id = event.target.dataset.id
+ wx.request({
+ url: groupMember.globalData.url + "/report/deleteReporter?id="+id,
+ method:"DELETE",
+ data: {
+ id: id
+ },
+ header: { 'token': wx.getStorageSync('token') },
+ success:(res)=>{
+ console.log(res);
+ this.getList()
+ }
+ })
+
+
+ },
+ getList(){
wx.request(
{
url: groupMember.globalData.url + "/wx/group/member",
method: "GET",
data: {
- id: e.id
+ id: this.data.groupId
},
header: { 'token': wx.getStorageSync('token') },
success: (res) => {
@@ -93,6 +129,11 @@
})
}
})
+ },
+ onLoad(e) {
+ console.log(e.id)
+ this.data.groupId=e.id
+ this.getList(e)
}
diff --git a/miniprogram/pages/manager/group/message/member/index.wxml b/miniprogram/pages/manager/group/message/member/index.wxml
index 451e4e6..0f890a1 100644
--- a/miniprogram/pages/manager/group/message/member/index.wxml
+++ b/miniprogram/pages/manager/group/message/member/index.wxml
@@ -1,4 +1,5 @@
<view>
+ <van-dialog id="van-dialog" />
<view class="input-view">
<input class="input" bindinput="seach" placeholder="馃攳鎼滅储" placeholder-class="center" />
</view>
@@ -11,11 +12,17 @@
</view>
<view class="manager">
<view class="wenzi">缇ゆ垚鍛� ({{memberConut}})浜�</view>
- <view class="list" wx:for="{{memberList}}" wx:key="index" >
- <view id="{{item.id}}" bindtap="memberDetail">
- <image class="managerIcon" src="../../../../../image/userman.jpg"></image>
- <view class="name">{{item.realName}}</view>
- </view>
+ <view wx:for="{{memberList}}" wx:key="index">
+ <van-swipe-cell class="list-swipe" id="swipe-cell" right-width="{{ 65 }}" async-close bind:close="onClose" data-id="{{item.id}}">
+ <!-- <view slot="left">閫夋嫨</view> -->
+ <view class="list" id="{{item.id}}" bindtap="memberDetail">
+ <image class="managerIcon" src="../../../../../image/userman.jpg"></image>
+ <view class="name">{{item.realName}}</view>
+ </view>
+ <view slot="right">鍒犻櫎</view>
+ </van-swipe-cell>
+
+
</view>
</view>
</view>
\ No newline at end of file
diff --git a/miniprogram/pages/manager/group/message/member/index.wxss b/miniprogram/pages/manager/group/message/member/index.wxss
index e0c5bba..994c5d9 100644
--- a/miniprogram/pages/manager/group/message/member/index.wxss
+++ b/miniprogram/pages/manager/group/message/member/index.wxss
@@ -18,11 +18,12 @@
margin-left: 2%;
background-color: #F5F5F9;
height: 30px;
+ line-height: 30px;
+ font-weight: 900;
}
.name{
font-size: 14px;
- margin-left: 13%;
- margin-top: -6%;
+ margin-left: 0.5rem;
}
.center{
text-align:center;
@@ -39,8 +40,15 @@
background-color: #F5F5F9;
} */
.list{
- margin-top: 2%;
- margin-bottom: 2%;
+ display: flex;
+ padding: 0.5rem 1rem;
width: 100%;
height: 30px;
+ align-items: center;
+}
+.van-swipe-cell__right{
+ padding: 0.7rem;
+ width: 100%;
+ background-color: red;
+ color: #FFF;
}
\ No newline at end of file
diff --git a/miniprogram/pages/manager/group/message/publicty/index.ts b/miniprogram/pages/manager/group/message/publicty/index.ts
index 0fac65b..2181874 100644
--- a/miniprogram/pages/manager/group/message/publicty/index.ts
+++ b/miniprogram/pages/manager/group/message/publicty/index.ts
@@ -7,6 +7,9 @@
causeList:[],
isShow:false
},
+ causeListAdd(){
+
+ },
// 浜嬩欢澶勭悊鍑芥暟
onLoad(e) {
wx.request(
diff --git a/miniprogram/pages/manager/group/message/publicty/index.wxml b/miniprogram/pages/manager/group/message/publicty/index.wxml
index 1a51e5c..106593c 100644
--- a/miniprogram/pages/manager/group/message/publicty/index.wxml
+++ b/miniprogram/pages/manager/group/message/publicty/index.wxml
@@ -1,4 +1,5 @@
<view class="content">
+ <van-empty class="empty" description="鏆傛棤鏁版嵁" wx:if="{{causeList.length === 0}}"></van-empty>
<view class="lists" wx:for="{{causeList}}" wx:key="id">
<view class="item2">
<image class="icon" src="../../../../icon/notice.png"></image>
@@ -7,5 +8,7 @@
</view>
<view class="item3">{{item.text}}</view>
+
+ <!-- <van-button type="info" bind:click="causeListAdd">娣诲姞</van-button> -->
</view>
</view>
\ No newline at end of file
diff --git a/miniprogram/pages/manager/myself/index.ts b/miniprogram/pages/manager/myself/index.ts
index 3bdddf9..9e1d09b 100644
--- a/miniprogram/pages/manager/myself/index.ts
+++ b/miniprogram/pages/manager/myself/index.ts
@@ -4,6 +4,7 @@
Page({
data: {
+ role:'',
reportList:{},
isShow:false
},
@@ -15,6 +16,9 @@
})
},
onLoad() {
+ this.setData({
+ role:wx.getStorageSync('role')
+ })
wx.request(
{
url:myself.globalData.url+ "/wx/manager/myself",
diff --git a/miniprogram/pages/manager/myself/index.wxml b/miniprogram/pages/manager/myself/index.wxml
index 6b50e02..024b398 100644
--- a/miniprogram/pages/manager/myself/index.wxml
+++ b/miniprogram/pages/manager/myself/index.wxml
@@ -3,12 +3,13 @@
<view class="bg">
</view>
<view class="icon">
- <image class="icon1" src="../../../image/7bedbaa41b1744fbfe0c55b507fd9e28.png"></image>
+ <image class="icon1" wx:if="{{role==1}}" src="../../../image/7bedbaa41b1744fbfe0c55b507fd9e28.png"></image>
+ <image class="icon1" wx:else src="../../../image/userman.jpg"></image>
</view>
- <view class="span">{{reportList.name}} <view class="pNum">{{reportList.phoneNum}}</view>
+ <view class="span">{{reportList.name||"鎮ㄥソ"}} <view class="pNum">{{reportList.phoneNum}}</view>
</view>
- <view class="wenzi">闈掔緤鍖哄叕瀹夊垎灞�缁忎睛澶ч槦</view>
- <view class="span2">
+ <view class="wenzi" wx:if="{{role==1}}">闈掔緤鍖哄叕瀹夊垎灞�缁忎睛澶ч槦</view>
+ <view class="span2" wx:if="{{role==1}}">
<view class="cNum">{{reportList.causeNum}}
<view class="wenzi-low">妗堜欢鏁�</view>
</view>
diff --git a/miniprogram/pages/user/group/index.ts b/miniprogram/pages/user/group/index.ts
index a0ae1fa..de4ada1 100644
--- a/miniprogram/pages/user/group/index.ts
+++ b/miniprogram/pages/user/group/index.ts
@@ -9,6 +9,10 @@
toHome() {
wx.navigateBack()
},
+ onTabItemTap() {
+
+ this.getmessList()
+ },
openGroup(e) {
if (wx.getStorageSync('role')==1) {
wx.navigateTo({
@@ -22,7 +26,7 @@
},
- onLoad() {
+ getmessList(){
var date = new Date()
var month = date.getMonth() + 1
var day = date.getDate()
@@ -48,7 +52,6 @@
time = date.getFullYear() + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + secends
var lastTime = wx.getStorageSync('time')
console.log(wx.getStorageSync('role'));
-
if (wx.getStorageSync('role')==1) {
wx.request(
{
@@ -92,6 +95,11 @@
}
})
}
+ },
+ onLoad() {
+
+ this.getmessList()
+
}
})
diff --git a/miniprogram/pages/user/group/message/index.ts b/miniprogram/pages/user/group/message/index.ts
index c47f467..b224609 100644
--- a/miniprogram/pages/user/group/message/index.ts
+++ b/miniprogram/pages/user/group/message/index.ts
@@ -206,9 +206,12 @@
clearInterval(thit.data.inter)
},
onUnload () {
+ console.log('娓呴櫎瀹氭椂鍣�');
+
this.endInter()
},
onHide(){
+ console.log('娓呴櫎瀹氭椂鍣�');
this.endInter()
},
onLoad(e) {
diff --git a/miniprogram/pages/user/index.ts b/miniprogram/pages/user/index.ts
index b5327ac..03ea24f 100644
--- a/miniprogram/pages/user/index.ts
+++ b/miniprogram/pages/user/index.ts
@@ -4,6 +4,7 @@
Page({
data: {
+ role:'',
swcurrent: 0,
isShow: false,
userInfo: {},
@@ -19,6 +20,10 @@
onLoad() {
+ this.setData({
+ role:wx.getStorageSync('role')
+ })
+
wx.request({
url: user.globalData.url+"/wx/login",
data: {
diff --git a/miniprogram/pages/user/index.wxml b/miniprogram/pages/user/index.wxml
index 13d7499..5d6df01 100644
--- a/miniprogram/pages/user/index.wxml
+++ b/miniprogram/pages/user/index.wxml
@@ -26,10 +26,10 @@
<view class="box2" bindtap="getReport">
<text class="font-wenzi">鍙楁崯浜哄憳淇℃伅鐧昏</text>
</view>
- <view class="box2 box3" bindtap="toDetailedInformation">
+ <view wx:if="{{role==1}}" class="box2 box3" bindtap="toDetailedInformation">
<text class="font-wenzi">鎶ユ璇︽儏</text>
</view>
- <view class="box2" bindtap="toManage">
+ <view wx:if="{{role==1}}" class="box2" bindtap="toManage">
<text class="font-wenzi">妗堜欢绠＄悊</text>
</view>
</view>
diff --git a/miniprogram/pages/user/index.wxss b/miniprogram/pages/user/index.wxss
index 29d089b..e03e758 100644
--- a/miniprogram/pages/user/index.wxss
+++ b/miniprogram/pages/user/index.wxss
@@ -141,7 +141,7 @@
}
.list .font-wenzi1 {
- font-size: 14px;
+ font-size: 17px;
margin-bottom: 4px;
margin-left: 0.5rem;
font-weight: 900;
@@ -150,7 +150,7 @@
.list .more {
margin-bottom: 4px;
float: right;
- font-size: 14px;
+ font-size: 17px;
color: rgba(0, 0, 0, 0.7);
margin-right: 0.5rem;
font-weight: 900;
--
Gitblit v1.8.0