Merge branch 'dev3.8' of http://192.168.3.207:10080/qmx/jy into dev3.8

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/pc/myOrder.html

@@ -1,4 +1,5 @@
-<html lang="en">
+<!DOCTYPE html>
+<html lang="zh-CN">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport"
@@ -169,6 +170,9 @@
         #order .order_content .order_list .o_l_middle .m_info.fix-el .shop_img {
             margin-top: 0;
         }
+        [v-cloak] {
+            display: none !important;
+        }
     </style>
 </head>
 <body style="background-color: #fff !important;">
@@ -189,10 +193,192 @@
                 <span class="th_status">订单状态</span>
                 <span class="th_handle">订单操作</span>
             </div>
-            <div class="c_tbody">
+            <div class="c_tbody_vue" id="page_tbody" v-cloak>
+                <div v-for="item in getList">
+                    <span style="margin-left: 118px;" v-if="!item.publishTime">@#item.publishTime#@</span>
+                    <span v-else>@#item.publishTime#@</span>
+                    <div class="order_list" :class="{'blueColor': item.order_status === 0, 'grayColor': item.order_status !== 0}">
+                        <div class="clearfix o_l_top"  :class="{'blueBg': item.order_status === 0, 'grayBg': item.order_status !== 0}">
+                            <div class="fl">
+                                <span class="o_time">@#item.create_time#@</span>
+                                <span class="o_number">订单号：@#item.order_code#@</span>
+                            </div>
+                            <i class="iconfont icon-shanchu fr o_del" onclick="deleteOrder('32032',this)"></i>
+                        </div>
+                        <div class="clearfix o_l_middle">
+                            <div class="fl m_info grayColor fix-el">
+                                <div class="fl shop_img">
+                                    <img :src="item.icon" :alt="item.product_type">
+                                </div>
+
+                                <div class="fl shop_main" v-if="item.product_type === '历史数据'">
+                                    <p>关键词：@#item.filter_keys ? item.filter_keys : '-'#@</p>
+                                    <p>数据量：@#item.data_count#@条</p>
+                                    <p>数据规格：@#item.data_spec#@</p>
+                                    <p>筛选时间：@#item.filter_publishtime#@</p>
+                                </div>
+                                <div class="fl shop_main" v-if="item.product_type === '中标必听课'">
+                                    <p>课程名称：@#item.filter.s_name#@</p>
+                                    <p>课程类型：中标必听课</p>
+                                    <p>课程时长：@#item.filter.s_courseDate#@</p>
+                                    <p>课程节数：共@#!item.filter.i_num ? 1 : item.filter.i_num#@节</p>
+                                    <p>有效日期：@#item.filter.l_endtime | FormatDateFn#@到期</p>
+                                </div>
+                                <div class="fl shop_main" v-if="item.product_type === '数据报告'">
+                                    <p style="line-height: 48px;">报告名称：@#item.filter.report_name#@</p>
+                                    <p style="line-height: 48px;">发布日期：@#item.filter.l_pushtime | FormatDateFn#@</p>
+                                </div>
+
+                                <div class="fl shop_main" v-if="item.product_type === 'VIP订阅'">
+                                    <p>区域：@#item.area#@</p>
+                                    <p>行业：@#item.industry#@</p>
+                                    <p>
+                                        订阅周期：@#item.cycle#@
+                                        <!--赠送30天-->
+                                        <span v-if="item.isUsedActiveCode" class="discount-container"><span> + </span><span class="highlight-text" style="color: #2cb7ca;">赠送30天</span></span>
+                                        <!--赠送-->
+                                        <span v-if="item.filter.give_cycle && item.filter.original_price" class="discount-container"><span> + </span><span class="highlight-text" style="color: #2cb7ca;">赠送@#item.filter.give_cycle < 12 ? (item.filter.give_cycle + '个月') : '1年'#@</span></span>
+                                    </p>
+                                    <p>有效时间：@#item.vip_starttime#@</p>
+                                </div>
+                                <div class="fl shop_main" v-if="item.product_type === '企业商机管理'">
+                                    <p style="line-height: 33px;">企业名称：@#item.filter.entname#@</p>
+                                    <p style="line-height: 33px;">团队人数：@#item.filter.personnum#@人</p>
+                                    <p style="line-height: 33px;">使用周期：@#item.filter.cycle#@年</p>
+                                </div>
+                                <div class="fl shop_main" v-if="item.product_type === '大会员'">
+                                    <p style="line-height: 24px;">会员套餐：@#item.memberInfo.level#@</p>
+                                    <p style="line-height: 24px;">订阅周期：@#item.memberInfo.cycle#@</p>
+                                    <p style="line-height: 24px;">有效日期：@#item.memberInfo.endTime#@</p>
+                                </div>
+                                <div class="fl shop_main" v-if="item.product_type === '大会员-AI中标预测包'
+                                                            || item.product_type === '大会员-补充包'
+                                                            || item.product_type === '大会员-招标文件解读'">
+                                    <p style="line-height: 24px;">有效日期：@#item.memberAddInfo.endTime#@到期</p>
+                                    <p style="line-height: 24px;display:flex;">服务列表：<span style="display: flex;flex-direction: column;" v-html="item.memberAddInfo.html"></span></p>
+                                </div>
+                                <div class="fl shop_main" v-if="item.product_type === '大会员-子账号'">
+                                    <p style="line-height: 24px;">会员套餐：@#item.memberChildInfo.level#@</p>
+                                    <p style="line-height: 24px;">有效日期：@#item.memberChildInfo.endTime#@到期</p>
+                                    <p style="line-height: 24px;">付费账号：@#item.memberChildInfo.fee#@个</p>
+                                    <p style="line-height: 24px;">免费账号：@#item.memberChildInfo.free#@个</p>
+                                </div>
+                                <div class="fl shop_main" v-if="item.product_type === '招标文件解读'">
+                                    <p style="line-height: 24px;">产品类型：@#item.product_type#@</p>
+                                    <p style="line-height: 24px;">购买次数：@#item.filter.count#@次</p>
+                                    <p style="line-height: 24px;">有效日期：2021/11/15到期</p>
+                                </div>
+                                <div class="fl shop_main" v-if="item.product_type === '剑鱼币'">
+                                    <p style="line-height: 24px;">产品类型：@#item.product_type#@</p>
+                                    <p style="line-height: 24px;">数量：@#item.filter.score | FormatNum#@枚</p>
+                                    <p style="line-height: 24px;">有效日期：永久</p>
+                                </div>
+                            </div>
+                            <div class="fl m_number" :class="{'blueColor': item.order_status === 0, 'grayColor': item.order_status !== 0}">
+                                <div v-if="item.filter&&item.filter.give_cycle&&item.filter.original_price" style='display: flex; flex-direction: column;align-items: center;justify-content: center;line-height:1;height:100%;color:#999;'>
+                                    <span style='text-decoration: line-through;'>￥@#(item.filter.original_price/100) | FormatNum#@ </span>
+                                    <div style='color:#1D1D1D;text-decoration:none;'>￥@#item.order_money | FormatNum#@ </div>
+                                </div>
+                                <div v-else>
+                                    ￥@#item.order_money | FormatNum#@
+                                </div>
+                            </div>
 
+                            <div class="fl m_status" :class="{'blueColor': item.order_status === 0, 'grayColor': item.order_status !== 0}">
+                                <!--大会员-->
+                                <div class="stateBox" v-if="item.product_type === '大会员'">
+                                    <div v-if="item.order_status === 0 && item.pay_way === 'transferAccounts'">
+                                        <span v-if="item.course_status === 2" style='color: #FE737A'>转账审核中</span>
+                                        <span v-else-if="item.course_status === 3" style='color: #FE737A'>未收到转账</span>
+                                    </div>
+                                    <div v-if="item.order_status === 1">
+                                        <p class="finish_status" v-if="item.filter.isAll == 2">待付款</p>
+                                        <p class="finish_status" v-else-if="item.filter.isAll == 3">待付完</p>
+                                        <p class="finish_status" v-else>已完成</p>
+                                    </div>
+                                    <p v-if="item.order_status === -2 || item.order_status === -3" class="finish_status">已取消</p>
+                                    <p><a onclick="toDetail('251793369330',10);">查看详情</a></p>
+                                </div>
+                                <div class="stateBox" v-else-if="item.product_type === '大会员-AI中标预测包'
+                                                            || item.product_type === '大会员-补充包'
+                                                            || item.product_type === '大会员-子账号'
+                                                            || item.product_type === '招标文件解读'
+                                                            || item.product_type === '剑鱼币'
+                                                            || item.product_type === '大会员-招标文件解读'">
+                                    <div v-if="item.order_status === 1">
+                                        <p class="finish_status" v-if="item.filter.isAll == 2">待付款</p>
+                                        <p class="finish_status" v-else-if="item.filter.isAll == 3">待付完</p>
+                                        <p class="finish_status" v-else>已完成</p>
+                                    </div>
+                                    <p v-if="item.order_status === -2 || item.order_status === -3" class="finish_status">已取消</p>
+                                    <p><a onclick="toDetail('251793369330',10);">查看详情</a></p>
+                                </div>
+                                <div class="stateBox" v-else>
+                                    <!--待支付-->
+                                    <p class="finish_status" v-if="item.order_status === 0">待付款</p>
+                                    <!--已完成-->
+                                    <p class="finish_status" v-else-if="item.order_status === 1">已完成</p>
+                                    <!--已取消-->
+                                    <p class="finish_status" v-else>已取消</p>
+                                    <p><a onclick="toDetail('251793369330',10);">查看详情</a></p>
+                                </div>
+                            </div>
+                            <div class="fl m_handle">
+                                <div class="handleBox"  v-if="item.product_type === '大会员'">
+                                    <div v-if="item.order_status === 0
+                                    && !(item.pay_way === 'transferAccounts' && (item.course_status === 2 || item.course_status === 4))">
+                                        <p><a class="gopay" @click="goPay(item)">@#item.course_status === 3 ? '再次' : '去'#@支付</a></p>
+                                        <p><a @click="goCancel(item)">取消订单</a></p>
+                                    </div>
+                                    <div v-if="item.order_status === 1 && (item.filter.source || '') === ''">
+                                        <p><a v-if="item.applybill_status === 0" @click="goInvoice(item)">开发票</a></p>
+                                        <p><a v-if="item.applybill_status === 1 || item.applybill_status === 2" @click="goInvoice(item)">发票信息</a></p>
+                                    </div>
+                                </div>
+                                <div class="handleBox"  v-else-if="item.product_type === '大会员-AI中标预测包'
+                                                            || item.product_type === '大会员-补充包'
+                                                            || item.product_type === '大会员-子账号'
+                                                            || item.product_type === '招标文件解读'
+                                                            || item.product_type === '剑鱼币'
+                                                            || item.product_type === '大会员-招标文件解读'">
+                                    <div v-if="item.order_status === 0
+                                    && !(item.pay_way === 'transferAccounts' && (item.course_status === 2 || item.course_status === 4))">
+                                        <p><a class="gopay" @click="goPay(item)">去支付</a></p>
+                                        <p><a @click="goCancel(item)">取消订单</a></p>
+                                    </div>
+                                    <div v-if="item.order_status === 1 && (item.filter.source || '') === ''">
+                                        <p><a v-if="item.applybill_status === 0" @click="goInvoice(item)">开发票</a></p>
+                                        <p><a v-if="item.applybill_status === 1 || item.applybill_status === 2" @click="goInvoice(item)">发票信息</a></p>
+                                    </div>
+                                </div>
+                                <div class="handleBox"  v-else>
+                                    <!--待支付-->
+                                    <!--剑鱼币 00-(!(obj.pay_way === "transferAccounts" && (obj.course_status === 2 || obj.course_status === 4)))-->
+                                    <p v-if="item.order_status === 0"><a class="gopay" @click="goPay(item)">去支付</a></p>
+                                    <p v-if="item.order_status === 0"><a @click="goCancel(item)">取消订单</a></p>
+                                    <!--已完成-->
+                                    <p v-if="item.order_status === 1"><a v-if="item.applybill_status === 0" @click="goInvoice(item)">开发票</a></p>
+                                    <p v-if="item.order_status === 1"><a v-if="item.applybill_status === 1 || item.applybill_status === 2" @click="goInvoice(item)">发票信息</a></p>
+                                    <!--已取消-->
+                                    <!--历史数据 再次购买-->
+                                    <p v-if="item.product_type === '历史数据'"><a href="/front/dataExport/toSieve">再次购买</a></p>
+                                    <!--超级订阅 试用-->
+                                    <p v-if="item.product_type === 'VIP订阅' && item.order_status === 1 && item.filter.cycleunit === 3">-</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div>
+                    <div class="inner">
+                        <div class="err-box">
+                            <img src="/images/pc_12.png" alt="暂无数据">
+                            <span>暂无数据</span>
+                        </div>
+                    </div>
+                </div>
             </div>
-            <div class="c_tbody" style="display: none;">2</div>
+            <div class="c_tbody">2</div>
             <div class="c_tbody" style="display: none;">3</div>
             <div class="c_tbody" style="display: none;">4</div>
         </div>
@@ -208,6 +394,726 @@
         src="{{Msg "seo" "cdn"}}/dataExport/js/pageination.ie.js?v={{Msg "seo" "version"}}"></script>
 {{include "/common/pcbottom.html"}}
 {{include "/common/baiducc.html"}}
+<script src="https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.js"></script>
+<script>
+
+  var tempJSON = {
+    "count": 247,
+    "hasNextPage": true,
+    "pageSize": 14,
+    "res": [
+      // 剑鱼币
+      {
+        "applybill_company": null,
+        "applybill_status": 0,
+        "applybill_taxnum": null,
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2021-03-31 11:06:49",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"isPermanent\":true,\"order_score\":1000,\"phone\":\"13027620557\",\"price\":1000,\"score\":1000}",
+        "filter_id": null,
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 31713,
+        "order_code": "251709258935",
+        "order_money": 10,
+        "order_status": -2,
+        "pay_money": null,
+        "pay_time": null,
+        "pay_way": "",
+        "product_type": "剑鱼币",
+        "vip_endtime": null,
+        "vip_starttime": null,
+        "vip_type": null
+      },
+      // 中标必听课
+      {
+        "applybill_company": null,
+        "applybill_status": 0,
+        "applybill_taxnum": null,
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2021-03-09 13:19:58",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"_id\":\"6046d8a4e138234bb8f4dcba\",\"courseType\":\"线上课程\",\"i_drawer\":1,\"i_exist\":0,\"i_num\":1,\"i_price\":1,\"l_endtime\":1646755200,\"phone\":\"13027620557\",\"s_courseDate\":\"00:15:30\",\"s_fileUrl\":\"\",\"s_name\":\"王凯精品课测试数据\",\"s_picUrl\":\"https://web2-qmxtest.jianyu360.cn//onLineUpload/2021/03/09/20210309100705003s82aGWuV.jpg\"}",
+        "filter_id": "425f4458014c530454044757425d511650085701100c120f",
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 30922,
+        "order_code": "251526079363",
+        "order_money": 0.01,
+        "order_status": 1,
+        "pay_money": 1,
+        "pay_time": "2021-03-09 13:20:12",
+        "pay_way": "wx_js",
+        "product_type": "中标必听课",
+        "vip_endtime": null,
+        "vip_starttime": null,
+        "vip_type": null
+      },
+      // 数据导出
+      {
+        "applybill_company": null,
+        "applybill_status": 0,
+        "applybill_taxnum": null,
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2021-01-28 17:28:51",
+        "data_count": 1175,
+        "data_spec": "标准字段包",
+        "filter": "{\"_id\":\"601283cc8591a1c4f15478d3\",\"area\":[\"安徽\"],\"buyer\":null,\"buyerclass\":[\"传媒\"],\"city\":null,\"comeinfrom\":\"exportPage\",\"comeintime\":1611826124,\"industry\":null,\"keywords\":[],\"maxprice\":\"\",\"minprice\":\"\",\"publishtime\":\"1546272000_1577807999\",\"region\":[\"安徽\"],\"s_openid\":\"o7Y1g0dayt6EWnyowyeUm8NTJ_4g\",\"s_userid\":\"5e8eb60ae138234b4f91aacf\",\"selectType\":\"title\",\"subtype\":\"\",\"winner\":null}",
+        "filter_id": "425f415c5d47515309004d5e115f0640540104014357145d",
+        "filter_keys": "",
+        "filter_publishtime": "2019.01.01-2019.12.31",
+        "id": 30509,
+        "order_code": "251182612000",
+        "order_money": 11.75,
+        "order_status": -2,
+        "pay_money": null,
+        "pay_time": null,
+        "pay_way": "wx_pc",
+        "product_type": "历史数据",
+        "vip_endtime": null,
+        "vip_starttime": null,
+        "vip_type": null
+      },
+      // 线上课程
+      {
+        "applybill_company": "",
+        "applybill_status": 1,
+        "applybill_taxnum": "",
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2020-12-17 09:32:17",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"_id\":\"5f3cc7859b54e20b8575ea96\",\"courseType\":\"线上课程\",\"i_drawer\":1,\"i_exist\":1,\"i_num\":6,\"i_price\":1,\"l_endtime\":1607223285,\"phone\":\"13027620555\",\"s_courseDate\":\"3:11:20\",\"s_fileUrl\":\"https://web-qmxtest.jianyu360.cn/upload/2019/04/15/2019041509190200407088M37.jpg\",\"s_name\":\"开发使用4\",\"s_picUrl\":\"http://web-qmxtest.jianyu360.cn//onLineUpload/2020/07/10/20200710134458007l7302T05.jpg\"}",
+        "filter_id": "4109430d06430a050857415b155c55160a050600110e4958",
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 23101,
+        "order_code": "093217853475",
+        "order_money": 0.01,
+        "order_status": 1,
+        "pay_money": null,
+        "pay_time": "2020-12-17 11:06:49",
+        "pay_way": "wx_pc",
+        "product_type": "线上课程",
+        "vip_endtime": null,
+        "vip_starttime": null,
+        "vip_type": null
+      },
+      // 大会员-3
+      {
+        "applybill_company": null,
+        "applybill_status": 0,
+        "applybill_taxnum": null,
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2020-12-10 17:07:22",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"cycle\":1,\"level\":3}",
+        "filter_id": null,
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 27914,
+        "order_code": "250759122966",
+        "order_money": 5999,
+        "order_status": -2,
+        "pay_money": null,
+        "pay_time": null,
+        "pay_way": "",
+        "product_type": "大会员",
+        "vip_endtime": null,
+        "vip_starttime": null,
+        "vip_type": null
+      },
+      // -1
+      {
+        "applybill_company": null,
+        "applybill_status": 0,
+        "applybill_taxnum": null,
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2020-11-09 11:08:42",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"cycle\":3,\"level\":1}",
+        "filter_id": null,
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 26554,
+        "order_code": "250488851986",
+        "order_money": 65997,
+        "order_status": -2,
+        "pay_money": null,
+        "pay_time": null,
+        "pay_way": "",
+        "product_type": "大会员",
+        "vip_endtime": null,
+        "vip_starttime": null,
+        "vip_type": null
+      },
+      // -2
+      {
+        "applybill_company": null,
+        "applybill_status": 0,
+        "applybill_taxnum": null,
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2021-04-14 16:41:13",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"cycle\":1,\"level\":2}",
+        "filter_id": null,
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 32274,
+        "order_code": "251838757366",
+        "order_money": 15999,
+        "order_status": 1,
+        "pay_money": 1,
+        "pay_time": "2021-04-14 16:41:21",
+        "pay_way": "wx_app",
+        "product_type": "大会员",
+        "vip_endtime": "2022-04-14 23:59:59",
+        "vip_starttime": "2021-04-14 16:41:21",
+        "vip_type": null
+      },
+      // -4
+      {
+        "applybill_company": null,
+        "applybill_status": 0,
+        "applybill_taxnum": null,
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2021-04-14 16:43:57",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"cycle\":7,\"level\":4}",
+        "filter_id": null,
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 32276,
+        "order_code": "251838758685",
+        "order_money": 199,
+        "order_status": 1,
+        "pay_money": 1,
+        "pay_time": "2021-04-14 16:44:04",
+        "pay_way": "wx_app",
+        "product_type": "大会员",
+        "vip_endtime": "2021-04-21 23:59:59",
+        "vip_starttime": "2021-04-14 16:44:04",
+        "vip_type": null
+      },
+      // -5
+      {
+        "applybill_company": null,
+        "applybill_status": 0,
+        "applybill_taxnum": null,
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2021-04-08 13:49:15",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"cycle\":7,\"level\":4}",
+        "filter_id": null,
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 31914,
+        "order_code": "251784997979",
+        "order_money": 199,
+        "order_status": 1,
+        "pay_money": 1,
+        "pay_time": "2021-04-08 13:49:23",
+        "pay_way": "wx_app",
+        "product_type": "大会员",
+        "vip_endtime": "2021-04-15 23:59:59",
+        "vip_starttime": "2021-04-08 13:49:23",
+        "vip_type": null
+      },
+      // VIP订阅
+      {
+        "applybill_company": null,
+        "applybill_status": 0,
+        "applybill_taxnum": null,
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2020-12-07 09:37:20",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"area\":{\"安徽\":[]},\"industry\":[\"财政\"],\"cyclecount\":1,\"cycleunit\":2,\"buyset\":null,\"newBuyset\":{\"areacount\":1,\"newcitys\":[],\"buyerclasscount\":1},\"upgradeSubtotail\":null,\"ordertype\":1,\"disWord\":\"\"}",
+        "filter_id": "4109130a5d4307005301155c485a5d4601080053105e4259",
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 27820,
+        "order_code": "250730473264",
+        "order_money": 11.8,
+        "order_status": -2,
+        "pay_money": null,
+        "pay_time": null,
+        "pay_way": null,
+        "product_type": "VIP订阅",
+        "vip_endtime": null,
+        "vip_starttime": null,
+        "vip_type": null
+      },
+      // 大会员-AI中标预测包
+      // 大会员-招标文件解读
+      // 大会员-子账号 -5
+      {
+        "applybill_company": null,
+        "applybill_status": 0,
+        "applybill_taxnum": null,
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2021-04-15 09:15:19",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"bigMoney\":637600,\"bigPayMoney\":200,\"comboId\":0,\"createType\":1,\"cycle\":2,\"effective_date\":\"2021/06/15\",\"free_sub_num\":2,\"isAll\":2,\"level\":5,\"pay_sub_num\":2,\"serversId\":\"1,3,4,5,6,7,8,9,10,11,12,13,14,15\",\"serversName\":\"搜索+订阅,附件下载,企业全景分析,采购单位全景分析,投标决策分析,挖掘潜在客户,挖掘潜在伙伴/竞争对手,挖掘潜在项目,周报/月报,招标文件解读,企业情报监控,企业中标动态,项目进度监控,中标企业预测\",\"source\":\"qmx\",\"subMoney\":400000,\"subPayMoney\":200,\"supplyMoney\":0,\"supplyPayMoney\":0,\"supplys\":null,\"transferV\":\"\",\"transferVTime\":\"2021-04-15 09:15:16\"}",
+        "filter_id": null,
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 32296,
+        "order_code": "091519311678",
+        "order_money": 2,
+        "order_status": 1,
+        "pay_money": 200,
+        "pay_time": "2021-04-15 09:15:19",
+        "pay_way": "transferAccounts",
+        "product_type": "大会员-子账号",
+        "vip_endtime": "2021-06-15 23:59:59",
+        "vip_starttime": "2021-04-15 00:00:00",
+        "vip_type": null
+      },
+      // 大会员-补充包
+      // 数据报告
+      {
+        "applybill_company": null,
+        "applybill_status": 0,
+        "applybill_taxnum": null,
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2020-08-14 16:56:11",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"company\":\"吃吃吃睡睡睡\",\"cover_url\":\"/datareportFile/2020/07/09/2020070910161600743w4YpES.jpg\",\"disWord\":\"\",\"email\":\"1161413678@qq.com\",\"i_price\":1,\"l_pushtime\":1594260936,\"phone\":\"13027620557\",\"report_id\":\"60\",\"report_name\":\"更改该\",\"s_price\":1}",
+        "filter_id": "425f",
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 22771,
+        "order_code": "249731099646",
+        "order_money": 0.01,
+        "order_status": -2,
+        "pay_money": null,
+        "pay_time": null,
+        "pay_way": "",
+        "product_type": "数据报告",
+        "vip_endtime": null,
+        "vip_starttime": null,
+        "vip_type": null
+      }
+      // 企业商机管理
+      , {
+        "applybill_company": null,
+        "applybill_status": 0,
+        "applybill_taxnum": null,
+        "applybill_type": 0,
+        "course_status": 0,
+        "create_time": "2020-08-12 16:15:52",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"cycle\":1,\"entid\":1595,\"entname\":\"asdasd\",\"industry\":\"行政办公\",\"personnum\":5}",
+        "filter_id": null,
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 22682,
+        "order_code": "161552576162",
+        "order_money": 0.01,
+        "order_status": -2,
+        "pay_money": null,
+        "pay_time": null,
+        "pay_way": "",
+        "product_type": "企业商机管理",
+        "vip_endtime": null,
+        "vip_starttime": null,
+        "vip_type": 1
+      }
+      // 招标文件解读
+      , {
+        "applybill_company": null,
+        "applybill_status": 2,
+        "applybill_taxnum": null,
+        "applybill_type": 2,
+        "course_status": 0,
+        "create_time": "2020-12-17 16:15:55",
+        "data_count": null,
+        "data_spec": null,
+        "filter": "{\"count\":5}",
+        "filter_id": null,
+        "filter_keys": null,
+        "filter_publishtime": null,
+        "id": 28233,
+        "order_code": "250819290895",
+        "order_money": 75,
+        "order_status": 1,
+        "pay_money": null,
+        "pay_time": null,
+        "pay_way": "",
+        "product_type": "招标文件解读",
+        "vip_endtime": null,
+        "vip_starttime": null,
+        "vip_type": null
+      }
+    ]
+  }
+
+    var orderListForVue = new Vue({
+      el: '#page_tbody',
+      delimiters: ['@#', '#@'],
+      data: function () {
+        return {
+          typeEnum: ["vip订阅", "中标必听课", "企业商机管理", "剑鱼币", "历史数据", "大会员", "大会员-AI中标预测包", "大会员-子账号", "大会员-招标文件解读", "大会员-补充包", "招标文件解读", "数据报告"],
+          imgMap: {
+            'vip订阅': {
+              icon: '/electronic_invoice/image/vipBook.png'
+            },
+            '中标必听课': {
+              icon: '/course/image/lessonsOnline.png'
+            },
+            '企业商机管理': {
+              icon: '/electronic_invoice/image/enterprise.png'
+            },
+            '剑鱼币': {
+              icon: '/order/image/jianyubi.png'
+            },
+            '历史数据': {
+              icon: '/electronic_invoice/image/dataOutput.png'
+            },
+            '大会员': {
+              icons: {
+                '专家版': {
+                  icon: '/order/image/dahuiyuan1.png'
+                },
+                '智慧版': {
+                  icon: '/order/image/dahuiyuan3.png'
+                },
+                '商机版': {
+                  icon: '/order/image/dahuiyuan2.png'
+                },
+                '试用版': {
+                  icon: '/order/image/dahuiyuan4.png'
+                },
+                '自定义': {
+                  icon: '/order/image/dahuiyuan1.png'
+                }
+              }
+            },
+            '大会员-AI中标预测包': {
+              icon: '/order/image/buchongbao.png'
+            },
+            '大会员-子账号': {
+              icons: {
+                '专家版': {
+                  icon: '/order/image/zizhanghao1.png'
+                },
+                '智慧版': {
+                  icon: '/order/image/zizhanghao3.png'
+                },
+                '商机版': {
+                  icon: '/order/image/zizhanghao2.png'
+                },
+                '自定义': {
+                  icon: '/order/image/zizhanghao1.png'
+                }
+              }
+            },
+            '大会员-招标文件解读': {
+              icon: '/order/image/buchongbao.png'
+            },
+            '大会员-补充包': {
+              icon: '/order/image/buchongbao.png'
+            },
+            '招标文件解读': {
+              icon: '/order/image/zbwjjd_new.png'
+            },
+            '数据报告': {
+              icon: '/images/pc/report_icon.png'
+            }
+          },
+          bigIndexMap: {
+            1: '专家版',
+            2: '智慧版',
+            3: '商机版',
+            4: '试用版',
+            5: '自定义'
+          },
+          list: []
+        }
+      },
+      filters: {
+        FormatNum (value) {
+          return FormatNum(value)
+        },
+        FormatDateFn (value) {
+          return new Date(value * 1000).Format('yyyy/MM/dd')
+        }
+      },
+      computed: {
+        getList () {
+            return this.list.filter(v => {
+              if (v.product_type === '线上课程') {
+                v.product_type = '中标必听课'
+              }
+              return this.typeEnum.indexOf(v.product_type) !== -1
+            }).map((v, index) => {
+              // product_type
+              if (v.product_type === '线上课程') {
+                v.product_type = '中标必听课'
+              }
+              // pushlishTime
+              if (!v.pushlishTime) {
+                v.pushlishTime = '全部'
+              } else if (v.pushlishTime.length === 1) {
+                if (v.publishTime.slice(0, 1) !== "_") {
+                  v.publishTime = timestampToTime(v.publishTime.slice(0, 10))  + "-";
+                } else {
+                  v.publishTime = timestampToTime(v.publishTime.slice(1, 11)) + "前全部";
+                }
+              }
+              // icon
+              if (v.filter) {
+                v.filter = JSON.parse(v.filter)
+              }
+              // 大会员
+              if (v.product_type === '大会员') {
+                v.icon = this.imgMap[v.product_type].icons[this.bigIndexMap[v.filter.level]].icon
+              } else if (v.product_type === '大会员-子账号') {
+                v.icon = this.imgMap[v.product_type].icons[this.bigIndexMap[v.filter.level]].icon
+              } else {
+                v.icon = this.imgMap[v.product_type].icon
+              }
+              v.memberInfo = {
+                level: this.bigIndexMap[v.filter.level],
+                cycle: '-',
+                endTime: '-'
+              }
+              if (v.vip_endtime != null) {
+                v.memberInfo.endTime = formatTime(v.vip_endtime).replace(/\./g, "/") + " 到期";
+              }
+              if (v.filter.level == 4) {
+                v.memberInfo.cycle = v.filter.cycle + "天";
+              } else {
+                v.memberInfo.cycle = v.filter.cycle + "年";
+                var createType = v.filter.createType
+                if (createType){
+                  v.memberInfo.cycle = v.filter.cycle + "个月";
+                }
+              }
+              // 超级订阅
+              if (v.product_type === 'VIP订阅') {
+                var vipOriginalInfo = v.filter.newBuyset
+                var vipInfo = {
+                  area: '全国',
+                  industry: '全行业',
+                  cycle: '-'
+                }
+                if (!$.isEmptyObject(vipOriginalInfo)) {
+                  if (vipOriginalInfo.areacount !== -1) {
+                    var newcitys = vipOriginalInfo.newcitys
+                    var scatter = newcitys.length
+                    var citynum = 0
+                    for (var k in newcitys) {
+                      citynum += newcitys[k]
+                    }
+                    if (vipOriginalInfo.areacount > 0) {
+                      vipInfo.area = vipOriginalInfo.areacount + '个省级区域'
+                      if (citynum !== 0) {
+                        vipInfo.area += "、" + citynum + '个地市'
+                      }
+                    } else {
+                      vipInfo.area += citynum + "个地市";
+                    }
+                  }
+                  if (vipOriginalInfo.buyerclasscount !== -1) {
+                    vipInfo.industry = vipOriginalInfo.buyerclasscount + '个行业'
+                  }
+                } else {
+                  var region_vipArr = v.filter.area;
+                  var province_length = 0;
+                  var city_length = 0;
+                  vipInfo.area = ''
+                  if (JSON.stringify(region_vipArr) !== JSON.stringify({})) {
+                    for (var i in region_vipArr) {
+                      if (region_vipArr[i].length === 0) {
+                        province_length++;
+                      } else {
+                        city_length += region_vipArr[i].length;
+                      }
+                    }
+                  } else {
+                    vipInfo.area = '全国'
+                  }
+                  if (province_length) {
+                    vipInfo.area = province_length + '个省级区域'
+                  }
+                  if (city_length) {
+                    if (vipInfo.area !== '') {
+                      vipInfo.area += '、'
+                    }
+                    vipInfo.area += city_length + '个地市'
+                  }
+                  if (v.filter.industry.length === 0) {
+                    vipInfo.industry = '全行业'
+                  } else {
+                    vipInfo.industry = v.filter.industry.length + '个行业'
+                  }
+                }
+                if (v.filter.cyclecount !== undefined && v.filter.cyclecount !== "" && v.filter.cycleunit !== undefined && v.filter.cycleunit !== "") {
+                  if (parseInt(v.filter.cycleunit) === 1) {
+                    vipInfo.cycle = v.filter.cyclecount + "年"
+                  } else if (parseInt(v.filter.cycleunit) === 2) {
+                    vipInfo.cycle = v.filter.cyclecount + "个月"
+                  } else {
+                    vipInfo.cycle = "7天"
+                  }
+                }
+                if (v.filter.cycleunit === 0 && v.filter.cyclecount === 0) {
+                  vipInfo.cycle = "不延期";
+                }
+                if (v.vip_endtime !== "" && v.vip_starttime !== "") {
+                  v.vip_starttime = formatTime(v.vip_starttime) + " - " + formatTime(v.vip_endtime)
+                }
+                if (v.order_status !== 1) {
+                  v.vip_starttime = "-"
+                }
+                v.vipInfo = vipInfo
+              }
+              // 大会员附加服务
+              if (v.product_type === '大会员-AI中标预测包' || v.product_type === '大会员-补充包' || v.product_type === '大会员-招标文件解读') {
+                v.memberAddInfo = {
+                  endTime: v.filter.effective_date,
+                  html: ''
+                }
+                if (v.vip_endtime != null) {
+                  v.memberAddInfo.endTime = formatTime(v.vip_endtime).replace(/\./g, "/");
+                }
+                var buchongbaoHtml = ''
+                if(v.product_type == "大会员-补充包"){
+                  var supplys = v.filter.supplys;
+                  if (supplys){
+                    for (var j = 0; j < supplys.length; j++) {
+                      var serviceUnit = '个'
+                      if (j > 1) {
+                        buchongbaoHtml += '<span>...</span>';
+                        break;
+                      }
+                      if (supplys[j]["id"] == "15" || supplys[j]["id"] == "6") {
+                        serviceUnit = "次"
+                      }
+                      buchongbaoHtml += '<span>'+ supplys[j]["name"] + '(' + supplys[j]["count"] + serviceUnit + ')'+'</span>'
+                    }
+                  }
+                }else  if(v.product_type == "大会员-AI中标预测包"){
+                  buchongbaoHtml += '<span>中标企业预测(' + v.filter.count*10 + '次)'+'</span>'
+                }else  if(v.product_type == "大会员-招标文件解读"){
+                  v.memberAddInfo.endTime="2021/11/15";
+                  buchongbaoHtml += '<span>招标文件解读(' + v.filter.count + '次)'+'</span>'
+                }
+                v.memberAddInfo.html = buchongbaoHtml
+              }
+              if (v.product_type === '大会员-子账号') {
+                // 大会员子账号
+                v.memberChildInfo = {
+                  level: this.bigIndexMap[v.filter.level],
+                  endTime: '',
+                  fee: v.filter.pay_sub_num,
+                  free: v.filter.free_sub_num
+                }
+                if (v.vip_endtime != null) {
+                  v.memberChildInfo.endTime = formatTime(v.vip_endtime).replace(/\./g, "/");
+                }
+              }
+              return v
+            })
+        }
+      },
+      mounted () {},
+      methods: {
+        goPay (item) {
+          var href = ''
+          switch (item.product_type) {
+            case '历史数据': {
+              href = '/front/dataexport/orderPay/' + item.order_code
+              break
+            }
+            case '中标必听课': {
+              if (item.filter.i_drawer === 1) {
+                href = '/front/onlineCourse/orderPay/' + item.order_code
+              } else {
+                href = '/jyxspc/pay-courser?order_code=' + item.order_code + '&id=' + item.filter._id + '&type=' + (item.pay_way.indexOf("wx") > -1 ? 0 : 1)
+              }
+              break
+            }
+            case '数据报告': {
+              href = '/front/datareport/orderPay/' + item.order_code
+              break
+            }
+            case 'VIP订阅': {
+              href = '/front/subvip/orderPay/' + item.order_code
+              break
+            }
+            case '企业商机管理': {
+              href = '/front/entniche/orderPay/' + item.order_code
+              break
+            }
+            case '大会员': {
+              href = '/front/entniche/orderPay/' + item.order_code
+              break
+            }
+            case '大会员-AI中标预测包': {
+              href = '/front/aiForecastPack/orderPay/' + item.order_code
+              break
+            }
+            case '大会员-补充包': {
+              href = '/front/aiForecastPack/orderPay/' + item.order_code
+              break
+            }
+            case '大会员-招标文件解读': {
+              href = '/front/aiForecastPack/orderPay/' + item.order_code
+              break
+            }
+            case '大会员-子账号': {
+              href = '/front/aiForecastPack/orderPay/' + item.order_code
+              break
+            }
+            case '招标文件解读': {
+              href = '/front/bidfile/orderPay/' + item.order_code
+              break
+            }
+            case '剑鱼币': {
+              href = '/front/integral/orderPay/' + item.order_code
+              break
+            }
+          }
+        },
+        goCancel (item) {
+          // toCancel()
+        },
+        goInvoice (item) {
+          if (item.applybill_status === 0) {
+            // check_over()
+          } else {
+            // checkinvoice
+          }
+        }
+      }
+    })
+</script>
 <script>
     var myPageNavIsNormal = true
     var totalPage = 1;
@@ -289,7 +1195,9 @@
             dataType: 'json',
             success: function (data) {
                 var temp = "";
+                data = tempJSON
                 if (data.res && data.res.length > 0) {
+                    orderListForVue.$set(orderListForVue.$data, 'list', data.res)
                     $(".pagination-box").show();
                     if (pageFlag) {
                         $(".pagination-box").html(pageHtml);
@@ -526,7 +1434,7 @@
                             if (obj.isUsedActiveCode) {
                                 cycleT = cycleT + '<span class="discount-container"><span> + </span><span class="highlight-text" style="color: #2cb7ca;">赠送30天</span></span>'
                             }
-                           
+
                             if (filter_.give_cycle&&filter_.original_price) {
                                 var giveTime = filter_.give_cycle
                                 giveTime = giveTime < 12 ? (giveTime + '个月') : ('1年')
@@ -732,11 +1640,11 @@
                                 level = "自定义"
                             }
                             var imgurl="/order/image/buchongbao.png"
-                           
+
                             shop_img_html += '<img src=' + imgurl + ' alt="">'
                             shop_main_html += '<p style="line-height: 24px;">有效日期：' + member_endtime + '到期</p>'
                                 + '<p style="line-height: 24px;display:flex;">服务列表：<span style="display: flex;flex-direction: column;">' + buchongbaoHtml + '</span></p>'
-                            
+
                             if (orderStatus === 0) {//0：待付款；
                                 var payNameTmp = "去支付"
                                 if (!(obj.pay_way === "transferAccounts" && (obj.course_status === 2 || obj.course_status === 4))) {

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))