Merge branch 'master' into hot-flx

reduce.html

@@ -142,7 +142,7 @@
   let goodsDetail = null, goodsCount = null;
   new Vue({
     el: "#reduce",
-    data() {
+    data () {
       return {
         plaflam: 1, //支付宝
         promtshow: false,
@@ -169,7 +169,7 @@
             5、使用立减金的微信支付订单，如发生全额退款，且立减金仍在有效期内，立减金将自动退还给用户，如立减金已过期，则不退还给用户；如发生部分退款，用户支付金额将按比例原路退还，立减金将不退还给用户<br />`,
       };
     },
-    created() {
+    created () {
       document.title = localStorage.getItem('title');
       /*  获取立减金信息*/
       goodsDetail = JSON.parse(sessionStorage.getItem("goodsInfo"));
@@ -205,21 +205,21 @@
       }
     },
     filters: {
-      cardType(val) {
+      cardType (val) {
         return val.map((item) => {
           return item == 1 ? "借记卡" : "信用卡" + " ";
         }).join(" ");
       },
     },
     methods: {
-      backgoodsFn() {
+      backgoodsFn () {
         if (goodsCount > 1) {
           window.location.replace('./homepage.html');
         } else {
           history.go(-2);
         }
       },
-      receiveFn() {
+      receiveFn () {
         if (this.loading) return;
         this.loading = true;
         let self = this;
@@ -236,7 +236,6 @@
         };
         req.axiosPost("/key/usage", data)
           .then((res) => {
-            this.loading = false;
             if (res.code == 200) {
               sessionStorage.setItem("lastid", self.goodInfo.product_id);
               this.orderId = res.data.order_number;
@@ -254,6 +253,7 @@
                 if (this.goodInfo.entity.is_webview == 1) {
                   this.publicCollection(res.data.order_number);
                 } else {
+                  this.loading = false;
                   //唤起微信福利官小程序
                   window.location.replace(res.data.redirect_url);
                 }
@@ -278,7 +278,7 @@
       },
 
       /* 公众号领取 */
-      publicCollection(order_number) {
+      publicCollection (order_number) {
         let params = {
           order_number,
           channel: 2,
@@ -287,6 +287,7 @@
         };
         req.axiosPost("/voucher/grant", params)
           .then((res) => {
+            this.loading = false;
             if (res.code == 200) {
               this.openErrorDialog('领取成功');
               this.goodInfo.available = 9;
@@ -300,7 +301,7 @@
       },
 
 
-      toLinkAlipay() {
+      toLinkAlipay () {
         //支付宝H5跳转
         let self = this;
         let banklink = encodeURIComponent(
@@ -320,18 +321,18 @@
         }
       },
       //错误弹出框关闭
-      knowFn() {
+      knowFn () {
         this.popboxshow = false;
         this.maskshow = false;
       },
       //错误弹出框
-      openErrorDialog(tip) {
+      openErrorDialog (tip) {
         this.maskshow = true;
         this.tiptext = tip;
         this.popboxshow = true;
       },
       // 单条弹框
-      openDialog(tip) {
+      openDialog (tip) {
         this.promtshow = true;
         this.promttip = tip;
         setTimeout(() => {
@@ -341,7 +342,7 @@
       },
 
       /* 动态font */
-      fonts() {
+      fonts () {
         const defaultCss = '0.32rem';
         const count = String(parseFloat(this.reduceInfo.reduce_amount)).length + 1;
         if (count > 4) {
@@ -352,7 +353,7 @@
       },
 
       //复制文本
-      copyFn() {
+      copyFn () {
         var textArea = document.createElement("textarea");
         textArea.value = this.copyLink;
         document.body.appendChild(textArea);