浏览代码

升级调试

caojunjie 4 年之前
父节点
当前提交
5557870f86
共有 3 个文件被更改,包括 9 次插入21 次删除
  1. 2 2
      manifest.json
  2. 6 18
      pages/home/index.vue
  3. 1 1
      pages/me/setting/setting.vue

+ 2 - 2
manifest.json

@@ -1,8 +1,8 @@
 {
     "name" : "耀灵掌上通",
     "appid" : "__UNI__0C3473D",
-    "description" : "测试",
-    "versionName" : "1.0.0",
+    "description" : "耀灵掌上通是提供给门店使用的移动端管理APP。",
+    "versionName" : "0.1.1",
     "versionCode" : 1,
     "transformPx" : false,
     "app-plus" : {

+ 6 - 18
pages/home/index.vue

@@ -42,7 +42,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" :url="url" :is_force="is_force" :describe="Copywriting"></luo-version-upgrade>
+		<luo-version-upgrade v-if="show_s == true" :version="platform" :url="url" :is_force="is_force" :describe="Copywriting"></luo-version-upgrade>
 	</view>
 </template>
 
@@ -73,6 +73,7 @@
 				url: '',
 				is_force: false,
 				Copywriting: '',
+				platform:''
 			}
 		},
 		onLoad() {
@@ -130,6 +131,7 @@
 		},
 		methods: {
 			system() {
+				console.log("在这里")
 				uni.getSystemInfo({
 					success: res => {
 						// let add = ''这个不要删除!
@@ -138,6 +140,8 @@
 					complete: err => {
 						if (err.platform == 'android') {
 							this.onLaunch_s()
+							console.log("在这里2")
+						this.platform =	err.platform
 						} else if (err.platform == 'ios') {
 							// 
 							this.iosstartup()
@@ -153,12 +157,6 @@
 							osType: 1
 						}
 					}).then(res => {
-						// 
-						// 
-						//  //最低版本
-						//  //更新文案
-						//  //最新版本
-
 						plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
 							// 
 							//版本号
@@ -233,16 +231,8 @@
 						params: {
 							osType: 0
 						}
-					}).then(res => {
-
-						//最低版本
-						//更新文案
-						//下载最新版地址
-						//最新版本
-
+					}).then(res =>{
 						plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
-
-							//版本号
 							if (wgtinfo.version == res.data.version) {
 								this.show_s = false
 								// uni.showToast({
@@ -250,7 +240,6 @@
 								// 	title: '已是最新版本',
 								// 	position: "bottom"
 								// })
-
 							} else if (wgtinfo.version != res.data.forceVersion) {
 								this.Copywriting = res.data.msg
 								this.show_s = true
@@ -262,7 +251,6 @@
 								this.show_s = true
 								this.url = res.data.url
 							}
-
 						})
 
 					}).catch(err => {

+ 1 - 1
pages/me/setting/setting.vue

@@ -51,7 +51,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" :describe="Copywriting"></luo-version-upgrade>
+		<luo-version-upgrade v-if="show_s == true" :version="edition_s" :url="url" :is_force="is_force" :describe="Copywriting"></luo-version-upgrade>
 	</view>
 </template>