修改缺陷

src/jfw/modules/subscribepay/src/service/vipSubscribeEdit.go

@@ -42,7 +42,7 @@ func (o *editSubResult) Format() *map[string]interface{} {
 func (this *EditSub) GetSubBuyMsg() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	r := func() *editSubResult {
-		mData, ok := util.MQFW.FindById("user", userId, `{"o_vipjy":1}`)
+		mData, ok := util.MQFW.FindById("user", userId, `{"o_vipjy":1,"i_vip_status":1}`)
 		if !ok || len(*mData) == 0 || mData == nil {
 			return &editSubResult{false, errors.New("获取信息失败"), nil}
 		}
@@ -50,6 +50,7 @@ func (this *EditSub) GetSubBuyMsg() {
 		//地区 城市 数量 修改次数
 		//editNum := qutil.IntAll(redis.Get("other", userId+"_SubEdit_"+time.Now().Month().String()))
 		return &editSubResult{true, nil, map[string]interface{}{
+			"isTrial":  qutil.IntAll((*mData)["i_vip_status"]) == 1,
 			"area":     (*o_vipjy)["o_area"],
 			"industry": (*o_vipjy)["a_buyerclass"],
 			"buyset":   (*o_vipjy)["o_buyset"],

src/web/staticres/css/subscribe.css

@@ -1,12 +1,12 @@
 /* banner图板块 */
 .tender-1 {
     width: 100%;
-    height: 475px;
+    /* height: 475px; */
 }
 
 .tender-1 .imgauto {
     width: 100%;
-    height: 100%;
+    /* height: 100%; */
     /* margin: 0 auto; */
 }
 
@@ -20,7 +20,7 @@
 .subscription {
     width: 100%;
     height: 268px;
-    margin-top: -110px;
+    margin-top: -70px;
 }
 
 .subscription .sub-center {
@@ -420,6 +420,7 @@
 .modal-content > img {
     margin: -46px 0 0 -1px;
     /* height: 447px; */
+    position: relative;
 }
 
 .modal-content .vip-code {
@@ -654,3 +655,9 @@
     animation-fill-mode: forwards
 }
 
+.modal-content .close{
+    position: absolute;
+    right: 10px;
+    top: 10px;
+    color: aliceblue;
+}

src/web/staticres/vipsubscribe/js/editArea.js

@@ -1,6 +1,7 @@
 // 后端数据结构
 var areaData = {
     "data": {
+        "isTrial": true,
         "area": {
             // "北京": [],
             // "河南": [
@@ -284,6 +285,11 @@ $(function () {
             getResult()
         } else {
             $('.checkbox:not(:checked)').attr('disabled', true)
+            if (areaData.data.isTrial) {
+                showTip(`<span style="white-space: nowrap;">您只选择试用了` + totalLength + `个省份</span>，<span style="white-space: nowrap;">如需更多，请前往VIP订阅进行购买</span>`);
+            } else {
+                showTip(`<span style="white-space: nowrap;">您只购买了` + totalLength + `个省份，如需更多请升级<span></p>`)
+            }
             getResult()
         }
         if ($(this).is(':checked')) {
@@ -336,6 +342,12 @@ $(function () {
             } else if (isActive > 0 && isActive == count) {
                 $(this).parents('li').find('input.checkbox').addClass('half');
                 $(this).parent('div').find('.city:not(.active)').attr('disabled', true)
+                //提示订阅
+                if (areaData.data.isTrial) {
+                    showTip(`<span style="white-space: nowrap;">您只选择试用了` + $(this).parents('li').find(".province").attr("data-count") + `个市</span>，<span style="white-space: nowrap;">如需更多，请前往VIP订阅进行购买</span>`);
+                } else {
+                    showTip(`<span style="white-space: nowrap;">您只购买了` + $(this).parents('li').find(".province").attr("data-count") + `个市，如需更多请升级<span></p>`)
+                }
                 getResult()
             } else {
                 $(this).parent('div').find('.city:not(.active)').removeAttr('disabled')
@@ -389,3 +401,10 @@ function theSameAs(select) {
     let tmp2 = getAreaClassArr(areaData.data.area);
     return (JSON.stringify(tmp1[0].sort()) === JSON.stringify(tmp2[0].sort())) && (JSON.stringify(tmp1[1].sort()) === JSON.stringify(tmp2[1].sort()));
 }
+
+function showTip(msg) {
+    weui.toast(msg, {
+        duration: 2000,
+        className: 'custom-toast',
+    });
+}

src/web/templates/pc/subscribe_new.html

@@ -58,6 +58,7 @@
     <div class="modal-dialog modal-dialog-subvip modal-sm" role="document">
         <div class="modal-content">
             <img src="{{Msg "seo" "cdn"}}/images/subscribe/vip_tanchuang.png?v={{Msg "seo" "version"}}" alt="">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
             <div class="vip-code">
                 <img id="vipCode" alt="" style="width: 139px;height: 139px">
                 <p class="vip-text">扫描二维码体验VIP订阅</p>

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

@@ -580,11 +580,14 @@
             console.log("this.selectObj:", tmpSelect)
             $('.result_name').append(html)
             AreaChoose.isOpen()
-
+            console.log(result)
             if (result.length > 0) { //已选择
                 $('.reset-btn').removeAttr("disabled");
                 $('.save-btn').removeAttr("disabled");
                 AreaChoose.flushPrice(); //刷新价格
+            }else{
+                $('.save-btn').attr("disabled","disabled");
+                AreaChoose.flushPrice(-1); //刷新价格
             }
         },
         submitArea: function () {
@@ -686,7 +689,7 @@
                         } else {
                             $(this).parent().parent().siblings('.tab_content').children('.city').removeClass('active');
                             if ($(".province .checkbox:checked").length == 0) {//若没有省份被选中 则选中全国
-                                $(".checkbox.other").prop('checked', true);
+                                //$(".checkbox.other").prop('checked', true);
                                 $(".checkbox").removeClass("half");
                             }
                         }
@@ -699,6 +702,7 @@
 
             //执行已购买城市函操作dom函数
             $('.tab_content').on('click', '.city', function () {
+                $(".checkbox.other").prop('checked', false);
                 //AreaChoose.showSelected(false)
                 $(this).toggleClass('active')
                 var isActive = $(this).parent().find('.city.active').length
@@ -715,7 +719,7 @@
                     $(this).parent('div').siblings('.tab').children().children('.checkbox').prop(
                         'checked', false).removeClass('half');
                 }
-                AreaChoose.isAllSelected()
+                //AreaChoose.isAllSelected()
                 AreaChoose.getResult($(this).parent('div').siblings('.tab').find('.province').text()) //出入选择的省份
             })
 
@@ -733,34 +737,31 @@
             })
         },
         reset: function () {
-            var checked = $(".other").is(':checked');
-            if (checked) {
-                $('.tab_content').slideUp(500)
-                $('.tab span i').css({
-                    "display": "inline-block",
-                    "transform": "rotate(0)"
-                })
-                $('.tab:not(.whole)').removeClass('selected').children('.province').find(
-                    'input').prop({
-                    'checked': false,
-                    "disabled": false
-                });
-                $('.tab_content').find('.city').removeClass('active').attr({
-                    "disabled": false,
-                    "checked": false
-                })
-                AreaChoose.getResult()
-            } else {
-                AreaChoose.getResult()
-            }
+            $('.tab_content').slideUp(500)
+            $('.tab span i').css({
+                "display": "inline-block",
+                "transform": "rotate(0)"
+            })
+            $('.tab').removeClass('selected').children('.province').find(
+                'input').prop({
+                'checked': false,
+                "disabled": false
+            });
+            $('.tab_content').find('.city').removeClass('active').attr({
+                "disabled": false,
+                "checked": false
+            })
+            AreaChoose.getResult()
         },
-        flushPrice: function () {
+        flushPrice: function (flag) {
             if (!this.vipSubisTrial) {
                 $('.tips_d_money').css("display", "block");
                 var price = getsubVipOrderPrice(this.selectObj, this.selectedIndustryArr, this.timeSelect);
                 $('.tips_d_money').text('￥' + price);
             }
-
+            if(flag===-1){
+                $('.tips_d_money').css("display", "none");
+            }
         },
         animatedRuning: false,
         checkAnimatedRuning: function () {

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

@@ -292,17 +292,20 @@
             $(".reset-btn").removeAttr("disabled");
             $(".save-btn").removeAttr("disabled");
             flushPrice()//刷新价格
+        } else {
+            $(".save-btn").attr("disabled","disabled");
+            flushPrice(-1)//刷新价格
         }
 
 
         var selectedStr = selectedArr.join('、')
         $('.result .result_name').text(selectedStr)
 
-        if (selectedArr.length === 0 && selectedIndustryArr[0] != "一个行业") {
+        /*if (selectedArr.length === 0 && selectedIndustryArr[0] != "一个行业") {
             var allButton = $('#all button')
             allButton.trigger('click')
             $('.result .result_name').text(allButton.text())
-        }
+        }*/
         if (selectedArr.length === buttons.length - 1) {
             // 除全部行业外所有按钮都被选中了
             $('#all button').trigger('click');
@@ -327,11 +330,14 @@
         })
     }
 
-    function flushPrice() {
+    function flushPrice(flag) {
         if (!vipSubisTrial) {
             var price = getsubVipOrderPrice(selectedAreaObj, selectedIndustryArr, timeSelect);
             $('.tips_d_money').css("display", "block").text('￥' + price);
         }
+        if (flag == -1) {
+            $('.tips_d_money').css("display", "none");
+        }
     }
 
     // 每个button的点击事件
@@ -352,7 +358,9 @@
 
     // 重置按钮事件
     $('.reset-btn').on('click', function () {
-        $("#all .industry_item").trigger("click");
+        //$("#all .industry_item").trigger("click");
+        $('.select-area-box .list button').removeClass('active');
+        findSelectedIndustry()
     })
 
     //=======================

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

@@ -15,7 +15,8 @@
 </head>
 <body>
 <main class="choose_industry main">
-    <p class="optional_count" style="background: rgba(245,244,249,1);"> 可选择行业数量： <em class="count"></em> / <span class="total"></span></p>
+    <p class="optional_count" style="background: rgba(245,244,249,1);"> 可选择行业数量： <em class="count"></em> / <span
+                class="total"></span></p>
     <!--<div class="result" style="display: block;">
         <span class="label">已选择：</span>
         <span class="result_name">全部行业</span>
@@ -311,7 +312,11 @@
                         return
                     }
                     if (EditIndustry.reqData.buyset.buyerclasscount != -1) { //购买不是全部行业 不能点击
-                        EditIndustry.showTip(`<span style="white-space: nowrap;">您只购买了${EditIndustry.reqData.buyset.buyerclasscount}个行业，如需更多请升级<span></p>`);
+                        if (EditIndustry.reqData.isTrial) {
+                            EditIndustry.showTip(`<span style="white-space: nowrap;">您只选择试用了${EditIndustry.reqData.buyset.buyerclasscount}个行业</span>，<span style="white-space: nowrap;">如需更多，请前往VIP订阅进行购买</span>`);
+                        } else {
+                            EditIndustry.showTip(`<span style="white-space: nowrap;">您只购买了${EditIndustry.reqData.buyset.buyerclasscount}个行业，如需更多请升级<span></p>`);
+                        }
                         return
                     }
                     $('.select-area-box .list button').removeClass('active');
@@ -380,7 +385,11 @@
             // 显示隐藏优惠tips
             if (selectedArr.length >= EditIndustry.reqData.buyset.buyerclasscount && EditIndustry.reqData.buyset.buyerclasscount != -1) {
                 if (!isInit) {
-                    EditIndustry.showTip(`<span style="white-space: nowrap;">您只购买了${EditIndustry.reqData.buyset.buyerclasscount}个行业，如需更多请升级<span></p>`);
+                    if (EditIndustry.reqData.isTrial) {
+                        EditIndustry.showTip(`<span style="white-space: nowrap;">您只选择试用了${EditIndustry.reqData.buyset.buyerclasscount}个行业</span>，<span style="white-space: nowrap;">如需更多，请前往VIP订阅进行购买</span>`);
+                    } else {
+                        EditIndustry.showTip(`<span style="white-space: nowrap;">您只购买了${EditIndustry.reqData.buyset.buyerclasscount}个行业，如需更多请升级<span></p>`);
+                    }
                 }
                 $('.industry_item:not(.active)').attr('disabled', 'disabled');
             } else {

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

@@ -474,7 +474,7 @@
                     {{if eq .T.orderType 5 }}
                     tipTxt = "已购买 ";
                     {{end}}
-                    $(".choose_industry").val(tipTxt+ this.industrySelect.length + " 个行业");
+                    $(".choose_industry").val(tipTxt + this.industrySelect.length + " 个行业");
                 } else if (this.industrySelect.length > 0 && this.industrySelect[0] == "全部行业") {
                     $(".choose_industry").val("全部行业");
                 } else {
@@ -496,16 +496,28 @@
                     if (this.timeSelect[0] >= 10) {
                         $('.profit_tips').text("已选择" + this.timeSelect[0] + "个月，建议“按年订阅”").show();
                     }
+                    if (this.timeSelect[0] == 1) {
+                        $('#number_box_month button:eq(0)').attr("disabled", "disabled");
+                    } else {
+                        $('#number_box_month button:eq(0)').removeAttr("disabled");
+                    }
                 }
                 $(".info.choose_time").val(tmp);
             },
-            flushPrice: function () {
+            flushPrice: function (time, flag) {
                 if (this.vipSubisTrial) {
                     $('.price strong').text('￥0.00');
                 } else {
-                    var price = getsubVipOrderPrice(this.areaSelect, this.industrySelect, this.timeSelect, this.price);
-                    $('.price strong').text('￥' + price);
-                    $('.computed_price').html('￥' + price);
+                    var price = getsubVipOrderPrice(this.areaSelect, this.industrySelect, time, this.price);
+                    if (flag === 1) {
+                        $('.price strong').text('￥' + price);
+                    } else if (flag === 2) {
+                        $('.computed_price').html('￥' + price);
+                    } else {
+                        $('.price strong').text('￥' + price);
+                        $('.computed_price').html('￥' + price);
+                    }
+
                 }
             }
         };
@@ -517,7 +529,7 @@
             purchase.showIndustry();
             purchase.showPrice();
             purchase.showTime();
-            purchase.flushPrice();
+            purchase.flushPrice(purchase.timeSelect);
             checkOk();
             var time_limit;//定义一个周期变量
             /*------ 关闭弹窗事件  点击取消或遮罩层 -----*/
@@ -592,8 +604,8 @@
                         .numboxStep;
                 }
                 $number.text(currentNum);
-                purchase.timeSelect = [Number(currentNum), 2];
-                purchase.flushPrice();
+                purchase.timeSelect_tmp = [Number(currentNum), 2];
+                purchase.flushPrice(purchase.timeSelect_tmp, 2);
                 //var price = (5.8 * currentNum).toFixed(1);
                 //$('.computed_price').html('￥' + price)
                 var firstButton = $('#number_box_month button:first');
@@ -630,8 +642,8 @@
                 // 渲染结果 保留一位小数
                 //let result = (Number(id) * 58).toFixed(1);
                 //$('.computed_price').html('￥' + result)
-                purchase.timeSelect = [Number(id), 1];
-                purchase.flushPrice();
+                purchase.timeSelect_tmp = [Number(id), 1]
+                purchase.flushPrice(purchase.timeSelect_tmp, 2);
             });
 
             /* -------- 选择按月订阅  radio触发的事件------- */
@@ -648,8 +660,8 @@
                 }
                 //let result = (Number(val) * 5.8).toFixed(1);
                 //$('.computed_price').html('￥' + result);
-                purchase.timeSelect = [Number(val), 2];
-                purchase.flushPrice();
+                purchase.timeSelect_tmp = [Number(val), 2];
+                purchase.flushPrice(purchase.timeSelect_tmp, 2);
 
             });
             /* -------- 选择按年订阅  radio触发的事件------- */
@@ -663,8 +675,8 @@
                 if (isChecked) {
                     $('#number_box_year span:eq(0)').addClass('active').siblings().removeClass('active')
                 }
-                purchase.timeSelect = [Number(val), 1];
-                purchase.flushPrice();
+                purchase.timeSelect_tmp = [Number(val), 1];
+                purchase.flushPrice(purchase.timeSelect_tmp, 2);
             });
 
             // 确认订阅周期
@@ -677,16 +689,17 @@
                         $('#time_cycle').hide(function () {
                             $('.choose_time').val(val)
                         });
-                        purchase.timeSelect = [parseInt(val[0]), 1]
+                        purchase.timeSelect_tmp = [parseInt(val[0]), 1]
                     } else if ($(v).is(':checked') === true) {
                         val = $('.month_number').html();
                         $('#time_cycle').hide(function () {
                             $('.choose_time').val(val + '个月')
                         });
-                        purchase.timeSelect = [parseInt(val), 2]
+                        purchase.timeSelect_tmp = [parseInt(val), 2]
                     }
                 });
-                purchase.flushPrice();
+                purchase.timeSelect = purchase.timeSelect_tmp;
+                purchase.flushPrice(purchase.timeSelect, 1);
                 sessionStorage.setItem("vipSubSelectTime", JSON.stringify(purchase.timeSelect));
             });
             $("input").bind("input propertychange change", function (event) {
@@ -763,7 +776,7 @@
             sessionStorage.removeItem("vipSubSelectTime");
             sessionStorage.removeItem("vipSub_read");
             sessionStorage.removeItem("historypushDataCache");
-            sessionStorage.To_introducePage=2;
+            sessionStorage.To_introducePage = 2;
         }
 
         /******* 获取url参数（正则）********/