修改图片

dist/css/chunk-001c7f79.beca7483.css

@@ -0,0 +1 @@
+.activepay[data-v-dcd9f2a4]{width:100vw;height:100vh;background:url(../img/bg2.e15f39b4.png) no-repeat 50%;background-size:cover;overflow:hidden}.coupon-section[data-v-dcd9f2a4]{margin-top:2.8rem;padding:0 .35rem}.coupon-section img[data-v-dcd9f2a4]{width:100%}.tip[data-v-dcd9f2a4]{padding:.22rem .35rem;font-size:.14rem;color:#fff}.btn[data-v-dcd9f2a4]{padding:.05rem 0 .08rem;border-radius:1rem;background:-webkit-gradient(linear,right top,left top,from(#f2d1a3),to(#bc824c));background:linear-gradient(270deg,#f2d1a3,#bc824c);border:0;color:#fff;font-size:.14rem;margin-bottom:.2rem;text-align:center}.btn del[data-v-dcd9f2a4]{font-size:.12rem}input[data-v-dcd9f2a4],textarea[data-v-dcd9f2a4]{-webkit-user-select:auto!important;-moz-user-select:auto!important;-ms-user-select:auto!important;-o-user-select:auto!important;user-select:auto!important}

dist/css/chunk-04225e12.7424ffe1.css

@@ -1 +0,0 @@
-header[data-v-9340ab14]{height:.4rem;line-height:.4rem;color:#000;font-size:.17rem;background:#fff;-webkit-box-shadow:0 1px 8px 0 rgba(0,0,0,.07);box-shadow:0 1px 8px 0 rgba(0,0,0,.07);text-align:center;margin-bottom:.06rem}.paymentresult[data-v-9340ab14]{min-height:100vh}.payerror[data-v-9340ab14],.paying[data-v-9340ab14],.payon[data-v-9340ab14]{padding-top:1rem}.payerror img[data-v-9340ab14],.paying img[data-v-9340ab14],.payon img[data-v-9340ab14]{display:block;margin:0 auto;width:1.03rem;height:1.37rem}.payerror p[data-v-9340ab14],.paying p[data-v-9340ab14],.payon p[data-v-9340ab14]{padding-top:.12rem;font-size:.18rem;color:#444;text-align:center;margin-bottom:1.5rem}.van-button[data-v-9340ab14]{width:90%;margin:0 5% 0;line-height:.48rem;height:.5rem;font-size:.18rem;background:#14928a;border-color:#14928a}

dist/css/chunk-166fad54.b7ec7061.css

@@ -1 +0,0 @@
-.activepay[data-v-4c891422]{width:100vw;height:100vh;background:url(../img/bg2.e15f39b4.png) no-repeat 50%;background-size:cover;overflow:hidden}.coupon-section[data-v-4c891422]{margin-top:2.8rem;padding:0 .35rem}.coupon-section img[data-v-4c891422]{width:100%}.tip[data-v-4c891422]{padding:.22rem .35rem;font-size:.14rem;color:#fff}.btn[data-v-4c891422]{padding:.05rem 0 .08rem;border-radius:1rem;background:-webkit-gradient(linear,right top,left top,from(#f2d1a3),to(#bc824c));background:linear-gradient(270deg,#f2d1a3,#bc824c);border:0;color:#fff;font-size:.14rem;margin-bottom:.2rem;text-align:center}.btn del[data-v-4c891422]{font-size:.12rem}input[data-v-4c891422],textarea[data-v-4c891422]{-webkit-user-select:auto!important;-moz-user-select:auto!important;-ms-user-select:auto!important;-o-user-select:auto!important;user-select:auto!important}

dist/css/chunk-386f9467.a32d8ead.css

@@ -0,0 +1 @@
+header[data-v-7dda10f4]{height:.4rem;line-height:.4rem;color:#000;font-size:.17rem;background:#fff;-webkit-box-shadow:0 1px 8px 0 rgba(0,0,0,.07);box-shadow:0 1px 8px 0 rgba(0,0,0,.07);text-align:center;margin-bottom:.06rem}.paymentresult[data-v-7dda10f4]{min-height:100vh}.payerror[data-v-7dda10f4],.paying[data-v-7dda10f4],.payon[data-v-7dda10f4]{padding-top:1rem}.payerror img[data-v-7dda10f4],.paying img[data-v-7dda10f4],.payon img[data-v-7dda10f4]{display:block;margin:0 auto;width:1.03rem;height:1.37rem}.payerror p[data-v-7dda10f4],.paying p[data-v-7dda10f4],.payon p[data-v-7dda10f4]{padding-top:.12rem;font-size:.18rem;color:#444;text-align:center;margin-bottom:1.5rem}.payerror p.countdown[data-v-7dda10f4],.paying p.countdown[data-v-7dda10f4],.payon p.countdown[data-v-7dda10f4]{font-size:.14rem}.van-button[data-v-7dda10f4]{width:90%;margin:0 5% 0;line-height:.48rem;height:.5rem;font-size:.18rem;background:#14928a;border-color:#14928a}

dist/js/chunk-04225e12.593998d4.js

@@ -1,2 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-04225e12"],{"01cc":function(t,a,n){"use strict";var e=n("a21a"),s=n.n(e);s.a},"0463":function(t,a,n){t.exports=n.p+"img/pay_success.181846c1.png"},"10b3":function(t,a,n){"use strict";n.r(a);var e=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",{staticClass:"paymentresult"},[e("header",[t._v("支付状态")]),"on"==t.pageStatus?e("div",{staticClass:"payon"},[e("img",{attrs:{src:n("0463"),alt:""}}),e("p",[t._v("支付成功")]),e("van-button",{attrs:{type:"info",round:""},on:{click:t.onAppBack}},[t._v("返回")])],1):t._e(),"error"==t.pageStatus?e("div",{staticClass:"payerror"},[e("img",{attrs:{src:n("b92e"),alt:""}}),e("p",[t._v("支付失败")]),e("van-button",{attrs:{type:"info",round:""},on:{click:t.onAppBack}},[t._v("返回")])],1):t._e(),"paying"==t.pageStatus?e("div",{staticClass:"paying"},[e("img",{attrs:{src:n("e868"),alt:""}}),e("p",[t._v("订单处理中")]),e("van-button",{attrs:{type:"info",round:""},on:{click:t.onAppBack}},[t._v("返回")])],1):t._e()])},s=[],r={name:"paymentresult",data:function(){return{pageStatus:null}},mounted:function(){this.__init()},methods:{__init:function(){var t=this,a=this.$route.query;a.merOrderId?this.$axios.get("/yqpay/getPayStatus?orderNo="+a.merOrderId).then(function(a){var n=a.data;200==n.code?"ING"==n.msg?t.pageStatus="paying":"SUCCESS"==n.msg?t.pageStatus="on":"FAIL"==n.msg&&(t.pageStatus="error"):(t.$toast(n.msg),t.pageStatus="error")}):this.pageStatus="paying"},onAppBack:function(){this.$router.push("loginActive")}}},i=r,o=(n("01cc"),n("2877")),p=Object(o["a"])(i,e,s,!1,null,"9340ab14",null);a["default"]=p.exports},a21a:function(t,a,n){},b92e:function(t,a,n){t.exports=n.p+"img/pay_error.109ccf27.png"},e868:function(t,a,n){t.exports=n.p+"img/pay_ing.2848bdf2.png"}}]);
-//# sourceMappingURL=chunk-04225e12.593998d4.js.map

src/assets/front_active.js

@@ -138,11 +138,6 @@ const branchRule = [{
     branchName: '淄博分部',
     branchType: '一类',
     branchPrice: 180
-}, {
-    branchId: 1030,
-    branchName: '测试分部',
-    branchType: '一类',
-    branchPrice: 180
 }]
 
 export default branchRule

src/views/activePay.vue

@@ -6,7 +6,7 @@
             <img v-else src="../assets/coupon2.png" alt="">
         </div>
 
-        <p class="tip">活动详情：缴费{{ showPrice }}元立刻享有 {{ activePrice }} 元现金券，仅限购买20次vip课，总价值{{ markAmount }}元；即日起至2019年11月11日 ，名额有限，先到先得。</p>
+        <p class="tip">活动详情：缴费{{ showPrice }}元立刻享有 {{ activePrice }} 元现金券，仅限购买20次vip课，总价值{{ markAmount }}元；即日起至2019年11月11日 ，名额仅限77名，先到先得。</p>
 
         <div style="padding: 0 .25rem">
             <div class="btn-group">
@@ -54,6 +54,19 @@ export default {
                 this.amount = this.markAmount  - this.activePrice + parseFloat(this.showPrice)
             }
         })
+
+        if(!this.priceList.branchPrice) {
+            this.priceList = {
+                branchId: 1030,
+                branchName: '武汉分部',
+                branchType: '一类',
+                branchPrice: 180
+            }
+            this.activePrice = 777
+            this.showPrice = 11.11
+            this.markAmount = 20 * this.priceList.branchPrice
+            this.amount = this.markAmount  - this.activePrice + parseFloat(this.showPrice)
+        }
     },
     methods: {
         onPromotionPay() {

src/views/paymentResult.vue

@@ -17,8 +17,9 @@
             <img src="@/assets/pay_ing.png" alt="">
             <p>订单处理中</p>
             <van-button type="info" @click="onAppBack" round>返回</van-button>
+            <p class="countdown">到计时{{ smsText }}秒刷新</p>
         </div>
-
+<!-- ?merOrderId=201911012051504080001 -->
   </div>
 </template>
 
@@ -27,7 +28,8 @@ export default {
     name: 'paymentresult',
     data() {
         return {
-            pageStatus: null
+            pageStatus: null,
+            smsText: 60
         }
     },
     mounted() {
@@ -37,12 +39,13 @@ export default {
         __init() {
             let params = this.$route.query
             // 支付成功
-            if(params.merOrderId) {
-                this.$axios.get('/yqpay/getPayStatus?orderNo=' + params.merOrderId).then(res => {
+            if(params.orderNo) {
+                this.$axios.get('/yqpay/getPayStatus?orderNo=' + params.orderNo).then(res => {
                     let result = res.data
                     if(result.code == 200) {
                         if(result.msg == "ING") {
                             this.pageStatus = 'paying'
+                            this.CountDown()
                         } else if(result.msg == 'SUCCESS') {
                             this.pageStatus = 'on'
                         } else if(result.msg == 'FAIL') {
@@ -55,11 +58,25 @@ export default {
                 })
             } else {
                 this.pageStatus = 'paying'
+                this.CountDown()
             }
         },
         onAppBack() { // app回调页面
             this.$router.push('loginActive')
         },
+        CountDown() {
+            let s = 60
+            this.smsText = s
+            let timer = setInterval(() => {
+                if(s <= 0) {
+                    window.location.reload()
+                    clearInterval(timer)
+                } else {
+                    s--
+                    this.smsText = s
+                }
+            }, 1000);
+        }
     }
 }
 </script>
@@ -75,6 +92,7 @@ header {
     text-align: center;
     margin-bottom: .06rem;
 }
+
 .paymentresult {
     min-height: 100vh;
 }
@@ -92,6 +110,9 @@ header {
         color: #444444;
         text-align: center;
         margin-bottom: 1.5rem;
+        &.countdown {
+            font-size: .14rem;
+        }
     }
 }
 .van-button {