提交

src/web/staticres/vipsubscribe/js/common.js

@@ -1,12 +1,3 @@
-$(function() {
-    // 解决ios系统click 事件300毫秒的延迟
-    try{
-	    FastClick.attach(document.body); 
-    }catch(e){
-		console.log(e)    	
-    }
-});
-
 //请求同意调用
 function $DoPost(url,param={},callback,async=true){
 	$.ajax({

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

@@ -354,12 +354,12 @@
         </div>
         <div class="tips_btn">
             <div class="tips_discount">
-                <div class="tips_d_money" style="display: block">&yen;38</div>
+                <div class="tips_d_money" style="display: none">&yen;38</div>
                 <div class="tips_d_text">已选择4个市，建议购买“全省”更划算哦~</div>
             </div>
             <div class="btns">
-                <button class="reset-btn">重置</button>
-                <button class="save-btn">确认</button>
+                <button class="reset-btn" disabled >重置</button>
+                <button class="save-btn" disabled >确认</button>
             </div>
         </div>
         <div class="slide">
@@ -382,7 +382,6 @@
         </div>
     </div>
     <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script>
@@ -469,13 +468,12 @@
             $(".checkbox.other").trigger("click");           
             return
           }
-          this.selectObj = {};
+          var tmpSelect = {};
           $('.result_name').empty()
           var data = []; //定义一个总数组
           var cityArr =[]; //定义一个选中城市数组
           var val = $('.other').parents('.province').text().trim();
           if ($('.other').is(':checked')) {
-            // data.push(val)
             data =[{name:val,children:[]}] //全国
             $(".tips_d_text").slideUp();
           }
@@ -526,6 +524,7 @@
           var html = '';
           var selectProvince = 0;
           var selectCityMax = 0;
+
           for (var i = 0; i < result.length; i++) {
               let children = result[i].children;
               if( children.length >0){
@@ -548,7 +547,7 @@
                   }else{
                       html += `)`
                   }
-                  this.selectObj[result[i].name]=childrenArr;//
+                  tmpSelect[result[i].name]=childrenArr;//
               }else{
                   selectProvince++
                  
@@ -557,7 +556,7 @@
                   }else{
                       html += `${result[i].name}`
                   }
-                  this.selectObj[result[i].name]=[];//
+                  tmpSelect[result[i].name]=[];//
               }
           }
           
@@ -573,14 +572,16 @@
               } 
             }
           }
-          
-          
-          
-          console.log("this.selectObj:",this.selectObj)
+          this.selectObj = tmpSelect;
+          console.log("this.selectObj:",tmpSelect)
           $('.result_name').append(html)
           AreaChoose.isOpen()
-          //刷新价格
-          AreaChoose.flushPrice();
+         
+          if(result.length>0){ //已选择
+            $('.reset-btn').removeAttr("disabled");
+            $('.save-btn').removeAttr("disabled");
+            AreaChoose.flushPrice(); //刷新价格
+          }
         },
         submitArea:function(){
           let addCity = $('.result_name').text(); //新增的城市
@@ -600,14 +601,6 @@
               $('.other').prop('checked', true);
           }
         },
-        getNationwide:function(){/*默认选中全国 */
-          $('.other').prop('checked', true);
-          $('.tab_content').slideUp(500)
-          $('.tab span i').css({
-              "display":"inline-block",
-              "transform":"rotate(0)"
-          });
-        },
         isOpen:function(){
           let pHeight = $('.result_text').height()
           let minHeight = $('.result_text').css('min-height')
@@ -674,21 +667,6 @@
             $('.checkbox').click(function (e) {  
                 e.stopPropagation();
             })
-            /*$('.province .checkbox:not(.other)').on('change', function () {
-                var isCheckded = $(this).is(':checked')
-                if (isCheckded) {
-                    $(this).parents('.tab').siblings('.tab_content').find('.city').addClass(
-                        'active')
-                    AreaChoose.isAllSelected()
-                    AreaChoose.getResult() 
-                } else {
-                    $(this).parents('.tab').siblings('.tab_content').find('.city').removeClass(
-                        'active')
-                    $(this).parents('.tab').siblings('.tab_content').find('.city').attr('disabled',false);    
-                    AreaChoose.isAllSelected()
-                    AreaChoose.getResult() 
-                }
-            })*/
             $('.tab .checkbox').on('click',function () {
                 if($(this).hasClass("other")){//点击全国
                   $(".province input").prop('checked', false);
@@ -763,12 +741,12 @@
             }
         },
         flushPrice:function(){
-          if(this.vipSubisTrial){
-            $('.tips_d_money').css("display","none");
-          }else{
-            var price=getsubVipOrderPrice(this.selectObj,this.selectedIndustryArr,this.timeSelect);
-            $('.tips_d_money').text('￥'+price);
-          }
+            if(!this.vipSubisTrial){
+              $('.tips_d_money').css("display","block");
+              var price=getsubVipOrderPrice(this.selectObj,this.selectedIndustryArr,this.timeSelect);
+              $('.tips_d_money').text('￥'+price);
+            }
+     
         }
       }
       
@@ -777,7 +755,7 @@
             AreaChoose.inintData(); //初始化 已选择和已购买数据
             AreaChoose.inintPage(); //初始化城市数据
 
-            AreaChoose.getNationwide();//默认选中全国 
+            //AreaChoose.getNationwide();//默认选中全国 
             AreaChoose.showSelected(true);//回显已选择
             /* 判断已购买的城市 在不在 全部城市里面，在，将按钮置灰，不可点击 */
 

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

@@ -24,7 +24,7 @@
                         <li class="list_item" id="all">
                             <div class="item_label"></div>
                             <div class="item_industry_list">
-                                <button class="industry_item active">全部行业</button>
+                                <button class="industry_item">全部行业</button>
                             </div>
                         </li>
                         <li class="list_item" id="A">
@@ -231,17 +231,16 @@
             </div>
             <div class="tips_btn">
                 <div class="tips_discount">
-                    <div class="tips_d_money" style="display: block">&yen;38</div>
+                    <div class="tips_d_money" style="display: none">&yen;38</div>
                     <div class="tips_d_text">已选择4个行业，建议购买“全部行业”更划算哦~</div>
                 </div>
                 <div class="btns">
-                    <button class="reset-btn">重置</button>
-                    <button class="save-btn">确认</button>
+                    <button class="reset-btn" disabled >重置</button>
+                    <button class="save-btn"  disabled >确认</button>
                 </div>
             </div>
         </main>
         <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-        <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
         <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
         <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
         <script>
@@ -278,7 +277,7 @@
                         }
                     }
                 })
-                
+                              
                 // 显示隐藏优惠tips
                 if (selectedArr.length >= 4 && !vipSubisTrial) {
                     $('.tips_btn .tips_d_text').text("已选择"+selectedArr.length+"个行业，建议购买“全部行业”更划算哦~").slideDown()
@@ -286,12 +285,19 @@
                     $('.tips_btn .tips_d_text').slideUp()
                 }
           
-                selectedIndustryArr = selectedArr
+                if(selectedArr.length>0){//是否已选择
+                  selectedIndustryArr = selectedArr
+                  
+                  $(".reset-btn").removeAttr("disabled");
+                  $(".save-btn").removeAttr("disabled");
+                  flushPrice()//刷新价格
+                }
+          
                 
                 var selectedStr = selectedArr.join('、')
                 $('.result .result_name').text(selectedStr)
 
-                if (selectedArr.length === 0) {
+                if (selectedArr.length === 0&&selectedIndustryArr[0]!="一个行业") {
                     var allButton = $('#all button')
                     allButton.trigger('click')
                     $('.result .result_name').text(allButton.text())
@@ -302,6 +308,9 @@
                 }
                 //调整高度
                 $(".select-area-box .list").css("margin-top",$(".result").height()+20);
+                
+                
+                               
             }
                       
             function showSelect(arr,canclick){
@@ -319,11 +328,9 @@
             }
             
             function flushPrice(){
-              if(vipSubisTrial){
-                $('.tips_d_money').css("display","none");
-              }else{
+              if(!vipSubisTrial){
                 var price=getsubVipOrderPrice(selectedAreaObj,selectedIndustryArr,timeSelect);
-                $('.tips_d_money').text('￥'+price);
+                $('.tips_d_money').css("display","bolck").text('￥'+price);
               }
             }
             
@@ -340,8 +347,7 @@
                     $('#all button').removeClass('active')
                 }
                 
-                findSelectedIndustry()
-                flushPrice()
+                findSelectedIndustry()                
             })
 
             // 重置按钮事件
@@ -359,7 +365,7 @@
                 history.go(-1);
             })
                        
-            var selectedIndustryArr //已选择行业
+            var selectedIndustryArr =["一个行业"] //已选择行业
             var selectedAreaObj = {"一个省":["一个市"]} //计算价格临时变量
             var timeSelect = [1,2]//计算价格临时变量 timeSelect[0]时长  timeSelect[1] 1:年 2:月
             var vipSubisTrial = false;
@@ -367,8 +373,6 @@
               try{
                 if(sessionStorage.getItem("vipSubSelectIndustry")){
                   selectedIndustryArr=JSON.parse(sessionStorage.getItem("vipSubSelectIndustry"));
-                }else{
-                  selectedIndustryArr=[];
                 }
                 if(sessionStorage.getItem("vipSubSelectArea")){
                   selectedAreaObj=JSON.parse(sessionStorage.getItem("vipSubSelectArea"));
@@ -384,7 +388,6 @@
               //已选择
               showSelect(selectedIndustryArr,true);
               findSelectedIndustry();
-              flushPrice();
             })
         </script>
     </body>

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

@@ -55,7 +55,6 @@
        </div>-->
     </div>
     <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script>

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

@@ -384,7 +384,6 @@
         </div>
     </div>
     <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>

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

@@ -385,7 +385,6 @@
         </div>
     </div>
     <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>

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

@@ -242,7 +242,6 @@
             </div>
         </main>
         <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-        <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
         <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
         <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
         <script>
@@ -316,19 +315,21 @@
                       }
                       $('.select-area-box .list button').removeClass('active');
                       $('#all button').addClass('active');
+                      $('#enter').removeAttr('disabled');
                     }else{
                       $(this).toggleClass('active')
                       if($(".industry_item.active").length==0){//如果没有行业被选中 则选中全部行业
-                        if(EditIndustry.reqData.buyset.buyerclasscount!=-1){
-                          EditIndustry.showTip(`至少选择一个行业`);
-                          $(this).toggleClass('active'); 
-                          return
+                        if(EditIndustry.reqData.buyset.buyerclasscount==-1){
+                          $('#all button').addClass('active');
+                        }else{
+                          $('#enter').attr('disabled','disabled');//选择空不能提交
                         }
-                        $('#all button').addClass('active'); 
                       }else{
                         $('#all button').removeClass('active');
+                        $('#enter').removeAttr('disabled');
                       }
                     }
+                    
                     EditIndustry.findSelectedIndustry(false);
                 })
                 // 取消按钮事件 返回上一页

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

@@ -353,7 +353,6 @@
         </div>
     </div>
     <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>

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

@@ -19,7 +19,6 @@
             <button class="public_btn" id="back">返回(<em class="time">5</em>)</button>
         </div>
         <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-        <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
         <script>
             function timer(obj,callback) { 
                 let t = 5; 

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

@@ -40,7 +40,6 @@
 	</body>
   <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
   <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
-  <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
   <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
   <script>
     $(function(){

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

@@ -68,7 +68,6 @@
                     <a href="javascript:;">
                         <span class="label">支付方式</span>
                         <span class="info choose_way">微信支付</span>
-                        <i class="iconfont icon-arrow choose_way"></i>
                     </a>
                 </div>
                 {{end}}
@@ -257,7 +256,6 @@
         </div>
     </div>
     <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <!--<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
     <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}