订单详情

mallApp/src/pages/billing/affirmGhs.vue

@@ -749,7 +749,8 @@ export default {
 					let getPayType = res.data.getPayType?res.data.getPayType:0
 					let totalPrice = res.data.totalPrice?res.data.totalPrice:0
 					let orderSn = res.data.orderSn?res.data.orderSn:''
-					this.$util.pageTo({url:"/pages/callback/pay?account="+account+'&hdId='+hdId+'&pageStatus=1&getPayType='+getPayType+'&totalPrice='+totalPrice+'&orderSn='+orderSn,type:2})
+					let id = res.data.id ? res.data.id : 0
+					this.$util.pageTo({url:"/pages/callback/pay?account="+account+'&id='+id+'&hdId='+hdId+'&pageStatus=1&getPayType='+getPayType+'&totalPrice='+totalPrice+'&orderSn='+orderSn,type:2})
 				}
 				this.removeMemory()
 			})

mallApp/src/pages/callback/pay.vue

@@ -88,7 +88,8 @@ export default {
       getPayType:1,
       hasRequestApi:false,
       hdInfo:{},
-      isYeBtnShow:false
+      isYeBtnShow:false,
+      id:0
     };
   },
   computed: {
@@ -152,6 +153,7 @@ export default {
                 this.payCallData = res.data
                 wexinPay(res.data, that.paySuccess, that.payFail)
                 that.orderSn = res.data.orderSn ? res.data.orderSn : ''
+                that.id = res.data.id ? res.data.id : 0
               })
             }
           })
@@ -167,16 +169,22 @@ export default {
       })
     },
     paySuccess() {
-      this.$util.pageTo({ url: "/pages/callback/paySuccess", type: 2 })
+      let account= this.option.account?this.option.account:0
+      let hdId = this.option.hdId ? this.option.hdId:0
+      let id = this.option.id ? this.option.id : 0
+      this.$util.pageTo({ url: "/pages/callback/paySuccess?id="+id+'&account='+account+'&hdId='+hdId, type: 2 })
     },
     payFail() {
     },
     balancePayFn() {
 			let that = this
+      let account= this.option.account?this.option.account:0
+      let hdId = this.option.hdId ? this.option.hdId:0
+      let id = this.option.id ? this.option.id : 0
 			that.$util.confirmModal({content:'确认余额支付？'},() => {
         balancePay({orderSn:this.orderSn}).then(res=>{
           if(res.code == 1){
-            this.$util.pageTo({ url:"/pages/callback/paySuccess",type: 2})
+            this.$util.pageTo({ url:"/pages/callback/paySuccess?id="+id+'&account='+account+'&hdId='+hdId,type: 2})
           }
         })
       })

mallApp/src/pages/callback/paySuccess.vue

@@ -1,148 +1,170 @@
 <template>
-    <div class="app-content successPay">
-      <div class="callback-wrap">
-        <div class="callback-blo">
-            <div class="status-img">
-              <img :src="`${constant.imgUrl}/retail/callback/success.png`" alt mode="widthFix" />
-            </div>
-            <div class="status-text app-size-36 app-bold">支付成功</div>
-            <div class="call-btn-com call-two-btn">
-            <button class="button-com red" @click="goBack()">返回</button>
-            </div>
-        </div>
+  <div class="app-content successPay">
+    <div class="callback-wrap">
+      <div class="callback-blo">
+          <div class="status-img">
+            <img :src="`${constant.imgUrl}/retail/callback/success.png`" alt mode="widthFix" />
+          </div>
+          <div class="status-text app-size-36 app-bold">支付成功</div>
+          <view>
+            <button class="button-com red big" style="width:280upx;" @click="goOrder()">订单详情</button>
+          </view>
+          <div>
+            <button class="button-com default big" style="width:280upx;margin-top:40upx;" @click="goBack()">返回</button>
+          </div>
+
+          <!-- #ifdef MP-WEIXIN -->
+          <view style="width:100%;height:10upx;background-color:white;margin-top:60upx;"></view>
+          <ad-custom unit-id="adunit-510957a20b72a06b" v-if="currentEnv=='production'"></ad-custom>
+          <ad-custom unit-id="adunit-6a8fe4bf5e96ffba" v-else></ad-custom>
+          <!-- #endif -->
+
       </div>
     </div>
-  </template>
-  <script>
-  export default {
-    name: "paySuccess",
-    components: {
+  </div>
+</template>
+<script>
+import { CURRENT_ENV } from "@/config"
+export default {
+  name: "paySuccess",
+  components: {
+  },
+  data() {
+    return {
+      currentEnv:'production'
+    };
+  },
+  onLoad(){
+
+    //当前环境
+    this.currentEnv = CURRENT_ENV
+
+    //返回上一页时刷新
+    let pages = getCurrentPages();
+    let prevPage = pages[ pages.length - 2 ];
+    prevPage.$vm.pageAction = {refresh:1}
+  },
+  methods: {
+    init() {
     },
-    data() {
-      return {
-      };
+    goBack(){
+      uni.navigateBack()
     },
-    onLoad(){
-      //返回上一页时刷新
-      let pages = getCurrentPages();
-      let prevPage = pages[ pages.length - 2 ];
-      prevPage.$vm.pageAction = {refresh:1}
-    },
-    methods: {
-      init() {
-      },
-      goBack(){
-        uni.navigateBack()
-      }
+    goOrder(){
+      let account= this.option.account?this.option.account:0
+      let hdId = this.option.hdId ? this.option.hdId:0
+      let id = this.option.id ? this.option.id : 0
+      this.$util.pageTo({ url: '/pages/order/detail?id='+id+'&account='+account+'&hdId='+hdId,type:2})
     }
-  };
-  </script>
-  <style lang="scss" scoped>
-  .app-content {
-    .callback-wrap {
-      padding-top: 50upx;
-      background-image: url("../../static/images/callback/bg.png");
-      background-repeat: no-repeat;
-      background-size: 100% auto;
-      .callback-blo {
-        width: 90%;
-        margin: 0 auto;
-        padding: 70upx 0;
-        background-color: #fff;
-        box-shadow: 2upx 2upx 16upx 0upx rgba(181, 181, 181, 0.29);
-        border-radius: 10upx;
-        text-align: center;
-        // 使用icon
-        .icon {
-          .iconfont {
-            font-size: 170upx;
-          }
-        }
-        // 使用状态图片
-        .status-img {
-          width: 294upx;
-          margin: 0 auto;
-        }
-        .call-btn-com {
-          margin-top:60upx;
-          @include disFlex(center, space-evenly);
-        }
-        // 一个按钮
-        .call-one-btn {
-          .button-com {
-            width: 80%;
-            padding-top: 22upx;
-            padding-bottom: 22upx;
-            font-size: 32upx;
-            margin-top: 40upx;
-          }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.app-content {
+  .callback-wrap {
+    padding-top: 50upx;
+    background-image: url("../../static/images/callback/bg.png");
+    background-repeat: no-repeat;
+    background-size: 100% auto;
+    .callback-blo {
+      width: 90%;
+      margin: 0 auto;
+      padding: 70upx 0;
+      background-color: #fff;
+      box-shadow: 2upx 2upx 16upx 0upx rgba(181, 181, 181, 0.29);
+      border-radius: 10upx;
+      text-align: center;
+      // 使用icon
+      .icon {
+        .iconfont {
+          font-size: 170upx;
         }
-        // 两个按钮
-        .call-two-btn {
-          .button-com {
-            width: 40%;
-            padding-top: 22upx;
-            padding-bottom: 22upx;
-            font-size: 32upx;
-          }
+      }
+      // 使用状态图片
+      .status-img {
+        width: 294upx;
+        margin: 0 auto;
+      }
+      .call-btn-com {
+        margin-top:60upx;
+        @include disFlex(center, space-evenly);
+      }
+      // 一个按钮
+      .call-one-btn {
+        .button-com {
+          width: 80%;
+          padding-top: 22upx;
+          padding-bottom: 22upx;
+          font-size: 32upx;
+          margin-top: 40upx;
         }
       }
-      // 优惠券
-      .coupon-wrap {
-        width: 96%;
-        margin: 52upx auto 0;
-        position: relative;
-        .qrcode-img {
-          width: 170upx;
-          height: 170upx;
-          position: absolute;
-          top: 40upx;
-          right: 108upx;
+      // 两个按钮
+      .call-two-btn {
+        .button-com {
+          width: 40%;
+          padding-top: 22upx;
+          padding-bottom: 22upx;
+          font-size: 32upx;
         }
       }
     }
-  }
-  .awaitPayWx,
-  .awaitPayYe {
-    .status-text {
-      margin-top: 22upx;
-      margin-bottom: 52upx;
-      color: #ffa92e;
-    }
-    .surplus {
-      margin-top: 22upx;
-      margin-bottom: 38upx;
-    }
-    .icon {
-      .iconfont {
-        color: #ffa92e;
+    // 优惠券
+    .coupon-wrap {
+      width: 96%;
+      margin: 52upx auto 0;
+      position: relative;
+      .qrcode-img {
+        width: 170upx;
+        height: 170upx;
+        position: absolute;
+        top: 40upx;
+        right: 108upx;
       }
     }
   }
-  .registerMember,
-  .successPay,
-  .successPayCode,
-  .successEval {
-    .status-text {
-      color: #333;
-      margin-top: 22upx;
-      margin-bottom: 52upx;
+}
+.awaitPayWx,
+.awaitPayYe {
+  .status-text {
+    margin-top: 22upx;
+    margin-bottom: 52upx;
+    color: #ffa92e;
+  }
+  .surplus {
+    margin-top: 22upx;
+    margin-bottom: 38upx;
+  }
+  .icon {
+    .iconfont {
+      color: #ffa92e;
     }
   }
-  .registerMember {
-    .call-back-wrap {
-      .qr-code-img {
-        width: 300upx;
-        height: 300upx;
-        margin: 20upx auto;
-        img {
-          height: 100%;
-        }
-      }
-      .app-color-2 {
-        font-size: 30upx;
-        margin-bottom: 20upx;
+}
+.registerMember,
+.successPay,
+.successPayCode,
+.successEval {
+  .status-text {
+    color: #333;
+    margin-top: 22upx;
+    margin-bottom: 52upx;
+  }
+}
+.registerMember {
+  .call-back-wrap {
+    .qr-code-img {
+      width: 300upx;
+      height: 300upx;
+      margin: 20upx auto;
+      img {
+        height: 100%;
       }
     }
+    .app-color-2 {
+      font-size: 30upx;
+      margin-bottom: 20upx;
+    }
   }
-  </style>
+}
+</style>