From 2a74d067dbffbdb09bcf9d77d7b5015f762e980a Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Thu, 29 Aug 2024 15:08:11 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/technicianLevel.vue | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pages/index/technicianLevel.vue b/pages/index/technicianLevel.vue
index 1702614..212bf05 100644
--- a/pages/index/technicianLevel.vue
+++ b/pages/index/technicianLevel.vue
@@ -41,15 +41,13 @@
 						<view v-else>
 							备注: 本期等级是根据技师上个周期的业绩最终计算得出
 						</view> -->
-						<view v-if="grade">
+						<view v-if="grade" class="dengji-text">
 							本周期到达等级：【{{grade}}】
 						</view>
-						<u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
+						<u-line-progress active-color="#9dd47a" :show-percent="false" :height="15" inactive-color="#098f7a"
 							:percent="lineProgressData" :striped-active="true"></u-line-progress>
-						
 						<view v-if="!maxStatus && longUpgradeDescriptionSet.differenceOutstandingAchievement" class="dengji-text">
-							还差{{ longUpgradeDescriptionSet.differenceDurationOnline }}小时，{{ longUpgradeDescriptionSet.differenceOutstandingAchievement }}业绩，{{ longUpgradeDescriptionSet.differenceIntegral }}积分;可以升级{{ longUpgradeDescriptionSet.differenceGrade }}
-							
+							还差<span class="memo">{{ longUpgradeDescriptionSet.differenceDurationOnline }}</span>小时，<span class="memo">{{ longUpgradeDescriptionSet.differenceOutstandingAchievement }}</span>业绩，<span class="memo">{{ longUpgradeDescriptionSet.differenceIntegral }}</span>积分;可以升级<span class="memo">{{ longUpgradeDescriptionSet.differenceGrade }}</span>
 						</view>
 						<view v-if="maxStatus" class=" dengji-text">
 							您已达到最高等级
@@ -286,12 +284,13 @@
 		position: relative;
 	}
 	.mian-view{
-		width: 90%;
+		width:100%;
 		display: flex;
 		flex-direction: column;
 		position: absolute;
 		top: 0;
-		margin-top: 160px;
+		margin-top: 140px;
+		background: #fff;
 	}
 	.djimg-text{
 		font-size: 23rpx;
@@ -325,6 +324,7 @@
 		margin-right: 6px;
 	}
 	.header-right-text{
+		width: 100%;
 		margin-top: 25px;
 		font-size: 26rpx;
 		color: #FFFFFF;
@@ -404,15 +404,14 @@
 	}
 	.content{
 		width: 100%;
-		height: 100vh;
-		background-image: url('../../static/index/swim.jpg');
+		/* height: 100vh; 
+		background:#f7f7f7;*/
 		background-repeat: no-repeat;
 		background-size: 100%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		padding-bottom: 30px;
-	}
+		}
 	.be-remarks{
 		border: 1px dashed #FE912E;
 		padding: 10rpx 20rpx;
@@ -431,7 +430,12 @@
 		width: 100%;
 	}
 	.memo{
+		font-size: 24rpx;
+		color: #ffe35d;
+		padding: 0 6rpx;
+	}
+	.dengji-text{
 		font-size: 22rpx;
-		color: #c1e7e1;
+		
 	}
 </style>

From a95b78aefdd6b46802a4e2dbf9c364aa4a5754d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 30 Aug 2024 15:29:02 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/msg/im.vue | 80 +++++++++++++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 32 deletions(-)

diff --git a/pages/msg/im.vue b/pages/msg/im.vue
index 7d49a97..65043e3 100644
--- a/pages/msg/im.vue
+++ b/pages/msg/im.vue
@@ -79,6 +79,8 @@
 </template>
 <script>
 	import * as websocketUtils from 'utils/websocketUtils.js';
+import { compile } from "vue";
+const maxReconnectMaxCn = 30;
 	export default {
 		data() {
 			return {
@@ -140,7 +142,9 @@
 				],
 				//表情图片图床名称 ，由于我上传的第三方图床名称会有改变，所以有此数据来做对应，您实际应用中应该不需要
 				onlineEmoji:{"100.gif":"AbNQgA.gif","101.gif":"AbN3ut.gif","102.gif":"AbNM3d.gif","103.gif":"AbN8DP.gif","104.gif":"AbNljI.gif","105.gif":"AbNtUS.gif","106.gif":"AbNGHf.gif","107.gif":"AbNYE8.gif","108.gif":"AbNaCQ.gif","109.gif":"AbNN4g.gif","110.gif":"AbN0vn.gif","111.gif":"AbNd3j.gif","112.gif":"AbNsbV.gif","113.gif":"AbNwgs.gif","114.gif":"AbNrD0.gif","115.gif":"AbNDuq.gif","116.gif":"AbNg5F.gif","117.gif":"AbN6ET.gif","118.gif":"AbNcUU.gif","119.gif":"AbNRC4.gif","120.gif":"AbNhvR.gif","121.gif":"AbNf29.gif","122.gif":"AbNW8J.gif","123.gif":"AbNob6.gif","124.gif":"AbN5K1.gif","125.gif":"AbNHUO.gif","126.gif":"AbNIDx.gif","127.gif":"AbN7VK.gif","128.gif":"AbNb5D.gif","129.gif":"AbNX2d.gif","130.gif":"AbNLPe.gif","131.gif":"AbNjxA.gif","132.gif":"AbNO8H.gif","133.gif":"AbNxKI.gif","134.gif":"AbNzrt.gif","135.gif":"AbU9Vf.gif","136.gif":"AbUSqP.gif","137.gif":"AbUCa8.gif","138.gif":"AbUkGQ.gif","139.gif":"AbUFPg.gif","140.gif":"AbUPIS.gif","141.gif":"AbUZMn.gif","142.gif":"AbUExs.gif","143.gif":"AbUA2j.gif","144.gif":"AbUMIU.gif","145.gif":"AbUerq.gif","146.gif":"AbUKaT.gif","147.gif":"AbUmq0.gif","148.gif":"AbUuZV.gif","149.gif":"AbUliF.gif","150.gif":"AbU1G4.gif","151.gif":"AbU8z9.gif","152.gif":"AbU3RJ.gif","153.gif":"AbUYs1.gif","154.gif":"AbUJMR.gif","155.gif":"AbUadK.gif","156.gif":"AbUtqx.gif","157.gif":"AbUUZ6.gif","158.gif":"AbUBJe.gif","159.gif":"AbUdIO.gif","160.gif":"AbU0iD.gif","161.gif":"AbUrzd.gif","162.gif":"AbUDRH.gif","163.gif":"AbUyQA.gif","164.gif":"AbUWo8.gif","165.gif":"AbU6sI.gif","166.gif":"AbU2eP.gif","167.gif":"AbUcLt.gif","168.gif":"AbU4Jg.gif","169.gif":"AbURdf.gif","170.gif":"AbUhFS.gif","171.gif":"AbU5WQ.gif","172.gif":"AbULwV.gif","173.gif":"AbUIzj.gif","174.gif":"AbUTQs.gif","175.gif":"AbU7yn.gif","176.gif":"AbUqe0.gif","177.gif":"AbUHLq.gif","178.gif":"AbUOoT.gif","179.gif":"AbUvYF.gif","180.gif":"AbUjFU.gif","181.gif":"AbaSSJ.gif","182.gif":"AbUxW4.gif","183.gif":"AbaCO1.gif","184.gif":"Abapl9.gif","185.gif":"Aba9yR.gif","186.gif":"AbaFw6.gif","187.gif":"Abaiex.gif","188.gif":"AbakTK.gif","189.gif":"AbaZfe.png","190.gif":"AbaEFO.gif","191.gif":"AbaVYD.gif","192.gif":"AbamSH.gif","193.gif":"AbaKOI.gif","194.gif":"Abanld.gif","195.gif":"Abau6A.gif","196.gif":"AbaQmt.gif","197.gif":"Abal0P.gif","198.gif":"AbatpQ.gif","199.gif":"Aba1Tf.gif","200.png":"Aba8k8.png","201.png":"AbaGtS.png","202.png":"AbaJfg.png","203.png":"AbaNlj.png","204.png":"Abawmq.png","205.png":"AbaU6s.png","206.png":"AbaaXn.png","207.png":"Aba000.png","208.png":"AbarkT.png","209.png":"AbastU.png","210.png":"AbaB7V.png","211.png":"Abafn1.png","212.png":"Abacp4.png","213.png":"AbayhF.png","214.png":"Abag1J.png","215.png":"Aba2c9.png","216.png":"AbaRXR.png","217.png":"Aba476.png","218.png":"Abah0x.png","219.png":"Abdg58.png"},
+				webSocketTask:null,
 				timer:null,
+				reconnectCn: 1
 			};
 		},
 		onLoad(d) {
@@ -163,17 +167,29 @@
 			}
 		},
 		mounted() {
-			this.timer = setInterval(() => {
-			  this.getTimeOrListItem1()
-			}, 3000);
+			// this.timer = setInterval(() => {
+			//   this.getTimeOrListItem1();
+			// }, 3000);
 		},
 		onUnload() {
+			// uni.closeSocket({
+			// 	success: () => {
+			// 		console.info("退出成功")
+			// 	},
+			// })
+			// this.webSocketTask.close({
+			// 	code:500,
+			// 	complete:(res)=>{
+			// 		console.log("主动断开",res);
+			// 	}
+			// });
+			this.reconnectCn = 101;
 			uni.closeSocket({
-				success: () => {
-					console.info("退出成功")
-				},
+				code:500,
+				complete:(res)=>{
+					console.log("主动断开",res);
+				}
 			})
-			// uni.closeSocket()
 			uni.hideLoading();
 			clearInterval(this.timer);
 			this.timer = null; 
@@ -246,11 +262,11 @@
 			connect() {
 				let that = this;
 				let userId = that.$queue.getData('userId');
-				if (that.connected || that.connecting) {
-					uni.showModal({
-						content: '正在连接或者已经连接，请勿重复连接',
-						showCancel: false
-					})
+				if (that.connected && that.connecting) {
+					// uni.showModal({
+					// 	content: '正在连接或者已经连接，请勿重复连接',
+					// 	showCancel: false
+					// })
 					return false
 				}
 				that.connecting = true
@@ -279,8 +295,8 @@
 					}
 				});
 				uni.onSocketOpen((res) => {
-					that.connecting = false
-					that.connected = true
+					// that.connecting = false
+					// that.connected = true
 					uni.hideLoading()
 					// uni.showToast({
 					// 	icon: 'none',
@@ -292,25 +308,28 @@
 					that.connecting = false
 					that.connected = false
 					uni.hideLoading()
-					uni.showModal({
-						content: '网络较差，请稍后再试',
-						showCancel: false
-					})
+					// uni.showModal({
+					// 	content: '网络较差，请稍后再试',
+					// 	showCancel: false
+					// })
 					console.log('onError', err);
 				});
 				uni.onSocketMessage(function (res) {
 					console.log('收到服务器内容：' + JSON.stringify(res));
-					
 					setTimeout(() => {
+						that.hideDrawer();
 						that.getTimeOrListItem1();
 					}, 50);
-					
 				});
 				uni.onSocketClose((res) => {
 					that.connected = false
 					that.startRecive = false
 					that.msg = false
 					console.log('onClose', res)
+					if(this.reconnectCn<maxReconnectMaxCn){
+						this.reconnectCn = this.reconnectCn + 1;
+						this.connect();
+					}		
 				});
 			},
 			close() {
@@ -319,6 +338,7 @@
 			
 			// 加载初始页面消息
 			getTimeOrListItem1() {
+				console.log("im:getTimeOrListItem1");
 				this.$Request.get('/app/chat/selectChatContent?page=1&limit=1000&chatConversationId=' + this.chatConversationId).then(
 					res => {
 						this.ListItem = [];
@@ -333,7 +353,7 @@
 								}
 								this.ListItem.push(d);
 							});
-							this.ListItem = this.ListItem.reverse();;
+							this.ListItem = this.ListItem.reverse();
 							setTimeout(() => {
 								uni.pageScrollTo({
 									scrollTop: 99999,
@@ -368,7 +388,6 @@
 				if (!phone) {
 					phone = this.$queue.getData('userName');
 				}
-				console.log("this.byUserId",this.byUserId)
 				// if(this.textMsg!=''){
 				// 	const isRich = this.isRichText(this.textMsg); // 返回 true
 				// 	if(isRich==true){
@@ -377,20 +396,16 @@
 				// 		this.content=this.textMsg
 				// 	}
 				// }
-				
-				
 				// console.log('this.content=============>',isRich)
 				let data = {
 					content: this.content,
 					messageType: type,
 					userId: this.byUserId,
 					chatConversationId: this.chatConversationId,
-					
 				}
 				if(data.messageType==2){
 					data.width="100"
 				}
-				console.log("data",data)
 				data = JSON.stringify(data);
 				
 				let that = this;
@@ -410,15 +425,16 @@
 							type: type,
 							userId: userId
 						}
-						console.log(data,'data99999999999999999')
+						// console.log(data,'data99999999999999999')
 						// that.ListItem.push(data);
-						setTimeout(() => {
-							that.hideDrawer();
-							that.getTimeOrListItem1();
-						}, 50);
-						console.log(that.content);
+						// setTimeout(() => {
+						// 	that.hideDrawer();
+						// 	that.getTimeOrListItem1();
+						// }, 500);
+						// console.log(that.content);
 					},
 					fail(err) {
+						that.connect();
 						console.log(err);
 					}
 				})

From e4014a1556004ba086bb5efba0a3b7f7011a7ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 30 Aug 2024 15:55:45 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.js               | 9 +++++----
 pages/order/index.vue          | 3 ---
 uview-ui/libs/request/index.js | 8 +++-----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/common/config.js b/common/config.js
index c6fc01f..bf721a9 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,13 +1,14 @@
 //生产环境
 const PROT = "https://"//生产需替换
-const ROOTHOST = "admin.sjajk.com";//生产需替换
+// const ROOTHOST = "admin.sjajk.com";//生产需替换
+const ROOTHOST = "sausers.blxinchuang.com";
 //测试环境
 // const PROT = "http://"
 // const ROOTHOST = "47.75.182.93:8090";
 // const ROOTHOST = "1.92.152.160";
 // const ROOTHOST = "1.92.152.160";
 // const ROOTHOST1 = "sausers.blxinchuang.com";
-// const ROOTHOST = "192.168.2.15:8187";
+// const ROOTHOST = "192.168.2.222:8187";
 // const ROOTHOST = "120.46.52.165";
 // const ROOTHOST = "192.168.0.115:8187";
 // const ROOTHOST = "192.168.1.169:8187";
@@ -33,8 +34,8 @@ const checkdomain = (ROOTHOST) => {
 //验证是否是域名后判断http/https
 const ROOTPATH = (checkdomain(ROOTHOST) ? "https://" : "http://") + ROOTHOST + "/sqx_fast";
 const ROOTPATH1 = (checkdomain(ROOTHOST) ? "https://" : "http://") + ROOTHOST + "/sqx_fast";
-const ROOTPATH2 = "wss://" + ROOTHOST + "/wss/chatSocket/"; //联系客服
 // const ROOTPATH3 = "wss://" + ROOTHOST1 + "/wss/chatSocket/"; //聊天
+const ROOTPATH2 = "wss://" + ROOTHOST + "/wss/chatSocket/"; //联系客服
 const WEBSOCKETADDRESS = "wss://" + ROOTHOST + "/wss/chatSocket/"; //退出软件后台后将用户状态置为离线
 const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload';
 
@@ -72,4 +73,4 @@ module.exports = {
 	WS_UPLOAD_MAP_PATH,
 	WS_UPLOAD_RECORDER_PATH,
 	WEBSOCKETADDRESS
-};
\ No newline at end of file
+};
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 55e8a3c..ef792ab 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -714,9 +714,6 @@
 							let currentTimeStamp = new Date().getTime() / 1000;
 							let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
 							ret.endOfServiceTimer = formatTimeStamp;
-							console.log("dddd",ret.ordersNo);
-							console.log("eeee",ret.endOfServiceTimer);
-							console.log("ffff",ret.earlyFinishReason);
 						}
 						if (this.$refs.countDownEl) this.$refs.countDownEl.update();
 					})
diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js
index 3fd6fba..3e39668 100644
--- a/uview-ui/libs/request/index.js
+++ b/uview-ui/libs/request/index.js
@@ -101,11 +101,9 @@ class Request {
 
 	constructor() {
 		this.config = {
-			baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
-			// baseUrl: 'http://47.75.182.93:8090/', // 请求的根域名
-			// baseUrl: 'http://120.46.52.165/', // 请求的根域名
-			// baseUrl: 'http://192.168.2.15:8187/', // 请求的根域名
-			// baseUrl: 'http://1.92.152.160/', // 请求的根域名
+			// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
+			// baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
+			baseUrl: 'https://sausers.blxinchuang.com', // 请求的根域名
 			// 默认的请求头
 			header: {},
 			method: 'POST',

From e09b462813fcab712f919ee6ad5059c15572f2ec Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 30 Aug 2024 16:09:00 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/video/index.vue | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pages/video/index.vue b/pages/video/index.vue
index 0d7e748..1904026 100644
--- a/pages/video/index.vue
+++ b/pages/video/index.vue
@@ -16,12 +16,15 @@
 							<image class="service-viedeimg" src="../../static/videoimg2.png"></image>
 							发布视频
 						</view>
-						
+						<view class="page-head-xuan" v-if="checkboxShow==0" @click="deleteVodeo">
+							<image class="service-viedeimg" src="../../static/dele.png"></image>
+							<span>删除</span>
+						</view>	
 					</view>	
 				</view>	
 			</view>	
 		</view>	
-		<scroll-view :style="'width: 100%; height: '+ (windowHeight) +'px; background-color: #f5f5f5;'" :scroll-y="true" @scrolltolower="scrolltolower" :lower-threshold="lowerThreshold">
+		<scroll-view :style="'width: 100%; height: '+ (windowHeight) +'px; background-color: #fff;'" :scroll-y="true" @scrolltolower="scrolltolower" :lower-threshold="lowerThreshold">
 			<view style="display: flex; flex-direction: row; flex-wrap: wrap;padding-top: 46px;">
 				<checkbox-group class="checkbox-group" @change="checkboxChange">
 					<view class="checkbox-group-list" v-for="(list,index) in dataList" :key="index">
@@ -34,10 +37,7 @@
 				</checkbox-group>
 			</view>
 		</scroll-view>
-		<view class="shanchu" v-if="checkboxShow==0" @click="deleteVodeo">
-			<image class="service-deleimg" src="../../static/dele.png"></image>
-			<span>删除</span>
-		</view>	
+		
 		<uni-popup style="width: 100%;height: 100vh;" type="center" ref="pinglun" @touchmove.stop.prevent="moveHandle">
 			<view style="width: 100%;height: 100%;">
 				<video
@@ -295,7 +295,6 @@
 	.data-list{
 		width:100%; 
 		height:100%; 
-		background-color: #fff;
 	}
 	.checkbox-group-list{
 		position: relative;
@@ -322,13 +321,13 @@
 		height: 24px;
 	}
 	.page-head-xuan{
-		margin-left: 10px;
+		margin-left:8px;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		font-size: 24rpx;
 		color: #333;
-		padding:10rpx 20rpx;
+		padding:8rpx 20rpx;
 		border: 1px solid #333;
 		border-radius: 30rpx;
 		background: #f0f0f0;

From 29c7d34b7707c5863c2054a14ee045fdc18b33c5 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 30 Aug 2024 16:19:03 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pages/my/index.vue b/pages/my/index.vue
index 9c6755d..2a0dbd2 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -1119,4 +1119,7 @@
 		flex-wrap: wrap;
 		justify-content: flex-start;
 	}
+	.djtit{
+		font-size: 22rpx;
+	}
 </style>
\ No newline at end of file