Merge pull request '1212' (#12) from caolc1 into master

Reviewed-on: #12

App.vue

@@ -237,16 +237,17 @@
 		
 		},
 
-		onShow: function() { 
-			// uni.getLocation({
-			// 	type: 'wgs84',
-			// 	success: function(res) {
-			// 		uni.setStorageSync('location', {
-			// 			longitude: res.longitude + '',
-			// 			latitude: res.latitude + ''
-			// 		})
-			// 	}
-			// });
+		onShow: function() {
+			console.log(12388)
+			uni.getLocation({
+				type: 'wgs84',
+				success: function(res) {
+					uni.setStorageSync('location', {
+						longitude: res.longitude + '',
+						latitude: res.latitude + ''
+					})
+				}
+			});
 			console.log('onReady')
 			const token = uni.getStorageSync('Authorization')
 			const openid = uni.getStorageSync('openid')

BagStation/pages/stationDetail/stationDetail.vue

@@ -96,23 +96,33 @@
 
 			</view>
 			<!-- 底部去支付 -->
-			<view class="">
-				<!-- <view class="btn bg-white placeholder-hidden">
+			<view class="" v-if="activePay||qrcodePay">
+				<view class="btn bg-white placeholder-hidden">
 					<view class="flex bg-white padding flex-direction">
 						<button class="cu-btn block bg-main-oil lg" v-if="activePay" @tap="makePay">
 							<image class="site-icon margin-right-sm" :src="imgURL+'site-yz.png'" mode="widthFix">
 							</image>
 							一键支付
-						</button> 
+						</button>
+					<!-- 	<button v-if="qrcodePay" class="cu-btn block bg-main-oil margin-tb-sm  lg" @tap="siteQrPay">
+							<image class="site-icon margin-right-sm" :src="imgURL+'site-qr.png'" mode="widthFix">
+							</image>
+							二维码支付
+						</button> -->
 					</view>
-				</view> -->
+				</view>
 				<view class="btn bg-white fixed ">
 					<view class="flex bg-white padding flex-direction">
-						<button class="cu-btn block bg-main-oil lg"   @tap="makePay">
+						<button class="cu-btn block bg-main-oil lg" v-if="activePay" @tap="makePay">
 							<image class="site-icon margin-right-sm" :src="imgURL+'site-yz.png'" mode="widthFix">
 							</image>
 							一键支付
-						</button> 
+						</button>
+						<!-- <button v-if="qrcodePay" class="cu-btn block bg-main-oil margin-tb-sm  lg" @tap="siteQrPay">
+							<image class="site-icon margin-right-sm" :src="imgURL+'site-qr.png'" mode="widthFix">
+							</image>
+							二维码支付
+						</button> -->
 					</view>
 				</view>
 			</view>

pages/index/startPage/startPage.vue

@@ -100,26 +100,19 @@
 				})
 				interstitialAd.onError((err) => {
 					setTimeout(() => {
-						uni.switchTab({
-							url: '/pages/tabbar/home/home',
-							fail: (err) => {
-								console.log(err)
-							}
-							// url:'/BagStation/orderDetail/orderDetail'
-						})
-						// if (key == '在线') {
-						// 	uni.switchTab({
-						// 		url: '/pages/tabbar/home/home',
-						// 		fail: (err) => {
-						// 			console.log(err)
-						// 		}
-						// 		// url:'/BagStation/orderDetail/orderDetail'
-						// 	})
-						// } else {
-						// 	uni.redirectTo({
-						// 		url: '/BagAuth/pages/login/login'
-						// 	})
-						// }
+						if (key == '在线') {
+							uni.switchTab({
+								url: '/pages/tabbar/home/home',
+								fail: (err) => {
+									console.log(err)
+								}
+								// url:'/BagStation/orderDetail/orderDetail'
+							})
+						} else {
+							uni.redirectTo({
+								url: '/BagAuth/pages/login/login'
+							})
+						}
 					}, 2000)
 					console.log('onError event emit', err)
 				})