2
0

4 Коммитууд 857ff53189 ... 1241da265d

Эзэн SHA1 Мессеж Огноо
  lyuis 1241da265d 1212 7 сар өмнө
  lyuis 5d7df019d2 Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5 7 сар өмнө
  lyuis e819bb32cc Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5 7 сар өмнө
  lyuis 62da854956 12 7 сар өмнө

+ 36 - 10
App.vue

@@ -249,16 +249,42 @@ export default {
                         success: (res) => {
                           const packgePath = res.savedFilePath;
                           // 保存更新记录到stroage,下次启动app时安装更新
-                          uni.setStorage({
-                            key: "updated",
-                            data: {
-                              completed: false,
-                              packgePath: packgePath,
-                            },
-                            success: () => {
-                              console.log("成功保存记录");
-                            },
-                          });
+                          if(true){
+							  console.log('直接进行安装')
+							  uni.removeStorageSync("updated");
+							  plus.runtime.install(packgePath, {
+							    force: true,
+							  });
+							  uni.setStorage({
+							    key: "updated",
+							    data: {
+							      completed: true,
+							      packgePath: packgePath,
+							    },
+							    success: (res) => {
+							      console.log("成功安装上次的更新,应用需要重启才能继续完成");
+							    },
+							  });
+							  uni.showModal({
+							    title: "温馨提示",
+							    content: "应用将重启以完成更新",
+							    showCancel: false,
+							    complete: () => {
+							      plus.runtime.restart();
+							    },
+							  });
+						  }else{
+							  uni.setStorage({
+								key: "updated",
+								data: {
+								  completed: false,
+								  packgePath: packgePath,
+								},
+								success: () => {
+								  console.log("成功保存记录");
+								},
+							  });
+						  }
                           // 任务完成,关闭下载任务
                           console.log(
                             "任务完成,关闭下载任务,下一次启动应用时将安装更新"

+ 11 - 10
pages/index/download.vue

@@ -103,37 +103,38 @@ export default {
 							var u = navigator.userAgent;
 							if (u.indexOf('Android') > -1 || u.indexOf('Linux') > -1) { //安卓手机
 								// 小米应用商店
-								    if (u.match(/mi\s/i) == 'mi ') {
+								this.$queue.appConfirm(ua)
+								    if (ua.match(/xiaomi/i) == 'xiaomi') {
 								        window.location.href = 'https://app.mi.com/details?id=uni.app.UNI0B0096D';
 								    
 								    // vivo应用商店
-								    } else if (u.match(/vivo/i) == 'vivo') {
+								    } else if (ua.match(/vivo/i) == 'vivo') {
 								        window.location.href = 'https://h5coml.vivo.com.cn/h5coml/appdetail_h5/browser_v2/index.html?appId=3629014';
 										return this.$queue.showToast('vivo系统请在应用商店搜索“亿职赞”')
 								    // OPPO应用商店
-								    } else if (u.match(/oppo/i) == 'oppo') {
+								    } else if (ua.match(/oppo/i) == 'oppo') {
 								        window.location.href = 'https://api.appstore.oppomobile.com/app/detail?packageName=uni.app.UNI0B0096D';
 								    
 								    // 荣耀应用商店
-								    } else if (u.match(/honor/i) == 'honor') {
+								    } else if (ua.match(/honor/i) == 'honor') {
 								        window.location.href = 'https://appgallery.huawei.com/app/C116155907'; // 替换为实际应用ID
 								    
 								    // 华为应用市场
-								    } else if (u.match(/huawei/i) == 'huawei') {
+								    } else if (ua.match(/huawei/i) == 'huawei') {
 								        window.location.href = 'https://appgallery.huawei.com/app/C116155907'; // 替换为实际应用ID
 								    
 								    // 三星应用商店
-								    } else if (u.match(/samsung/i) == 'samsung') {
+								    } else if (ua.match(/samsung/i) == 'samsung') {
 								        window.location.href = 'https://galaxystore.samsung.com/detail/uni.app.UNI0B0096D';
 								    
 								    // 魅族应用商店
-								    } else if (u.match(/meizu/i) == 'meizu') {
+								    } else if (ua.match(/meizu/i) == 'meizu') {
 								        window.location.href = 'https://app.meizu.com/apps/uni.app.UNI0B0096D';
 								    
 								    
 								    // 默认跳转(Google Play或官方下载页)
 								    } else {
-								        window.location.href = 'https://play.google.com/store/apps/details?id=uni.app.UNI0B0096D';
+								        this.$queue.showToast('请在手机应用市场内搜索“亿职赞”')
 								    }
 		
 							} else if (u.indexOf('iPhone') > -1) { //苹果手机
@@ -389,8 +390,8 @@ page {
 				font-weight: 600;
 				color: #ffffff;
 				width: 130rpx;
-				padding: 10rpx 0;
-				background: #3478F6;
+				padding: 4rpx 0;
+				background: #3478F6dd;
 				border-radius: 32rpx;
 				margin-right: 13rpx;
 			}

+ 4 - 2
pages/my/setup.vue

@@ -50,7 +50,7 @@
 		<view v-if="token" class="footer-btn">
 			<view class="usermain-btn" @click="goOut()">退出</view>
 		</view>
-		<view class="version">{{appname}}<text>v {{appversion}}</text></view>
+		<view class="version">{{appname}}<text>v {{appversion}}</text> <text>wgt {{wgt}}</text></view>
 		<!-- 权限说明弹窗 -->
 		<u-popup mode="top" ref="permission">
 			<view class="popup-content">
@@ -95,7 +95,8 @@ export default {
 			storageSize: 0.,
 			appname: '亿职赞',//默认名称只对小程序生效,因为小程序获取不到名称
 			appversion: '1.0.1',
-			token: ''
+			token: '',
+			wgt:'1.0.1'
 		};
 	},
 	computed: {
@@ -116,6 +117,7 @@ export default {
 		var sys = uni.getSystemInfoSync()
 		this.appname = sys.appName
 		this.appversion = sys.appVersion
+		this.wgt=sys.appWgtVersion
 		// #endif
 		// this.avatar = uni.getStorageSync('avatar')
 		this.token = uni.getStorageSync("token");

BIN
unpackage/res/icons/1024x1024.png


BIN
unpackage/res/icons/120x120.png


BIN
unpackage/res/icons/144x144.png


BIN
unpackage/res/icons/152x152.png


BIN
unpackage/res/icons/167x167.png


BIN
unpackage/res/icons/180x180.png


BIN
unpackage/res/icons/192x192.png


BIN
unpackage/res/icons/20x20.png


BIN
unpackage/res/icons/29x29.png


BIN
unpackage/res/icons/40x40.png


BIN
unpackage/res/icons/58x58.png


BIN
unpackage/res/icons/60x60.png


BIN
unpackage/res/icons/72x72.png


BIN
unpackage/res/icons/76x76.png


BIN
unpackage/res/icons/80x80.png


BIN
unpackage/res/icons/87x87.png


BIN
unpackage/res/icons/96x96.png