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

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

@@ -102,8 +102,9 @@ var purchase = {
     } catch (e) {
       console.log(e)
     }
-    this.nowBuyset = getBuySet(purchase.areaSelect, purchase.industrySelect, this.price);
-
+    // console.log(purchase.areaSelect, 'purchase.areaSelect')
+    this.nowBuyset = getBuySet(purchase.areaSelect, purchase.industrySelect, this.price)
+    // console.log(this.nowBuyset)
     var old = this.oldBuySet
     // 选择完区域回显后 需判断选择省份结果
     // if (purchase.nowBuyset.areacount == -1) {
@@ -113,6 +114,16 @@ var purchase = {
     //     old.areacount = purchase.nowBuyset.areacount
     //   }
     // }
+    // 老套餐0：选择省份数量大于原省份数量 新套餐1： 选择省份数量大于等于原省份数量
+    if (purchase.oldBuySet.upgrade == 0) {
+      if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length <= old.areacount) {
+        $('.error-update-tips').show()
+      }
+    } else {
+      if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length < old.areacount) {
+        $('.error-update-tips').show()
+      }
+    }
     //初始化 
     Calculation.Init(this.isTrial,new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade),this.renewList,  purchase.price, this.endTime)
 
@@ -203,7 +214,6 @@ var purchase = {
     // 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,  this.oldBuySet,'obj')
     /* 处理 
       1.如果原选择的是全国，则不让跳转选择区域
       2.当前选择的省份数量大于原省份数量 则按当前选择的数量
@@ -212,14 +222,12 @@ var purchase = {
     */
     if (this.oldBuySet.areacount == -1) {
       $('[data-upgrade-to-area]').attr('href', 'javascript:;')
-      // $('[data-upgrade-to-area] .iconfont').hide()
     } else {
       // 如果原购买的省份数量大于当前选择的 则按最大的数量走
       if (obj.areacount != -1 && this.oldBuySet.areacount > obj.areacount) {
         obj.areacount = this.oldBuySet.areacount
       }
     }
-    console.log(obj.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')
@@ -244,7 +252,7 @@ var purchase = {
     }
     this.flushSelectTime(times, flag === undefined ? 1 : flag);
     
-    coupon.updatePrice(price)
+    coupon.updatePrice(Number(price) < 0 ? 0 : price)
   },
   flushSelectTime (thisValue, flag) {
     if (this.endTime) {
@@ -299,10 +307,16 @@ var purchase = {
     }
   },
   flushSubmit () { //是否可提交
+    // 判断原价小于等于0  不可提交
     if (this.timeCheckOk && sessionStorage.getItem("vipSub_read") === "true") {
       $('.vip-footer.renew .confirm').prop('disabled', false)
       coupon.checkboxStatus = true
       coupon.$refs.couponRef.submitStatus = false
+      if (!$('.error-update-tips').is(':hidden')) {
+        coupon.$refs.couponRef.submitStatus = true
+      } else {
+        coupon.$refs.couponRef.submitStatus = false
+      }
     } else {
       $('.vip-footer.renew .confirm').prop('disabled', true)
       coupon.$refs.couponRef.submitStatus = true
@@ -674,7 +688,7 @@ var coupon = new Vue({
     checkSubmitStatus: function (checkStatus) {
       sessionStorage.setItem("vipSub_read", checkStatus);
       purchase.flushSubmit();
-      return purchase.timeCheckOk && sessionStorage.getItem("vipSub_read") === "true"
+      return purchase.timeCheckOk && sessionStorage.getItem("vipSub_read") === "true" &&  $('.error-update-tips').is(':hidden')
     },
     saveEvent: function () {
       sessionStorage.setItem("pay_read_cache", "0");

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

@@ -31,6 +31,12 @@
     button[disabled] {
       opacity: .5;
     }
+    .error-update-tips{
+      display: none;
+      margin-top: .12rem;
+      font-size: .24rem;
+      color:#FE737A;
+    }
   </style>
 </head>
 
@@ -60,6 +66,7 @@
                 <span>已选择</span>
                 <span class="text selected-area"></span>
               </div>
+              <p class="error-update-tips">选择省份数量低于原套餐数，无法升级，请增加省份数量</p>
             </a>
           </li>
           <li class="body-item select_cycle">

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

@@ -902,6 +902,8 @@
                 // var price = getsubVipOrderPriceBybuyset(this.nowBuyset, time);
                 // var givePrice = getsubVipOrderPriceBybuyset(this.nowBuyset, [time[1] === 1 ? 1 :time[0], time[1]]);
                 var obj = this.nowBuyset
+                // console.log(obj, 'obj')
+                obj.areacount = obj.areacount == 0 ? 1 : obj.areacount
                 var price = Calculation.GetTotal(new Buyset(obj.areacount,[],obj.buyerclasscount, 1),time)
                 var givePrice = Calculation.GetTotal(new Buyset(obj.areacount,[],obj.buyerclasscount, 1),[time[1] === 1 ? 1 :time[0], time[1]])
                 price = (price / 100)

src/web/staticres/digital_expo/css/index.css

@@ -178,7 +178,8 @@ p.text--y {
     color:#FFFFFF;
 }
 .list-info {
-    margin:0.24rem 0.64rem;
+    position: relative;
+    padding :0.24rem 0.64rem;
 }
 .title-box h3 {
     font-weight:bold;
@@ -299,6 +300,11 @@ p.text--y {
 .play-icon-box p {
     margin-left:0.08rem;
 }
+.fixed-play.play-icon-box {
+    position: absolute;
+    right: 0;
+    bottom: 1.12rem;
+}
 .play-icon-box {
     width:1.6rem;
     height:0.8rem;

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

@@ -876,6 +876,8 @@ $(function () {
             $('*[data-bind-update]').hide()
           }
         }
+        // 清除升级页面的区域选择
+        sessionStorage.removeItem('vipSubSelectArea')
     }
 
 

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

@@ -29,7 +29,7 @@ var purchase = {
         $('.coupon-code-tx').off('click');
       }
       //即将到期 回显已购买
-      if (!sessionStorage.getItem("vipSubSelectArea") || !sessionStorage.getItem("vipSubSelectIndustry")) {
+      if (!sessionStorage.getItem("vipSubSelectArea")) {
         $DoPost("/subscribepay/vipsubscribe/getSubBuyMsg", {}, function (r) {
           if (r.success) {
             if (!$.isEmptyObject(r.data.area)) {
@@ -113,17 +113,18 @@ var purchase = {
       console.log(e)
     }
     this.nowBuyset = getBuySet(purchase.areaSelect, purchase.industrySelect, this.price);
+    console.log(this.nowBuyset,this.oldBuySet)
     var old = this.oldBuySet
     //初始化 非试用用户 已经购买了 1个省份 两个省份【1个城市、两个城市】 3个行业 非升级版超级订阅
-    // 选择完区域回显后 需判断选择省份结果与原购买的省份结果进行对比，取最多的值
-    // if (purchase.nowBuyset.areacount == -1) {
-    //   old.areacount = -1
-    // } else {
-    //   if (purchase.nowBuyset.areacount > old.areacount) {
-    //     old.areacount = purchase.nowBuyset.areacount
-    //   }
-    // }
-    console.log(old)
+    if (purchase.oldBuySet.upgrade == 0) {
+      if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length <= old.areacount) {
+        $('.error-update-tips').show()
+      }
+    } else {
+      if (this.nowBuyset.areacount != -1 && Object.keys(purchase.areaSelect).length < old.areacount) {
+        $('.error-update-tips').show()
+      }
+    }
     Calculation.Init(this.isTrial,new Buyset(old.areacount, old.newcitys, old.buyerclasscount,old.upgrade),this.renewList, purchase.price, this.endTime)
   },
   showArea: function () {
@@ -210,7 +211,7 @@ var purchase = {
       3.当前选择的省份数量小于原省份数量 则按原省份数量
       总：按照选择最多省份数量的计算
     */
-    console.log(obj, 'obj')
+    
     if (this.oldBuySet.areacount == -1) {
       $('[data-upgrade-to-area]').attr('href', 'javascript:;')
       // $('[data-upgrade-to-area] .iconfont').hide()
@@ -221,10 +222,9 @@ var purchase = {
         obj.areacount = this.oldBuySet.areacount
       }
     }
-    
+    console.log(obj, 'obj')
     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')
     price = price[0] / 100
 
     var showPrice = formatMoney(price);
@@ -261,7 +261,7 @@ var purchase = {
       $('.now-price .dis-price').text(formatMoney(price));
     }
     this.flushSelectTime(times, flag === undefined ? 1 : flag);
-    coupon.updatePrice(price)
+    coupon.updatePrice(Number(price) < 0 ? 0 : price)
   },
   flushSelectTime(thisValue, flag) {
     if (this.endTime) {
@@ -319,6 +319,12 @@ var purchase = {
   flushSubmit() {//是否可提交
     if (this.timeCheckOk && sessionStorage.getItem("vipSub_read") === "true") {
       $('.vip-footer.renew .confirm').prop('disabled', false)
+      console.log(coupon.initPrice, 'coupon.initPrice')
+      if (!$('.error-update-tips').is(':hidden')) {
+        coupon.$refs.couponRef.submitStatus = true
+      } else {
+        coupon.$refs.couponRef.submitStatus = false
+      }
     } else {
       $('.vip-footer.renew .confirm').prop('disabled', true)
     }
@@ -559,7 +565,8 @@ $(function () {
     var param = {
       "userLotteryId":coupon.$refs.couponRef.coupon.userLotteryId,
       "lotteryId": coupon.$refs.couponRef.coupon.lotteryId,
-      "area": JSON.stringify(area),
+      "area": flag ? JSON.stringify(area) : '',
+      'area_count': flag ? 0 : areaCount,
       // "industry": industry.join(","),
       'price': coupon.initPrice*100,
       "time": purchase.timeValue.trim(),
@@ -726,7 +733,7 @@ var coupon = new Vue({
       var endTime = sessionStorage.getItem('endTime')
       var readSelect = sessionStorage.getItem('vipSub_read') === 'true' ? true : false
       purchase.flushSubmit();
-      return Object.keys(areaSelect).length > 0 && industrySelect.length > 0 && readSelect
+      return Object.keys(areaSelect).length > 0 && industrySelect.length > 0 && readSelect && $('.error-update-tips').is(':hidden')
     },
     saveEvent: function() {
       // sessionStorage.setItem("vipSub_read", 0)

src/web/templates/active/digital/index.html

@@ -172,6 +172,10 @@
                         <p>创建跟踪列表，追踪结果及时结果反馈</p>
                     </div>
                 </div>
+                <div class="flex-r-c center play-icon-box fixed-play" data-media="1">
+                    <img class="icon-s-32" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_play.png?v={{Msg "seo" "digital_v"}}' alt="">
+                    <p>介绍<br>视频</p>
+                </div>
             </div>
 
             <div class="flex-c-c center data-info">
@@ -217,10 +221,10 @@
                         <p>企业情报监控</p>
                         <span>商业情报，一手掌控</span>
                     </div>
-                    <div class="flex-r-c center play-icon-box" data-media="1">
-                        <img class="icon-s-32" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_play.png?v={{Msg "seo" "digital_v"}}' alt="">
-                        <p>介绍<br>视频</p>
-                    </div>
+<!--                    <div class="flex-r-c center play-icon-box" data-media="1">-->
+<!--                        <img class="icon-s-32" src='{{Msg "seo" "cdn"}}/digital_expo/zip-image/page/icon_play.png?v={{Msg "seo" "digital_v"}}' alt="">-->
+<!--                        <p>介绍<br>视频</p>-->
+<!--                    </div>-->
                 </div>
                 <div class="flex flex-r-c wrap center left m-t-24 circle-text-group p-32 wrap-list">
                     <div class="flex-r-c center left circle-text-box">

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

@@ -29,6 +29,12 @@
     button[disabled] {
       opacity: .5;
     }
+    .error-update-tips{
+      display: none;
+      margin-top: .12rem;
+      font-size: .24rem;
+      color:#FE737A;
+    }
   </style>
 </head>
 
@@ -49,6 +55,7 @@
                 <span class="item-l">行业：</span>
                 <span class="item-r"></span>
               </div> -->
+              <p class="error-update-tips">选择省份数量低于原套餐数，无法升级，请增加省份数量</p>
             </a>
           </li>
           <li class="body-item select_cycle">

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

@@ -876,6 +876,7 @@
                         // var price = getsubVipOrderPriceBybuyset(this.nowBuyset, time);
                         // var givePrice = getsubVipOrderPriceBybuyset(this.nowBuyset, [time[1] === 1 ? 1 : time[0], time[1]]);
                         var obj = this.nowBuyset
+                        obj.areacount = obj.areacount == 0 ? 1 : obj.areacount
                         var price = Calculation.GetTotal(new Buyset(obj.areacount,[],obj.buyerclasscount, 1),time)
                         var givePrice = Calculation.GetTotal(new Buyset(obj.areacount,[],obj.buyerclasscount, 1),[time[1] === 1 ? 1 :time[0], time[1]])
                         price = (price / 100)