caojunjie 4 år sedan
förälder
incheckning
6d768a369d
2 ändrade filer med 13 tillägg och 3 borttagningar
  1. 7 1
      pages/home/index.vue
  2. 6 2
      pages/me/setting/setting.vue

+ 7 - 1
pages/home/index.vue

@@ -43,7 +43,7 @@
 		<!-- <u-tabbar v-model="current" :list="list"></u-tabbar> -->
 		<u-skeleton :loading="loading" :animation="true"></u-skeleton>
 		<u-toast ref="ulogin" />
-		<luo-version-upgrade v-if="show_s == true" version="1.0.1" :url="url" :is_force="is_force"></luo-version-upgrade>
+		<luo-version-upgrade v-if="show_s == true" version="1.0.1" :url="url" :is_force="is_force" :describe="Copywriting"></luo-version-upgrade>
 	</view>
 </template>
 
@@ -71,6 +71,7 @@
 				show_s: false,
 				url: '',
 				is_force:false,
+				Copywriting:''
 			}
 		},
 		onLoad() {
@@ -139,12 +140,17 @@
 								console.log("已是最新版本")
 							}else if (wgtinfo.version != res.data.forceVersion) {
 								console.log("必须强制更新")
+								this.Copywriting = res.data.msg
+								console.log(this.Copywriting)
 								this.show_s = true
 								console.log(res.data.url)
 								this.url = res.data.url
 								this.is_force = true
 							}else if(wgtinfo.version == res.data.forceVersion){
 								console.log("达到最低版本")
+								this.Copywriting = res.data.msg
+								console.log(this.Copywriting)
+								
 								this.is_force = false
 								this.show_s = true
 								this.url = res.data.url

+ 6 - 2
pages/me/setting/setting.vue

@@ -49,7 +49,7 @@
 			</view>
 		</u-card>
 		<u-button type="primary" @click="exit" style="margin: 20rpx">安全退出</u-button>
-		<luo-version-upgrade v-if="show_s == true" version="1.0.1" :url="url" :is_force="is_force"></luo-version-upgrade>
+		<luo-version-upgrade v-if="show_s == true" version="1.0.1" :url="url" :is_force="is_force" :describe="Copywriting"></luo-version-upgrade>
 	</view>
 </template>
 
@@ -69,6 +69,7 @@
 				show_s: false,
 				url: '',
 				is_force:false,
+				Copywriting:''
 			};
 		},
 		created() {
@@ -107,7 +108,7 @@
 							console.log(res.data.msg) //更新文案
 							console.log(res.data.url) //下载最新版地址
 							console.log(res.data.version) //最新版本
-					
+							
 							plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
 								console.log(wgtinfo);
 								console.log(wgtinfo.version); //版本号
@@ -122,12 +123,15 @@
 									console.log("已经是最新版本了")
 								} else if (wgtinfo.version != res.data.forceVersion) {
 									console.log("必须强制更新")
+									this.Copywriting = res.data.msg
 									this.show_s = true
 									console.log(res.data.url)
 									this.url = res.data.url
 									this.is_force = true
 								} else if (wgtinfo.version == res.data.forceVersion) {
 									console.log("达到最低版本")
+									this.Copywriting = res.data.msg
+									console.log(this.Copywriting)
 									this.is_force = false
 									this.show_s = true
 									console.log(this.show_s)