From 3ee7795d29420b41e4c74678eed0a0490528476f Mon Sep 17 00:00:00 2001
From: zhengshuiqi <zhengshiqi@xingtongworld.com>
Date: Thu, 24 Nov 2022 11:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AE=E8=AF=A2=E7=BD=91=E7=BB=9C=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD(=E7=99=BD=E5=B1=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                      |  1 +
 common/base.js               |  0
 main.js                      |  4 ++
 manifest.json                |  2 +-
 pages/account/index.vue      |  2 +-
 pages/index/index.vue        | 80 ++++++++++++++++++++++++------------
 pages/order/confirmation.vue |  4 ++
 7 files changed, 64 insertions(+), 29 deletions(-)
 create mode 100644 common/base.js

diff --git a/App.vue b/App.vue
index 8c7dd9b..2c6e748 100644
--- a/App.vue
+++ b/App.vue
@@ -94,6 +94,7 @@
 		onHide: function() {
 			// console.log('App Hide')
 		},
+		
 	
 	}
 </script>
diff --git a/common/base.js b/common/base.js
new file mode 100644
index 0000000..e69de29
diff --git a/main.js b/main.js
index 6dfa9ba..4b2d064 100644
--- a/main.js
+++ b/main.js
@@ -3,6 +3,10 @@ import store from '@/store/store.js'
 import ios from '@/ios/index.js'
 // #ifndef VUE3
 import Vue from 'vue'
+
+Vue.prototype.$onLaunched = new Promise(resolve => {
+    Vue.prototype.$isResolve = resolve
+})
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
diff --git a/manifest.json b/manifest.json
index 126004a..1a19141 100644
--- a/manifest.json
+++ b/manifest.json
@@ -112,7 +112,7 @@
                     "xxhdpi" : "unpackage/res/icons/dope2.png"
                 },
                 "useOriginalMsgbox" : false,
-                "iosStyle" : "common",
+                "iosStyle" : "default",
                 "ios" : {
                     "iphone" : {
                         "retina47" : "unpackage/res/icons/dope2.png",
diff --git a/pages/account/index.vue b/pages/account/index.vue
index 41e0a80..df87d53 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -535,7 +535,7 @@
 			align-items: center;
 			position: absolute;
 			width: 100%;
-			top: 13.5%;
+			top: 15.5%;
 			// left: 15%;
 
 				// z-index: 1111;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d366f32..c929a33 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -157,21 +157,50 @@
 			}, 2000)
 		},
 		onReady() {
-
+			// 轮询判断
+			// typee = 2 有网络
 			//判断是否有网络(尝试解决IOS白屏)
-			uni.getNetworkType({
-			    success: function (res) {
-			        console.log(res.networkType);//网络类型 wifi、2g、3g、4g、ethernet、unknown、none
-			        if(res.networkType === "none"){
-			            
-						this.typee = 1;
-						console.log("当前无网络",this.typee);
-			        }else{
-						this.typee = 2
-			            console.log("有网络",this.typee);
-			        }
-			    }
-			});
+			let that = this;
+			let s = 0;
+			let time = setInterval(()=>{
+				console.log('6666')
+				uni.getNetworkType({
+					success:(res)=>{
+						console.log(res.networkType,s);
+						if(res.networkType !== 'none'){
+							that.typee =  2;
+							clearInterval(time);
+							console.log('清楚网络..')
+						}
+					}
+				})
+				s++;
+			},1000);
+			/* uni.getNetworkType({
+				success: function(res) {
+					console.log(res.networkType);
+					//网络类型 wifi、2g、3g、4g、ethernet、unknown、none
+					setTimeout(function() {
+						if (res.networkType === "none") {
+							that.typee = 1;
+							console.log("当前无网络", that.typee);
+							uni.showToast({
+								title: '网络不佳,请重新打开........',
+								duration: 20000
+							});
+
+						} else {
+							that.typee = 2
+							console.log("有网络", that.typee);
+							uni.showToast({
+								title: '网络不佳,请重新打开........',
+								duration: 2000
+							});
+
+						}
+					}, 3000)
+				}
+			}); */
 		},
 		onLoad() {
 			let home = 'HOME'
@@ -1134,7 +1163,7 @@
 </script>
 <template>
 
-	<view class="body" :class="isScrollShow?'body_pad':''">
+	<view v-if="typee == 2" class="body" :class="isScrollShow?'body_pad':''">
 		<!-- 进入页面部分 -->
 		<view v-show="!open_img || countdownTime2==0">
 
@@ -1344,20 +1373,19 @@
 
 
 				<!-- HOT SELLS 2 -->
-				<scroll-view class="spike1 page_padding" scroll-x="true"  @change="handlechange" :show-scrollbar="false"
-				:indicator-dots="true"  :circular="true" :interval="3000" :duration="1000"
+				<scroll-view class="spike1 page_padding" scroll-x="true" @change="handlechange" :show-scrollbar="false"
+					:indicator-dots="true" :circular="true" :interval="3000" :duration="1000"
 					v-if="item.zone_code=='HONLIST2' && item.zone_status=='NORMAL'" :current="mycurrent">
 					<view class="spike1_item padding_honlist2" v-for="(item1,index1) in item.blocks"
 						:key="item1.block_id">
-						<view :class="['swiper-item',index1==mycurrent ? 'active' : '']" >
-						<!-- class="item_img"> -->
+						<view :class="['swiper-item',index1==mycurrent ? 'active' : '']">
+							<!-- class="item_img"> -->
 							<image :src="item1.block_pic" mode=""
 								:style="{width:(item.zone_code=='HONLIST2')?420+'rpx':'',height:item.zone_column+'rpx'}"
 								@click="imgTo(itesm1)"></image>
 						</view>
 					</view>
 					<!-- 轮播图 -->
-<<<<<<< HEAD
 					<!-- <view v-if="item.zone_code=='HONLIST2' && item.zone_status=='NORMAL'" :current="mycurrent">
 						<swiper v-for="(item1,index1) in item.blocks" :key="item1.block_id" style="height: 600rpx;" previous-margin="140rpx" next-margin="140rpx" @change="handlechange" :current="mycurrent"   :indicator-dots="true"  :circular="true" :interval="3000" :duration="1000">
 							<swiper-item v-for="i,index in 10" :key="i">
@@ -1365,21 +1393,19 @@
 									<image :src="item1.block_pic" mode=""
 												:style="{width:(item.zone_code=='HONLIST2')?420+'rpx':'',height:item.zone_column+'rpx'}"
 												@click="imgTo(itesm1)"></image>
-=======
 					<!-- <view> -->
-						<!-- previous-margin指的是当前图片的左边框距离屏幕最左边的距离 -->
-						<!-- <swiper class="spike1 page_padding" scroll-x="true" :show-scrollbar="false"
+					<!-- previous-margin指的是当前图片的左边框距离屏幕最左边的距离 -->
+					<!-- <swiper class="spike1 page_padding" scroll-x="true" :show-scrollbar="false"
 							v-if="item.zone_code=='HONLIST2' && item.zone_status=='NORMAL'" style="height: 600rpx;"
 							previous-margin="140rpx" next-margin="140rpx" @change="handlechange" :current="mycurrent"
 							:indicator-dots="true" :circular="true" :interval="3000" :duration="1000">
 							<swiper-item v-for="(item1,index1) in item.blocks" :key="item1.block_id"> -->
-								<!-- v-for="(item1,index1) in item.blocks" :key="item1.block_id"> -->
-								<!--   v-for="i,index in 10" :key="i" -->
-								<!-- <view :class="['swiper-items',index==mycurrent ? 'active' : '']">
+					<!-- v-for="(item1,index1) in item.blocks" :key="item1.block_id"> -->
+					<!--   v-for="i,index in 10" :key="i" -->
+					<!-- <view :class="['swiper-items',index==mycurrent ? 'active' : '']">
 									<img :src="item1.block_pic" mode=""
 										:style="{width:(item.zone_code=='HONLIST2')?420+'rpx':'',height:item.zone_column+'rpx'}"
 										@click="imgTo(item1)">
->>>>>>> parent of 3509ff0 (样式修改)
 								</view>
 							</swiper-item>
 						</swiper>
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 0b5f276..5fc45d3 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -426,6 +426,7 @@
 						console.info(data,'支付')
 						console.log(res)
 						if (res.error == 0) {
+							console.log(res.error);
 							// plus.runtime.openURL(res.data.prepay_data.checkoutnow_url)
 							// this.src = res.data.prepay_data.checkoutnow_url
 							uni.navigateTo({
@@ -434,6 +435,7 @@
 						}
 					})
 				} else if (this.pay_index == 1) {
+					// 银行卡支付
 					data = {
 						_action: 'payorder',
 						order_id: id,
@@ -443,6 +445,8 @@
 					defaultRequest2(data).then(res => {
 						console.info(data,'支付1111')
 						console.log(res)
+						
+						console.log(res.error);
 						if (res.error == 0) {
 							// plus.runtime.openURL(res.data.prepay_data.checkoutnow_url)
 							// this.src = res.data.prepay_data.checkoutnow_url