Merge pull request '1' (#13) from caolc1 into master

Reviewed-on: #13

BagStation/pages/stationDetail/stationDetail.vue

@@ -96,33 +96,23 @@
 
 			</view>
 			<!-- 底部去支付 -->
-			<view class="" v-if="activePay||qrcodePay">
-				<view class="btn bg-white placeholder-hidden">
+			<view class="">
+				<!-- <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 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> -->
+						</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" v-if="activePay" @tap="makePay">
+						<button class="cu-btn block bg-main-oil lg"   @tap="makePay">
 							<image class="site-icon margin-right-sm" :src="imgURL+'site-yz.png'" mode="widthFix">
 							</image>
 							一键支付
-						</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> -->
+						</button> 
 					</view>
 				</view>
 			</view>

pages/index/startPage/startPage.vue

@@ -100,19 +100,26 @@
 				})
 				interstitialAd.onError((err) => {
 					setTimeout(() => {
-						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'
-							})
-						}
+						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'
+						// 	})
+						// }
 					}, 2000)
 					console.log('onError event emit', err)
 				})