Merge branch 'work-1.1_20191010' of http://git.vipzhuang.cn/wxd/MShopWeApp into work-1.1_20191010

yvan.ni
2 parents 684a7cd8 73f1b29c
Showing 2 changed files with 36 additions and 8 deletions
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
@@ -38,6 +38,8 @@ Page({
       one_level_classify:[],// 新的版本左边的边分类1级
       is_level_three:0,//判断有没有3级
       cat_id:0,
+      pl_timer: null,//只有品类的定时器
+      is_pl_time:0,
     },
     onLoad: function(tt) { 
       const res = wx.getSystemInfoSync(),
@@ -84,6 +86,7 @@ Page({
       var that=this;
       getApp().getConfig2(function (e) {
+
         var data=e;
         var switch_list_data = data.switch_list;
         var switch_list = JSON.parse(switch_list_data);
@@ -93,7 +96,25 @@ Page({
         if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); }
         if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); }
         that.setData({ store_config: e,is_do:1 });
-
+        if (   that.data.is_show_gb != 1 && that.data.is_show_pp != 1){
+          console.log("品类数据", that.data.is_pl_time);
+          var one_level_classify = that.data.one_level_classify;
+          that.data.pl_timer = setInterval(function () {
+            console.log("品类数据", that.data.is_pl_time);
+            that.requestFirstCategoris();
+            if (that.data.is_pl_time==1){
+              console.log("品类数据", that.data.is_pl_time);
+              clearInterval(that.data.pl_timer);
+            }
+          }, 6000);
+          console.log(one_level_classify,"999999999999999999999999999999999" );
+          that.setData({ select_classify_on: 0, index: 0, goodslist: one_level_classify[0].array}); 
+        } else if (that.data.is_show_gb != 1 ){
+         // console.log("品类数据", that.data.is_show_pl);
+       
+          that.setData({ select_classify_on: 220, classify_name: "品牌" });
+        }
+        
         if (that.data.is_show_pl) that.setData({ currentTab: 0 });
         else if (that.data.is_show_gb){ that.setData({ currentTab: 1 });that.get_nation();  }
         else if (that.data.is_show_pp) {that.setData({ currentTab: 2 });that.get_brand(); }
@@ -123,8 +144,10 @@ Page({
             success: function(e) {   
                 var arr=new Array();
                 var dda = e.data.data.pageData;
-             
-              console.log(dda, "所有的数据");
+              if (dda != null && dda !=""&&dda!=undefined){
+                t.setData({is_pl_time:1});
+              }
+           
               if (t.data.is_used_share == 0) {//is_used_share控制新旧版本
                 for(var i=0;i<dda.length;i++){
                   if (parseInt(dda[i].level)==1){
@@ -450,6 +473,7 @@ Page({
      }
      if (this.data.is_level_three!=1) {
        console.log("2级");
+
        this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, goodslist: arr });
@@ -146,7 +146,7 @@
          </view>
          <view wx:else class="sort-name">
-         {{ittms.items.name}}
+         {{ittms.items.name}} 
          </view>
          </view>
@@ -164,7 +164,7 @@
 <view class="classify_content"> 
 <!-- 国家的样式 -->
-<block wx:if="{{select_classify_on==223}}">
+<block wx:if="{{select_classify_on==223&&is_show_gb}}">
 <view class="classify_name fs32 flex-space-between">
 <view>{{ishaf_three==1?good_list.name:classify_name}}</view>
@@ -182,7 +182,7 @@
 </view>
 </block>
 <!-- 品牌 -->
-<block wx:if="{{select_classify_on==220}}">
+<block wx:if="{{select_classify_on==220&&is_show_pp}}">
 <view class="classify_name fs32 flex-space-between">
 <view>{{classify_name}}</view>
@@ -204,7 +204,8 @@
 </block>
 </view>
 </block>
-<!-- 只是2级的 -->
+<!-- 只是2级的 品类-->
+<block  wx:if="{{is_show_pl}}">
 <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
 <view>
 <view class="classify_name fs32 flex-space-between"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
@@ -225,8 +226,9 @@
 </block>
  </view>
 </view>
-
 </block>
+
+
 <!-- 商品 含有3级的-->
 <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three==1}}">
 <block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="inds">
@@ -251,9 +253,11 @@
 </view>
 <view class="divider_line"></view>
 </block>
+
 </view>
 </block>
 </block>
+</block>
 </view>