From 0c3e40c399a00fe6405f7b9a79eb1c93b7cc660e Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 11 七月 2023 16:23:33 +0800
Subject: [PATCH] 更改字眼，增加非稳定态下不可称重，增加验质字段

---
 pages/public-page/forward/forward.vue                                                         |   12 
 pages/login/login.vue                                                                         |   13 
 pages/register/register.vue                                                                   |  844 ++++++++++++++++++++++++++--------------------
 pages.json                                                                                    |    6 
 pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue                           |    4 
 pages/customer-page/customer-index/customer-index.vue                                         |   24 
 pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue                      |    2 
 pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue     |    2 
 pages/tabbar-page/index-tabbar/index-tabbar.vue                                               |    7 
 pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue |    6 
 components/combined-title/combined-title.vue                                                  |    2 
 pages/customer-page/customer-my/customer-my.vue                                               |    4 
 pages/driver-page/driver-index/driver-index.vue                                               |   14 
 store/index.js                                                                                |   12 
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue       |   12 
 api/globalApi.js                                                                              |   17 
 pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue             |    6 
 pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue              |   28 -
 pages/driver-page/driver-index/bill-of-lading-details/completeOutSale/completeOutSale.vue     |    2 
 pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue                |   10 
 pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue           |    4 
 21 files changed, 576 insertions(+), 455 deletions(-)

diff --git a/api/globalApi.js b/api/globalApi.js
index 384cc47..2fafc83 100644
--- a/api/globalApi.js
+++ b/api/globalApi.js
@@ -5,7 +5,7 @@
 		method: 'POST'
 	},
 
-	//	鎻愮叅鍗�
+	//	閫氱煡鍗�
 	//	鑾峰彇鍙戣繍璁″垝鍒楄〃
 	GetOrderPlan: {
 		url: '/wrzs/wx/getOrderPlan',
@@ -57,7 +57,7 @@
 		method: 'POST'
 	},
 	/**
-	 * @description 鑾峰彇鍘嗗彶鎻愮叅鍗�
+	 * @description 鑾峰彇鍘嗗彶閫氱煡鍗�
 	 */
 	getJhOrderPlanDataPage: {
 		url: '/wrzs/userOperation/getJhOrderPlanDataPage',
@@ -127,7 +127,7 @@
 		method: 'POST'
 	},
 	/**
-	 * @description 鑾峰彇鎻愮叅鍗曡鎯�  娌抽挗
+	 * @description 鑾峰彇閫氱煡鍗曡鎯�  娌抽挗
 	 */
 	getTakeCoal: {
 		url: '/wrzs/userOperation/getTakeCoal',
@@ -150,6 +150,11 @@
 	 * @description 楠岃川浜у搧鍘嗗彶 娌抽挗     */
 	qualityInspectionHistory: {
 		url: '/wrzs/userOperation/qualityInspectionHistory',
+		method: 'GET'
+	},
+	// 鑾峰彇appid鍜宻ecret
+	getAppidAndSercet: {
+		url: '/wrzs/wx/getAppidAndSercet',
 		method: 'GET'
 	},
 	getMaterialDetailByOrderCode: {
@@ -303,7 +308,7 @@
 		method: 'GET'
 	},
 
-	// 鎻愮叅鍗曟棩蹇楁煡璇�
+	// 閫氱煡鍗曟棩蹇楁煡璇�
 	coalDayPage: {
 		url: '/wrzs/tmtaskcoallog/getTmId',
 		method: 'GET'
@@ -380,14 +385,14 @@
 		method: 'GET'
 	},
 	/**
-	 @description 鍒ゆ柇鏄惁瑕佸畬鎴愬閿�鎻愮叅鍗�
+	 @description 鍒ゆ柇鏄惁瑕佸畬鎴愬閿�閫氱煡鍗�
 	 */
 	getTmTaskCoalOrderType: {
 		url: '/wrzs/tmtaskcoal/getTmTaskCoalOrderType',
 		method: 'GET'
 	},
 	/**
-	 @description 鏇存柊鎻愮叅鍗曠姸鎬�
+	 @description 鏇存柊閫氱煡鍗曠姸鎬�
 	 */
 	updateTmTaskCoalState: {
 		url: '/wrzs/tmtaskcoal/updateTmTaskCoalState',
diff --git a/components/combined-title/combined-title.vue b/components/combined-title/combined-title.vue
index 5e74587..ea06b99 100644
--- a/components/combined-title/combined-title.vue
+++ b/components/combined-title/combined-title.vue
@@ -29,7 +29,7 @@
 		name: 'combined-title',
 		data() {
 			return {
-				onlineurl: null
+				onlineurl,
 			};
 		},
 		props: {
diff --git a/pages.json b/pages.json
index 33f8c33..399eee8 100644
--- a/pages.json
+++ b/pages.json
@@ -93,7 +93,7 @@
 		{
 			"path": "pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details",
 			"style": {
-				"navigationBarTitleText": "鎻愮叅鍗曡鎯�",
+				"navigationBarTitleText": "閫氱煡鍗曡鎯�",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -138,7 +138,7 @@
 		{
 			"path": "pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill",
 			"style": {
-				"navigationBarTitleText": "鎻愮叅鍗�",
+				"navigationBarTitleText": "閫氱煡鍗�",
 				"enablePullDownRefresh": false
 			}
 
@@ -169,7 +169,7 @@
 		{
 			"path": "pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore",
 			"style": {
-				"navigationBarTitleText": "鎻愮叅鍗曡鎯�",
+				"navigationBarTitleText": "閫氱煡鍗曡鎯�",
 				"enablePullDownRefresh": false
 			}
 
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index 29b8964..49837bf 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -2,7 +2,7 @@
 	<view class="">
 		<view class="customer-index">
 			<view class="customer-index-body">
-				<!-- 寰呴鍙栧拰杞彂鎻愮叅鍗� -->
+				<!-- 寰呴鍙栧拰杞彂閫氱煡鍗� -->
 				<view class="wait-collection"
 					:style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/customerbanner.png)`, backgroundSize: 'contain', backgroundRepeat: 'no-repeat' }">
 				</view>
@@ -72,9 +72,9 @@
 					</view>
 				</view>
 
-				<!-- 鍘嗗彶鎻愮叅鍗� -->
+				<!-- 鍘嗗彶閫氱煡鍗� -->
 				<view class="history-numbers">
-					<combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+					<combined-title title="鍘嗗彶閫氱煡鍗�"></combined-title>
 					<scroll-view :scroll-top="scrollTop"
 						scroll-y="true"
 						class="scroll-Y"
@@ -111,7 +111,7 @@
 										v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
 								</view>
 								<view class="third-line">
-									<view class="third-line_text">鎻愮叅鍗曚釜鏁�:</view>
+									<view class="third-line_text">閫氱煡鍗曚釜鏁�:</view>
 									<view class="third-line_num">{{ item.tmCount }}</view>
 								</view>
 							</view>
@@ -192,7 +192,7 @@
 		data() {
 			return {
 				orderPlanData: [],
-				show: false, // 棰嗗彇鎻愮叅鍗曞脊鍑烘
+				show: false, // 棰嗗彇閫氱煡鍗曞脊鍑烘
 				receiveNum: null,
 				getOrderNum: {
 					num: '',
@@ -212,7 +212,7 @@
 				showMoreData: false,
 				cars2: "",
 				carNum: "",
-				// 鍓╀綑鐨勬彁鐓ゅ崟鏁伴噺
+				// 鍓╀綑鐨勯�氱煡鍗曟暟閲�
 				carNumSurplus: '',
 				canClick: false,
 				onlineurl: ''
@@ -238,7 +238,7 @@
 					}
 				});
 			},
-			// 鑾峰彇鍘嗗彶鎻愮叅鍗�
+			// 鑾峰彇鍘嗗彶閫氱煡鍗�
 			getJhOrderPlanDataPage() {
 				uni.showLoading({
 					title: '鍔犺浇涓�'
@@ -263,7 +263,7 @@
 				this.pageCurrent++;
 				this.getJhOrderPlanDataPage();
 			},
-			//fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+			//fix 鐐瑰嚮閫氱煡鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
 			ArrSet(Arr, id) {
 				var obj = {};
 				const arrays = Arr.reduce((setArr, item) => {
@@ -311,7 +311,7 @@
 			 */
 			receiveClick(item) {
 				this.show = true;
-				this.getOrderNum.id = item.id; // 鑾峰彇棰嗗彇鎻愮叅鍗曠殑id
+				this.getOrderNum.id = item.id; // 鑾峰彇棰嗗彇閫氱煡鍗曠殑id
 				this.cars2 = item.cars2
 				this.carNum = item.carNum
 			},
@@ -324,15 +324,15 @@
 				console.log('杈撳叆妗�', e);
 				this.canClick = e > (this.carNum - this.cars2)
 				if (this.canClick) {
-					this.$u.toast('宸茶秴杩囧綋鍓嶆棩璁″垝鎻愮叅鍗曟暟閲�,璇烽噸鏂拌緭鍏�')
+					this.$u.toast('宸茶秴杩囧綋鍓嶆棩璁″垝閫氱煡鍗曟暟閲�,璇烽噸鏂拌緭鍏�')
 				}
 			},
-			// 鎻愮叅鍗曡鎯�
+			// 閫氱煡鍗曡鎯�
 			cardBodyClick(v) {
 				uni
 					.navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2?v.cars2:""}` });
 			},
-			// 鐐瑰嚮鍘嗗彶鎻愮叅鍗曡幏鍙栬鎯�
+			// 鐐瑰嚮鍘嗗彶閫氱煡鍗曡幏鍙栬鎯�
 			faYundetail(v) {
 				uni.navigateTo({
 					url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}&coalName=${v.coalName}&deptName=${v.deptName}`
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index e3d1cee..5e2026e 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -60,7 +60,7 @@
 				</view>
 			</view>
 			<view class="block-top">
-				<combined-title title="鎻愮叅鍗曞巻鍙�"></combined-title>
+				<combined-title title="閫氱煡鍗曞巻鍙�"></combined-title>
 				<view class="total">
 					鎬诲噣閲�
 					<text>{{ total.toFixed(2) || 0 }}</text>
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
index f75429e..b66045c 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
@@ -10,7 +10,7 @@
 				</view>
 				<view class="body-container">
 					<view class="container-block">
-						<view class="">鎻愮叅鍗曠姸鎬�</view>
+						<view class="">閫氱煡鍗曠姸鎬�</view>
 						<view class="">{{ coalStatus[yyDailyList.statusWeigh]||'' }}</view>
 					</view>
 				</view>
@@ -46,7 +46,7 @@
 				</view>
 				<view class="body-container">
 					<view class="container-block">
-						<view class="">鎻愮叅鍗曠紪鍙�</view>
+						<view class="">閫氱煡鍗曠紪鍙�</view>
 						<view class="">{{ yyDailyList.code || '' }}</view>
 					</view>
 				</view>
diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue
index 5bbdee3..a2d91a3 100644
--- a/pages/customer-page/customer-my/customer-my.vue
+++ b/pages/customer-page/customer-my/customer-my.vue
@@ -360,11 +360,11 @@
 			},
 			logoutConfirm() {
 				redirectLogin();
+				this.$store.commit('changeisLogin', false)
+				this.$store.dispatch('websocketOnClose')
 			},
 			logoutCancel() {
 				this.logoutShow = false;
-				this.$store.commit('changeisLogin', false)
-				this.$store.dispatch('websocketOnClose')
 			},
 			// 璺宠浆鐢ㄦ埛绠＄悊椤甸潰
 			userManage() {
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index 8b6e600..7837438 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -31,7 +31,7 @@
 							size="40"></u-icon></view>
 					<view class="send-date">{{ coalDetailsData.sendDate }}</view>
 				</view>
-				<view class="coal-code">鎻愮叅鍗曠紪鍙�:&nbsp;&nbsp;{{ coalDetailsData.code || '' }}</view>
+				<view class="coal-code">閫氱煡鍗曠紪鍙�:&nbsp;&nbsp;{{ coalDetailsData.code || '' }}</view>
 				<view class="order-code">
 					璁㈠崟缂栧彿:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ coalDetailsData.orderCode || '' }}</view>
 				<view class="coal-code"
@@ -91,7 +91,7 @@
 			</view>
 		</view>
 		<view class="weigh-ability">
-			<view class="weigh-button"><u-button text="灞曠ず鎻愮叅鍗�"
+			<view class="weigh-button"><u-button text="灞曠ず閫氱煡鍗�"
 					@click="showCaolPickUpBill"
 					type="primary"
 					shape="circle"></u-button></view>
@@ -111,7 +111,7 @@
 		<view class="completeOutSale">
 			<u-modal :show="completeOutSaleShow"
 				title="纭"
-				content="鏄惁瀹屾垚澶栭攢鎻愮叅鍗�"
+				content="鏄惁瀹屾垚澶栭攢閫氱煡鍗�"
 				:showCancelButton="true"
 				@confirm="completeOutSaleConfirm"
 				@cancel="completeOutSaleCancel"></u-modal>
@@ -141,8 +141,8 @@
 				orderPlanId: null,
 				yyId: null,
 				dayRZ: [],
-				coalDetailsData: {}, // 鎻愮叅鍗曡鎯�
-				currentPageCoalStatus: 0, // 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
+				coalDetailsData: {}, // 閫氱煡鍗曡鎯�
+				currentPageCoalStatus: 0, // 褰撳墠椤甸潰閫氱煡鍗曠姸鎬�
 				// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
 				getWeightHouseObj: {
 					deptId: '',
@@ -260,7 +260,7 @@
 					}
 				});
 				this.coalDayPage(); //鑾峰彇鏃ュ織
-				this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+				this.getTakeCoal(); //鑾峰彇閫氱煡鍗曡鎯�
 				this.getgetService(); //鑾峰彇瀹㈡湇
 			},
 			// 鑾峰彇瀹㈡湇openid
@@ -277,7 +277,7 @@
 					}
 				});
 			},
-			// 鑾峰彇鎻愮叅鍗曡鎯�
+			// 鑾峰彇閫氱煡鍗曡鎯�
 			getTakeCoal() {
 				uni.showLoading({
 					title: '鍔犺浇涓�'
@@ -285,7 +285,7 @@
 				this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
 					uni.hideLoading();
 					if (res.code == 0) {
-						console.log(res, '鎻愮叅鍗曡鎯�');
+						console.log(res, '閫氱煡鍗曡鎯�');
 						this.coalDetailsData = res.data;
 						this.orderType = this.coalDetailsData.orderType;
 						// 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
@@ -306,7 +306,7 @@
 						// 鑾峰彇瀹㈡湇openId鍙傛暟璧嬪��
 						this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
 						this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
-						// 鑾峰彇鎻愮叅鍗曠姸鎬�
+						// 鑾峰彇閫氱煡鍗曠姸鎬�
 						this.currentPageCoalStatus = this.coalDetailsData.statusWeigh;
 						// 鑾峰彇鍘熷彂淇℃伅
 						this.primarySkin = this.coalDetailsData.skinTwo;
@@ -361,7 +361,7 @@
 					this.$u.toast('鏈嶅姟鍣ㄩ敊璇�,璇风◢鍚庨噸璇�')
 				}
 			},
-			// 灞曠ず鎻愮叅鍗曡鎯�
+			// 灞曠ず閫氱煡鍗曡鎯�
 			showCaolPickUpBill() {
 				uni.navigateTo({
 					url: `/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill?orderPlanId=${this.orderPlanId}`
@@ -428,14 +428,6 @@
 						console.log('鑾峰彇澶辫触');
 					}
 				});
-			},
-			calling() {
-				// wx.join1v1Chat({
-				// 	caller: { nickname: this.name, openid: this.openid }, //oZjXk5RRmbroAfl1m5aZ6hRNvqh4
-				// 	listener: { nickname: this.serviceInfoObj.openName, openid: 'orutI5YT0yEvARVngdsTmBpisWmw' }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
-				// 	backgroundType: 2,
-				// 	roomType: 'voice'
-				// });
 			},
 			// 绉伴噸
 			cengZhongClick() {
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue b/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue
index 51b5fb4..124546c 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill.vue
@@ -2,7 +2,7 @@
 	<view class="coal-pick-up-bill">
 		<view class="driver"
 			:style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/coal-background.png)`, backgroundSize: '100% 100%', }">
-			<view class="driver-coalOne">鐢靛瓙鎻愮叅鍗�</view>
+			<view class="driver-coalOne">鐢靛瓙閫氱煡鍗�</view>
 			<view class="driver-coalTwo">
 				<view>{{ coalData.code || '鏆傛棤璁㈠崟缂栧彿' }}</view>
 				<view>{{ coalData.orderType || '鏆傛棤璁㈠崟绫诲瀷' }}</view>
@@ -47,10 +47,10 @@
 			init() {
 				this.getTakeCoal();
 			},
-			// 鑾峰彇鎻愮叅鍗曡鎯�
+			// 鑾峰彇閫氱煡鍗曡鎯�
 			getTakeCoal() {
 				this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
-					console.log('鑾峰彇鎻愮叅鍗曡鎯�', res);
+					console.log('鑾峰彇閫氱煡鍗曡鎯�', res);
 					if (res.code == 0) {
 						this.coalData = res.data;
 					} else {
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/completeOutSale/completeOutSale.vue b/pages/driver-page/driver-index/bill-of-lading-details/completeOutSale/completeOutSale.vue
index 8fab8d2..a8a0ebe 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/completeOutSale/completeOutSale.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/completeOutSale/completeOutSale.vue
@@ -13,7 +13,7 @@
 					鐓ょ鍚嶇О:{{item.coalName}}
 				</view>
 				<view class="code">
-					鎻愮叅鍗曠紪鍙�:{{item.code}}
+					閫氱煡鍗曠紪鍙�:{{item.code}}
 				</view>
 				<view class="reservationTime">
 					棰勭害鏃堕棿:{{item.yuYueTime||''}}
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue b/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
index 86aba00..9bf9a2b 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
@@ -182,7 +182,7 @@
 				this.pageCurrent++;
 				this.qualityInspectionHistory();
 			},
-			//fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+			//fix 鐐瑰嚮閫氱煡鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
 			ArrSet(Arr, id) {
 				var obj = {};
 				const arrays = Arr.reduce((setArr, item) => {
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
index d1c9f2e..5d790c9 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
@@ -82,12 +82,13 @@
 			</view>
 			<view class="level"
 				v-if='item.modifygoodsName||flag'>
-				<view style="width: 140rpx;">
-					<u--text text="浜у搧鍚嶇О"
+				<view style="width: 220rpx;">
+					<u--text text="鍝佸悕涓庤鏍间慨鏀�"
 						size='32'></u--text>
 				</view>
 				<view v-if="showWeighCopy[i].modifyProductName||item.breed&&item.spec">
 					<u-tag :text="!flag?showWeighCopy[i].modifyProductName:item.breed+item.spec"
+						v-if="showWeighCopy[i].modifyProductName"
 						plain
 						@click="productNamePopoverShow(i)"></u-tag>
 				</view>
@@ -274,6 +275,7 @@
 				this.showWeigh[this.goodsIndex].remark = val.remark
 				this.showWeigh[this.goodsIndex].breed = val.breed
 				this.showWeigh[this.goodsIndex].spec = val.spec
+				this.showWeigh[this.goodsIndex].weightUnit = val.weightUnit
 			},
 			// 浜у搧鍒楄〃
 			productNamePopoverShow(index) {
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index 214e8f2..b775edd 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -51,18 +51,18 @@
 				</view>
 				<view class="main-information"
 					v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
-					<view class="prefix">鐭垮満:</view>
+					<view class="prefix">浠撳簱:</view>
 					<view class="suffix">{{ weighList.deptName || '' }}</view>
 				</view>
 				<view class="main-information"
 					v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
-					<view class="prefix">鐓ゅ満:</view>
+					<view class="prefix">鍩哄湴:</view>
 					<view class="suffix">{{ weighList.filedName || '' }}</view>
 				</view>
-				<view class="main-information">
+				<!-- <view class="main-information">
 					<view class="prefix">鐓ょ鍚嶇О:</view>
 					<view class="suffix">{{ weighList.coalName || '' }}</view>
-				</view>
+				</view> -->
 				<view class="main-information">
 					<view class="prefix">璁㈠崟绫诲瀷:</view>
 					<view class="suffix">{{ weighList.orderType || '' }}</view>
@@ -104,7 +104,7 @@
 			<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
 			<u-button type="primary"
 				text="纭畾绉伴噸"
-				:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh "
+				:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
 				:loading="isConfirmWeighLoading"
 				loadingText="纭"
 				@click="confirmWeigh"></u-button>
@@ -255,7 +255,7 @@
 			// this.realTimeWeigh = 0
 		},
 		computed: {
-			...mapState(['globalweigh', 'globalinfraredStatus']),
+			...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning']),
 			token() {
 				return uni.getStorageSync('token');
 			},
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 7f6106a..4821623 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -2,7 +2,7 @@
 	<view class="">
 		<view class="driver-index">
 			<view class="driver-index-body">
-				<!-- 寰呴鍙栨彁鐓ゅ崟 -->
+				<!-- 寰呴鍙栭�氱煡鍗� -->
 				<view class="wait-collection"
 					:style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/diverbanner.png)`, backgroundSize: 'contain', backgroundRepeat: 'no-repeat' }">
 				</view>
@@ -71,9 +71,9 @@
 						@cancel="qiangDanCancel"></u-modal>
 				</view>
 
-				<!-- 寰呴绾︽彁鐓ゅ崟 -->
+				<!-- 寰呴绾﹂�氱煡鍗� -->
 				<view class="wait-appointment">
-					<combined-title title="寰呴绾︽彁鐓ゅ崟"></combined-title>
+					<combined-title title="寰呴绾﹂�氱煡鍗�"></combined-title>
 					<u-empty mode="data"
 						icon="http://cdn.uviewui.com/uview/empty/data.png"
 						textSize="30"
@@ -149,9 +149,9 @@
 					</view>
 				</view>
 
-				<!-- 宸查绾︽彁鐓ゅ崟 -->
+				<!-- 宸查绾﹂�氱煡鍗� -->
 				<view class="Reserved">
-					<combined-title title="宸查绾︽彁鐓ゅ崟"></combined-title>
+					<combined-title title="宸查绾﹂�氱煡鍗�"></combined-title>
 					<u-empty mode="data"
 						icon="http://cdn.uviewui.com/uview/empty/data.png"
 						textSize="30"
@@ -347,7 +347,7 @@
 					url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${value.id}&yyId=${value.yyId}`
 				});
 			},
-			// 鎻愮叅鍗曡鎯�
+			// 閫氱煡鍗曡鎯�
 			cardBodyClick(name) {
 				uni.navigateTo({
 					url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}`
@@ -456,7 +456,7 @@
 		.driver-index-body {
 
 			// margin-bottom: vww(56);
-			// 寰呴鍙栨彁鐓ゅ崟
+			// 寰呴鍙栭�氱煡鍗�
 			.wait-collection {
 				width: 100%;
 				height: 600rpx;
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 07c8cf5..961b857 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -71,7 +71,7 @@
 				<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="orderPlanData.length == 0"></u-empty>
 			</view> -->
 			<view class="history-numbers">
-				<combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+				<combined-title title="鍘嗗彶閫氱煡鍗�"></combined-title>
 				<scroll-view :scroll-top="scrollTop"
 					scroll-y="true"
 					class="scroll-Y"
@@ -106,7 +106,7 @@
 								<view class="third-line_num">{{ item.carNumSurplus }}</view>
 							</view>
 							<view class="third-line">
-								<view class="third-line_text">鎻愮叅鍗曚釜鏁帮細</view>
+								<view class="third-line_text">閫氱煡鍗曚釜鏁帮細</view>
 								<view class="third-line_num">{{ item.tmCount }}</view>
 							</view>
 						</view>
@@ -196,7 +196,7 @@
 			}
 		},
 		methods: {
-			// 鑾峰彇鍘嗗彶鎻愮叅鍗�
+			// 鑾峰彇鍘嗗彶閫氱煡鍗�
 			getJhOrderPlanDataPage() {
 				uni.showLoading({
 					title: '鍔犺浇涓�'
@@ -220,7 +220,7 @@
 				this.pageCurrent++;
 				this.getJhOrderPlanDataPage();
 			},
-			//fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+			//fix 鐐瑰嚮閫氱煡鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
 			ArrSet(Arr, id) {
 				var obj = {};
 				const arrays = Arr.reduce((setArr, item) => {
@@ -256,7 +256,7 @@
 					url: `/pages/public-page/forward/forward?orderPlanId=${value.orderPlanId}&carNumSurplusHuodai=${value.carNumSurplusHuodai}&carNum=${value.carNum}`
 				});
 			},
-			// 鐐瑰嚮鍘嗗彶鎻愮叅鍗曚竴琛岃幏鍙栬鎯�
+			// 鐐瑰嚮鍘嗗彶閫氱煡鍗曚竴琛岃幏鍙栬鎯�
 			faYundetail(v) {
 				uni.navigateTo({
 					url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}`
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 132f756..5ef3909 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -73,7 +73,9 @@
 				// 缁戝畾寰俊妯℃�佹
 				bindWxModelShow: false,
 				bindWxModelTitle: '鎻愮ず',
-				bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰'
+				bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰',
+				appid: "",
+				secret: ""
 			};
 		},
 		components: {
@@ -81,9 +83,16 @@
 		},
 		methods: {
 			...mapMutations(['setUserTabbar', 'changeisLogin']),
+			getAppidAndSercet() {
+				this.$reqGet('getAppidAndSercet').then(res => {
+					this.appid = res.data.appid;
+					this.secret = res.data.secret
+				})
+			},
 			// 璁块棶wx.login,鑾峰彇code
 			beforeLoginEvent() {
 				this.loginPopupShow = true;
+				this.getAppidAndSercet();
 			},
 			wxLogin() {
 				// 鑾峰彇鐧诲綍鐢ㄦ埛code
@@ -108,7 +117,7 @@
 					title: '鍔犺浇涓�...'
 				});
 				wx.request({
-					url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx4a62fc1684c429a9&secret=ee90afe376cdcec2fdd947c0a4db961a&js_code=${code}&grant_type=authorization_code`,
+					url: `https://api.weixin.qq.com/sns/jscode2session?appid=${this.appid}&secret=${this.secret}&js_code=${code}&grant_type=authorization_code`,
 					success(res) {
 						uni.setStorageSync('openid', res.data.openid);
 						// uni.showToast({
diff --git a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
index 96c7575..494dc8c 100644
--- a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
+++ b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
@@ -10,7 +10,7 @@
 				</view>
 				<view class="body-container">
 					<view class="container-block">
-						<view class="">鎻愮叅鍗曠姸鎬�</view>
+						<view class="">閫氱煡鍗曠姸鎬�</view>
 						<view class="">{{ coalStatus[faYunDetailobj.statusWeigh]||''}}</view>
 					</view>
 				</view>
@@ -46,7 +46,7 @@
 				</view>
 				<view class="body-container">
 					<view class="container-block">
-						<view class="">鎻愮叅鍗曠紪鍙�</view>
+						<view class="">閫氱煡鍗曠紪鍙�</view>
 						<view class="">{{ faYunDetailobj.code || '' }}</view>
 					</view>
 				</view>
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index 515db6d..5e81f78 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -247,10 +247,10 @@
 				return uni.getStorageSync('roleType');
 			},
 			text() {
-				return `宸查鍙�${this.cars2}寮犳彁鐓ゅ崟,鍓╀綑${this.carNumSurplus1}寮犳彁鐓ゅ崟`;
+				return `宸查鍙�${this.cars2}寮犻�氱煡鍗�,鍓╀綑${this.carNumSurplus1}寮犻�氱煡鍗昤;
 			},
 			text1() {
-				return `宸叉嫢鏈�${this.carNum}寮犳彁鐓ゅ崟,鍓╀綑${this.carNumSurplusHuodai}寮犳彁鐓ゅ崟`;
+				return `宸叉嫢鏈�${this.carNum}寮犻�氱煡鍗�,鍓╀綑${this.carNumSurplusHuodai}寮犻�氱煡鍗昤;
 			}
 		},
 		methods: {
@@ -372,12 +372,12 @@
 					}
 				});
 			},
-			// 璁＄畻鎻愮叅鍗曟暟閲忥紝娣诲姞鎴栧垹闄ゆ椂璋冪敤
+			// 璁＄畻閫氱煡鍗曟暟閲忥紝娣诲姞鎴栧垹闄ゆ椂璋冪敤
 			calculate(arr) {
 				let total = arr.reduce((prev, cur) => {
 					return cur.carNum + prev;
 				}, 0);
-				console.log(total, '鎻愮叅鍗曚竴鍏辩殑鏁版嵁');
+				console.log(total, '閫氱煡鍗曚竴鍏辩殑鏁版嵁');
 				if (this.roleType == 1) {
 					if (Number(this.cars2) >= total) {
 						this.carNumSurplus1 = Number(this.cars2) - total;
@@ -385,7 +385,7 @@
 						this.whetherClick1 = false;
 					} else {
 						this.carNumSurplus1 = 0;
-						this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�');
+						this.$u.toast('鍓╀綑閫氱煡鍗曟暟閲忎笉瓒�');
 						this.whetherClick = true;
 						this.whetherClick1 = true;
 					}
@@ -397,7 +397,7 @@
 						this.whetherClick1 = false;
 					} else {
 						this.carNumSurplusHuodai = 0;
-						this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�');
+						this.$u.toast('鍓╀綑閫氱煡鍗曟暟閲忎笉瓒�');
 						this.whetherClick = true;
 						this.whetherClick1 = true;
 					}
diff --git a/pages/register/register.vue b/pages/register/register.vue
index c901a7b..ffb99f4 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -1,42 +1,116 @@
 <template>
 	<view class="register">
 		<view class="registerForm">
-			<u--form :rules="rules" :model="registerFormModel" ref="regesterFormRef">
-				<u-form-item labelWidth="20%" label="閫夋嫨韬唤" borderBottom ref="roleRef" required>
-					<u-radio-group v-model="radiovalue1" placement="row" @change="groupChange" size="30" shape="circle" iconSize="20">
-						<u-radio
-							labelSize="14px"
+			<u--form :rules="rules"
+				:model="registerFormModel"
+				ref="regesterFormRef">
+				<u-form-item labelWidth="20%"
+					label="閫夋嫨韬唤"
+					borderBottom
+					ref="roleRef"
+					required>
+					<u-radio-group v-model="radiovalue1"
+						placement="row"
+						@change="groupChange"
+						size="30"
+						shape="circle"
+						iconSize="20">
+						<u-radio labelSize="14px"
 							size="20px"
 							:customStyle="{ marginBottom: '8px' }"
 							v-for="(item, index) in radiolist1"
 							:key="index"
 							:label="item.name"
 							:name="item.name"
-							@change="radioChange"
-						></u-radio>
+							@change="radioChange"></u-radio>
 					</u-radio-group>
 				</u-form-item>
-				<u-form-item prop="name" label="濮撳悕" labelWidth="20%" borderBottom required>
-					<u--input v-model="registerFormModel.name" placeholder="璇疯緭鍏ュ唴瀹�" clearable></u--input>
+				<u-form-item prop="name"
+					label="濮撳悕"
+					labelWidth="20%"
+					borderBottom
+					required>
+					<u--input v-model="registerFormModel.name"
+						placeholder="璇疯緭鍏ュ唴瀹�"
+						clearable></u--input>
 				</u-form-item>
-				<u-form-item prop="idCard" label="韬唤璇�" labelWidth="20%" borderBottom required>
-					<u--input v-model="registerFormModel.idCard" placeholder="璇疯緭鍏ュ唴瀹�" clearable></u--input>
+				<u-form-item prop="idCard"
+					label="韬唤璇�"
+					labelWidth="20%"
+					borderBottom
+					required>
+					<u--input v-model="registerFormModel.idCard"
+						placeholder="璇疯緭鍏ュ唴瀹�"
+						clearable></u--input>
 				</u-form-item>
-				<u-form-item prop="phone" label="鎵嬫満鍙�" labelWidth="20%" borderBottom required>
-					<u--input v-model="registerFormModel.phone" placeholder="璇疯緭鍏ュ唴瀹�" clearable></u--input>
+				<u-form-item prop="phone"
+					label="鎵嬫満鍙�"
+					labelWidth="20%"
+					borderBottom
+					required>
+					<u--input v-model="registerFormModel.phone"
+						placeholder="璇疯緭鍏ュ唴瀹�"
+						clearable></u--input>
 				</u-form-item>
-				<u-form-item prop="password" label="瀵嗙爜" labelWidth="20%" borderBottom required>
-					<u--input v-model="registerFormModel.password" placeholder="璇疯緭鍏ュ唴瀹�" password clearable></u--input>
+				<u-form-item prop="password"
+					label="瀵嗙爜"
+					labelWidth="20%"
+					borderBottom
+					required>
+					<u--input v-model="registerFormModel.password"
+						placeholder="璇疯緭鍏ュ唴瀹�"
+						password
+						clearable></u--input>
 				</u-form-item>
-				<u-form-item prop="confirmPassword" label="纭瀵嗙爜" labelWidth="20%" borderBottom required>
-					<u--input v-model="registerFormModel.confirmPassword" placeholder="璇疯緭鍏ュ唴瀹�" password clearable @blur="jiaoYanPassword"></u--input>
+				<u-form-item prop="confirmPassword"
+					label="纭瀵嗙爜"
+					labelWidth="20%"
+					borderBottom
+					required>
+					<u--input v-model="registerFormModel.confirmPassword"
+						placeholder="璇疯緭鍏ュ唴瀹�"
+						password
+						clearable
+						@blur="jiaoYanPassword"></u--input>
 				</u-form-item>
-				<u-form-item prop="carNo" label="杞︾墝鍙�" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required>
-					<u--input v-model="registerFormModel.carNo" placeholder="璇疯緭鍏ュ唴瀹�" clearable></u--input>
+				<u-form-item prop="carNo"
+					label="杞︾墝鍙�"
+					labelWidth="20%"
+					borderBottom
+					v-if="radiovalue1 == '鍙告満'"
+					required>
+					<u--input v-model="registerFormModel.carNo"
+						placeholder="璇疯緭鍏ュ唴瀹�"
+						clearable></u--input>
 				</u-form-item>
-				<u-form-item prop="carImg" label="杞﹁締鐓х墖" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required @click="beforeRead">
-					<u-upload
-						:fileList="fileList1"
+				<u-form-item labelWidth="20%"
+					label="杞︾墝棰滆壊"
+					borderBottom
+					v-if="radiovalue1 == '鍙告満'"
+					required
+					prop="vehicleColour">
+					<u-radio-group v-model="registerFormModel.vehicleColour"
+						placement="row"
+						size="30"
+						shape="circle"
+						iconSize="20">
+						<u-radio labelSize="14px"
+							size="20px"
+							:customStyle="{ marginBottom: '8px' }"
+							v-for="(item, index) in radiolist2"
+							:key="index"
+							:label="item.name"
+							:name="item.value"></u-radio>
+					</u-radio-group>
+				</u-form-item>
+				<u-form-item prop="carImg"
+					label="杞﹁締鐓х墖"
+					labelWidth="20%"
+					borderBottom
+					v-if="radiovalue1 == '鍙告満'"
+					required
+					@click="beforeRead">
+					<u-upload :fileList="fileList1"
 						deletable
 						@afterRead="afterRead"
 						@delete="deletePic"
@@ -45,15 +119,19 @@
 						:maxCount="1"
 						width="250"
 						height="150"
-						:previewFullImage="true"
-					>
+						:previewFullImage="true">
 						<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
 						mode="widthFix" style="width: 250px;height: 150px;"></image> -->
 					</u-upload>
 				</u-form-item>
-				<u-form-item prop="drivingImg" label="琛岄┒璇�" labelWidth="20%" borderBottom v-if="radiovalue1 == '鍙告満'" required @click="beforeRead">
-					<u-upload
-						:fileList="fileList2"
+				<u-form-item prop="drivingImg"
+					label="琛岄┒璇�"
+					labelWidth="20%"
+					borderBottom
+					v-if="radiovalue1 == '鍙告満'"
+					required
+					@click="beforeRead">
+					<u-upload :fileList="fileList2"
 						deletable
 						@afterRead="afterRead"
 						@delete="deletePic"
@@ -62,21 +140,31 @@
 						:maxCount="1"
 						width="250"
 						height="150"
-						:previewFullImage="true"
-					>
+						:previewFullImage="true">
 						<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
 						mode="widthFix" style="width: 250px;height: 150px;"></image> -->
 					</u-upload>
 				</u-form-item>
-				<u-form-item label="鎺ㄨ崘浜鸿处鍙�" labelWidth="25%" borderBottom>
-					<u--input v-model="registerFormModel.tuiJianMa" placeholder="璇疯緭鍏ュ唴瀹�" clearable></u--input>
+				<u-form-item label="鎺ㄨ崘浜鸿处鍙�"
+					labelWidth="25%"
+					borderBottom>
+					<u--input v-model="registerFormModel.tuiJianMa"
+						placeholder="璇疯緭鍏ュ唴瀹�"
+						clearable></u--input>
 				</u-form-item>
 			</u--form>
 		</view>
 		<view class="roleModel">
-			<u-modal :show="editRoleModelShow" :title="title" :content="content" :showCancelButton="true" @confirm="roleConfirm" @cancel="roleCancel"></u-modal>
+			<u-modal :show="editRoleModelShow"
+				:title="title"
+				:content="content"
+				:showCancelButton="true"
+				@confirm="roleConfirm"
+				@cancel="roleCancel"></u-modal>
 		</view>
-		<view class="registerBtn"><u-button text="娉ㄥ唽" type="primary" @click="registerClick"></u-button></view>
+		<view class="registerBtn"><u-button text="娉ㄥ唽"
+				type="primary"
+				@click="registerClick"></u-button></view>
 		<!-- 鍥剧墖棰勮寮瑰嚭妗� -->
 		<!-- <view class="previewImage-container">
 			<u-popup :show="previewImageShow" mode="center" @close="previewImageClose" @open="previewImageOpen">
@@ -87,358 +175,374 @@
 </template>
 
 <script>
-import { apiRegister } from '@/api/publicInterface.js';
-import { BaseUrl } from '@/api/publicInterface.js';
-import { mapMutations } from 'vuex';
-export default {
-	// onLoad: function() {
-	//   // 鏌ョ湅鏄惁鎺堟潈
-	//   wx.getSetting({
-	//     success (res){
-	//       if (res.authSetting['scope.userInfo']) {
-	//         // 宸茬粡鎺堟潈锛屽彲浠ョ洿鎺ヨ皟鐢� getUserInfo 鑾峰彇澶村儚鏄电О
-	//         wx.getUserInfo({
-	//           success: function(res) {
-	//             console.log('res.userInfo',res.userInfo)
-	//           }
-	//         })
-	//       }
-	//     }
-	//   })
-	// },
-	// 鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚銆傛敞鎰忓鏋滄覆鏌撻�熷害蹇紝浼氬湪椤甸潰杩涘叆鍔ㄧ敾瀹屾垚鍓嶈Е鍙�
-	onReady() {
-		this.$refs.regesterFormRef.setRules(this.rules);
-		// this.$refs.regesterFormRef.validate().then(res => {}).catch(err => {
-		//   console.log(err);
-		// })
-	},
-	onLoad(params) {
-		if (params) {
-			this.registerFormModel.openId = params.code;
-			console.log('椤甸潰鍔犺浇', this.registerFormModel.openId);
-		}
-	},
-	data() {
-		return {
-			// 杞︾墝鍙烽敭鐩樻帶鍒�
-			carNumShow: false,
-			keyValue: '',
-			registerFormModel: {
-				phone: '',
-				password: '',
-				name: '',
-				username: '',
-				openId: '',
-				type: 2,
-				idCard: '',
-				carNo: '',
-				carImg: '',
-				drivingImg: '',
-				tuiJianMa: '',
-				confirmPassword: ''
-			},
-			fileList1: [],
-			fileList2: [],
-			rules: {
-				name: {
-					type: 'string',
-					required: true,
-					message: '璇峰～鍐欏鍚�',
-					trigger: ['blur', 'change']
+	import { apiRegister } from '@/api/publicInterface.js';
+	import { BaseUrl } from '@/api/publicInterface.js';
+	import { mapMutations } from 'vuex';
+	export default {
+		// onLoad: function() {
+		//   // 鏌ョ湅鏄惁鎺堟潈
+		//   wx.getSetting({
+		//     success (res){
+		//       if (res.authSetting['scope.userInfo']) {
+		//         // 宸茬粡鎺堟潈锛屽彲浠ョ洿鎺ヨ皟鐢� getUserInfo 鑾峰彇澶村儚鏄电О
+		//         wx.getUserInfo({
+		//           success: function(res) {
+		//             console.log('res.userInfo',res.userInfo)
+		//           }
+		//         })
+		//       }
+		//     }
+		//   })
+		// },
+		// 鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚銆傛敞鎰忓鏋滄覆鏌撻�熷害蹇紝浼氬湪椤甸潰杩涘叆鍔ㄧ敾瀹屾垚鍓嶈Е鍙�
+		onReady() {
+			this.$refs.regesterFormRef.setRules(this.rules);
+			// this.$refs.regesterFormRef.validate().then(res => {}).catch(err => {
+			//   console.log(err);
+			// })
+		},
+		onLoad(params) {
+			if (params) {
+				this.registerFormModel.openId = params.code;
+				console.log('椤甸潰鍔犺浇', this.registerFormModel.openId);
+			}
+		},
+		data() {
+			return {
+				// 杞︾墝鍙烽敭鐩樻帶鍒�
+				carNumShow: false,
+				keyValue: '',
+				registerFormModel: {
+					phone: '',
+					password: '',
+					name: '',
+					username: '',
+					openId: '',
+					type: 2,
+					idCard: '',
+					carNo: '',
+					carImg: '',
+					drivingImg: '',
+					tuiJianMa: '',
+					confirmPassword: '',
+					vehicleColour: ''
 				},
-				idCard: [
-					{
+				fileList1: [],
+				fileList2: [],
+				rules: {
+					name: {
 						type: 'string',
 						required: true,
-						message: '璇疯緭鍏ヨ韩浠借瘉鍙�',
+						message: '璇峰～鍐欏鍚�',
 						trigger: ['blur', 'change']
 					},
-					{
-						pattern: /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
-						message: '韬唤璇佸彿鏍煎紡涓嶆纭�'
-					}
-				],
-				phone: [
-					{
-						required: true,
-						message: '姝ら」涓哄繀濉」',
-						// blur鍜宑hange浜嬩欢瑙﹀彂妫�楠�
-						trigger: ['blur', 'change']
-					},
-					{
-						min: 11,
-						max: 11,
-						message: '璇疯緭鍏ュ悎娉曟墜鏈哄彿'
-					},
-					{
-						validator: (rule, value, callback) => {
-							return uni.$u.test.mobile(value);
+					idCard: [{
+							type: 'string',
+							required: true,
+							message: '璇疯緭鍏ヨ韩浠借瘉鍙�',
+							trigger: ['blur', 'change']
 						},
-						message: '鎵嬫満鍙风爜涓嶆纭�',
-						trigger: ['change', 'blur']
-					}
-				],
-				password: [
-					{
-						required: true,
-						message: '璇疯缃垵濮嬪瘑鐮�',
-						trigger: ['blur', 'change']
-					},
-					{
-						min: 6,
-						max: 12,
-						message: '闀垮害鍦�6-12涓瓧绗︿箣闂�'
-					}
-				],
-				confirmPassword: [
-					{
-						required: true,
-						message: '璇疯缃垵濮嬪瘑鐮�',
-						trigger: ['blur', 'change']
-					},
-					{
-						min: 6,
-						max: 12,
-						message: '闀垮害鍦�6-12涓瓧绗︿箣闂�'
-					}
-				],
-				carNo: [
-					{
-						type: 'string',
-						required: true,
-						message: '璇疯緭鍏ヨ溅鐗屽彿',
-						trigger: ['blur', 'change']
-					},
-					{
-						transform(value) {
-							return String(value);
-						},
-						validator: (rule, value, callback) => {
-							return uni.$u.test.carNo(value);
-						},
-						message: '璇疯緭鍏ユ纭殑杞︾墝鍙�',
-						trigger: ['change', 'blur']
-					}
-				],
-				carImg: {
-					type: 'string',
-					required: true,
-					message: '璇蜂笂浼犺溅杈嗗浘鐗�',
-					trigger: ['blur', 'change']
-				},
-				drivingImg: {
-					type: 'string',
-					required: true,
-					message: '璇蜂笂浼犺椹惰瘉鐓х墖',
-					trigger: ['blur', 'change']
-				}
-			},
-			// 鍩烘湰妗堝垪鏁版嵁
-			radiolist1: [
-				{
-					name: '璐т唬',
-					disabled: false
-				},
-				{
-					name: '鍙告満',
-					disabled: false
-				}
-			],
-			// u-radio-group鐨剉-model缁戝畾鐨勫�煎鏋滆缃负鏌愪釜radio鐨刵ame锛屽氨浼氳榛樿閫変腑
-			radiovalue1: '璐т唬',
-			beforeChangeValue: '',
-			// 鏇存崲瑙掕壊寮规
-			editRoleModelShow: false,
-			title: '鎻愮ず',
-			content: '褰撳墠濉叆淇℃伅锛屽垏鎹㈣鑹插悗锛屽嵆娓呴櫎锛屾槸鍚﹀垏鎹紵',
-			wxcode: '',
-			openid: ''
-		};
-	},
-	watch: {
-		radiovalue1(newV) {
-			if (this.registerFormModel.name || this.registerFormModel.idCard || this.registerFormModel.phone || this.registerFormModel.carNo || this.registerFormModel.password) {
-				if (this.editRoleModelShow == true) {
-					this.editRoleModelShow = false;
-				} else {
-					this.editRoleModelShow = true;
-				}
-			}
-			switch (newV) {
-				case '璐т唬':
-					this.registerFormModel.type = 2;
-					break;
-				case '鍙告満':
-					this.registerFormModel.type = 3;
-					break;
-				default:
-					break;
-			}
-			return;
-		}
-	},
-	methods: {
-		...mapMutations(['changeisUploadimg']),
-		registerClick() {
-			if (this.registerFormModel.password == this.registerFormModel.confirmPassword) {
-				this.$refs.regesterFormRef
-					.validate()
-					.then(res => {
-						console.log(this.registerFormModel);
-						this.registerFormModel.username = this.registerFormModel.phone;
-						apiRegister(this.registerFormModel)
-							.then(res => {
-								if (res.data.code == 0) {
-									uni.showToast({
-										title: '娉ㄥ唽鎴愬姛,鍗冲皢杩斿洖鐧诲綍椤�',
-										icon: 'none',
-										duration: 1000
-									});
-									setTimeout(() => {
-										uni.redirectTo({ url: '/pages/login/login' });
-									}, 1000);
-								} else {
-									this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
-								}
-							})
-							.catch(err => {
-								console.log('閿欒', err);
-							});
-					})
-					.catch(err => {
-						console.log('err', err);
-						this.$u.toast('璇疯鑼冭緭鍏ュ唴瀹�');
-					});
-			} else {
-				this.$u.toast('涓ゆ瀵嗙爜涓嶄竴鑷�');
-			}
-		},
-		// 鍗曢�夋浜嬩欢
-		groupChange(e) {},
-		radioChange(e) {
-			if (
-				this.registerFormModel.name == '' &&
-				this.registerFormModel.idCard == '' &&
-				this.registerFormModel.phone == '' &&
-				this.registerFormModel.carNo == '' &&
-				this.registerFormModel.password == ''
-			) {
-				this.$refs.regesterFormRef.clearValidate();
-				this.beforeChangeValue = e;
-			}
-		},
-		jiaoYanPassword() {
-			if (this.registerFormModel.password != this.registerFormModel.confirmPassword) {
-				this.$u.toast('涓ゆ瀵嗙爜涓嶄竴鑷�');
-			}
-		},
-		// 涓婁紶鍥剧墖鏂规硶
-		beforeRead() {
-			this.changeisUploadimg(true);
-		},
-		// 鍒犻櫎鍥剧墖
-		deletePic(event) {
-			this.changeisUploadimg(true);
-			this[`fileList${event.name}`].splice(event.index, 1);
-		},
-		// 鏂板鍥剧墖
-		async afterRead(event) {
-			// 褰撹缃� mutiple 涓� true 鏃�, file 涓烘暟缁勬牸寮忥紝鍚﹀垯涓哄璞℃牸寮�
-			let lists = [].concat(event.file);
-			let fileListLen = this[`fileList${event.name}`].length;
-			lists.map(item => {
-				this[`fileList${event.name}`].push({
-					...item,
-					status: 'uploading',
-					message: '涓婁紶涓�'
-				});
-			});
-			for (let i = 0; i < lists.length; i++) {
-				const result = await this.uploadFilePromise(lists[i].url, event.name);
-				let item = this[`fileList${event.name}`][fileListLen];
-				this[`fileList${event.name}`].splice(
-					fileListLen,
-					1,
-					Object.assign(item, {
-						status: 'success',
-						message: '涓婁紶鎴愬姛',
-						url: result
-					})
-				);
-				fileListLen++;
-			}
-		},
-		uploadFilePromise(url, num) {
-			return new Promise((resolve, reject) => {
-				let a = uni.uploadFile({
-					url: BaseUrl + '/admin/sys-file/uploadUnToken',
-					filePath: url,
-					name: 'file',
-					formData: {
-						// user: ''
-					},
-					success: res => {
-						if (num == 1) {
-							this.registerFormModel.carImg = JSON.parse(res.data).data.url;
-							resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
-						} else if (num == 2) {
-							this.registerFormModel.drivingImg = JSON.parse(res.data).data.url;
-							resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+						{
+							pattern: /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+							message: '韬唤璇佸彿鏍煎紡涓嶆纭�'
 						}
+					],
+					phone: [{
+							required: true,
+							message: '姝ら」涓哄繀濉」',
+							// blur鍜宑hange浜嬩欢瑙﹀彂妫�楠�
+							trigger: ['blur', 'change']
+						},
+						{
+							min: 11,
+							max: 11,
+							message: '璇疯緭鍏ュ悎娉曟墜鏈哄彿'
+						},
+						{
+							validator: (rule, value, callback) => {
+								return uni.$u.test.mobile(value);
+							},
+							message: '鎵嬫満鍙风爜涓嶆纭�',
+							trigger: ['change', 'blur']
+						}
+					],
+					password: [{
+							required: true,
+							message: '璇疯缃垵濮嬪瘑鐮�',
+							trigger: ['blur', 'change']
+						},
+						{
+							min: 6,
+							max: 12,
+							message: '闀垮害鍦�6-12涓瓧绗︿箣闂�'
+						}
+					],
+					confirmPassword: [{
+							required: true,
+							message: '璇疯缃垵濮嬪瘑鐮�',
+							trigger: ['blur', 'change']
+						},
+						{
+							min: 6,
+							max: 12,
+							message: '闀垮害鍦�6-12涓瓧绗︿箣闂�'
+						}
+					],
+					carNo: [{
+							type: 'string',
+							required: true,
+							message: '璇疯緭鍏ヨ溅鐗屽彿',
+							trigger: ['blur', 'change']
+						},
+						{
+							transform(value) {
+								return String(value);
+							},
+							validator: (rule, value, callback) => {
+								return uni.$u.test.carNo(value);
+							},
+							message: '璇疯緭鍏ユ纭殑杞︾墝鍙�',
+							trigger: ['change', 'blur']
+						}
+					],
+					vehicleColour: {
+						type: 'string',
+						required: true,
+						message: '璇烽�夋嫨杞︾墝棰滆壊',
+						trigger: ['blur', 'change']
+					},
+					carImg: {
+						type: 'string',
+						required: true,
+						message: '璇蜂笂浼犺溅杈嗗浘鐗�',
+						trigger: ['blur', 'change']
+					},
+					drivingImg: {
+						type: 'string',
+						required: true,
+						message: '璇蜂笂浼犺椹惰瘉鐓х墖',
+						trigger: ['blur', 'change']
+					}
+				},
+				radiolist1: [{
+						name: '璐т唬',
+						disabled: false
+					},
+					{
+						name: '鍙告満',
+						disabled: false
+					}
+				],
+				radiovalue1: '璐т唬',
+				radiolist2: [{
+						name: '榛勮壊',
+						value: 'huangse'
+					},
+					{
+						name: '缁胯壊',
+						disabled: 'lvse'
+					}
+				],
+				radiovalue2: '榛勮壊',
+				beforeChangeValue: '',
+				// 鏇存崲瑙掕壊寮规
+				editRoleModelShow: false,
+				title: '鎻愮ず',
+				content: '褰撳墠濉叆淇℃伅锛屽垏鎹㈣鑹插悗锛屽嵆娓呴櫎锛屾槸鍚﹀垏鎹紵',
+				wxcode: '',
+				openid: ''
+			};
+		},
+		watch: {
+			radiovalue1(newV) {
+				if (this.registerFormModel.name || this.registerFormModel.idCard || this.registerFormModel.phone || this
+					.registerFormModel.carNo || this.registerFormModel.password) {
+					if (this.editRoleModelShow == true) {
+						this.editRoleModelShow = false;
+					} else {
+						this.editRoleModelShow = true;
+					}
+				}
+				switch (newV) {
+					case '璐т唬':
+						this.registerFormModel.type = 2;
+						break;
+					case '鍙告満':
+						this.registerFormModel.type = 3;
+						break;
+					default:
+						break;
+				}
+				return;
+			}
+		},
+		methods: {
+			...mapMutations(['changeisUploadimg']),
+			registerClick() {
+				if (this.registerFormModel.password == this.registerFormModel.confirmPassword) {
+					this.$refs.regesterFormRef
+						.validate()
+						.then(res => {
+							console.log(this.registerFormModel);
+							this.registerFormModel.username = this.registerFormModel.phone;
+							apiRegister(this.registerFormModel)
+								.then(res => {
+									if (res.data.code == 0) {
+										uni.showToast({
+											title: '娉ㄥ唽鎴愬姛,鍗冲皢杩斿洖鐧诲綍椤�',
+											icon: 'none',
+											duration: 1000
+										});
+										setTimeout(() => {
+											uni.redirectTo({ url: '/pages/login/login' });
+										}, 1000);
+									} else {
+										this.$u.toast(res.data.msg ? res.data.msg : '娣诲姞澶辫触');
+									}
+								})
+								.catch(err => {
+									console.log('閿欒', err);
+								});
+						})
+						.catch(err => {
+							console.log('err', err);
+							this.$u.toast('璇疯鑼冭緭鍏ュ唴瀹�');
+						});
+				} else {
+					this.$u.toast('涓ゆ瀵嗙爜涓嶄竴鑷�');
+				}
+			},
+			// 鍗曢�夋浜嬩欢
+			groupChange(e) {},
+			radioChange(e) {
+				if (
+					this.registerFormModel.name == '' &&
+					this.registerFormModel.idCard == '' &&
+					this.registerFormModel.phone == '' &&
+					this.registerFormModel.carNo == '' &&
+					this.registerFormModel.password == ''
+				) {
+					this.$refs.regesterFormRef.clearValidate();
+					this.beforeChangeValue = e;
+				}
+			},
+			jiaoYanPassword() {
+				if (this.registerFormModel.password != this.registerFormModel.confirmPassword) {
+					this.$u.toast('涓ゆ瀵嗙爜涓嶄竴鑷�');
+				}
+			},
+			// 涓婁紶鍥剧墖鏂规硶
+			beforeRead() {
+				this.changeisUploadimg(true);
+			},
+			// 鍒犻櫎鍥剧墖
+			deletePic(event) {
+				this.changeisUploadimg(true);
+				this[`fileList${event.name}`].splice(event.index, 1);
+			},
+			// 鏂板鍥剧墖
+			async afterRead(event) {
+				// 褰撹缃� mutiple 涓� true 鏃�, file 涓烘暟缁勬牸寮忥紝鍚﹀垯涓哄璞℃牸寮�
+				let lists = [].concat(event.file);
+				let fileListLen = this[`fileList${event.name}`].length;
+				lists.map(item => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '涓婁紶涓�'
+					});
+				});
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url, event.name);
+					let item = this[`fileList${event.name}`][fileListLen];
+					this[`fileList${event.name}`].splice(
+						fileListLen,
+						1,
+						Object.assign(item, {
+							status: 'success',
+							message: '涓婁紶鎴愬姛',
+							url: result
+						})
+					);
+					fileListLen++;
+				}
+			},
+			uploadFilePromise(url, num) {
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: BaseUrl + '/admin/sys-file/uploadUnToken',
+						filePath: url,
+						name: 'file',
+						formData: {
+							// user: ''
+						},
+						success: res => {
+							if (num == 1) {
+								this.registerFormModel.carImg = JSON.parse(res.data).data.url;
+								resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+							} else if (num == 2) {
+								this.registerFormModel.drivingImg = JSON.parse(res.data).data.url;
+								resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+							}
+						}
+					});
+				});
+			},
+			// 鏇存崲瑙掕壊寮瑰嚭妗�
+			roleConfirm() {
+				console.log('閬嶅巻瀵硅薄', Object.keys(this.registerFormModel));
+				Object.keys(this.registerFormModel).forEach(item => {
+					if (item !== 'type') {
+						if (this.registerFormModel[item]) this.registerFormModel[item] = '';
 					}
 				});
-			});
-		},
-		// 鏇存崲瑙掕壊寮瑰嚭妗�
-		roleConfirm() {
-			console.log('閬嶅巻瀵硅薄', Object.keys(this.registerFormModel));
-			Object.keys(this.registerFormModel).forEach(item => {
-				if (item !== 'type') {
-					if (this.registerFormModel[item]) this.registerFormModel[item] = '';
-				}
-			});
-			/**
-			 * @resetFields 涓嶇鐢ㄦ椂鍊欑敤涓婅竟鐨勪唬鏇�
-			 */
-			this.$refs.regesterFormRef.resetFields();
-			this.editRoleModelShow = false;
-		},
-		roleCancel() {
-			this.radiovalue1 = this.beforeChangeValue;
-			this.$nextTick(() => {
+				/**
+				 * @resetFields 涓嶇鐢ㄦ椂鍊欑敤涓婅竟鐨勪唬鏇�
+				 */
+				this.$refs.regesterFormRef.resetFields();
 				this.editRoleModelShow = false;
-			});
+			},
+			roleCancel() {
+				this.radiovalue1 = this.beforeChangeValue;
+				this.$nextTick(() => {
+					this.editRoleModelShow = false;
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
-<style lang="scss" scoped>
-::v-deep.register {
-	width: 94%;
-	padding: 0 0 vww(20) 0;
-	margin: 0 auto;
-	.registerForm {
+<style lang="scss"
+	scoped>
+	::v-deep.register {
 		width: 94%;
+		padding: 0 0 vww(20) 0;
 		margin: 0 auto;
-		font-size: 16px !important;
-		.u-form {
-			.u-radio {
-				width: 33%;
+
+		.registerForm {
+			width: 94%;
+			margin: 0 auto;
+			font-size: 16px !important;
+
+			.u-form {
+				.u-radio {
+					width: 33%;
+				}
+			}
+		}
+
+		.registerBtn {
+			width: 94%;
+			margin: vww(50) auto 0;
+		}
+
+		.utils {
+			line-height: vww(30);
+			text-align: center;
+
+			text:nth-of-type(1) {
+				margin-right: vww(10);
 			}
 		}
 	}
-	.registerBtn {
-		width: 94%;
-		margin: vww(50) auto 0;
-	}
-	.utils {
-		line-height: vww(30);
-		text-align: center;
-		text:nth-of-type(1) {
-			margin-right: vww(10);
-		}
-	}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index a2087ce..895a958 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -57,7 +57,7 @@
 		//棣栭〉涓嬫媺鍒锋柊
 		onPullDownRefresh() {
 			uni.showLoading({ title: '鍔犺浇涓�...' });
-			// 鑾峰彇鍘嗗彶鎻愮叅鍗�
+			// 鑾峰彇鍘嗗彶閫氱煡鍗�
 			if (this.roleType == 1 || this.roleType == 2) {
 				this.$reqGet('getJhOrderPlanDataPage', { current: 1, size: 10 }).then(res => {
 					if (res.data.records) {
@@ -150,9 +150,12 @@
 						if (nowWeighObj.eqInfraredStatus) {
 							this.changeinfraredStatus(true);
 							this.changeWeigh(nowWeighObj.weigh);
+							let warningState = nowWeighObj.warning == 1
+							this.changeWarning(warningState)
 						} else {
 							this.changeinfraredStatus(false);
 							this.changeWeigh(nowWeighObj.weigh);
+							this.changeWarning(warningState)
 						}
 					}
 				} else if (v.startsWith('msg')) {
@@ -188,7 +191,7 @@
 		},
 		methods: {
 			...mapMutations(['pushMessage', 'changeWeigh', 'changeinfraredStatus', 'changeisconnect', 'websocketInit',
-				'changeisLogin'
+				'changeisLogin', 'changeWarning'
 			]),
 			messagePage() {
 				uni.navigateTo({
diff --git a/store/index.js b/store/index.js
index 4c8a99f..e9c61e3 100644
--- a/store/index.js
+++ b/store/index.js
@@ -105,7 +105,9 @@
 		globalIntervalId: null,
 		is_open_socket: false, //閬垮厤閲嶅杩炴帴
 		connectNum: 1, //閲嶈繛娆℃暟,
-		reconnectTimeOut: null
+		reconnectTimeOut: null,
+		// 绉伴噸绋冲畾鎬�  0/绋冲畾 1/闈炵ǔ瀹�  闈炵ǔ瀹氭�佷笉鑳界偣绉伴噸
+		globalWarning: false
 	},
 	mutations: {
 		lengthchange(state, payload) {
@@ -169,12 +171,16 @@
 		},
 		// 鏀瑰彉閲嶈繛娆℃暟
 		changereconnectNum(state, payload) {
-			if (state.connectNum < 6) {
+			if (state.connectNum <= 6) {
 				state.connectNum += payload
 			} else {
 				state.connectNum = payload
 			}
 		},
+		// 鏀瑰彉绋冲畾鎬�
+		changeWarning(state, payload) {
+			state.globalWarning = payload
+		}
 	},
 	actions: {
 		websocketInit({ state, dispatch, commit }) {
@@ -225,7 +231,7 @@
 			clearInterval(state.reconnectTimeOut)
 			state.socketTast = null
 			commit('changereconnectState', false)
-			if (state.connectNum < 6 && state.globalisLogin) {
+			if (state.connectNum <= 6 && state.globalisLogin) {
 				uni.showToast({
 					title: `杩炴帴澶辫触锛屾鍦ㄥ皾璇曠${state.connectNum}娆¤繛鎺,
 					icon: 'none'

--
Gitblit v1.9.1