shish 1 год назад
Родитель
Сommit
53d7a109ad

+ 2 - 2
hdApp/src/admin/order/detail.vue

@@ -114,9 +114,9 @@
               <view class="value" v-else>线下付款</view>
             </view>
             <view class="msg-list" v-if="orderInfo.payStatus == 1">
-              <view class="label">支付:</view>
+              <view class="label">方式:</view>
               <view class="value">
-                {{ orderInfo.payWay == 0 ? '微信支付':orderInfo.payWay==1?'支付宝':orderInfo.payWay==4?'现金':orderInfo.payWay==5 ?'银行卡' : orderInfo.payWay==3 ?'欠款':'其它'}}
+                {{ orderInfo.payWay == 0 ? '微信支付':orderInfo.payWay==1?'支付宝':orderInfo.payWay==2?'余额':orderInfo.payWay==4?'现金':orderInfo.payWay==5 ?'银行卡' : orderInfo.payWay==3 ?'欠款':'其它'}}
                 <text v-if="Number(orderInfo.mainPay)>0 && Number(orderInfo.cash)>0">(现金付¥{{ orderInfo.cash ? parseFloat(orderInfo.cash) : 0 }})</text>
                 <text v-if="Number(orderInfo.settleId)>0" style="color:red;font-weight:bold;">(已结清)</text>
               </view>

+ 2 - 1
mallApp/src/pages.json

@@ -51,7 +51,8 @@
             "root": "pages/callback",
             "pages": [
                 { "path": "index" },
-                { "path": "success", "style": { "navigationBarTitleText": "支付成功" } }
+                { "path": "success", "style": { "navigationBarTitleText": "支付成功" } },
+                { "path": "paySuccess", "style": { "navigationBarTitleText": "支付成功" } }
             ]
         },
         {

+ 2 - 11
mallApp/src/pages/callback/index.vue

@@ -163,16 +163,7 @@ export default {
       })
     },
     paySuccess() {
-      this.$util.pageTo({
-        url: "/pages/callback/index",
-        type: 2,
-        query: {
-          ...this.option,
-          pageStatus: 3,
-          payDiscountPrice: this.payCallData.discountAmount,
-          payDiscountType: this.payCallData.discountType
-        }
-      });
+      this.$util.pageTo({ url: "/pages/callback/paySuccess", type: 2 })
     },
     payFail() {
     },
@@ -181,7 +172,7 @@ export default {
 			that.$util.confirmModal({content:'确认支付?'},() => {
         balancePay({orderSn:this.orderSn}).then(res=>{
           if(res.code == 1){
-
+            this.$util.pageTo({ url:"/pages/callback/paySuccess",type: 2})
           }
         })
       })

+ 144 - 0
mallApp/src/pages/callback/paySuccess.vue

@@ -0,0 +1,144 @@
+<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>
+    </div>
+  </template>
+  <script>
+  export default {
+    name: "paySuccess",
+    components: {
+    },
+    data() {
+      return {
+      };
+    },
+    computed: {
+    },
+    methods: {
+      init() {
+      },
+      goBack(){
+        uni.navigateBack()
+      }
+    }
+  };
+  </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;
+          }
+        }
+        // 两个按钮
+        .call-two-btn {
+          .button-com {
+            width: 40%;
+            padding-top: 22upx;
+            padding-bottom: 22upx;
+            font-size: 32upx;
+          }
+        }
+      }
+      // 优惠券
+      .coupon-wrap {
+        width: 96%;
+        margin: 52upx auto 0;
+        position: relative;
+        .qrcode-img {
+          width: 170upx;
+          height: 170upx;
+          position: absolute;
+          top: 40upx;
+          right: 108upx;
+        }
+      }
+    }
+  }
+  .awaitPayWx,
+  .awaitPayYe {
+    .status-text {
+      margin-top: 22upx;
+      margin-bottom: 52upx;
+      color: #ffa92e;
+    }
+    .surplus {
+      margin-top: 22upx;
+      margin-bottom: 38upx;
+    }
+    .icon {
+      .iconfont {
+        color: #ffa92e;
+      }
+    }
+  }
+  .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>