Merge branch 'dev4.4' of http://192.168.3.207:10080/qmx/jy into dev4.4

src/jfw/modules/app/src/web/staticres/jyapp/me/js/mine.js

@@ -66,7 +66,6 @@ var mine = {
                     // 超级订阅状态(0-暂不使用vip订阅 1-试用 2-正式 -1-试用到期 -2-正式到期)
                     if (r.data.subscribeVip > 0) {
                         $('.user .u_left').addClass('vip')
-                        $('.ent-search').attr('data-href', '/jyapp/vipsubscribe/entSearch')
                     } else {
                         $(".govip").show();
                         $('.user .u_left').removeClass('vip')
@@ -221,6 +220,9 @@ var mine = {
                     if ($.isArray(res.data.power)) {
                         pageUserInfo.power = res.data.power
                     }
+                    if (res.viper) {
+                        $('.ent-search').show().attr('data-href', '/jyapp/vipsubscribe/entSearch')
+                    }
                     _this.setBigVipState()
                 }
             }

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

@@ -46,7 +46,7 @@ var Calculation = {
             },
             "provincePrice": 3800,
             "provinceMaxCount": 15,
-            "monthMaxCount": 9
+            "monthMaxCount": 10
         },
         "discount": 1
     }, //套餐价格表
@@ -59,7 +59,7 @@ var Calculation = {
         this.OldBuyset = oldBuyset;
         this.RenewList = renewList;
         this.EndTime = endTime;
-        //this.PriceRule = price;
+        if (price) this.PriceRule = price;
     },
     Check: function (tmpBuyset, oldBuyset) { //校验是否合法
         if (!oldBuyset) {
@@ -208,6 +208,7 @@ var Calculation = {
         } else {//新版大会员价格计算
             let pCount = vipbuyset.areacount
             let count = t[0]
+            let unit = t[1]
             if (pCount > this.PriceRule.new.provinceMaxCount) {
                 pCount = -1
             }
@@ -215,10 +216,11 @@ var Calculation = {
                 pCount = 0
             }
             //当选择月份大于  按照全年计算
-            if (t[0] > this.PriceRule.new.monthMaxCount && t[1] === 2) { //月份十个月以上价格一样
-                count = 10
+            if (t[0] > this.PriceRule.new.monthMaxCount && unit === 2) { //月份十个月以上价格一样
+                count = 1
+                unit = 1
             }
-            return this.getSetMealPrice_new(pCount, t[1]) * count //全国1行业套餐
+            return this.getSetMealPrice_new(pCount, unit) * count //全国1行业套餐
         }
     },
     getSetMealPrice_old: function (c, iCount, u) { //旧套餐价格计算

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

@@ -775,7 +775,7 @@ $(function () {
   $('.vip-footer .button-r.confirm').on('click', function () {
     console.log("object")
       $(this).attr("disabled", "disabled");
-      doSubmit();
+      // doSubmit();
       $(this).removeAttr("disabled");
   });
   // 以下数据交互 -------------------
@@ -789,13 +789,8 @@ $(function () {
       checkmerge(state.industry, state.isread)
       // init 已选择的区域和行业
       // var selectedAreaAndInd = getBuySet(state.area, state.industry);
-      // 2021-5-21修改 每次从接口buyset里取，不用通过common.js里公共函数处理 
-      var selectedAreaAndInd = {
-        areacount: state.buyset.areacount,
-        buyerclasscount: state.buyset.buyerclasscount,
-        citys: state.buyset.newcitys
-      }
-      console.log(selectedAreaAndInd, 'selectedAreaAndInd')
+      // 2021-5-21修改 初始化已选择的区域和行业 
+      var selectedAreaAndInd = getSelectBuyset(state.area, state.industry)
       setSelectedAreaAndInd(selectedAreaAndInd);
       // 初始化，已购买的城市和行业
       setBuyAreaAndInd(state.buyset);
@@ -865,6 +860,10 @@ $(function () {
             showGiveStatus(true)
           }
       }
+      // 如果购买的是升级版套餐且是全国全行业 则不显示升级按钮
+      if (state.buyset.upgrade === 1 && state.buyset.areacount == -1){
+        $('*[data-bind-update]').hide()
+      }
   }
 
 
@@ -875,6 +874,7 @@ $(function () {
   var readcache = sessionStorage.getItem('index_read_cache');
   var reqData = JSON.parse(subVipState);
   console.log(readcache,'readcache')
+  /*
   if (readcache) {
       sessionStorage.removeItem('index_read_cache');
       init(reqData);
@@ -917,7 +917,7 @@ $(function () {
       if (status[0] === -1) {
           //直接修改
           $(".vip-footer.modify").show();
-          doSubmit()
+          // doSubmit()
           // initBack(1);
           return
       }
@@ -992,7 +992,9 @@ $(function () {
 
   } else {
       getDataWitXHR()
-  }
+  }*/
+  // 每次请求接口
+  getDataWitXHR()
 
 
   //保存 or 升级

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

@@ -20,10 +20,11 @@ var renew = {
         renewList: []
     },
     init: function () {
+        this.initEvents()
         this.recoverState()
         this.getPrice()
         this.getBuySetInfo()
-        this.initEvents()
+        this.setTimePickerSelected(this.timeSelect)
     },
     setAreaAndIndustry: function () {
         var buySet = this.buyInfo.buyset
@@ -84,7 +85,7 @@ var renew = {
                             _this.buyInfo.buyset.areacount,
                             _this.buyInfo.buyset.newcitys,
                             _this.buyInfo.buyset.buyerclasscount,
-                            _this.buyInfo.buyset.upgrade
+                            _this.buyInfo.buyset.upgrade || 0
                         )
                     )
                     // 初始化默认金额
@@ -105,12 +106,14 @@ var renew = {
             }
         })
     },
-    calcPrice: function () {
-        return Calculation.GetTotal(undefined, this.timeSelect)
+    // 计算价格
+    calcPrice: function (timeSelect) {
+        return Calculation.GetTotal(undefined, timeSelect ? timeSelect : this.timeSelect)
     },
+    // 设置价格
     setPrice: function (price) {
         this.price = price
-        coupon.updatePrice(formatMoney(this.price / 100))
+        coupon.updatePrice(this.price / 100)
     },
     // 根据选中结果得到一个时间段的时间戳
     getDuration: function (timeSelect) {
@@ -173,14 +176,14 @@ var renew = {
             month: month
         }
     },
-    checkOver3Years: function () {
+    checkOver3Years: function (timeSelect) {
         // 根据
         var endTime = this.buyInfo.endTime
         if (!endTime) {
             return
         }
         var maxEndMonth = 36 // 最大续费36个月
-        var durationInfo = this.getDuration(this.timeSelect)
+        var durationInfo = this.getDuration(timeSelect)
         var durationStamp = durationInfo.stamp // 续费时间段时间戳
 
         // 最长订阅周期不可超过3年 ------------
@@ -213,15 +216,19 @@ var renew = {
         }
     },
     setTimePickerSelected: function (timeSelect) {
-        timeSelect = [1 ,2]
-        if (timeSelect[1] === 1) {
+        if (timeSelect[1] == 1) {
             // 年
-            dStamp = timeSelect[0] * 12 * perMonthStamp
-            s = timeSelect[0] + '年'
-        } else if (timeSelect[1] === 2) {
+            var cButton = $('.year_number.j-button-select[data-id=' + timeSelect[0] + ']')
+            if (cButton) {
+                cButton.trigger('click')
+            } else {
+                $('input[value=year]').trigger('click')
+            }
+        } else if (timeSelect[1] == 2) {
             // 月
-            dStamp = timeSelect[0] * perMonthStamp
-            s = timeSelect[0] + '个月'
+            $('input[value=month]').trigger('click')
+            $('#number_box_month .month_number').text(timeSelect[0] - 1)
+            $('#number_box_month button.add').trigger('click')
         }
     },
     getTimePickerSelected: function () {
@@ -241,10 +248,10 @@ var renew = {
         return timeSelectedArr
     },
     onTimePickerChange: function () {
-        this.timeSelect = this.getTimePickerSelected()
-        var price = this.calcPrice()
+        var timeSelect = this.getTimePickerSelected()
+        var price = this.calcPrice(timeSelect)
         $('.computed_price').text(formatMoney(price / 100))
-        this.checkOver3Years()
+        this.checkOver3Years(timeSelect)
     },
     // 恢复数据
     recoverState: function () {
@@ -278,8 +285,10 @@ var renew = {
         // 确认订阅周期
         $('#enter_period').on('click', function () {
             $('.weui-mask').trigger('click')
+            _this.timeSelect = _this.getTimePickerSelected()
             _this.calcDuration(true)
             _this.setPrice(_this.calcPrice())
+            _this.saveState()
         })
 
         $('.vip-footer.renew .confirm').on('click', function () {

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

@@ -107,7 +107,7 @@ var purchase = {
     var old = this.oldBuySet
     //初始化 非试用用户 已经购买了 1个省份 两个省份【1个城市、两个城市】 3个行业 非升级版超级订阅
     console.log(new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade))
-    Calculation.Init(this.isTrial,new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade),this.renewList, undefined, this.endTime)
+    Calculation.Init(this.isTrial,new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade),this.renewList,  purchase.price, this.endTime)
 
     if (sessionStorage.getItem("payWay")) {
       if (sessionStorage.getItem("payWay").indexOf("ali") > -1) {
@@ -191,13 +191,17 @@ var purchase = {
     }
     this.timeValue = tmp;
   },
+  // 计算价格
   flushPrice: function (time, flag) {
-    //var price = getsubVipOrderPrice(this.areaSelect, this.industrySelect, time, this.price);
     var times = [time[0], time[1]];
     // var price = getsubVipOrderPriceBybuyset(this.nowBuyset, time); // 2021-5-20
     // var givePrice = getsubVipOrderPriceBybuyset(this.nowBuyset, [time[1] === 1 ? 1 : time[0], time[1]]); // 2021-5-20
     var obj = this.nowBuyset
-    console.log(obj, 'obj')
+    console.log(obj,  this.oldBuySet,'obj')
+    // 处理如果升级的
+    if (obj.areacount > this.oldBuySet.areacount) {
+      obj.areacount = this.oldBuySet.areacount
+    }
     var price = Calculation.GetUpgradeDetail(new Buyset(obj.areacount,[],obj.buyerclasscount,1), time)
     var givePrice = Calculation.GetUpgradeDetail(new Buyset(obj.areacount,[],obj.buyerclasscount,1), [time[1] === 1 ? 1 : time[0], time[1]])
     console.log(typeof price,price, 'price')

src/jfw/modules/app/src/web/templates/me/mine.html

@@ -138,7 +138,7 @@
                             <span class="j-icon base-icon icon-arrow-right"></span>
                         </div>
                     </div>
-                    <div data-need-bind-phone class="menu_list ent-search" data-href='/jyapp/vipsubscribe/introducePage'>
+                    <div data-need-bind-phone class="menu_list ent-search" style="display: none;" data-href='/jyapp/vipsubscribe/introducePage'>
                         <div class="menu_list_left">
                             <span class="j-icon base-icon icon-qiyechaxun"></span>
                             <span class="label">企业查询</span>

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

@@ -7,6 +7,7 @@
     text-align: center;
     font-size: .26rem;
     color: #5F5E64;
+    flex-shrink: 0;
   }
   .rights-item{
     padding: .32rem .28rem;

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

@@ -107,9 +107,13 @@
     }
 
     .j-button-confirm {
-      flex: none;
+      flex: 1;
+      width: 100%!important;
       border-radius: 0.08rem;
     }
+    .j-button-confirm:nth-child(1){
+      margin-right: .16rem;
+    }
   </style>
 </head>
 

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

@@ -233,7 +233,7 @@
                 </table>
                 <dl class="tips">
                   <dt class="b-line">购买须知</dt>
-                  <dd>套餐周期内，不支持套餐降级，续费可降级；</dd>
+                  <dd>套餐周期内，不支持套餐降级；</dd>
                   <dd>用户最多购买/续费3年套餐；</dd>
                   <dd>支持套餐升级，补差价（按月进行补差价，不足一个月按一个月计算）。</dd>
                   <!-- <dd>3个市及以上即为全省，16个省及以上即为全国。4个行业及以上即为全行业。</dd> -->
@@ -461,7 +461,7 @@
       <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
       <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
       <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-      <!-- <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script> -->
+      <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "mod_version"}}"></script>
       <!--<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
       <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/price.js?v={{Msg "seo" "version"}}"></script>
       <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js></script>

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -348,6 +348,9 @@ func (this *vipSubscribeStruct) UpgradeSubVip(userId string, vmsg VipSimpleMsg,
 
 //超级订阅获取购买项
 func (this *vipSubscribeStruct) NewBuySet(area *map[string]interface{}, industry []string, isUpgrade bool) *SubvipBuySet {
+	if area != nil && (*area)["全国"] != nil {
+		area = &map[string]interface{}{}
+	}
 	buyset := SubvipBuySet{}
 	if !isUpgrade {
 		buyset.Upgrade = 0 //升级版超级订阅标识
@@ -562,7 +565,8 @@ func (this *vipSubscribeStruct) GetSubVipPriceByBuySet(buySet *SubvipBuySet, cou
 			}
 			//当选择月份大于  按照全年计算
 			if count > SubVipPrice.New.MonthMaxCount && unit == 2 { //月份十个月以上价格一样
-				count = 10
+				unit = 1
+				count = 1
 			}
 			return getSetMealPrice(pCount, unit) * count //全国1行业套餐
 		}

src/jfw/modules/subscribepay/src/subvip_price.json

@@ -35,7 +35,7 @@
     },
     "provincePrice": 3800,
     "provinceMaxCount": 15,
-    "monthMaxCount": 9
+    "monthMaxCount": 10
   },
   "discount": 1
 }

src/web/staticres/vipsubscribe/js/price.js

@@ -46,7 +46,7 @@ var Calculation = {
             },
             "provincePrice": 3800,
             "provinceMaxCount": 15,
-            "monthMaxCount": 9
+            "monthMaxCount": 10
         },
         "discount": 1
     }, //套餐价格表
@@ -59,7 +59,7 @@ var Calculation = {
         this.OldBuyset = oldBuyset;
         this.RenewList = renewList;
         this.EndTime = endTime;
-        //this.PriceRule = price;
+        if (price) this.PriceRule = price;
     },
     Check: function (tmpBuyset, oldBuyset) { //校验是否合法
         if (!oldBuyset) {
@@ -208,6 +208,7 @@ var Calculation = {
         } else {//新版大会员价格计算
             let pCount = vipbuyset.areacount
             let count = t[0]
+            let unit = t[1]
             if (pCount > this.PriceRule.new.provinceMaxCount) {
                 pCount = -1
             }
@@ -215,10 +216,11 @@ var Calculation = {
                 pCount = 0
             }
             //当选择月份大于  按照全年计算
-            if (t[0] > this.PriceRule.new.monthMaxCount && t[1] === 2) { //月份十个月以上价格一样
-                count = 10
+            if (t[0] > this.PriceRule.new.monthMaxCount && unit === 2) { //月份十个月以上价格一样
+                count = 1
+                unit = 1
             }
-            return this.getSetMealPrice_new(pCount, t[1]) * count //全国1行业套餐
+            return this.getSetMealPrice_new(pCount, unit) * count //全国1行业套餐
         }
     },
     getSetMealPrice_old: function (c, iCount, u) { //旧套餐价格计算

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

@@ -776,7 +776,7 @@ $(function () {
     //提交请求
     $('.vip-footer .button-r.confirm').on('click', function () {
         $(this).attr("disabled", "disabled");
-        doSubmit();
+        // doSubmit();
         $(this).removeAttr("disabled");
     });
     // 以下数据交互 -------------------
@@ -790,12 +790,8 @@ $(function () {
         checkmerge(state.industry, state.isread)
         // init 已选择的区域和行业
         // var selectedAreaAndInd = getBuySet(state.area, state.industry);
-        // 2021-5-21修改 每次从接口buyset里取，不用通过common.js里公共函数处理 
-        var selectedAreaAndInd = {
-          areacount: state.buyset.areacount,
-          buyerclasscount: state.buyset.buyerclasscount,
-          citys: state.buyset.newcitys
-        }
+        // 2021-5-21修改
+        var selectedAreaAndInd = getSelectBuyset(state.area, state.industry)
         setSelectedAreaAndInd(selectedAreaAndInd);
         // 初始化，已购买的城市和行业
         setBuyAreaAndInd(state.buyset);
@@ -873,6 +869,10 @@ $(function () {
             showGiveStatus(true)
           }
         }
+        // 如果购买的是升级版套餐且是全国全行业 则不显示升级按钮
+        if (state.buyset.upgrade === 1 && state.buyset.areacount == -1){
+          $('*[data-bind-update]').hide()
+        }
     }
 
 
@@ -922,7 +922,7 @@ $(function () {
         if (status[0] === -1) {
             //直接修改
             $(".vip-footer.modify").show();
-            doSubmit()
+            // doSubmit()
             // initBack(1);
             return
         }

src/web/staticres/vipsubscribe/js/vip_renew.js

@@ -20,10 +20,11 @@ var renew = {
         renewList: []
     },
     init: function () {
+        this.initEvents()
         this.recoverState()
         this.getPrice()
         this.getBuySetInfo()
-        this.initEvents()
+        this.setTimePickerSelected(this.timeSelect)
     },
     setAreaAndIndustry: function () {
         var buySet = this.buyInfo.buyset
@@ -84,7 +85,7 @@ var renew = {
                             _this.buyInfo.buyset.areacount,
                             _this.buyInfo.buyset.newcitys,
                             _this.buyInfo.buyset.buyerclasscount,
-                            _this.buyInfo.buyset.upgrade
+                            _this.buyInfo.buyset.upgrade || 0
                         )
                     )
                     // 初始化默认金额
@@ -105,12 +106,14 @@ var renew = {
             }
         })
     },
-    calcPrice: function () {
-        return Calculation.GetTotal(undefined, this.timeSelect)
+    // 计算价格
+    calcPrice: function (timeSelect) {
+        return Calculation.GetTotal(undefined, timeSelect ? timeSelect : this.timeSelect)
     },
+    // 设置价格
     setPrice: function (price) {
         this.price = price
-        coupon.updatePrice(formatMoney(this.price / 100))
+        coupon.updatePrice(this.price / 100)
     },
     // 根据选中结果得到一个时间段的时间戳
     getDuration: function (timeSelect) {
@@ -173,14 +176,14 @@ var renew = {
             month: month
         }
     },
-    checkOver3Years: function () {
+    checkOver3Years: function (timeSelect) {
         // 根据
         var endTime = this.buyInfo.endTime
         if (!endTime) {
             return
         }
         var maxEndMonth = 36 // 最大续费36个月
-        var durationInfo = this.getDuration(this.timeSelect)
+        var durationInfo = this.getDuration(timeSelect)
         var durationStamp = durationInfo.stamp // 续费时间段时间戳
 
         // 最长订阅周期不可超过3年 ------------
@@ -213,15 +216,19 @@ var renew = {
         }
     },
     setTimePickerSelected: function (timeSelect) {
-        timeSelect = [1 ,2]
-        if (timeSelect[1] === 1) {
+        if (timeSelect[1] == 1) {
             // 年
-            dStamp = timeSelect[0] * 12 * perMonthStamp
-            s = timeSelect[0] + '年'
-        } else if (timeSelect[1] === 2) {
+            var cButton = $('.year_number.j-button-select[data-id=' + timeSelect[0] + ']')
+            if (cButton) {
+                cButton.trigger('click')
+            } else {
+                $('input[value=year]').trigger('click')
+            }
+        } else if (timeSelect[1] == 2) {
             // 月
-            dStamp = timeSelect[0] * perMonthStamp
-            s = timeSelect[0] + '个月'
+            $('input[value=month]').trigger('click')
+            $('#number_box_month .month_number').text(timeSelect[0] - 1)
+            $('#number_box_month button.add').trigger('click')
         }
     },
     getTimePickerSelected: function () {
@@ -241,10 +248,10 @@ var renew = {
         return timeSelectedArr
     },
     onTimePickerChange: function () {
-        this.timeSelect = this.getTimePickerSelected()
-        var price = this.calcPrice()
+        var timeSelect = this.getTimePickerSelected()
+        var price = this.calcPrice(timeSelect)
         $('.computed_price').text(formatMoney(price / 100))
-        this.checkOver3Years()
+        this.checkOver3Years(timeSelect)
     },
     // 恢复数据
     recoverState: function () {
@@ -278,8 +285,10 @@ var renew = {
         // 确认订阅周期
         $('#enter_period').on('click', function () {
             $('.weui-mask').trigger('click')
+            _this.timeSelect = _this.getTimePickerSelected()
             _this.calcDuration(true)
             _this.setPrice(_this.calcPrice())
+            _this.saveState()
         })
 
         $('.vip-footer.renew .confirm').on('click', function () {
@@ -557,6 +566,7 @@ var coupon = new Vue({
     // 阅读协议点击事件
     readEvent: function () {
       renew.saveState()
+      toRead()
     },
     // 订单提交事件
     submitOrder: function () {

src/web/staticres/vipsubscribe/js/vip_upgrade.js

@@ -195,6 +195,9 @@ var purchase = {
 
     var obj = this.nowBuyset
     console.log(obj, 'obj')
+    if (obj.areacount > this.oldBuySet.areacount) {
+      obj.areacount = this.oldBuySet.areacount
+    }
     var price = Calculation.GetUpgradeDetail(new Buyset(obj.areacount,[],obj.buyerclasscount,1), time)
     var givePrice = Calculation.GetUpgradeDetail(new Buyset(obj.areacount,[],obj.buyerclasscount,1), [time[1] === 1 ? 1 : time[0], time[1]])
     console.log(typeof price,price, 'price')
@@ -571,6 +574,11 @@ function clearSessionStorage() {
   sessionStorage.removeItem("historypushDataCache");
   sessionStorage.removeItem("endTime");
   sessionStorage.To_introducePage = 2;
+
+  // 2021-5-20添加
+  sessionStorage.removeItem("vipSub_isTrial");
+  sessionStorage.removeItem("vipSub_renewList");
+  sessionStorage.removeItem("vipSub_oldBuySet");
   //订阅首页
   sessionStorage.removeItem("sub_vip_state");
   sessionStorage.removeItem("vip_index_read");

src/web/templates/common/commonRules.html

@@ -7,6 +7,7 @@
     text-align: center;
     font-size: .26rem;
     color: #5F5E64;
+    flex-shrink: 0;
   }
   .rights-item{
     padding: .32rem .28rem;

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

@@ -72,9 +72,13 @@
     }
 
     .j-button-confirm {
-      flex: none;
+      flex: 1;
+      width: 100%!important;
       border-radius: 0.08rem;
     }
+    .j-button-confirm:nth-child(1){
+      margin-right: .16rem;
+    }
     </style>
 </head>
 

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

@@ -174,8 +174,8 @@
                     -->
                     <!-- 超级订阅专属权益 封装为公共页面-->
                     {{include "/common/commonRules.html"}}
-                    <div class="vip_prise_table" style="display: none;">
-                        <table class="monthly">
+                    <div class="vip_prise_table">
+                        <table class="monthly" style="display: none;">
                             <caption class="table_title b-line">超级订阅价格</caption>
                             <tr>
                                 <td class="table-label" colspan="2">按月购买</td>
@@ -193,7 +193,7 @@
                                 <td><span>388</span>元 月/全国/全行业</td>
                             </tr>
                         </table>
-                        <table class="yearly">
+                        <table class="yearly" style="display: none;">
                             <tr>
                                 <td class="table-label" colspan="2">按年购买</td>
                             </tr>
@@ -212,10 +212,10 @@
                         </table>
                         <dl class="tips">
                             <dt class="b-line">购买须知</dt>
-                            <dd>套餐周期内，不支持套餐降级，续费可降级；</dd>
+                            <dd>套餐周期内，不支持套餐降级；</dd>
                             <dd>用户最多购买/续费3年套餐；</dd>
-                            <dd>支持套餐升级，补差价（按月进行补差价，不足一个月按一个月计算)。</dd>
-                            <dd>3个市及以上即为全省，10个省及以上即为全国。4个行业及以上即为全行业。</dd>
+                            <dd>支持套餐升级，补差价（按月进行补差价，不足一个月按一个月计算）。</dd>
+                            <!-- <dd>3个市及以上即为全省，10个省及以上即为全国。4个行业及以上即为全行业。</dd> -->
                             <dd>购买的采购单位行业与地域为个数，购买后可不限次数进行更换。</dd>
                         </dl>
                     </div>

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

@@ -134,8 +134,7 @@
                 </div>
                 <div class="clause-box">
                     <span class="checkbox"></span>
-                    <span class="clause-read">我已阅读，理解并接受<a
-                                href="/front/staticPage/wx-serviceterms.html">《剑鱼标讯线上购买与服务条款》</a></span>
+                    <span class="clause-read" onclick="toRead">我已阅读，理解并接受<a onclick="toRead()">《剑鱼标讯线上购买与服务条款》</a></span>
                 </div>
             </div>
             <div class="footer-button-group j-footer">
@@ -398,6 +397,10 @@
         }
     });
 
+    function toRead () {
+        sessionStorage.setItem('pay_read_cache', '0');
+        window.location.href = '/front/staticPage/wx-serviceterms.html'
+    }
 
     document.body.addEventListener("focusout", function () {
         //软键盘收起的事件处理