From 448733a1c8816b37e4a47cde4a86d7c7d1f1e610 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Mon, 29 Apr 2024 23:05:49 +0800
Subject: [PATCH] add

---
 App.vue                                       |  33 +--
 pages/chat/customer_list/index.vue            | 212 ++++++++++--------
 pages/product/addGoodDetail/addGoodDetail.vue |   8 -
 3 files changed, 135 insertions(+), 118 deletions(-)

diff --git a/App.vue b/App.vue
index d34dde9..f5b558c 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,6 @@
 <script>
 	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]  测试分指
 	// +----------------------------------------------------------------------
 	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
 	// +----------------------------------------------------------------------
@@ -16,7 +16,9 @@
 		checkLogin
 	} from "./libs/login";
 	import {
+
 		getUserInfo
+
 	} from '@/api/user.js';
 	import {
 		parseToken
@@ -89,6 +91,16 @@
 				//发送消息成功回调
 				console.log('消息成功' + JSON.stringify(option));
 			});
+
+
+			uni.onHostEventReceive((event, data) => {
+				if (event == 'tocustomlist') {
+					uni.switchTab({
+						url: '/pages/chat/customer_list/index'
+					});
+				}
+			});
+
 			// #endif
 
 			this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
@@ -120,6 +132,10 @@
 
 			if (option?.referrerInfo?.extraData?.uniMP) {
 				uni.setStorageSync('uniMP', option.referrerInfo?.extraData?.uniMP);
+				// this.$store.commit("LOGIN", {
+				// 	'token': option.referrerInfo?.extraData?.token,
+				// 	'time': 604800
+				// });
 				parseToken({
 					token: option.referrerInfo?.extraData?.token
 				}).then((res) => {
@@ -133,6 +149,7 @@
 						'token': option.referrerInfo?.extraData?.token,
 						'time': 604800
 					});
+					console.log('TOKEN解析错误:', err);
 					this.$isResolve()
 				})
 			} else {
@@ -405,8 +422,7 @@
 			//console.log('App Hide')
 		},
 		watch: {
-			// https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/40390202404250914319725.mp4
-			// 记录H5和公众号?spm=a2c4e.11153940.blogcont573781.6.c1032027sQ46VG&x-oss-process=video/snapshot,t_1000,m_fast
+			// 记录H5和公众号
 			$route(n) {
 				if (this.$store.state.app.token) {
 					// 浏览记录
@@ -428,21 +444,10 @@
 	@import 'static/css/style.scss';
 
 
-	// 全局取消滚动条
-	* {
-		scrollbar-color: #e5e5e500 #f7f7f9 !important;
-	}
-
 	view {
 		box-sizing: border-box;
 	}
 
-	.c_active {
-		&:active {
-			opacity: .8;
-		}
-	}
-
 	.custom_style {
 		color: #fff;
 		display: flex;
diff --git a/pages/chat/customer_list/index.vue b/pages/chat/customer_list/index.vue
index e548227..1a9055e 100644
--- a/pages/chat/customer_list/index.vue
+++ b/pages/chat/customer_list/index.vue
@@ -12,7 +12,8 @@
 						<view class="con line1" v-if="item.last && item.last.msn_type == 2">[表情]</view>
 						<view class="con line1" v-if="item.last && item.last.msn_type == 3">[图片]</view>
 						<view class="con line1" v-if="item.last && item.last.msn_type == 4">[商品]</view>
-						<view class="con line1" v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
+						<view class="con line1"
+							v-if="item.last && (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
 					</view>
 					<view class="right-box">
 						<view class="time">{{item.last && item.last.create_time.split(' ')[1] || ''}}</view>
@@ -23,15 +24,18 @@
 			<block v-if="type == 1 && list.length>0" v-for="(item,index) in list" :key="index">
 				<div class="item acea-row" @click="goPage(item)">
 					<view class="logo">
-						<image :src="(item.user && item.user.avatar) ? item.user.avatar : '/static/images/f.png'" mode=""></image>
+						<image :src="(item.user && item.user.avatar) ? item.user.avatar : '/static/images/f.png'"
+							mode=""></image>
 					</view>
 					<view class="info">
 						<view class="name">{{item.user && item.user.nickname}}</view>
 						<view class="con line1" v-if="item.last && item.last.msn_type == 1">{{item.last.msn}}</view>
 						<view class="con line1" v-if="item.last && item.last.msn_type == 2">[表情]</view>
 						<view class="con line1" v-if="item.last && item.last.msn_type == 3">[图片]</view>
-						<view class="con line1" v-if="item.last && (item.last.msn_type == 4 || item.last.msn_type == 7)">[商品]</view>
-						<view class="con line1" v-if="item.last &&  (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
+						<view class="con line1"
+							v-if="item.last && (item.last.msn_type == 4 || item.last.msn_type == 7)">[商品]</view>
+						<view class="con line1"
+							v-if="item.last &&  (item.last.msn_type == 5 || item.last.msn_type == 6)">[订单]</view>
 					</view>
 					<view class="right-box">
 						<view class="time">{{item.last && item.last.create_time.split(' ')[1]}}</view>
@@ -65,10 +69,12 @@
 	import {
 		getUserInfo
 	} from '@/api/user.js';
-	import { mapGetters } from "vuex";
+	import {
+		mapGetters
+	} from "vuex";
 	export default {
 		name: "CustomerList",
-		components:{
+		components: {
 			emptyPage,
 			authorize
 		},
@@ -77,10 +83,10 @@
 				list: [],
 				productId: 0,
 				orderId: "",
-				type: 0 ,// 0 用户 1客服
+				type: 0, // 0 用户 1客服
 				timer: null,
-				page:1,
-				limit:9999,
+				page: 1,
+				limit: 9999,
 				mer_id: '',
 				loading: false,
 				clear: false,
@@ -88,58 +94,58 @@
 				isShowAuth: false, //是否隐藏授权
 			};
 		},
-		computed: mapGetters(['isLogin','viewColor']),
+		computed: mapGetters(['isLogin', 'viewColor']),
 		onLoad(optios) {
-			this.type = optios.type||1;
-			this.getindex()
+			this.type = optios.type || 1;
 		},
 		onShow(option) {
-			if(this.isLogin){
+			if (this.isLogin) {
 				this.liveUpdate();
 			} else {
 				this.isAuto = true;
 				this.isShowAuth = true
 			}
+			this.getindex()
 		},
-		onHide(){  
-			if(this.timer) {  
-				clearInterval(this.timer);  
-				this.timer = null; 
-			}   
+		onHide() {
+			if (this.timer) {
+				clearInterval(this.timer);
+				this.timer = null;
+			}
 			this.clear = true;
 		},
 		onUnload() {
-			if(this.timer) {
-				clearInterval(this.timer);  
-				this.timer = null;  
-			}  
+			if (this.timer) {
+				clearInterval(this.timer);
+				this.timer = null;
+			}
 			this.clear = true;
 		},
 		methods: {
 			//获取商户信息
-			getindex(){
+			getindex() {
 				getUserInfo().then(res => {
-          if (res.data.mer_info.length == 0) {
-            return uni.showModal({
-              title: '暂未开通商户',
-              complete(res) {
-                // #ifdef APP-PLUS
-                uni.sendHostEvent('closeApp',  (ret) => {
-                	//发送消息成功回调
-                	console.log('关闭应用' + JSON.stringify(ret));
-                });
-                // #endif
-              }
-            })
-          } 
+					if (res.data.mer_info.length == 0) {
+						return uni.showModal({
+							title: '暂未开通商户',
+							complete(res) {
+								// #ifdef APP-PLUS
+								uni.sendHostEvent('closeApp', (ret) => {
+									//发送消息成功回调
+									console.log('关闭应用' + JSON.stringify(ret));
+								});
+								// #endif
+							}
+						})
+					}
 					this.mer_id = res.data.service.mer_id;
-					if(this.isLogin){
+					if (this.isLogin) {
 						this.getList(this.mer_id)
 					} else {
 						this.isAuto = true;
 						this.isShowAuth = true
 					}
-						// this.getList(this.mer_id)
+					// this.getList(this.mer_id)
 					// this.getList(res.data.service.mer_id, true);
 				});
 			},
@@ -152,84 +158,84 @@
 			authColse: function(e) {
 				this.isShowAuth = e
 			},
-			getList(mer_id) {		
+			getList(mer_id) {
 				this.loading = true;
-				if(this.type == 0){
+				if (this.type == 0) {
 					serviceList({
-						page:this.page,
-						limit:this.limit
+						page: this.page,
+						limit: this.limit
 					}).then(res => {
 						this.list = res.data.list;
-						if(res.status == 400){
+						if (res.status == 400) {
 							clearInterval(this.timer);
-							this.timer = null; 
-							return this.$util.Tips({
-								title: res.message
-							})
-						}	
-					}).finally(v=>{
-						this.loading = false;
-						return this.$util.Tips({
-							title: v
-						})
-					}).catch(err => {
-						return this.$util.Tips({
-							title: err
-						})
-					});
-				}else{
-					serviceUserList(mer_id,{
-						page:this.page,
-						limit:this.limit
-					}).then(res =>{
-						this.list = res.data.list;
-						if(res.status == 400){
-							clearInterval(this.timer);
-							this.timer = null; 
+							this.timer = null;
 							return this.$util.Tips({
 								title: res.message
 							})
 						}
-					}).finally(v=>{
+					}).finally(v => {
+						this.loading = false;
+						return this.$util.Tips({
+							title: v
+						})
+					}).catch(err => {
+						return this.$util.Tips({
+							title: err
+						})
+					});
+				} else {
+					serviceUserList(mer_id, {
+						page: this.page,
+						limit: this.limit
+					}).then(res => {
+						this.list = res.data.list;
+						if (res.status == 400) {
+							clearInterval(this.timer);
+							this.timer = null;
+							return this.$util.Tips({
+								title: res.message
+							})
+						}
+					}).finally(v => {
 						this.loading = false;
 						clearInterval(this.timer);
-						this.timer = null; 
+						this.timer = null;
 						return this.$util.Tips({
 							title: v
 						})
 					}).catch(err => {
 						clearInterval(this.timer);
-						this.timer = null; 
+						this.timer = null;
 						return this.$util.Tips({
 							title: err
 						})
 					});
-				}				
+				}
 			},
 			//实时刷新列表
-			liveUpdate(){
+			liveUpdate() {
 				let that = this;
 				this.clear = false;
-				if(that.timer) {
+				if (that.timer) {
 					clearInterval(that.timer);
-					that.timer = null;	
-				}  
-				that.timer = setInterval(function(){
-					if(that.clear){
+					that.timer = null;
+				}
+				that.timer = setInterval(function() {
+					if (that.clear) {
 						clearInterval(that.timer);
-						return ;
+						return;
 					}
 					// 用户
 					(!that.loading) && that.getList(that.mer_id);
-				},5000);	
+				}, 5000);
 			},
 			goPage(item) {
 				item.num = 0;
-				if(this.type == 0){
+				if (this.type == 0) {
 					uni.navigateTo({
 						url: `/pages/chat/customer_list/chat?mer_id=${item.mer_id}`
 					})
-				}else{
+				} else {
 					uni.navigateTo({
 						url: `/pages/chat/customer_list/chat?userId=${item.user.uid}&mer_id=${item.mer_id}`
 					})
@@ -248,7 +254,8 @@
 			transform: rotate(180deg);
 			font-size: 36rpx;
 		}
-		.popupn{
+
+		.popupn {
 			position: fixed;
 			width: 100%;
 			text-align: center;
@@ -258,65 +265,78 @@
 			height: 90rpx;
 			line-height: 90rpx;
 			z-index: 100;
-			.title{
+
+			.title {
 				max-width: 560rpx;
 				margin: 0 auto;
 				position: relative;
 			}
-			.iconfont{
+
+			.iconfont {
 				display: inline-block;
 				position: relative;
 				top: 4rpx;
 				right: 0;
 			}
-			.mer_logo{
+
+			.mer_logo {
 				width: 34rpx;
 				height: 34rpx;
 				position: relative;
 				top: 6rpx;
-				right: 10px;			
+				right: 10px;
 			}
-			.mer_name{
+
+			.mer_name {
 				display: inline-block;
 				max-width: 650rpx;
 			}
-			.invoice-content{
+
+			.invoice-content {
 				background-color: #ffffff;
 			}
 		}
-		.list_count{
+
+		.list_count {
 			margin-top: 104rpx;
 		}
+
 		.item {
 			align-items: center;
 			border-bottom: 1px solid #eee;
 			padding: 20rpx 30rpx;
 			background-color: #fff;
-			.logo image{
+
+			.logo image {
 				width: 88rpx;
 				height: 88rpx;
 				border-radius: 50%;
 			}
-			.info{
+
+			.info {
 				width: 334rpx;
 				margin-left: 20rpx;
-				.con{
+
+				.con {
 					margin-top: 10rpx;
 					color: #999999;
 					font-size: 24rpx;
 				}
 			}
-			.right-box{
+
+			.right-box {
 				flex: 1;
 				display: flex;
 				flex-direction: column;
 				align-items: flex-end;
 				font-size: 20rpx;
 				color: #BBBBBB;
-				.time{
+
+				.time {
 					margin-bottom: 10rpx;
 				}
-				.num{
+
+				.num {
 					min-width: 6px;
 					background-color: var(--view-theme);
 					border-radius: 15px;
@@ -328,4 +348,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/product/addGoodDetail/addGoodDetail.vue b/pages/product/addGoodDetail/addGoodDetail.vue
index 2714c02..a0681bb 100644
--- a/pages/product/addGoodDetail/addGoodDetail.vue
+++ b/pages/product/addGoodDetail/addGoodDetail.vue
@@ -17,10 +17,8 @@
 				</u-form-item>
 				<view class="card" style="min-height: 150rpx;margin-bottom: 0;padding: 0;">
 					<view class="" style="display: flex;flex-wrap: wrap;">
-
 						<view v-for="(item,index) in formData.imageList"
 							style="margin-right: 20rpx;margin-bottom: 20rpx;">
-
 							<view class="video_list" v-if='vidioTypeList.includes(getSuffix(item))'>
 								<view class="video_list_item photo" style="position: relative;">
 									<view class="jiao">
@@ -46,8 +44,6 @@
 									</view>
 								</view>
 							</view>
-
-
 							<view class="" style="position: relative;" v-else>
 								<view class="jiao" @click="formData.imageList.splice(index,1)">
 									<image src="@/static/images/gban.png" mode="widthFix"></image>
@@ -57,10 +53,7 @@
 							</view>
 						</view>
 
-
-
 						<view class='uploadimg' @click="show=true,isDetail=false">
-							<!-- <view class='uploadimg'> -->
 							<u-icon name="plus" color="#777777"></u-icon>
 							<view class="" style="color: #777777;font-size: 20rpx;">
 								上传图片/视频
@@ -823,7 +816,6 @@
 			align-items: center;
 			box-sizing: border-box;
 			padding: 20rpx 0;
-			/* margin-left: 20rpx; */
 			overflow: hidden;
 
 		}