发货+兼容苹果

pages/bookShop/orderList.vue

@@ -77,8 +77,10 @@
 						style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
 				</view>
 				<view class="orderOper" v-if="ifex.orderStatus==0">
-					<view class="opFix" @click.stop="canceOrder(ifex)">取消订单</view>
-					<view class="opCan" @click="goPay(ifex)">去支付</view>
+					<view class="opFix" @click.stop = "canceOrder(ifex)">取消订单</view>
+					<view class="opCan" @click.stop = "getNewIap" v-if="ifex.orderType == 'point' && ifex.paymentMethod == '3'">重新下单</view>
+					<view class="opCan" v-else @click.stop = "goPay(ifex)">去支付</view>
+					
 				</view>
 			</view>
 			<view v-if="status==0" style="text-align: center;">
@@ -151,7 +153,7 @@
 		},
 		onShow() {
 			this.getOrderList()
-			this.checkIapOrders() //检查未完成的苹果支付订单
+			// this.checkIapOrders() //检查未完成的苹果支付订单
 			this.getOS()
 			// this.countDown()
 
@@ -185,6 +187,12 @@
 		},
 		methods: {
 			...mapMutations(['setUserInfo']),
+			// 苹果用户重新下单
+			getNewIap(){
+				uni.navigateTo({
+					url:'/pages/peanut/reCharge'
+				})
+			},
 			// 倒计时回调
 			countDown() {
 				console.log('重新刷新订单')
@@ -459,7 +467,7 @@
 				}, function(e) {
 					if (e.errCode == 2) {
 						// 用户未绑定支付方式，app内支付流程结束，系统弹出框引导用户绑定支付方式，此过程将跳转到系统应用 AppStore 进行绑定支付方式，绑定成功同步支付成功，用户成功付款
-						plus.runtime.openURL("https://apps.apple.com/account/billing");
+						// plus.runtime.openURL("https://apps.apple.com/account/billing");
 					} else {
 						// restoreFlag = false; // 支付失败清楚标记					
 						that.finishTransaction(result);