From 6abdd28e794560593c3ee2c203bbd096629a1813 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Mon, 11 Sep 2023 16:10:05 +0800
Subject: [PATCH] 2

---
 common/js/api.js                          |   9 +-
 pages.json                                |   9 ++
 pages/about/bannerManage/addBanner.vue    |   1 +
 pages/about/bannerManage/bannerManage.vue |  16 +--
 pages/about/bonusSet/bonusSet.vue         |  15 ++-
 pages/about/bonusSet/index.vue            |   2 +-
 pages/about/noticeManage/noticeManage.vue |  15 ++-
 pages/about/serviceSet/serviceSet.vue     |  23 ++--
 pages/list/agent.vue                      |  23 ++--
 pages/list/user.vue                       |  23 ++--
 pages/recordsList/recordsList.vue         | 136 ++++++++++++++--------
 pages/serivce/serivce.vue                 | 129 ++++++++++++++++++++
 pages/ucenter/ucenter.vue                 |   8 +-
 static/user/icon_manager2.png             | Bin 0 -> 658 bytes
 14 files changed, 306 insertions(+), 103 deletions(-)
 create mode 100644 pages/serivce/serivce.vue
 create mode 100644 static/user/icon_manager2.png

diff --git a/common/js/api.js b/common/js/api.js
index 0f096c7..9d97b2c 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -91,9 +91,16 @@ let API = {
 			...requestObj,
 			success(res) {
 				// console.log(res, '000');
-				// 200=成功， 400 = 失败错误返回、404 token验证失败  
+				// 200=成功， 400 = 失败错误返回、404 token验证失败  ,403 token已过2小时失效
 				if(res.data.code==200){
 					success && success(res.data);
+				}else if(res.data.code==403){
+					uni.removeStorageSync('user_token');
+					setTimeout(()=>{
+						uni.reLaunch({
+							url: '/uni_modules/uni-id-pages/pages/login/login-withpwd'
+						})
+					}, 1000)
 				}else{
 					uni.showToast({
 						title: res.data.msg,
diff --git a/pages.json b/pages.json
index ea3fbf1..a34bd6e 100644
--- a/pages.json
+++ b/pages.json
@@ -321,6 +321,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/serivce/serivce",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "联系客服",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"subPackages": [{
 			"root": "uni_modules/uni-feedback",
diff --git a/pages/about/bannerManage/addBanner.vue b/pages/about/bannerManage/addBanner.vue
index 705f56b..1d8857e 100644
--- a/pages/about/bannerManage/addBanner.vue
+++ b/pages/about/bannerManage/addBanner.vue
@@ -93,6 +93,7 @@
 				this.id = e.id;
 				this.editInfo.title = e.title;
 				this.editInfo.image = e.image;
+				this.editInfo.img = e.image.split('/storage')[1];
 				this.editInfo.sort = e.sort;
 			}
 			
diff --git a/pages/about/bannerManage/bannerManage.vue b/pages/about/bannerManage/bannerManage.vue
index 9c3d94e..9df64a8 100644
--- a/pages/about/bannerManage/bannerManage.vue
+++ b/pages/about/bannerManage/bannerManage.vue
@@ -6,7 +6,7 @@
 				<view class="icon_new"><image :src="item.image" mode=""></image></view>
 				<view style="flex:1;" class="flex-col">
 					<view class="box3"><text>轮播名称：</text>{{item.title}}</view>
-					<view class=""><text>排序：</text>{{item.sort}}%</view>
+					<view class=""><text>排序：</text>{{item.sort}}</view>
 				</view>
 				<view style="" class="flex-col">
 					<view class="red" @click="edit(item,index)">编辑</view>
@@ -43,13 +43,15 @@
 				uni.showModal({
 					title:'温馨提示',
 					content:"确定是否删除该信息",
-					success() {
-						API.request('/rotationChart/delete', {id: val.id}, res=>{
-							uni.showToast({
-								title: res.msg
+					success(res) {
+						if(res.confirm){
+							API.request('/rotationChart/delete', {id: val.id}, res=>{
+								uni.showToast({
+									title: res.msg
+								})
+								_this.setList.splice(i, 1);
 							})
-							_this.setList.splice(i, 1);
-						})
+						}
 					}
 				})
 			},
diff --git a/pages/about/bonusSet/bonusSet.vue b/pages/about/bonusSet/bonusSet.vue
index bffb0bd..7777415 100644
--- a/pages/about/bonusSet/bonusSet.vue
+++ b/pages/about/bonusSet/bonusSet.vue
@@ -72,13 +72,16 @@
 				uni.showModal({
 					title:'温馨提示',
 					content:"确定是否删除该奖金信息",
-					success() {
-						API.request('/adminZoneManage/goodsParamDel', {z_g_p_id: val.id}, res=>{
-							uni.showToast({
-								title: res.msg
+					success(res) {
+						if(res.confirm){
+							API.request('/adminZoneManage/goodsParamDel', {z_g_p_id: val.id}, res=>{
+								uni.showToast({
+									title: res.msg
+								})
+								_this.setList.splice(i, 1);
 							})
-							_this.setList.splice(i, 1);
-						})
+						}
+						
 					}
 				})
 			},
diff --git a/pages/about/bonusSet/index.vue b/pages/about/bonusSet/index.vue
index 4f52eb2..b4aa1a4 100644
--- a/pages/about/bonusSet/index.vue
+++ b/pages/about/bonusSet/index.vue
@@ -57,7 +57,7 @@
 					}else{
 						this.bonusList = res.data;
 					}
-				}, fail=>{}, false)
+				}, fail=>{})
 			}
 		},
 		onLoad(e) {
diff --git a/pages/about/noticeManage/noticeManage.vue b/pages/about/noticeManage/noticeManage.vue
index a6618ac..1adfd01 100644
--- a/pages/about/noticeManage/noticeManage.vue
+++ b/pages/about/noticeManage/noticeManage.vue
@@ -52,13 +52,16 @@
 				uni.showModal({
 					title:'温馨提示',
 					content:"确定是否删除该信息",
-					success() {
-						API.request('/notice/delete', {id: val.id}, res=>{
-							uni.showToast({
-								title: res.msg
+					success(res) {
+						if(res.confirm){
+							API.request('/notice/delete', {id: val.id}, res=>{
+								uni.showToast({
+									title: res.msg
+								})
+								_this.setList.splice(i, 1);
 							})
-							_this.setList.splice(i, 1);
-						})
+						}
+						
 					}
 				})
 			},
diff --git a/pages/about/serviceSet/serviceSet.vue b/pages/about/serviceSet/serviceSet.vue
index f76a0fb..1b2c20b 100644
--- a/pages/about/serviceSet/serviceSet.vue
+++ b/pages/about/serviceSet/serviceSet.vue
@@ -66,22 +66,25 @@
 			edit(val, i){
 				this.title = "编辑客服信息";
 				this.showEdit = true;
-				this.editInfo = val;
+				this.editInfo = {...val};
 			},
 			remove(val, i){
 				let _this = this;
 				uni.showModal({
 					title:'温馨提示',
 					content:"确定是否删除该客服信息",
-					success() {
-						API.request('/customerService/delete', {
-							id: val.id
-						}, res=>{
-							uni.showToast({
-								title: res.msg
+					success(res) {
+						if(res.confirm){
+							API.request('/customerService/delete', {
+								id: val.id
+							}, res=>{
+								uni.showToast({
+									title: res.msg
+								})
+								_this.dataList.splice(i, 1);
 							})
-							_this.dataList.splice(i, 1);
-						})
+						}
+						
 					}
 				})
 			},
@@ -116,7 +119,7 @@
 				})
 			}
 		},
-		onLoad() {
+		onShow() {
 			this.getList();
 		},
 		onNavigationBarButtonTap(e){
diff --git a/pages/list/agent.vue b/pages/list/agent.vue
index 83aac7e..942d46c 100644
--- a/pages/list/agent.vue
+++ b/pages/list/agent.vue
@@ -140,17 +140,20 @@
 				uni.showModal({
 					title:'温馨提示',
 					content:"确定是否删除该代理信息",
-					success() {
-						API.request('/adminAgentTeam/deleteAgent', {
-							aid: val.id
-						}, res=>{
-							uni.showToast({
-								title: res.msg
+					success(res) {
+						if(res.confirm){
+							API.request('/adminAgentTeam/deleteAgent', {
+								aid: val.id
+							}, res=>{
+								uni.showToast({
+									title: res.msg
+								})
+								_this.listsData.splice(i, 1);
+								// _this.account = '';
+								// _this.search();
 							})
-							_this.listsData.splice(i, 1);
-							// _this.account = '';
-							// _this.search();
-						})
+						}
+						
 					}
 				})
 			},
diff --git a/pages/list/user.vue b/pages/list/user.vue
index 02a65d3..a4a4999 100644
--- a/pages/list/user.vue
+++ b/pages/list/user.vue
@@ -141,17 +141,20 @@
 				uni.showModal({
 					title:'温馨提示',
 					content:"确定是否删除该用户信息",
-					success() {
-						API.request('/adminUserTeam/deleteUser', {
-							user_id: val.id
-						}, res=>{
-							uni.showToast({
-								title: res.msg
+					success(res) {
+						if(res.confirm){
+							API.request('/adminUserTeam/deleteUser', {
+								user_id: val.id
+							}, res=>{
+								uni.showToast({
+									title: res.msg
+								})
+								_this.listsData.splice(i, 1);
+								// _this.account = '';
+								// _this.search();
 							})
-							_this.listsData.splice(i, 1);
-							// _this.account = '';
-							// _this.search();
-						})
+						}
+						
 					}
 				})
 			},
diff --git a/pages/recordsList/recordsList.vue b/pages/recordsList/recordsList.vue
index eb53adf..17f7b26 100644
--- a/pages/recordsList/recordsList.vue
+++ b/pages/recordsList/recordsList.vue
@@ -4,8 +4,8 @@
 		<view v-for="(item,index) in recordsList" :key="index" class="record-item">
 			<view class="record-item-top">
 				<view v-if="type=='XF'||type=='ZJ'">消费、中奖记录</view>
-				<view v-if="type=='UP'||type=='DOWN'">ID：{{item.id}}（{{item.type}}）</view>
-				<view v-if="type=='CZ'">余额</view>
+				<view v-if="type=='UP'||type=='DOWN'">ID：{{item.id}}<text v-if="item.type">（{{item.type}}）</text></view>
+				<view v-if="type=='CZ'">{{item.trade_type}}</view>
 				<view v-if="type=='TX'">可提余额</view>
 				<view class="" style="color: #CD2731;">
 					<!-- <text v-if="type=='CZ'||type=='ZJ'||type=='DOWN'">+</text>
@@ -23,6 +23,9 @@
 				</view>
 			</view>
 		</view>
+		<view class="" v-if="recordsList.length===0" style="color: #999;text-align: center;padding: 40rpx;">
+			- 暂无记录 -
+		</view>
 	</view>
 </template>
 
@@ -31,27 +34,26 @@
 	export default {
 		data() {
 			return {
+				userType: '',
 				type: null,
 				recordsList:[
-					{
-						amount1: '100.00',
-						amount2: '1000.00',
-						time: '08月27日 12:00',
-					},
-					{
-						amount1: '100.00',
-						amount2: '1000.00',
-						time: '08月27日 12:00',
-					},
+					// {
+					// 	amount1: '100.00',
+					// 	amount2: '1000.00',
+					// 	time: '08月27日 12:00',
+					// },
+					// {
+					// 	amount1: '100.00',
+					// 	amount2: '1000.00',
+					// 	time: '08月27日 12:00',
+					// },
 				],
 				page: 1,
 				noMore: true,
 			}
-		},
-		methods: {
-			
 		},
 		onLoad(e) {
+			this.userType = uni.getStorageSync('userType');
 			this.type = e.type;
 			let title = '';
 			switch(e.type){
@@ -77,27 +79,26 @@
 			uni.setNavigationBarTitle({
 				title: title+'记录'
 			})
-			this['get'+this.type](this.page);
-
+			this['get'+this.type]();
 		},
 		methods: {
-			getTX(page=1){
+			getTX(){
 				API.getWithdrawal({
-					page: page,
+					page: this.page,
 					limit: 10
 				}, res=>{
-					let list = res.list.map(item=>{
+					let list = res.data.list.map(item=>{
 						return {
 							amount1: item.withdrawal_amount,
 							amount2: item.withdrawal_balence,
 							time: item.apply_time,
 						}
 					});
-					if(page===1){
+					if(this.page===1){
 						list.length>0 ? this.noMore=false : false;
 						this.recordsList = list;
 					}else{
-						if(res.list.length==0){
+						if(res.data.list.length==0){
 							uni.showToast({
 								title: '没有更多了',
 								icon: 'none'
@@ -108,23 +109,36 @@
 					}
 				})
 			},
-			getCZ(page=1){
-				API.getRecharge({
-					page: page,
+			getCZ(){
+				let url = '';
+				switch(this.userType){
+					case 'user':
+					url = '/user/rechargeRecords'
+					break;
+					case 'agent':
+					url = '/agentTeam/rechargeRecords'
+					break;
+					case 'background':
+					url = ''
+					break;
+				}
+				API.request(url,{
+					page: this.page,
 					limit: 10
 				}, res=>{
-					let list = res.list.map(item=>{
+					let list = res.data.list.map(item=>{
 						return {
 							amount1: item.recharge_amount,
 							amount2: item.residue_amount,
 							time: item.recharge_time,
+							trade_type: item.trade_type
 						}
 					});
-					if(page===1){
+					if(this.page===1){
 						list.length>0 ? this.noMore=false : false;
 						this.recordsList = list;
 					}else{
-						if(res.list.length==0){
+						if(res.data.list.length==0){
 							uni.showToast({
 								title: '没有更多了',
 								icon: 'none'
@@ -135,23 +149,23 @@
 					}
 				})
 			},
-			getXF(page=1){
+			getXF(){
 				API.getConsumption({
-					page: page,
+					page: this.page,
 					limit: 10
 				}, res=>{
-					let list = res.list.map(item=>{
+					let list = res.data.list.map(item=>{
 						return {
 							amount1: item.actual_price,
 							amount2: item.residue_amount,
 							time: item.create_time,
 						}
 					});
-					if(page===1){
+					if(this.page===1){
 						list.length>0 ? this.noMore=false : false;
 						this.recordsList = list;
 					}else{
-						if(res.list.length==0){
+						if(res.data.list.length==0){
 							uni.showToast({
 								title: '没有更多了',
 								icon: 'none'
@@ -162,23 +176,23 @@
 					}
 				})
 			},
-			getZJ(page=1){
+			getZJ(){
 				API.getAwards({
-					page: page,
+					page: this.page,
 					limit: 10
 				}, res=>{
-					let list = res.list.map(item=>{
+					let list = res.data.list.map(item=>{
 						return {
 							amount1: item.awards_amount,
 							amount2: item.withdrawal_balance,
 							time: item.create_time,
 						}
 					});
-					if(page===1){
+					if(this.page===1){
 						list.length>0 ? this.noMore=false : false;
 						this.recordsList = list;
 					}else{
-						if(res.list.length==0){
+						if(res.data.list.length==0){
 							uni.showToast({
 								title: '没有更多了',
 								icon: 'none'
@@ -190,23 +204,35 @@
 				})
 			},
 			getUP(){
-				API.request('/adminUser/upScoresList', {
+				let url = '';
+				switch(this.userType){
+					case 'user':
+					url = ''
+					break;
+					case 'agent':
+					url = '/agentTeam/upScoresList'
+					break;
+					case 'background':
+					url = '/adminUser/upScoresList'
+					break;
+				}
+				API.request(url, {
 					page: this.page,limit:10
 				}, res=>{
-					let list = res.list.map(item=>{
+					let list = res.data.list.map(item=>{
 						return {
 							amount1: item.balance,
 							amount2: item.residue_amount,
 							time: item.create_time,
 							id: item.relation_id,
-							type: item.relation_type
+							type: item.relation_type||''
 						}
 					});
-					if(page===1){
+					if(this.page===1){
 						list.length>0 ? this.noMore=false : false;
 						this.recordsList = list;
 					}else{
-						if(res.list.length==0){
+						if(res.data.list.length==0){
 							uni.showToast({
 								title: '没有更多了',
 								icon: 'none'
@@ -218,23 +244,35 @@
 				})
 			},
 			getDOWN(){
-				API.request('/adminUser/downScoresList', {
+				let url = '';
+				switch(this.userType){
+					case 'user':
+					url = ''
+					break;
+					case 'agent':
+					url = '/agentTeam/downScoresList'
+					break;
+					case 'background':
+					url = '/adminUser/downScoresList'
+					break;
+				}
+				API.request(url, {
 					page: this.page,limit:10
 				}, res=>{
-					let list = res.list.map(item=>{
+					let list = res.data.list.map(item=>{
 						return {
 							amount1: item.withdrawal_amount,
 							amount2: item.withdrawal_balance,
 							time: item.create_time,
 							id: item.relation_id,
-							type: item.relation_type
+							type: item.relation_type||''
 						}
 					});
-					if(page===1){
+					if(this.page===1){
 						list.length>0 ? this.noMore=false : false;
 						this.recordsList = list;
 					}else{
-						if(res.list.length==0){
+						if(res.data.list.length==0){
 							uni.showToast({
 								title: '没有更多了',
 								icon: 'none'
@@ -250,7 +288,7 @@
 		onReachBottom() {
 			if(this.noMore) return;
 			this.page++;
-			this['get'+this.type](this.page);
+			this['get'+this.type]();
 		}
 	}
 </script>
diff --git a/pages/serivce/serivce.vue b/pages/serivce/serivce.vue
new file mode 100644
index 0000000..a8b6099
--- /dev/null
+++ b/pages/serivce/serivce.vue
@@ -0,0 +1,129 @@
+<template>
+	<view>
+		<view class="nav_area"></view>
+		<view v-for="(item,index) in serviceList" :key="index" class="record-item">
+			<view class="line1">
+				<image src="../../static/user/icon_manager2.png" mode=""></image>
+				<view class="">客服名：<text style="color:#101010;">{{item.name}}</text></view>
+			</view>
+			<view class="line2">微信号码：<text style="color:#101010;">{{item.wx}}</text></view>
+			<view class="btn" @click="copyNum(item.wx)">复制联系方式</view>
+		</view>
+		<view class="" v-if="serviceList.length===0" style="color: #999;text-align: center;padding: 40rpx;">
+			- 暂无记录 -
+		</view>
+	</view>
+</template>
+
+<script>
+	import API from '@/common/js/api.js'
+	export default {
+		data() {
+			return {
+				serviceList:[
+					{
+						name: '100.00',
+						wx: '17177771111',
+					},
+					{
+						name: '100.00',
+						wx: '1000.00',
+					},
+				],
+				page: 1,
+				noMore: true,
+			}
+		},
+		onLoad(e) {
+			this.getList();
+		},
+		methods: {
+			copyNum(num){
+				uni.setClipboardData({
+					data: num,
+					success() {
+						uni.showToast({
+							title: '复制成功'
+						})
+					}
+				})
+			},
+			getList(){
+				API.request('/user/getCustomerServiceList', {}, res=>{
+					let list = res.data.list;
+					if(this.page===1){
+						list.length>0 ? this.noMore=false : false;
+						this.serviceList = list;
+					}else{
+						if(res.data.list.length==0){
+							uni.showToast({
+								title: '没有更多了',
+								icon: 'none'
+							})
+							this.noMore = true;
+						}
+						this.serviceList = this.serviceList.concat(list)
+					}
+				})
+			},
+			
+		},
+		onReachBottom() {
+			if(this.noMore) return;
+			this.page++;
+			this.getList();
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.nav_area {
+		position: fixed;
+		top: 0px;
+		left: 0px;
+		z-index: 99;
+		background-color: #fff;
+		box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.05);
+		width: 700rpx;
+		height: 88rpx;
+		padding: 0px 25rpx;
+		padding-top: var(--status-bar-height);
+		box-sizing: content-box;
+		color: #b0b0b0;
+		font-size: 14px;
+	
+	}
+	.record-item{
+		padding: 80rpx 88rpx 0px;
+		
+		.line1{
+			width: 100%;
+			display: flex;
+			color: #999;
+			
+			image{
+				width: 40rpx;
+				height: 40rpx;
+				margin-right: 20rpx;
+			}
+		}
+		.line2{
+			width: 100%;
+			padding-left: 60rpx;
+			color: #999;
+			margin-top: 10px;
+		}
+		.btn{
+			width: 226rpx;
+			height: 68rpx;
+			line-height: 68rpx;
+			border: 1px solid #d6e6ff;
+			border-radius: 10px;
+			font-size: 12px;
+			text-align: center;
+			color: #6DA6FF;
+			margin: 40rpx auto 0px;
+		}
+	}
+	
+</style>
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index 75713cc..a534725 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -208,7 +208,7 @@
 					[
 						{
 							"title": '在线客服',
-							"event": '',
+							"to": '/pages/serivce/serivce',
 							"icon": "compose",
 							"iconN": "people"
 						},
@@ -573,8 +573,10 @@
 				uni.showModal({
 					title:'温馨提示',
 					content:"确定后，将清除所有缓存数据",
-					success() {
-						
+					success(res) {
+						if(res.confirm){
+							
+						}
 						// let tk = uni.getStorageSync('user_token');
 						// let ut = uni.getStorageSync('userType');
 						// uni.clearStorageSync();
diff --git a/static/user/icon_manager2.png b/static/user/icon_manager2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fa1fbd74ce4d7cf62fbd936fb333c77c4578cc7
GIT binary patch
literal 658
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*Fy#?EyX^u0VPyf~cqSoq_JQEeY}q
zX83=gp>K6t1!wQomGAgECr{saOj<4H^o!3y%A$)unkJms@gU6ea?0E_vA62ApPu*4
zi2A0xdx2cjT|=jmH!C%MPGw+V^!0Rc45^rNbn?rvLk0q^)q+7$3zoi#zR7wsMKqxD
z|8pbFZF4JTJhH6%@^9Ad8egNCl8^bfl-Zn@yuWx;np~q^n$q<uma^LIH>PK-owH#+
z?~X`O(YOX7eyamkJ=F)Sk56sPdc*REiCOQ1Pp+&mn~tOR)(&;HImzB{-Rv7qxb@%S
z%we-Ru<+WU21fB2!PZyS`)pyEwQ(|kWTJy|ySH}Fce`aW>08=A*nhwCCZYJf?$TLG
zs<Wb3vwabs<+RQ9<E_*Nk3&;-y__{)zw@c>yXmG@OFGyV-wxSU#V5>Jx{mGbx|O<D
zLQ3U2tUfvayK-$qmyDpvoyGq?U(7vmJ~-&ax-X@l-4wafV)foC>u;D<$ayZz!d0!8
z=eVRB+e?jY6Mk>fVh?}1?2ybFmJd;%5_V|(c)R$&pvZ>Iw<R~1w1=h&eUZwy|CUkz
f^3%N^*?&FcJKhO7$4mMj0;McZS3j3^P6<r_;vLmu

literal 0
HcmV?d00001