fix:卡券逻辑

src/jfw/modules/app/src/web/staticres/jyapp/js/coupon-template.js

@@ -1,6 +1,5 @@
 Vue.component('coupon-list', {
   delimiters: ['@@', '@@'],
-  // props: ['couponList', 'mold', 'isSelect', 'disabled'],
   props: {
     couponList: Array,
     mold: Number || String,
@@ -59,7 +58,6 @@ Vue.component('coupon-list', {
   </div>
   `,
   created() {
-    console.log(this.couponList)
     this.getTextByProducts(this.couponList)
   },
   methods: {

src/jfw/modules/app/src/web/staticres/jyapp/js/pay-order-template.js

@@ -175,7 +175,6 @@ var couponTem = {
     },
     // 取消按钮（vip升级适用）
     cancelFn: function () {
-      console.log("11111")
       this.config.buttons.cancel()
     },
     // 提交订单事件
@@ -231,6 +230,7 @@ var couponTem = {
         _this.coupon.list = arr;
         _this.coupon.value = couponStorage.reduce;
         _this.coupon.type = couponStorage.lotteryAttribute;
+        _this.coupon.checkedId = couponStorage.checkedId
         sessionStorage.removeItem('$select-coupon')
         _this.$emit('update-coupon',_this.coupon)
       } else {

src/jfw/modules/app/src/web/staticres/jyapp/me/js/coupon-template.js

@@ -1,9 +0,0 @@
-/*
- * @Editor: Created with VScode
- * @Descripttion: 
- * @Author: Do not edit
- * @Date: 2021-04-15 15:43:35
- * @LastEditors: yangfeng
- * @LastEditTime: 2021-04-15 15:43:36
- * @target: 
- */

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js

@@ -130,57 +130,7 @@ $(function () {
       },
       // 订单提交事件
       submitOrder: function () {
-        this.$refs.couponRef.submitStatus = true
-        var submited = false;
-        var noshow = false;
-        if (submited) {
-          return
-        }
-        submited = true;
-        setTimeout(function () {
-          submited = false;
-        }, 1000);
-        weui.loading()
-        $DoPost('/subscribepay/vipsubscribe/saveChange', {
-          "area": reqData.area["全国"] ? '{}' : JSON.stringify(reqData.area),
-          "industry": reqData.industry.join(","),
-          "time": selectTime,
-          "price": parseInt((submitPrice).toFixed(0))
-        }, function (r) {
-          if (r.success) {
-            if (r.data.needPay) {
-              weui.loading().hide()
-              //创建支付订单
-              clearSessionStorage()
-              history.replaceState({"flag": "pay"}, '', '/jyapp/vipsubscribe/toOrderDetailPage?orderCode=' + r.data.code);
-              var nextHref = "/jyapp/pay/checkout_subvip?orderCode=" + r.data.code + '&from=buy'
-              if (reqData.isTrial) {
-                nextHref += "&t=3"
-              }else {
-                nextHref += "&t=2"
-              }
-              window.location.href = nextHref
-            } else {
-              weui.loading().hide()
-              //订阅修改
-              if (r.data.doSuccess) {
-                noshow = true;
-                clearSessionStorage();
-                getDataWitXHR()
-                // window.history.go(-1);
-                // locationReplace(location.pathname)
-              } else {
-                weui.toast('修改保存失败', {
-                  duration: 1500,
-                  className: 'jy-toast',
-                });
-              }
-            }
-          }else{
-            weui.loading().hide();
-          }
-        }, false);
-        this.$refs.couponRef.submitStatus = false
+        doSubmit()
       }
     }
   })
@@ -820,6 +770,7 @@ $(function () {
 
   //提交请求
   $('.vip-footer .button-r.confirm').on('click', function () {
+    console.log("object")
       $(this).attr("disabled", "disabled");
       doSubmit();
       $(this).removeAttr("disabled");
@@ -1047,17 +998,17 @@ $(function () {
       }, 1000);
 
       //校验是否点击阅读条款
-      if (submitPrice > 0) {
-          if (!$('.checkbox').hasClass("checked")) {
-              weui.toast('请勾选服务条款', {
-                  duration: 1500,
-                  className: 'jy-toast',
-              });
-              $dialog.hide(function () {
-              });
-              return
-          }
-      }
+      // if (submitPrice > 0) {
+      //     if (!$('.checkbox').hasClass("checked")) {
+      //         weui.toast('请勾选服务条款', {
+      //             duration: 1500,
+      //             className: 'jy-toast',
+      //         });
+      //         $dialog.hide(function () {
+      //         });
+      //         return
+      //     }
+      // }
       weui.loading()
       $DoPost('/subscribepay/vipsubscribe/saveChange', {
           "area": reqData.area["全国"] ? '{}' : JSON.stringify(reqData.area),

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_renew.js

@@ -14,6 +14,7 @@ var purchase = {
         //已选择
         try {
             //即将到期 回显已购买
+            console.log(sessionStorage.getItem("pay_read_cache"))
             if (!sessionStorage.getItem("pay_read_cache")) {
                 $DoPost("/subscribepay/vipsubscribe/getSubBuyMsg", {}, function (r) {
                     if (r.success) {
@@ -247,8 +248,11 @@ var purchase = {
     flushSubmit() { //是否可提交
         if (this.timeCheckOk && sessionStorage.getItem("vipSub_read") === "true") {
             $('.vip-footer.renew .confirm').prop('disabled', false)
+            coupon.checkboxStatus = true
+            coupon.$refs.couponRef.submitStatus = false
         } else {
             $('.vip-footer.renew .confirm').prop('disabled', true)
+            coupon.$refs.couponRef.submitStatus = true
         }
     }
 };
@@ -568,7 +572,7 @@ var coupon = new Vue({
       links: [
         {
           text: '《剑鱼标讯线上购买与服务条款》',
-          url: '/jyapp/front/staticPage/dataExport_serviceterms.html',
+          url: '',
           event: this.readEvent
         }
       ],
@@ -578,7 +582,7 @@ var coupon = new Vue({
     }
   },
   mounted () {
-    this.init(this.$data)
+    this.init()
   }, 
   methods: {
     // 更新价格相关
@@ -589,21 +593,7 @@ var coupon = new Vue({
       this.$refs.couponRef.getCoupon();
     },
     // 初始化及回显相关
-    init: function (data) {
-      if (sessionStorage.getItem("vipSub_read") === "true") {
-        this.checkboxStatus = true
-      }
-      var areaSelect = JSON.parse(sessionStorage.getItem("vipSubSelectArea"));
-      var industrySelect = JSON.parse(sessionStorage.getItem("vipSubSelectIndustry"));
-      var endTime = sessionStorage.getItem("endTime")
-      var readStorage = sessionStorage.getItem("vipSub_read") == "true" ? true : false
-      console.log(areaSelect,industrySelect,endTime)
-      if (areaSelect && industrySelect && endTime && readStorage) {
-        this.$refs.couponRef.submitStatus = false
-      } else {
-        this.$refs.couponRef.submitStatus = true
-      }
-    },
+    init: function () {},
     // 勾选阅读协议
     updateS: function(data) {
       data.callback(this.checkSubmitStatus(data.check))

src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -500,6 +500,7 @@
                 $(".phone_check_ok").hide();
                 finishPhoneVerity = false;
                 $(".toPay").attr("disabled", "disabled");
+                coupon.$refs.couponRef.submitStatus = true
             }
         } else if (phone_lastInput != "") {
             $(".phone_check_ok").show();
@@ -509,6 +510,7 @@
 
         if (readClause && finishPhoneVerity && finishEmailVerity) {
             $(".toPay").removeAttr("disabled")
+            coupon.$refs.couponRef.submitStatus = false
         }
 
         //缓存判断是否点击我已阅读
@@ -599,12 +601,14 @@
                             finishPhoneVerity = true;
                             if (readClause && finishEmailVerity) {
                                 $(".toPay").removeAttr("disabled")
+                                coupon.$refs.couponRef.submitStatus = false
                             }
                         } else {
                             $(".phone_err_msg").show();
                             $(".phone_check_ok").hide();
                             finishPhoneVerity = false;
                             $(".toPay").attr("disabled", "disabled");
+                            coupon.$refs.couponRef.submitStatus = true
                         }
                     })
                 } else {
@@ -612,12 +616,14 @@
                     $(".phone_check_ok").hide();
                     finishPhoneVerity = false;
                     $(".toPay").attr("disabled", "disabled");
+                    coupon.$refs.couponRef.submitStatus = true
                 }
             } else {
                 $(".phone_err_msg").hide();
                 $(".phone_check_ok").hide();
                 finishPhoneVerity = false;
                 $(".toPay").attr("disabled", "disabled");
+                coupon.$refs.couponRef.submitStatus = true
                 sessionStorage.removeItem("ischecked");
             }
         }).blur(function () {
@@ -627,6 +633,7 @@
                 $(".phone_check_ok").hide();
                 finishPhoneVerity = false;
                 $(".toPay").attr("disabled", "disabled");
+                coupon.$refs.couponRef.submitStatus = true
             }
         });
         //邮箱输入监控
@@ -655,6 +662,7 @@
                     }
                     finishEmailVerity = false;
                     $(".toPay").prop("disabled", "disabled");
+                    coupon.$refs.couponRef.submitStatus = true
                     if (/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email_input)) {
                         lstimes_ = parseInt(sessionStorage.getItem("send_code_" + userId));
                         lstimes_ = lstimes_ - Date.parse(new Date()) / 1000 + 60 * 5;
@@ -674,6 +682,7 @@
                     finishEmailVerity = true;
                     if (readClause && finishPhoneVerity) {
                         $(".toPay").removeAttr("disabled")
+                        coupon.$refs.couponRef.submitStatus = false
                     }
                     $("#sendCode").attr("disabled", "disabled");
                     $(".verity_input").attr("readonly", true);
@@ -732,10 +741,12 @@
                         $(".email_check_ok").show();
                         if (readClause && finishPhoneVerity) {
                             $(".toPay").removeAttr("disabled")
+                            coupon.$refs.couponRef.submitStatus = false
                         }
                         $(".email_input").parents('div.form-control').siblings().slideUp();
                     } else {
                         $(".toPay").attr("disabled", "disabled");
+                        coupon.$refs.couponRef.submitStatus = true
                         finishEmailVerity = false;
                         //发送成功
                         sendemailTimer(60 * 5);
@@ -772,6 +783,7 @@
                         finishEmailVerity = true;
                         if (readClause && finishPhoneVerity) {
                             $(".toPay").removeAttr("disabled")
+                            coupon.$refs.couponRef.submitStatus = false
                         }
                         $(".email_check_ok").show();
                         $(".email_err_msg").hide();
@@ -971,8 +983,6 @@
         }
     },
     mounted () {
-      console.log(finishEmailVerity,finishPhoneVerity, sessionStorage.readClause, sessionStorage.getItem("ischecked"))
-      console.log(localStorage.getItem("new_email_" + userId))
       this.init()
     }, 
     methods: {

src/jfw/modules/app/src/web/templates/frontRouter/coupon/free/myCoupon.html

@@ -108,7 +108,6 @@
               platform: 'A'
             },
             success: function(res){
-              console.log(res)
               if (res.error_code == 1 && res.data) {
                 console.log(mold)
                 switch (mold) {

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_purchase.html

@@ -683,68 +683,8 @@
             // 订单提交事件
             submitOrder: function () {
               this.$refs.couponRef.submitStatus = true
-              // $("#payHandle").attr("disabled", "disabled");
-              //支付请求
-              var area = purchase.areaSelect;
-              var industry = purchase.industrySelect;
-              var _this = this;
-              if (area["全国"]) {
-                area = {};
-              }
-              if (industry.length === 1 && industry[0] === "全部行业") {
-                industry = [];
-              }
-
-              {{if not .T.isTrial}}
-                //优惠码
-                var activeCode = $('.coupon-picker .weui-input').val();
-                // alert(activeCode)
-                var activeCodes = "";
-                if (activeCode.toLowerCase() === "jianyu360" && $('.coupon-code-tx .info').text() === "支付成功赠送30天订阅周期") {
-                  activeCodes = "jianyu360";
-                }
-                //付费用户
-                var param = {
-                  "area": JSON.stringify(area),
-                  "industry": industry.join(","),
-                  "time": $(".info:eq(2)").val().trim(),
-                  "orderType":{{.T.orderType}},
-                  "activeCode": activeCodes,
-                  "disWord":getParam("disWord")
-                };
-                // @订单手机号-S
-                if (OrderPhoneCheck.status) {
-                  param.order_phone = OrderPhoneCheck.phone
-                }
-                // @订单手机号-E
-                $DoPost("/subscribepay/vipsubscribe/createOrder", param, function (r) {
-                  if (r.success) {
-                    try {
-                      clearSessionStorage()
-                      history.replaceState({}, '', '/jyapp/vipsubscribe/toOrderDetailPage?orderCode=' + r.data.code);
-                      window.location.href = "/jyapp/pay/checkout_subvip?orderCode=" + r.data.code + "&t=3&from=buy"
-                    } catch (e) {
-                      showToast(e)
-                    }
-                  }
-                  $("#payHandle").removeAttr("disabled")
-                  _this.$refs.couponRef.submitStatus = false
-                });
-              {{else}}
-                //试用用户
-                $DoPost("/subscribepay/order/trialPay", {
-                  "area": JSON.stringify(area),
-                  "industry": industry.join(","),
-                  "order_phone": OrderPhoneCheck.phone
-                }, function (r) {
-                  if (r.success) {
-                    clearSessionStorage();
-                    $("#payHandle").attr("disabled", "disabled");
-                    _this.$refs.couponRef.submitStatus = true
-                    window.location.replace("/jyapp/subvip/paySuccess?orderCode=" + r.data.code);
-                  }
-                });
-              {{end}}
+              $('#payHandle').trigger('click')
+              this.$refs.couponRef.submitStatus = false
             }
           }
         })

src/web/staticres/frontRouter/wx/coupon/js/coupon-template.js

@@ -1,6 +1,5 @@
 Vue.component('coupon-list', {
   delimiters: ['@@', '@@'],
-  // props: ['couponList', 'mold', 'isSelect', 'disabled'],
   props: {
     couponList: Array,
     mold: Number || String,

src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -131,58 +131,7 @@ $(function () {
       },
       // 订单提交事件
       submitOrder: function () {
-        this.$refs.couponRef.submitStatus = true
-        $('.vip-footer .button-r.confirm').trigger('click')
-        var submited = false;
-        var noshow = false;
-        if (submited) {
-          return
-        }
-        submited = true;
-        setTimeout(function () {
-          submited = false;
-        }, 1000);
-        weui.loading()
-        $DoPost('/subscribepay/vipsubscribe/saveChange', {
-          "area": reqData.area["全国"] ? '{}' : JSON.stringify(reqData.area),
-          "industry": reqData.industry.join(","),
-          "time": selectTime,
-          "price": parseInt((submitPrice).toFixed(0))
-        }, function (r) {
-          if (r.success) {
-            if (r.data.needPay) {
-              weui.loading().hide()
-              //创建支付订单
-              clearSessionStorage()
-              history.replaceState({"flag": "pay"}, '', '/jyapp/vipsubscribe/toOrderDetailPage?orderCode=' + r.data.code);
-              var nextHref = "/jyapp/pay/checkout_subvip?orderCode=" + r.data.code + '&from=buy'
-              if (reqData.isTrial) {
-                nextHref += "&t=3"
-              }else {
-                nextHref += "&t=2"
-              }
-              window.location.href = nextHref
-            } else {
-              weui.loading().hide()
-              //订阅修改
-              if (r.data.doSuccess) {
-                noshow = true;
-                clearSessionStorage();
-                getDataWitXHR()
-                // window.history.go(-1);
-                // locationReplace(location.pathname)
-              } else {
-                weui.toast('修改保存失败', {
-                  duration: 1500,
-                  className: 'jy-toast',
-                });
-              }
-            }
-          }else{
-            weui.loading().hide();
-          }
-        }, false);
-        this.$refs.couponRef.submitStatus = false
+        doSubmit()
       }
     }
   })
@@ -624,7 +573,8 @@ $(function () {
                     type: 'primary',
                     onClick: function () {
                         // doSubmit();
-                        $('.vip-footer .button-r.confirm').trigger('click')
+                        // $('.vip-footer .button-r.confirm').trigger('click')
+                        coupon.submitOrder()
                     }
                 }
             ]
@@ -1110,17 +1060,17 @@ $(function () {
         }, 1000);
 
         //校验是否点击阅读条款
-        if (submitPrice > 0) {
-            if (!$('.checkbox').hasClass("checked")) {
-                weui.toast('请勾选服务条款', {
-                    duration: 1500,
-                    className: 'jy-toast',
-                });
-                $dialog.hide(function () {
-                });
-                return
-            }
-        }
+        // if (submitPrice > 0) {
+        //     if (!$('.checkbox').hasClass("checked")) {
+        //         weui.toast('请勾选服务条款', {
+        //             duration: 1500,
+        //             className: 'jy-toast',
+        //         });
+        //         $dialog.hide(function () {
+        //         });
+        //         return
+        //     }
+        // }
         //优惠码
         var activeCode = $('.coupon-picker .weui-input').val();
         var activeCodes = "";

src/web/templates/frontRouter/wx/coupon/free/myCoupon.html

@@ -93,7 +93,6 @@
       },
       mounted() {
         this.getDomOffsetTop()
-        // this.getCoupon(1)
         var _this = this;
         window.addEventListener('resize',function() {
           _this.getDomOffsetTop()
@@ -122,7 +121,6 @@
               platform: 'W'
             },
             success: function(res){
-              console.log(res)
               if (res.error_code == 1 && res.data) {
                 console.log(mold)
                 switch (mold) {

src/web/templates/weixin/dataExport/dataExport_payOrder.html

@@ -396,6 +396,7 @@
                 $(".phone_check_ok").hide();
                 finishPhoneVerity = false;
                 $(".toPay").attr("disabled", "disabled");
+                coupon.$refs.couponRef.submitStatus = true
             }
         } else if (phone_lastInput != "" && phone_lastInput != null) {
             $(".phone_check_ok").show();
@@ -413,6 +414,7 @@
             coupon.checkboxStatus = true
             if (finishPhoneVerity && finishEmailVerity) {
                 $(".toPay").removeAttr("disabled")
+                coupon.$refs.couponRef.submitStatus = false
                 readClause = true;
             }
             if (!$(".fixed-bottom-box .weui-check").is(":checked")) {
@@ -471,12 +473,14 @@
                             finishPhoneVerity = true;
                             if (readClause && finishEmailVerity) {
                                 $(".toPay").removeAttr("disabled")
+                                coupon.$refs.couponRef.submitStatus = false
                             }
                         } else {
                             $(".phone_err_msg").show();
                             $(".phone_check_ok").hide();
                             finishPhoneVerity = false;
                             $(".toPay").attr("disabled", "disabled");
+                            coupon.$refs.couponRef.submitStatus = true
                         }
                     })
                 } else {
@@ -484,12 +488,14 @@
                     $(".phone_check_ok").hide();
                     finishPhoneVerity = false;
                     $(".toPay").attr("disabled", "disabled");
+                    coupon.$refs.couponRef.submitStatus = true
                 }
             } else {
                 $(".phone_err_msg").hide();
                 $(".phone_check_ok").hide();
                 finishPhoneVerity = false;
                 $(".toPay").attr("disabled", "disabled");
+                coupon.$refs.couponRef.submitStatus = true
             }
         }).blur(function () {
             var phone_input = $(this).val().replace(/\s*/g, "");
@@ -498,6 +504,7 @@
                 $(".phone_check_ok").hide();
                 finishPhoneVerity = false;
                 $(".toPay").attr("disabled", "disabled");
+                coupon.$refs.couponRef.submitStatus = true
             }
         }).on("focus", function () {
             this.scrollIntoView();
@@ -529,6 +536,7 @@
                     }
                     finishEmailVerity = false;
                     $(".toPay").attr("disabled", "disabled");
+                    coupon.$refs.couponRef.submitStatus = true
                     if (/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email_input)) {
                         lstimes_ = parseInt(sessionStorage.getItem("send_code_" + userId));
                         lstimes_ = lstimes_ - Date.parse(new Date()) / 1000 + 60 * 5;
@@ -548,6 +556,7 @@
                     finishEmailVerity = true;
                     if (readClause && finishPhoneVerity) {
                         $(".toPay").removeAttr("disabled")
+                        coupon.$refs.couponRef.submitStatus = false
                     }
                     $("#sendCode").attr("disabled", "disabled");
                     $(".verity_input").attr("readonly", true);
@@ -604,9 +613,11 @@
                         $(".email_input").parents('div.form-control').siblings().slideUp();
                         if (readClause && finishPhoneVerity) {
                             $(".toPay").removeAttr("disabled")
+                            coupon.$refs.couponRef.submitStatus = false
                         }
                     } else {
                         $(".toPay").attr("disabled", "disabled");
+                        coupon.$refs.couponRef.submitStatus = true
                         finishEmailVerity = false;
                         //发送成功
                         sendemailTimer(60 * 5);
@@ -640,6 +651,7 @@
                         finishEmailVerity = true;
                         if (readClause && finishPhoneVerity) {
                             $(".toPay").removeAttr("disabled")
+                            coupon.$refs.couponRef.submitStatus = false
                         }
                         $(".email_check_ok").show();
                         $(".email_err_msg").hide();
@@ -709,11 +721,13 @@
                         readClause = true;
                         sessionStorage.readClause = "true";
                         $(".toPay").attr("disabled", "disabled");
+                        coupon.$refs.couponRef.submitStatus = true
                     }
                 } else {
                     readClause = false;
                     sessionStorage.readClause = "false";
                     $(".toPay").attr("disabled", "disabled");
+                    coupon.$refs.couponRef.submitStatus = true
                 }
                 window.open("/front/wx_dataExport/toPreview/{{.T._id}}?dataType=" + dataType);
             } else {
@@ -912,16 +926,13 @@
             if (finishEmailVerity && finishPhoneVerity) {
               readClause = true;
               sessionStorage.readClause = "true";
-              $(".toPay").removeAttr("disabled")
             } else {
               readClause = true;
               sessionStorage.readClause = "true";
-              $(".toPay").attr("disabled", "disabled");
             }
           } else {
             readClause = false;
             sessionStorage.readClause = "false";
-            $(".toPay").attr("disabled", "disabled");
           }
           return finishEmailVerity && finishPhoneVerity
         },

src/web/templates/weixin/vipsubscribe/vip_renew.html

@@ -701,8 +701,11 @@
             flushSubmit() {//是否可提交
                 if (this.timeCheckOk && sessionStorage.getItem("vipSub_read") === "true") {
                     $('.vip-footer.renew .confirm').prop('disabled', false)
+                    coupon.checkboxStatus = true
+                    coupon.$refs.couponRef.submitStatus = false
                 } else {
                     $('.vip-footer.renew .confirm').prop('disabled', true)
+                    coupon.$refs.couponRef.submitStatus = true
                 }
             }
         };
@@ -1085,21 +1088,7 @@
               this.$refs.couponRef.getCoupon();
             },
             // 初始化及回显相关
-            init: function () {
-              if (sessionStorage.getItem("vipSub_read") === "true") {
-                this.checkboxStatus = true
-              }
-              var areaSelect = JSON.parse(sessionStorage.getItem("vipSubSelectArea"));
-              var industrySelect = JSON.parse(sessionStorage.getItem("vipSubSelectIndustry"));
-              var endTime = sessionStorage.getItem("endTime")
-              var readStorage = sessionStorage.getItem("vipSub_read") == "true" ? true : false
-              console.log(areaSelect,industrySelect,endTime)
-              if (areaSelect && industrySelect && endTime && readStorage) {
-                this.$refs.couponRef.submitStatus = false
-              } else {
-                this.$refs.couponRef.submitStatus = true
-              }
-            },
+            init: function () {},
             // 勾选阅读协议
             updateS: function(data) {
               data.callback(this.checkSubmitStatus(data.check))