From 8f25b05713551b21fbbe605ed223f295fa492626 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Tue, 27 Jun 2023 09:39:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=BC=80=E5=8F=91=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=83=AD=E6=9B=B4=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/downloadUp.vue  |  39 ++++++-----
 manifest.json              |   2 +-
 pages/tabBar/home/home.vue | 129 +++++++++++++++++++++++++++----------
 3 files changed, 114 insertions(+), 56 deletions(-)

diff --git a/components/downloadUp.vue b/components/downloadUp.vue
index da79ecc..d13a6b9 100644
--- a/components/downloadUp.vue
+++ b/components/downloadUp.vue
@@ -2,7 +2,7 @@
 	<view class="content" v-if="bannerShow">
 		<!-- 弹出层 -->
 		<view class="uni-banner">
-			<!-- <image src="../static/logo.png" class="startUpHeaderLogo" /> -->
+			<image src="../static/logo.png" class="startUpHeaderLogo" />
 			<view class="banner_box">
 				<view class="startUpHeaderBox h6">发现新版本</view>
 				<view class="conter">{{ msg }}</view>
@@ -41,10 +41,11 @@
 				let localAppVersonName = uni.getStorageSync('version');
 				// #ifdef APP-PLUS
 				let datas = {
-					termType: "app"
+					termType: "APP"
 				}
 				queryVersion(datas).then(res => {
 					if (res.return_code == '000000') {
+						that.msg  = res.return_data.content;
 						if (res.return_data.versionType == 1 && that.comparisonVersionHandler(localAppVersonName,
 								res.return_data.version)) {
 							that.downloadWgt(res.return_data.fileUrl);
@@ -67,19 +68,17 @@
 				const that = this;
 				// 更新文件 wgt 文件地址
 				plus.nativeUI.showWaiting('正在更新...');
-				plus.downloader
-					.createDownload(
-						updateWgtUrl, {
-							filename: '_doc/update/'
-						},
-						function(d, status) {
-							if (status == 200) {
-								that.installWgt(d.filename); // 安装wgt方法
-							}
-							plus.nativeUI.closeWaiting();
+				plus.downloader.createDownload(
+					updateWgtUrl, {
+						filename: '_doc/update/'
+					},
+					function(d, status) {
+						if (status == 200) {
+							that.installWgt(d.filename); // 安装wgt方法
 						}
-					)
-					.start();
+						plus.nativeUI.closeWaiting();
+					}
+				).start();
 			},
 			installWgt(path) {
 				// 安装wgt方法
@@ -100,7 +99,7 @@
 				);
 			},
 			goUpdate() {
-				if (this.type == 2) {
+				// if (this.type == 2) {
 					// 弹出系统等待对话框
 					var dtask = plus.downloader.createDownload(
 						this.updateApkObj.fileUrl, {},
@@ -156,9 +155,9 @@
 							duration: 1500
 						});
 					}
-				} else if (this.type == 1) { // ios跳转到app store
-					plus.runtime.openURL(updateApkObj.downloadUrl);
-				}
+				// } else if (this.type == 1) { // ios跳转到app store
+				// 	plus.runtime.openURL(updateApkObj.downloadUrl);
+				// }
 			},
 			//判断是否升级
 			comparisonVersionHandler(reqV, curV) {
@@ -257,8 +256,8 @@
 		width: 80%;
 
 		.startUpHeaderLogo {
-			width: 256rpx;
-			height: 194rpx;
+			width: 200rpx;
+			height: 200rpx;
 		}
 
 		.banner_box {
diff --git a/manifest.json b/manifest.json
index e8d4b83..0d3dcc0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -128,6 +128,6 @@
 					"key": "7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB"
 				}
 			}
-		},
+		}
 	}
 }
\ No newline at end of file
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 206337f..91470f1 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -103,6 +103,44 @@
 		},
 
 		onLoad() {
+			if (this.userInfo.secUser.objectType == 5) {
+				let status = 1;
+				let that = this;
+				uni.getPushClientId({
+					success: res => {
+						that.storeCid = res.cid;
+						uni.getStorage({
+							key: "clientId",
+							success: (res) => {
+								if (res.data && res.data != undefined && res.data != that
+									.storeCid) {
+									status = 2;
+								}
+							},
+							fail(err) {
+								status = 3;
+								uni.setStorage({
+									key: "clientId",
+									data: that.storeCid
+								})
+							}
+						})
+					},
+					fail(err) {
+						console.log(err);
+					}
+				})
+				setTimeout(function() {
+					if (status == 1 && that.storeCid) {
+						that.setTimer();
+					}
+					if ((status == 2 || status == 3) && that.storeCid) {
+						that.connectStoreCid(that.storeCid)
+					}
+				}, 1500);
+			}
+
+
 			uni.onPushMessage((res) => {
 				// console.log("收到推送消息：", res.data.content) //监听推送消息
 				let conts = res.data.content.split('!@#PUSH#@!');
@@ -226,52 +264,73 @@
 			if (this.userInfo.secUser.objectType == 4) {
 				this.mermoveHomeCount();
 			}
-			if (this.userInfo.secUser.objectType == 5) {
-				this.storemoveHomeCount();
-				let status = 1;
-				let that = this;
-				uni.getPushClientId({
-					success: res => {
-						that.storeCid = res.cid;
-						uni.getStorage({
-							key: "clientId",
-							success: (res) => {
-								if (res.data && res.data != undefined && res.data != that
-									.storeCid) {
-									status = 2;
-								}
-							},
-							fail(err) {
-								status = 1;
-								uni.setStorage({
-									key: "clientId",
-									data: that.storeCid
-								})
-							}
-						})
-					},
-					fail(err) {
-						console.log(err);
-					}
-				})
-
-				setTimeout(function() {
-					if (status == 1 && that.storeCid) {
-						that.connectStoreCid(that.storeCid)
-					}
-				}, 1500);
 
+			if (this.userInfo.secUser.objectType == 5) {
+				this.storemoveHomeCount();
 			}
+
 			this.getDictionaries();
 		},
 		methods: {
+			Timersockt() {},
 			//绑定商户cid
 			connectStoreCid(item) {
 				let datas = {
 					"cid": item,
 					"storeId": this.userInfo.store.id
 				}
-				connectStoreCid(datas).then(res => {})
+				connectStoreCid(datas).then(res => {
+					this.setTimer();
+				})
+			},
+
+			setTimer() {
+				let holdTime = 10;
+				this.Timersockt = setInterval(() => {
+					if (holdTime <= 0) {
+						holdTime = 60;
+						clearInterval(this.Timersockt);
+						let status = 1;
+						let that = this;
+						uni.getPushClientId({
+							success: res => {
+								that.storeCid = res.cid;
+								uni.getStorage({
+									key: "clientId",
+									success: (res) => {
+										if (res.data && res.data != undefined && res
+											.data != that
+											.storeCid) {
+											status = 2;
+										}
+									},
+									fail(err) {
+										status = 3;
+										uni.setStorage({
+											key: "clientId",
+											data: that.storeCid
+										})
+									}
+								})
+							},
+							fail(err) {
+								console.log(err);
+							}
+						})
+
+						setTimeout(function() {
+							if (status == 1 && that.storeCid) {
+								that.setTimer();
+							}
+
+							if ((status == 2 || status == 3) && that.storeCid) {
+								that.connectStoreCid(that.storeCid)
+							}
+						}, 1500);
+						return;
+					}
+					holdTime--;
+				}, 1000)
 			},
 			//播报结束上传
 			voiceSucceed(item) {