WIN-2CJ8FMUT9OF\Administrator 8 mēneši atpakaļ
vecāks
revīzija
07a9681577
2 mainītis faili ar 13 papildinājumiem un 8 dzēšanām
  1. 2 2
      manifest.json
  2. 11 6
      pages/index/index.vue

+ 2 - 2
manifest.json

@@ -75,8 +75,8 @@
             "https" : false,
             "proxy" : {
                 "/api" : {
-                    // "target" : "https://testwap.jhcs888.com",
-					"target" : "https://wap.jhcs888.com",
+                    "target" : "https://testwap.jhcs888.com",
+					// "target" : "https://wap.jhcs888.com",
                     "changeOrigin" : true,
                     "secure" : true
                 }

+ 11 - 6
pages/index/index.vue

@@ -9,7 +9,8 @@
 			</view>
 		</view>
 		<view class="align-items-center flex-justify-center cg-box">
-			<uni-icons v-if="orderInfo.status === 2 || orderInfo.status === 6" class="mr-10" type="checkbox-filled" size="25" color="#547BFA"></uni-icons>
+			<uni-icons v-if="orderInfo.status === 2 || orderInfo.status === 6" class="mr-10" type="checkbox-filled"
+				size="25" color="#547BFA"></uni-icons>
 			<uni-icons v-else class="mr-10" type="clear" size="25" color="#FF0000"></uni-icons>
 			<view class="" v-if="orderInfo.status === 2 || orderInfo.status === 6">
 				支付成功
@@ -88,12 +89,16 @@
 				})
 			},
 			jumpOut() {
-				var mchData = {
-					action: 'jumpOut',
-					jumpOutUrl: "https://wap.jhcs888.com/#/pages/index-my/index"
+				if (this.orderInfo.status === 2 || this.orderInfo.status === 6) {
+					var mchData = {
+						action: 'jumpOut',
+						jumpOutUrl: "https://wap.jhcs888.com/#/pages/index-my/index"
+					}
+					var postData = JSON.stringify(mchData)
+					parent.postMessage(postData, 'https://payapp.weixin.qq.com')
+				} else {
+					window.location.href = "https://wap.jhcs888.com/#/pages/index-my/index"
 				}
-				var postData = JSON.stringify(mchData)
-				parent.postMessage(postData, 'https://payapp.weixin.qq.com')
 			},
 			shopAutomaticCancel(order_sn) {
 				shopAutomaticCancel({