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

+ 4 - 0
src/web/staticres/vipsubscribe/css/vip_purchase.css

@@ -482,6 +482,10 @@
   color: #686868;
 }
 
+.choose_item input:disabled, .choose_item input[disabled]{
+  opacity: 1;
+}
+
 .vip_purchase .choose_condition .chooseList .choose_item a i.iconfont,
 .vip_purchase .choose_condition .pay_mode .choose_item a i.iconfont {
   float: right;

+ 1 - 1
src/web/templates/weixin/vipsubscribe/choose_industry.html

@@ -367,7 +367,7 @@
                        
             var selectedIndustryArr =["一个行业"] //已选择行业
             var selectedAreaObj = {"一个省":["一个市"]} //计算价格临时变量
-            var timeSelect = [2,1]//计算价格临时变量 timeSelect[0]时长  timeSelect[1] 1:年 2:月
+            var timeSelect = [1,2]//计算价格临时变量 timeSelect[0]时长  timeSelect[1] 1:年 2:月
             var vipSubisTrial = false;
             $(function(){
               try{

+ 2 - 2
src/web/templates/weixin/vipsubscribe/edit_subscribe_success.html

@@ -32,10 +32,10 @@
             }
             $(function(){
                 timer($('.time'),()=>{
-                    window.location.replace('/front/vipsubscribe/toEditSubPage');
+                    window.history.go(-1); 
                 })
                 $('#back').click(function () {  
-                    window.location.replace('/front/vipsubscribe/toEditSubPage');
+                    window.history.go(-1); 
                 })
             })
         </script>

+ 14 - 7
src/web/templates/weixin/vipsubscribe/trial_info.html

@@ -15,8 +15,8 @@
     <link rel="stylesheet" href="/vipsubscribe/css/trial_info.css?v=111">    
 </head>
 
-<body style="height: 100vh">
-    <div class="trial_info">
+<body>
+    <div class="trial_info" style="height: 100vh">
         <form class="form" id="formInfo">
             <div class="trial_body">
                 <div class="banner">
@@ -49,9 +49,9 @@
                         </div>
                     </div>
                     <div class="form_bottom">
-                        <div class="form-item-textarea">
-                            <textarea name="" id="" rows="1" placeholder="输入公司名称" class="company"
-                                onchange="check_company($(this))"></textarea>
+                        <div class="form_item">
+                            <input type="text" id=""  placeholder="输入公司名称" class="company"
+                                onchange="check_company($(this))"></input>
                         </div>
                         <div class="form_item">
                             <input type="text" placeholder="职位(非必填)" class="job">
@@ -85,6 +85,7 @@
         initShare({{.T.signature}});
         {{if not .T.trialSign }}
         $(function () {
+            initScroll()
             $(".btn").text("申请免费试用").attr("disabled","disabled");
             //获取用户信息
             $DoPost("/subscribepay/trial/GetUserPhone",{},function(r){
@@ -117,11 +118,11 @@
             });
             
             // textarea自适应高度
-            $(".form-item-textarea textarea")[0].style.height = $(".form-item-textarea textarea")[0].scrollHeight + 'px';
+            /*$(".form-item-textarea textarea")[0].style.height = $(".form-item-textarea textarea")[0].scrollHeight + 'px';
             $(".form-item-textarea textarea").on("input", function () {
                 this.style.height = 'auto';
                 this.style.height = this.scrollHeight + "px";
-            })
+            })*/
              // 倒计时
              $('.code_btn').click(function (e) {
                 e.stopPropagation();
@@ -165,6 +166,12 @@
                 return false;	
             });
         });
+          function initScroll() {
+          	(/iphone|ipod|ipad/i.test(navigator.appVersion)) && document.addEventListener('blur', function(e) {
+          		// 这里加了个类型判断,因为a等元素也会触发blur事件
+          		['input', 'textarea'].includes(e.target.localName) && document.body.scrollIntoView(true)
+          	}, true)
+        	}
         {{else}}
             $('#formInfo').submit(function(e) {	
               window.location.replace("/weixin/pay/vipsubscribe_trial");

+ 7 - 7
src/web/templates/weixin/vipsubscribe/vip_purchase.html

@@ -10,15 +10,14 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/vipsubscribe/css/vip_purchase.css?v={{Msg "seo" "version"}}">
-</head>
-
+    <link rel="stylesheet" href="/vipsubscribe/css/vip_purchase.css?v=3{{Msg "seo" "version"}}">
+</head> 
 <body>
   <div>
     <div class="vip_purchase">
         <div class="choose_condition">
             <ul class="chooseList">
-                <li class="choose_item">
+                <li class="choose_item">                      
                     <a href="/front/vipsubscribe/toChooseArea">
                         <span class="label">区域</span>
                         {{if not .T.isTrial }}
@@ -45,12 +44,12 @@
                     <p class="add_tips industry" style="display:none">已选择 0 个行业</p>
                 </li>
                 <li class="choose_item select_cycle">
-                    <!-- 需要选择订阅周期就用a标签,div.class="free-7day"隐藏 -->
+                    <!-- 需要选择订阅周期就用a标签,div.class="free-7day"隐藏 opacity: 1 !important; -->
                     <!-- 需要选择试用就用div标签,a标签隐藏 -->
                     {{if not .T.isTrial }}
                       <a href="javascript:;">
                         <span class="label">订阅周期</span>
-                        <input type="text" disabled value="1个月" class="info choose_time">
+                        <input type="text" readonly="readonly" disabled style="color:#000;opacity:0.7;" value="1个月" class="info choose_time">
                         <i class="iconfont icon-arrow choose_time"></i>
                       </a>
                     {{else}}
@@ -67,7 +66,8 @@
                 <div class="select_payment choose_item">
                     <a href="javascript:;">
                         <span class="label">支付方式</span>
-                        <span class="info choose_way">微信支付</span>
+                        <span class="info choose_way" style="width: 6rem;">微信支付</span>
+                        <!--<i class="iconfont"></i>-->
                     </a>
                 </div>
                 {{end}}