From 4ca0dbcd5f2b0c2688e38cd05e190dd9a4760178 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Wed, 1 Mar 2023 16:40:34 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=E4=BF=AE=E5=A4=8D=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=B1=95=E7=A4=BA=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 alipay.html | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/alipay.html b/alipay.html
index 36c4152..668f7db 100644
--- a/alipay.html
+++ b/alipay.html
@@ -29,7 +29,8 @@
       -webkit-text-size-adjust: 100%;
       -ms-text-size-adjust: 100%;
     }
-    .bind_btn{
+
+    .bind_btn {
       filter: grayscale(100%);
     }
   </style>
@@ -58,7 +59,8 @@
           满{{reduceInfo.full}}元可用
         </div>
       </div>
-      <div class="receive_btn" @click="toReceive"  :class="reduceInfo.status == 0 ? 'receive_btn' : 'receive_btn bind_btn'">{{reduceInfo.status|statusFn}}</div>
+      <div @click="toReceive" :class="reduceInfo.status == 0 ? 'receive_btn' : 'receive_btn bind_btn'">
+        {{reduceInfo.status|statusFn}}</div>
       <div class="validity">
         有效期:{{reduceInfo.time_limit.effect_time.start_time}}至{{reduceInfo.time_limit.effect_time.end_time}}</div>
     </div>
@@ -73,7 +75,7 @@
 <script>
   new Vue({
     el: "#alipay",
-    data() {
+    data () {
       return {
         explain: `1.在活动期间，每名用户仅可参与一次活动并享受一次赠礼。请注意：【（a）如用户在参与活动前已经是亚朵酒店金卡及以上级别会员，该用户无法领取亚朵酒店会员权益赠礼，权益不叠加；（b）喜马拉雅会员叠加上限为10年；（c）QQ音乐会员叠加上限为120个月。】如用户合作平台会员叠加（含本次活动领取时长）达到上限时间，用户将无法（完整）领取该合作平台赠礼，因此无法领取的赠礼不做补发；购买前请您确认您在合作平台会员有效期情况。
 				2.活动期间，开通/续费严选Pro会员年卡后，赠礼将发放至“联合会员领取页面”，可前往一键领取（赠礼仅支持领取到同一手机号）；如遇到网络问题等原因，可能会存在延迟到账的情况，请在24小时内查看到账情况。
@@ -90,10 +92,10 @@
         maskshow: false,
         reduceInfo: {},
         couponInfo: {},
-        disabledBtn:false,
+        disabledBtn: false,
       };
     },
-    created() {
+    created () {
       //唤起支付宝授权，打开领取
       this.openId = this.getQueryString(
         window.location.search,
@@ -103,11 +105,11 @@
         window.location.search,
         "orderNumber"
       );
-      this.orderNumber=orderNumber;
+      this.orderNumber = orderNumber;
       this.getOrderDetail(this.orderNumber);
     },
     methods: {
-      getQueryString(path, name) {
+      getQueryString (path, name) {
         //获取浏览器地址栏的参数
         var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
         var r = path.substr(1).match(reg);
@@ -115,15 +117,16 @@
         return null;
       },
       //获取订单详情
-      getOrderDetail(id) {
+      getOrderDetail (id) {
         req.axiosGet('/voucher/info', {
           order_number: id
         }).then(res => {
           this.reduceInfo = res.data.rule;
+          this.reduceInfo.status = res.data.status;
           this.couponInfo = res.data;
         }).catch();
       },
-      toReceive() {
+      toReceive () {
         let self = this;
         //领取立减金
         let data = {
@@ -131,39 +134,39 @@
           channel: "1", //立减金发放渠道，1：支付宝；2：微信小程序
           channel_user_id: this.openId, // "渠道用户id"
         };
-        if(this.disabledBtn){
-					return
-				}
-				 this.disabledBtn = true;
+        if (this.disabledBtn) {
+          return;
+        }
+        this.disabledBtn = true;
         req.axiosPost("/voucher/grant", data)
           .then((res) => {
-            setTimeout(()=>{
-							 this.disabledBtn = false;
-						},2000)
+            setTimeout(() => {
+              this.disabledBtn = false;
+            }, 2000);
             if (res.code == 200) {
-              window.location.href = './advise.html'
+              window.location.href = './advise.html';
               sessionStorage.setItem('messageTip', '');
             } else {
-              window.location.href = './advise.html'
+              window.location.href = './advise.html';
               sessionStorage.setItem('messageTip', res.message);
             }
           })
-          .catch((err) => {});
+          .catch((err) => { });
       },
       //提示弹出框
-      openDialog(tip) {
+      openDialog (tip) {
         this.maskshow = true;
         this.tiptext = tip;
         this.popboxshow = true;
       },
-      knowFn() {
+      knowFn () {
         this.maskshow = false;
         this.tiptext = '';
         this.popboxshow = false;
       }
     },
     filters: {
-      statusFn(val) {
+      statusFn (val) {
         switch (val) {
           case 0:
             return '立即领取';