wxd / MShopWeApp

Commit 77378de8e772a193499d1921a01a5bcbf3f1b412

Authored by yvan.ni
2 parents 684a7cd8 73f1b29c

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

Inline Side-by-side
Showing 2 changed files with 36 additions and 8 deletions
pages/goods/categoryList/categoryList.js
  View file @77378de
... ... @@ -38,6 +38,8 @@ Page({
38 38 one_level_classify:[],// 新的版本左边的边分类1级
39 39 is_level_three:0,//判断有没有3级
40 40 cat_id:0,
  41 + pl_timer: null,//只有品类的定时器
  42 + is_pl_time:0,
41 43 },
42 44 onLoad: function(tt) {
43 45 const res = wx.getSystemInfoSync(),
... ... @@ -84,6 +86,7 @@ Page({
84 86 var that=this;
85 87  
86 88 getApp().getConfig2(function (e) {
  89 +
87 90 var data=e;
88 91 var switch_list_data = data.switch_list;
89 92 var switch_list = JSON.parse(switch_list_data);
... ... @@ -93,7 +96,25 @@ Page({
93 96 if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); }
94 97 if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); }
95 98 that.setData({ store_config: e,is_do:1 });
96   -
  99 + if ( that.data.is_show_gb != 1 && that.data.is_show_pp != 1){
  100 + console.log("品类数据", that.data.is_pl_time);
  101 + var one_level_classify = that.data.one_level_classify;
  102 + that.data.pl_timer = setInterval(function () {
  103 + console.log("品类数据", that.data.is_pl_time);
  104 + that.requestFirstCategoris();
  105 + if (that.data.is_pl_time==1){
  106 + console.log("品类数据", that.data.is_pl_time);
  107 + clearInterval(that.data.pl_timer);
  108 + }
  109 + }, 6000);
  110 + console.log(one_level_classify,"999999999999999999999999999999999" );
  111 + that.setData({ select_classify_on: 0, index: 0, goodslist: one_level_classify[0].array});
  112 + } else if (that.data.is_show_gb != 1 ){
  113 + // console.log("品类数据", that.data.is_show_pl);
  114 +
  115 + that.setData({ select_classify_on: 220, classify_name: "品牌" });
  116 + }
  117 +
97 118 if (that.data.is_show_pl) that.setData({ currentTab: 0 });
98 119 else if (that.data.is_show_gb){ that.setData({ currentTab: 1 });that.get_nation(); }
99 120 else if (that.data.is_show_pp) {that.setData({ currentTab: 2 });that.get_brand(); }
... ... @@ -123,8 +144,10 @@ Page({
123 144 success: function(e) {
124 145 var arr=new Array();
125 146 var dda = e.data.data.pageData;
126   -
127   - console.log(dda, "所有的数据");
  147 + if (dda != null && dda !=""&&dda!=undefined){
  148 + t.setData({is_pl_time:1});
  149 + }
  150 +
128 151 if (t.data.is_used_share == 0) {//is_used_share控制新旧版本
129 152 for(var i=0;i<dda.length;i++){
130 153 if (parseInt(dda[i].level)==1){
... ... @@ -450,6 +473,7 @@ Page({
450 473 }
451 474 if (this.data.is_level_three!=1) {
452 475 console.log("2级");
  476 +
453 477 this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, goodslist: arr });
454 478  
455 479  
... ...
pages/goods/categoryList/categoryList.wxml
  View file @77378de
... ... @@ -146,7 +146,7 @@
146 146  
147 147 </view>
148 148 <view wx:else class="sort-name">
149   - {{ittms.items.name}}
  149 + {{ittms.items.name}}
150 150 </view>
151 151 </view>
152 152  
... ... @@ -164,7 +164,7 @@
164 164  
165 165 <view class="classify_content">
166 166 <!-- 国家的样式 -->
167   -<block wx:if="{{select_classify_on==223}}">
  167 +<block wx:if="{{select_classify_on==223&&is_show_gb}}">
168 168 <view class="classify_name fs32 flex-space-between">
169 169 <view>{{ishaf_three==1?good_list.name:classify_name}}</view>
170 170  
... ... @@ -182,7 +182,7 @@
182 182 </view>
183 183 </block>
184 184 <!-- 品牌 -->
185   -<block wx:if="{{select_classify_on==220}}">
  185 +<block wx:if="{{select_classify_on==220&&is_show_pp}}">
186 186  
187 187 <view class="classify_name fs32 flex-space-between">
188 188 <view>{{classify_name}}</view>
... ... @@ -204,7 +204,8 @@
204 204 </block>
205 205 </view>
206 206 </block>
207   -<!-- 只是2级的 -->
  207 +<!-- 只是2级的 品类-->
  208 +<block wx:if="{{is_show_pl}}">
208 209 <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
209 210 <view>
210 211 <view class="classify_name fs32 flex-space-between"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
... ... @@ -225,8 +226,9 @@
225 226 </block>
226 227 </view>
227 228 </view>
228   -
229 229 </block>
  230 +
  231 +
230 232 <!-- 商品 含有3级的-->
231 233 <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three==1}}">
232 234 <block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="inds">
... ... @@ -251,9 +253,11 @@
251 253 </view>
252 254 <view class="divider_line"></view>
253 255 </block>
  256 +
254 257 </view>
255 258 </block>
256 259 </block>
  260 +</block>
257 261 </view>
258 262  
259 263  
... ...