更新弹框有bug；已修复

App.vue

@@ -44,15 +44,13 @@ export default {
 			// 存储所有请求的头部信息
 			uni.setStorage({ key: 'm-header-version', data: versionNumber });
 		})
-
-		/*** tabbar*/
-		switchShowTabbar()
 	},
 
 	async onShow() {
 		await ininIndex()
 		await initSettings()
 		await initApp()
+		switchShowTabbar()
 	},
 	/** 切换到后台 */
 	onHide() {

components/showModal/upgradePopup.vue

 <template>
 	<view>
 		<!-- 遮罩滚动锁定组件 -->
-		<page-meta :page-style="'overflow:'+(popupShow?'hidden':'visible')"></page-meta>
+		<page-meta :page-style="'overflow:' + (popupShow ? 'hidden' : 'visible')"></page-meta>
 		<uni-popup ref="upgradePopup" background-color="#fff" class="upgradePopup" @change="upgradePopupChange"
 			:mask-click="false">
 			<view class="rocket-content">
@@ -21,13 +21,15 @@
 
 
 			<view class="update-content">
-				<text space="nbsp">{{appUpgeadeObj.updateContent}}</text>
+				<text space="nbsp">{{ appUpgeadeObj.updateContent }}</text>
 			</view>
 			<view v-if="updateButtonBoolean" class="update-button">
 				<button class="not-updated-button" :disabled="noUpdatedDisabled"
 					v-show="appUpgeadeObj.forceUpdate == false" type="warn" @tap.stop="noUpdate">暂不更新</button>
-				<button v-show='appUpgeadeObj.type == "ANDROID"' class="updated-button" type="warn" @tap.stop="upgradeNowAndroid">立即升级</button>
-				<button v-show='appUpgeadeObj.type == "IOS" ' class="updated-button" type="warn" @tap.stop="upgradeNow">立即升级</button>
+				<button v-show='appUpgeadeObj.type == "ANDROID"' class="updated-button" type="warn"
+					@tap.stop="upgradeNowAndroid">立即升级</button>
+				<button v-show='appUpgeadeObj.type == "IOS"' class="updated-button" type="warn"
+					@tap.stop="upgradeNow">立即升级</button>
 			</view>
 			<!-- v-if="progressBolean" -->
 			<!-- {{progressBolean}} -->
@@ -40,7 +42,7 @@
 </template>
 
 <script>
-	export default {
+export default {
 	props: {
 		appUpgeadeObj: {
 			type: Object,
@@ -63,7 +65,7 @@
 			},
 			progressBolean: false, // 进度条的显示和隐藏
 			noUpdatedDisabled: false,
-				isWGT:false,// 是否wgt资源包
+			isWGT: false,// 是否wgt资源包
 
 		};
 	},
@@ -94,8 +96,11 @@
 		},
 		// 暂不更新按钮事件
 		noUpdate() {
+			this.popupShow = false
 			uni.showTabBar()
+			setTimeout(() => {
 				this.$emit('pause')
+			}, 10)
 		},
 		// 立即升级事件
 		upgradeNow() {
@@ -104,26 +109,26 @@
 
 			let platform = uni.getSystemInfoSync().platform
 
-				const wgtType=that.containsWGTExtension(that.appUpgeadeObj.downloadUrl)
-				that.isWGT=wgtType
+			const wgtType = that.containsWGTExtension(that.appUpgeadeObj.downloadUrl)
+			that.isWGT = wgtType
 			const index = that.appUpgeadeObj.downloadUrl.indexOf('apps.apple.com')
-				console.log(that.isWGT,'that.isWGT3333')
-				if(that.isWGT==true){
-					that.updateWgt(that.appUpgeadeObj.downloadUrl,that.appUpgeadeObj.downloadUrl.versionName)
-				}else{
+			console.log(that.isWGT, 'that.isWGT3333')
+			if (that.isWGT == true) {
+				that.updateWgt(that.appUpgeadeObj.downloadUrl, that.appUpgeadeObj.downloadUrl.versionName)
+			} else {
 				if (platform == 'ios' && index !== -1) return plus.runtime.openURL(that.appUpgeadeObj.downloadUrl);
 			}
 
 		},
-			upgradeNowAndroid(){
+		upgradeNowAndroid() {
 			let that = this
 			that.noUpdatedDisabled = true
 			let platform = uni.getSystemInfoSync().platform
 			const index = that.containsApkExtension(that.appUpgeadeObj.downloadUrl)
-				const wgtType=that.containsWGTExtension(that.appUpgeadeObj.downloadUrl)
-				console.log(wgtType,'that.isWGT')
-				that.isWGT= wgtType
-					if(index==true){
+			const wgtType = that.containsWGTExtension(that.appUpgeadeObj.downloadUrl)
+			console.log(wgtType, 'that.isWGT')
+			that.isWGT = wgtType
+			if (index == true) {
 				plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
 					var downloadTask = uni.downloadFile({
 						url: that.appUpgeadeObj.downloadUrl,
@@ -133,11 +138,11 @@
 									.tempFilePath, {
 									force: false
 								},
-											function() {
+									function () {
 										plus.cache.clear();
 										plus.runtime.restart();
 									},
-											function(err) {
+									function (err) {
 										console.log('err--------安装升级包失败', err)
 										uni.showToast({
 											title: '安装升级包失败',
@@ -151,8 +156,8 @@
 						this.progressData.percent = res.progress
 					});
 				})
-					}else{
-						console.log(333,'indexw')
+			} else {
+				console.log(333, 'indexw')
 				//跳转到应用商店
 				let appurl = "market://details?id=io.dcloud.ddh"
 				plus.runtime.openURL(appurl)
@@ -162,37 +167,37 @@
 
 		},
 		//wgt更新
-			updateWgt(downloadUrl,newVersion){
+		updateWgt(downloadUrl, newVersion) {
 			uni.showModal({
 				title: '已发现新版本',
 				content: '确认更新？',
 				showCancel: false,
-							success:function(res){
-								uni.setStorageSync('checkVersions',newVersion)
-								if(res.confirm){
+				success: function (res) {
+					uni.setStorageSync('checkVersions', newVersion)
+					if (res.confirm) {
 						uni.downloadFile({
 							url: downloadUrl,
 							success: (downloadResult) => {
-											plus.runtime.install(downloadResult.tempFilePath,{force: true},function(){	
+								plus.runtime.install(downloadResult.tempFilePath, { force: true }, function () {
 									//应用热重启，重新启动进入首页
 									plus.runtime.restart();
 									uni.showModal({
 										title: '安装成功！',
 										content: '已重新进入应用',
 										showCancel: false,
-														success:function(res){
-															if(res.confirm){
+										success: function (res) {
+											if (res.confirm) {
 
 												console.log('用户点击确定');
-															}else if(res.cancel){
+											} else if (res.cancel) {
 												console.log('用户点击确定');
 											}
 										}
 
 									})
 								},
-											function(e){
-												console.log(e,'安装失败')
+									function (e) {
+										console.log(e, '安装失败')
 										uni.showModal({
 											title: '安装失败',
 											icon: 'none'
@@ -206,7 +211,7 @@
 								})
 							}
 						})
-								}else if(res.cancel){
+					} else if (res.cancel) {
 						uni.showToast({
 							title: '已取消',
 							icon: 'none'
@@ -222,11 +227,11 @@
 			return /\.wgt$/i.test(url);
 		}
 	}
-	};
+};
 </script>
 
 <style scoped lang="scss">
-	.upgradePopup {
+.upgradePopup {
 	z-index: 999;
 
 	/deep/.uni-popup__wrapper {
@@ -254,23 +259,27 @@
 				left: 225rpx;
 			}
 		}
-			.content-v-des{
+
+		.content-v-des {
 			position: absolute;
 			left: 40rpx;
 			top: 30rpx;
 			z-index: 3;
-				.content-v{
+
+			.content-v {
 				font-size: 75rpx;
-					color:#FFFFFF;
+				color: #FFFFFF;
 			}
-				.content-text{
+
+			.content-text {
 				padding-top: 20rpx;
 				font-family: PingFangSC, PingFang SC;
 				font-size: 42rpx;
-					color:#333333;
+				color: #333333;
 			}
+
 			.title {
-					margin-top:20rpx;
+				margin-top: 20rpx;
 				display: flex;
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;
@@ -279,13 +288,15 @@
 				line-height: 28px;
 				text-align: left;
 				font-style: normal;
-					.info_desc_scroll{
+
+				.info_desc_scroll {
 					width: 450rpx;
 					height: 200rpx;
 					box-sizing: border-box;
 					line-height: 1.3;
-						.scroll-text{
-							padding-bottom:6rpx;
+
+					.scroll-text {
+						padding-bottom: 6rpx;
 					}
 				}
 			}
@@ -354,5 +365,5 @@
 			}
 		}
 	}
-	}
+}
 </style>
\ No newline at end of file

pages/index/index.less

@@ -236,8 +236,8 @@
 				}
 			}
 			.box-at-home{			
-					// height: 1200rpx;
 					background:#F7FAFF ;
+					
 				.main-box{
 						display:flex;
 						flex-wrap: wrap;

pages/index/index.vue

@@ -3,6 +3,7 @@
 		<view class='i-header' v-show='isFixed != true'>
 			<text>多典花</text>
 		</view>
+
 		<view v-if='index !== null' class='i-boxs'>
 			<!-- Banner 位 -->
 			<view class='i-banner'>
@@ -76,10 +77,10 @@
 						</view>
 					</view>
 				</scroll-view>
+			</view>
 
 
 		</view>
-		</view>
 
 		<!-- 更新 -->
 		<upgrade-Popup :app-upgeade-obj="appUpgeadeObj" v-if="appUpgeadeObj.downloadUrl"
@@ -88,8 +89,7 @@
 </template>
 
 <script>
-import { isLogin, ininIndex } from '@/utils/index'
-
+import { isLogin, switchShowTabbar, ininIndex } from '@/utils/index'
 const cacheIndexData = uni.getStorageSync('dataIndex') ? JSON.parse(uni.getStorageSync('dataIndex')) : null;
 
 export default {
@@ -134,16 +134,19 @@ export default {
 	},
 	async onLoad() {
 		this.isFirstShow = uni.getStorageSync('isFirstShow')
+
+
+		await this.getAppVersion()
 	},
 	async onShow() {
+		// 初始化首页数据
 		ininIndex()
 		// 显示隐藏tabBar
-		// switchShowTabbar()
-		// initSettings()
+		switchShowTabbar()
 		// 首页流量埋点
 		this.buryingPoint('app:index_page_view')
 		await this.initAjax();
-		// await this.getAppVersion()
+
 	},
 
 	methods: {

pages/starPage/index.vue

@@ -9,9 +9,7 @@ import { ininIndex, initSettings, initApp } from '@/utils/index'
 export default {
 	async onLoad() {
 
-		await ininIndex()
-		await initSettings()
-		await initApp()
+
 
 		// 有网络了再弹窗
 		uni.getNetworkType({
@@ -33,6 +31,9 @@ export default {
 		})
 
 
+		await ininIndex()
+		await initSettings()
+		await initApp()
 	},
 	methods: {
 		init() {