wangkaiyue %!s(int64=5) %!d(string=hai) anos
pai
achega
fa41d31e81

+ 3 - 6
src/web/templates/weixin/vipsubscribe/choose_area.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html style="height: 100%">
 
 <head>
     <meta charset="utf-8">
@@ -15,7 +15,7 @@
     <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}">
 </head>
 
-<body>
+<body style="height: 100%">
 <div id="choose_area">
     <div class="result">
         <!-- 首次购买 显示"已选择" -----  升级订阅显示"已新增" -->
@@ -609,7 +609,6 @@
             let pHeight = $('.result_text').height()
             let minHeight = $('.result_text').css('min-height')
             let rows = Math.round(Math.round(pHeight) / parseFloat(minHeight));
-            $(".select-area-box .area-list").css("margin-top", $('.result_text').height() + 25);
             console.log("高度:" + pHeight, "最小高度" + minHeight, "行数:" + rows)
             if (rows == 1) {
                 $('.packup').hide()
@@ -636,14 +635,12 @@
                 $(".result").css("padding-bottom", "0.3rem")
                 $(this).hide();
                 $('.packup').show()
-                $(".select-area-box .area-list").css("margin-top", $('.result_text').height() + 25);
             })
             $('.packup').click(function () {
                 $(".result").css("padding-bottom", "0.2rem")
                 $('.result_text').addClass('line_two')
                 $(this).hide();
                 $('.detail').show()
-                $(".select-area-box .area-list").css("margin-top", $('.result_text').height() + 25);
             })
             $("body").on('click', '.slide a', function () {
                 var s = $(this).html()
@@ -716,7 +713,7 @@
                     }
                 } else {
                     $(this).parent('div').siblings('.tab').children().children('.checkbox').prop(
-                        'checked', false)
+                        'checked', false).removeClass('half');
                 }
                 AreaChoose.isAllSelected()
                 AreaChoose.getResult($(this).parent('div').siblings('.tab').find('.province').text()) //出入选择的省份

+ 9 - 2
src/web/templates/weixin/vipsubscribe/vip_purchase.html

@@ -190,7 +190,7 @@
                             </label>
                             <div class="number_box" id="number_box_month" data-numbox-step="1" data-numbox-min="1"
                                  data-numbox-max="12">
-                                <button class="weui-btn weui-btn_plain-default" type="button">
+                                <button class="weui-btn weui-btn_plain-default" type="button" disabled>
                                     <div class="jy_icon decrease"></div>
                                 </button>
                                 <span class="month_number">1</span>
@@ -433,6 +433,9 @@
 
                 if (!$.isEmptyObject(this.areaSelect) && !this.areaSelect["全国"] && !this.areaSelect["一个省"]) { //选择有行业信息 且不是全国
                     var tipTxt = "已选择 ";
+                    {{if eq .T.orderType 5 }}
+                    tipTxt = "已购买 ";
+                    {{end}}
                     if (provinceArr.length > 0) tipTxt += provinceArr.length + " 个省级区域";
                     if (cityArr.length > 0) {
                         if (provinceArr.length > 0) tipTxt += "、";
@@ -467,7 +470,11 @@
                     $(".choose_industry").val(data.join(" "));
                 }*/
                 if (this.industrySelect.length > 0 && this.industrySelect[0] != "全部行业" && this.industrySelect[0] != "一个行业") { //选择有行业信息
-                    $(".choose_industry").val("已选择 " + this.industrySelect.length + " 个行业");
+                    var tipTxt = "已选择 ";
+                    {{if eq .T.orderType 5 }}
+                    tipTxt = "已购买 ";
+                    {{end}}
+                    $(".choose_industry").val(tipTxt+ this.industrySelect.length + " 个行业");
                 } else if (this.industrySelect.length > 0 && this.industrySelect[0] == "全部行业") {
                     $(".choose_industry").val("全部行业");
                 } else {