修改

src/web/staticres/vipsubscribe/js/UpgradePrice.js

@@ -196,11 +196,11 @@ function needUpgrade(newBuyset, oldBuyset) {
 //获取支付价格
 //-1 不用升级 -2 不能升级
 function getUpgradeFinalStatus(newBuyset, oldBuyset, t, endUnix, renewList, isTrail) {
+    var Upgradestatus = needUpgrade(newBuyset, oldBuyset);
     if (isTrail) {
         var trailPay = getsubVipOrderPriceBybuyset(newBuyset, t);//试用用户购买
-        return [trailPay, true, true, []]
+        return [trailPay, Upgradestatus[1], Upgradestatus[2], []]
     }
-    var Upgradestatus = needUpgrade(newBuyset, oldBuyset);
     var Upgrade = Upgradestatus[0];
     console.log("Upgrade", Upgrade, Upgradestatus);
     if (Upgrade === -1) {

src/web/staticres/vipsubscribe/js/change_area.js

@@ -105,6 +105,9 @@ $(function () {
             citys: areaData.data.buyset.newcitys,
             buyerclasscount: areaData.data.buyset.buyerclasscount
         })[1]) {
+            if (areaData.data.isTrial) {
+                $(".result-selected .info-tip").text("已超出现订单购买范围，需购买");
+            }
             $(".result-selected .info-tip").show();
         } else {
             $(".result-selected .info-tip").hide();

src/web/staticres/vipsubscribe/js/change_industry.js

@@ -30,6 +30,9 @@ var array = data.data.industry;//已选择的行业（数组）
 var result = [];//声明一个空数组为选择结果
 // 初始化行业数据，渲染到页面
 function initData() {
+    if (data.data.isTrial) {
+        $('.update_tips').text("已超出现订单购买范围，需购买")
+    }
     buyCount = data.data.buyset.buyerclasscount;//已购买的行业数量  -1是全部行业，正数为购买的行业数量
     array = data.data.industry;//已选择的行业（数组）
     /* 已购买过的行业 */
@@ -54,7 +57,9 @@ function initData() {
             }
         })
     }
+    resultCount();
 }
+
 // 实时改变选择结果
 function resultCount() {
     $('.result_count').empty();
@@ -90,8 +95,9 @@ function resultCount() {
         result = canChangeArr;
     }
 }
+
 $(function () {
-    
+
     // 公共资源交易介绍提示框
     $('#showTips').click(function (e) {
         e.stopPropagation();
@@ -142,7 +148,7 @@ $(function () {
         })
     }
 
-    var subVipState =  sessionStorage.getItem('sub_vip_state')
+    var subVipState = sessionStorage.getItem('sub_vip_state')
     if (subVipState) {
         data.data = JSON.parse(subVipState)
         initData();

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

@@ -526,7 +526,7 @@ $(function () {
         var change = sessionStorage.getItem("vip_change_time");
         var endflag = state.endTime;
         var stratFlag = state.startTime;
-        if (state.isTrial) {
+        if (state.isTrial && change) {
             // 初始化订阅周期
             endflag = new Date().getTime() / 1000;
             stratFlag = new Date().getTime() / 1000;
@@ -635,14 +635,6 @@ $(function () {
             });
             return
         }
-
-        if (status[0] > 0) {
-            //需要付钱
-            $(".vip-footer.upgrade").show();
-            //价格展示
-            $(".vip-footer.upgrade .billing-price").text("￥" + formatMoney(status[0]));
-            submitPrice = status[0] * 10000 / 100
-        }
         //区域需要升级
         if (status[1]) {
             if (reqData.isTrial) {
@@ -657,6 +649,21 @@ $(function () {
             }
             $(".body-item.industry .tip-need-upgrade").show()
         }
+        if (changeTime.length === 0 && reqData.isTrial) {//试用用户购买未选择时间
+            weui.toast('请选择订阅周期', {
+                duration: 3000,
+                className: 'jy-toast',
+            });
+            return
+        }
+        if (status[0] > 0) {
+            //需要付钱
+            $(".vip-footer.upgrade").show();
+            //价格展示
+            $(".vip-footer.upgrade .billing-price").text("￥" + formatMoney(status[0]));
+            submitPrice = status[0] * 10000 / 100
+        }
+
 
         if (!status[1] && !status[2]) {
             $(".vip-footer.upgrade .confirm").text("立即续费");
@@ -690,7 +697,17 @@ $(function () {
 
 
     //保存 or 升级
+    var submited = false;
+
     function doSubmit() {
+        if (submited) {
+            return
+        }
+        submited = true;
+        setTimeout(function () {
+            submited = false;
+        }, 1000);
+
         $DoPost('/subscribepay/vipsubscribe/saveChange', {
             "area": reqData.area["全国"] ? '{}' : JSON.stringify(reqData.area),
             "industry": reqData.industry.join(","),