From c8f27ab24d4d6db0cc452396f140143e6c7f67f2 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 07 二月 2023 13:36:08 +0800
Subject: [PATCH] #

---
 App.vue |  175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 167 insertions(+), 8 deletions(-)

diff --git a/App.vue b/App.vue
index 92e790a..6aeb746 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,10 @@
 <script>
 	import Vue from 'vue'
 	export default {
+		globalData: {
+			baseHttp:'',
+			baseUrll: '',
+		},
 		onLaunch: function() {
 			Vue.prototype.ColorList = [{
 					title: '瀚g孩',
@@ -80,11 +84,104 @@
 			]
 		},
 		onShow: function() {
+			// 闅愯棌鏃堕棿,鐢甸噺,淇″彿绛�
+			// #ifdef APP-PLUS
+			plus.navigator.setFullscreen(true)
+			// #endif
+			// 鑾峰彇鐗堟湰
+			// this.getVersion();
+			this.baseUrll = uni.getStorageSync("baseUrl")
 			console.log('App Show')
 		},
 		onHide: function() {
 			console.log('App Hide')
 		},
+		methods: {
+			//妫�娴嬪綋鍓嶅钩鍙帮紝濡傛灉鏄畨鍗撳垯鍚姩瀹夊崜鏇存柊  
+			getVersion() {
+				let that = this;
+				uni.getSystemInfo({
+					success: (res) => {
+						console.log(res.platform);
+						if (res.platform == "android") {
+							that.AndroidCheckUpdate();
+						}
+					}
+				})
+			},
+			// 鑾峰彇褰撳墠鐗堟湰鍙�
+			AndroidCheckUpdate() {
+				let that = this;
+				plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+					that.version = wgtinfo.version //瀹㈡埛绔増鏈彿
+					console.log('褰撳墠app鐗堟湰淇℃伅锛�' + that.version);
+				})
+				that.getUpdateVersion()
+			},
+			getUpdateVersion() {
+				let that = this;
+				uni.request({
+					url: that.baseUrll + "/mobile/appUpdate/queryUpdate",
+					// data: {combParam: 'asd'},
+					method:'GET',
+					success(res) {
+						console.log(res);
+					}
+				})
+				return
+				that.$req.get(that.baseUrll + "/appUpdate/queryUpdate", {}, {}).then(function(res) {
+					console.log('res.data:' + JSON.stringify(res.data))
+					console.log("鐜板湪鐨勭増鏈�" + that.version + "鏁版嵁搴撶増鏈�" + res.data.data.version + "杩涘叆鏌ユ壘app鐗堟湰");
+					if (res.data.data.version > that.version) {
+						// 杩欓噷涓嬭浇apkurl浠�/appUpdate/queryUpdate鎺ュ彛璇锋眰杩斿洖鏁版嵁涓幏鍙�
+						that.downloadUrl = BaseUrl + '/' + res.data.data.androidUrl
+						// 鏄惁寮哄埗鏇存柊锛�0 鍚︼紱1 鏄級
+						that.isForceUpdate = res.data.data.isForceUpdate
+						uni.showModal({
+							// 鏇存柊鎻愰啋
+							title: '鍙戠幇鏂扮増鏈紝鏄惁鏇存柊',
+							content: '姝ょ増鏈彿锛�' + that.version + '\xa0\xa0\xa0' + '寰呮洿鏂扮増鏈彿锛�' + res.data.data
+								.version,
+							success: res => {
+								if (res.confirm) {
+									that.downWgt(); //涓嬭浇鏂囦欢
+									// that.showdownLine = true;
+									// plus.runtime.openURL(androidUrl)
+								} else if (res.cancel) {
+									console.log('that.isForceUpdate锛�' + that.isForceUpdate);
+									// 涓嶆洿鏂板己鍒堕��鍑篴pp
+									if (that.isForceUpdate == 1) {
+										console.log('that.isForceUpdate1锛�' + that.isForceUpdate);
+										uni.showModal({
+											// 鏇存柊鎻愰啋
+											title: '鍙戠幇鏂扮増鏈紝鏄惁鏇存柊',
+											content: '姝ょ増鏈负寮哄埗鏇存柊鐗堟湰濡備笉鍗囩骇灏嗛��鍑篈PP',
+											success: res => {
+												if (res.confirm) {
+													console.log('涓嶆洿鏂板己鍒堕��鍑篴pp');
+													plus.runtime.quit();
+												} else if (res.cancel) {
+													that.AndroidCheckUpdate();
+												}
+											}
+										});
+									}
+								}
+							}
+						});
+						//dtask.start();   
+					}
+				}).catch(error => {
+					uni.showToast({
+						title: '璋冪敤璇锋眰澶辫触',
+						mask: false,
+						duration: 5000,
+						icon: "none"
+					});
+				});
+				complete: () => {}
+			},
+		}
 	}
 </script>
 
@@ -281,7 +378,7 @@
 		transform: translate(-50%, -50%) scale(1);
 		-webkit-transform: translate(-50%, -50%) scale(1);
 	}
-.square-2 {
+	.square-2 {
 		background-color: #ffffff;
 		box-shadow: 0px 0px 5px #d9d9d9;
 		width: 94%;
@@ -314,6 +411,17 @@
 		width: 100%;
 		height: 100rpx;
 	}
+	.square-content>text{
+		height: 100%;
+		/* background-color: #18BC37; */
+		width: 22%;
+		line-height: 100rpx;
+		display: inline-block;
+		float: left;
+		text-align: right;
+		margin-left: 3%;
+		font-size: 30rpx;
+	}
 	.content-input {
 		background-color: #f9f9f9;
 		display: inline-block;
@@ -328,9 +436,8 @@
 	.content-input input {
 		display: inline-block;
 		float: left;
-		height: 100%;
+		height: 80rpx;
 		width: 90%;
-		/* background-color: #007AFF; */
 		text-indent: 20rpx;
 		font-size: 32rpx;
 		letter-spacing: 3rpx;
@@ -362,10 +469,11 @@
 		float: right;
 		height: 80rpx;
 		line-height: 80rpx;
-		width: 60%;
+		width: 70%;
 		margin: 10rpx 2.5%;
-		border-radius: 15rpx;
+		border-radius: 10rpx;
 		border: 1px solid #eeeeee;
+		margin: 10rpx 3% 10rpx 0 ;
 	}
 	.content-input-combox input {
 		display: inline-block;
@@ -379,15 +487,17 @@
 	}
 	.content-combox {
 		display: inline-block;
+		float: right;
 		height: 80rpx;
-		width: 30%;
-		margin: 10rpx 0 10rpx 3% ;
+		width: 94%;
+		margin: 10rpx 3% 10rpx 0 ;
 	}
 	.square-none {
 		width: 100%;
 		height: 100rpx;
 	}
 	.square-1 {
+		position: relative;
 		background-color: #ffffff;
 		box-shadow: 0px 0px 5px #d9d9d9;
 		width: 94%;
@@ -403,9 +513,10 @@
 		color: #7a7a7a;
 	}
 	.title-text {
+		/* background-color: #000000; */
 		display: inline-block;
 		height: 100rpx;
-		width: 10em;
+		width: 250rpx;
 		line-height: 110rpx;
 		font-size: 40rpx;
 		font-weight: 700;
@@ -427,4 +538,52 @@
 		font-size: 32rpx;
 		color: #FFFFFF;
 	}
+	.square-3 {
+		background-color: #ffffff;
+		box-shadow: 0px 0px 5px #d9d9d9;
+		width: 94%;
+		height: 300rpx;
+		border-radius: 20rpx;
+		margin: 20rpx auto 20rpx auto;
+	}
+	.searchBox {
+		position: absolute;
+		width: 94%;
+		height: 80%;
+		top: 0;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		margin: auto;
+		background-color: #F9F9F9;
+		border-radius: 20rpx;
+	}
+	.searchIcon {
+		display: inline-block;
+		float: left;
+		width: 10%;
+		height: 100%;
+		text-align: center;
+		line-height: 80rpx;
+	}
+	
+	.searchArea {
+		display: inline-block;
+		float: left;
+		width: 80%;
+		height: 100%;
+	}
+	.searchArea input {
+		height: 100%;
+		font-size: 14px;
+		color: #5f5f5f;
+	}
+	.closeIcon {
+		display: inline-block;
+		float: left;
+		width: 10%;
+		height: 100%;
+		text-align: center;
+		line-height: 80rpx;
+	}
 </style>

--
Gitblit v1.9.1