Merge branch 'dev_oa_luo36' into dev

WXD-SEASON\season
2 parents bace0fb8 f1352a89
Showing 11 changed files with 293 additions and 87 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_goodsGroup/diy_goodsGroup.wxss
packageA/pages/distribution/shop/shop.js
packageA/pages/distribution/shop/shop.wxml
packageA/pages/profile/profile.js
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
pages/goods/categoryList/categoryList.wxss
pages/template/index.js
pages/template/index.json
pages/template/index.wxml
@@ -11,17 +11,17 @@
     <view  class="{{'tabBox ' + (object.menu_style==2 ? 'tab2' :'')}}">
       <!--样式一-->
       <block wx:if="{{object.menu_style==1}}">
-        <view wx:if="{{object.show_all==1}}" style="padding: 0 35rpx;" class="{{'tab ' + (title_index == 10 ? 'clor ' :'')}}" >全部<span class="tab1" wx:if="{{10==title_index}}"></span></view>
-        <view wx:for="{{object.nav_list}}" style="padding: 0 35rpx;" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}" class="{{'tab ' + (index==title_index ? 'clor ' :'')}}">{{item.title}}<span class="tab1" wx:if="{{index==title_index}}"></span></view>
+        <view wx:if="{{object.show_all==1}}" style="padding: 0 35rpx;font-size: {{object.title_font_size*2}}rpx;color: {{object.title_color}};" class="{{'tab ' + (title_index == 10 ? 'clor ' :'')}}" >全部<span class="tab1" wx:if="{{10==title_index}}"></span></view>
+        <view wx:for="{{object.nav_list}}" style="padding: 0 35rpx;font-size: {{object.title_font_size*2}}rpx;color: {{object.title_color}};" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}" class="{{'tab ' + (index==title_index ? 'clor ' :'')}}">{{item.title}}<span class="tab1" wx:if="{{index==title_index}}"></span></view>
       </block>
       <!--样式二-->
       <block wx:if="{{object.menu_style==2}}">       
-        <view wx:for="{{object.nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}"  class="{{'tab ' + (index==title_index ? 'tab_action' : '')}}"> {{item.title}}</view>
+        <view wx:for="{{object.nav_list}}" style="font-size: {{object.title_font_size*2}}rpx;color: {{object.title_color}};" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}"  class="{{'tab ' + (index==title_index ? 'tab_action' : '')}}"> {{item.title}}</view>
       </block>
       <!--样式三-->
       <block wx:if="{{object.menu_style==3}}">
         <view wx:for="{{object.nav_list}}"  class="tab ">
-          <view class="{{'tab3 ' + (index==title_index ? 'tab_action' : '')}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}">
+          <view class="{{'tab3 ' + (index==title_index ? 'tab_action' : '')}}" style="font-size: {{object.title_font_size*2}}rpx;color: {{object.title_color}};" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}">
             {{item.title}}
           </view>
         </view>
@@ -50,7 +50,7 @@
     <block wx:if="{{goods_array.length > 0  }}">
       <!-- 大图模式 -->
       <block wx:if="{{object.style==1}}">
-        <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
+        <view style="{{'padding-top:'+object.product_spacing+'px;padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(object.product_style==2 ? ('background-color:'+object.bg_color) :'' )}}" class="{{'new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
           <!-- <block wx:for="{{goods_array}}"> -->
           <view wx:for="{{goods_array}}" wx:for-item="aitem" wx:for-index="aind" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')   + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}">
             <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
@@ -91,7 +91,7 @@
       </block>
       <!-- 一行两个 -->
       <block wx:if="{{object.style==2}}">
-        <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')  }}">
+        <view style="{{'padding-top:'+object.product_spacing+'px;padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(object.product_style==2 ? ('background-color:'+object.bg_color) :'' )}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')  }}">
           <!-- <block wx:for="{{goods_array}}"> -->
             <view wx:for="{{goods_array}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')   + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')+ (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
               <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
@@ -139,7 +139,7 @@
       </block>
       <!-- 一行三个 -->
       <block wx:if="{{object.style==3}}">
-        <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
+        <view style="{{'padding-top:'+object.product_spacing+'px;padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(object.product_style==2 ? ('background-color:'+object.bg_color) :'' )}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
           <!-- <block wx:for="{{goods_array}}"> -->
             <view wx:for="{{goods_array}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')   + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}">
               <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
@@ -187,7 +187,7 @@
       </block>
       <!-- 详细列表 -->
       <block wx:if="{{object.style==4}}">
-        <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')  }}">
+        <view style="{{'padding-top:'+object.product_spacing+'px;padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(object.product_style==2 ? ('background-color:'+object.bg_color) :'' )}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')  }}">
           <!-- <block wx:for="{{goods_array}}"> -->
             <view wx:for="{{goods_array}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')  + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}">
               <navigator style="display: flex;" url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1">
@@ -235,7 +235,7 @@
       </block>
       <!-- 一大一小 -->
       <block wx:if="{{object.style==5}}">
-        <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
+        <view style="{{'padding-top:'+object.product_spacing+'px;padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(object.product_style==2 ? ('background-color:'+object.bg_color) :'' )}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
           <block wx:for="{{goods_array}}">
             <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
               <view wx:if="{{aind==0}}" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')  + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'')  + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}">
@@ -413,7 +413,7 @@
  
       </block>
       <!-- 横向滑动 3个-->
-      <block wx:if="{{object.style==6}}">
+      <view wx:if="{{object.style==6}}" style="padding-top:{{object.product_spacing}}px;{{(object.product_style==2 ? ('background-color:'+object.bg_color) :'' )}}">
         <!-- <swiper indicator-dots circular> -->
         <swiper indicator-dots style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(swiperHeight ? ('height:'+swiperHeight+';'):'' )}}" class="{{' new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
           <swiper-item wx:for="{{goods_array}}"  class="flex2" style="padding: 5rpx;">
@@ -459,7 +459,7 @@
         </swiper>
         <!-- </swiper> -->
  
-      </block>
+      </view>
  
       <block wx:if="{{object.style!=6}}">
         <block wx:if="{{classstyle_id=='1' }}">
@@ -1025,6 +1025,7 @@ top: 10rpx;
 .boxsha{
   /* box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); */
   /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
+  background-color: #fff;
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 3px 10px 0 rgba(0, 0, 0, 0.19);
 }
 .but_radius85{
@@ -1151,7 +1152,7 @@ top: 10rpx;
 		font-size: 28rpx;
 		font-weight: bold;
     overflow-x: auto;
-    margin-bottom: 20rpx;
+    /* margin-bottom: 20rpx; */
 		/* min-width: 25%; */
   }
  
@@ -1188,7 +1189,7 @@ top: 10rpx;
 	}
 	.tab_action{
 		background-color: #f23030;
-    color: #fff;
+    color: #fff !important;
     border: none !important;
     opacity: .8;
 		/* border-color: #f23030 !important; */
@@ -33,6 +33,7 @@ Page({
     isAll: true,
     is_no_plus:1,
     default_img: '/miniapp/images/default_g_img.gif',
+    is_distribut:0, //是否是分销
   },
  
   /**
@@ -190,8 +191,8 @@ Page({
     var th = this;
     //更新一下会员的信息
     if (getApp().globalData.user_id) {
-      if (!getApp().globalData.userInfo['is_distribut']) {
-        th.setData({ ishidden_comise: 1 })
+      if (getApp().globalData.userInfo['is_distribut']) {
+        th.setData({ is_distribut: 1 })
       }
       getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
         isShowLoading: false,
@@ -207,9 +207,9 @@
 						<!-- 分层金额 -->
 						<!-- <view hidden="{{ishidden_comise}}" class="fs24 c-a">
 							分成金额：
-							<text class="money c-red">{{filter.toFix(item.commission,2)}}</text>
+							<text class="money c-red">{{filter.toFix(item.commission,2)}}</text> 
 						</view> -->
-            <view hidden="{{ishidden_comise}}">
+            <view wx:if="{{is_distribut || (!is_distribut && storeDistribut && storeDistribut.is_commission_displayed==1)}}">
               <view class="fs24 c-a" wx:if="{{item.distribut_level >= 1 && item.new_fir_rate !=0}}">
                 一级分成：
                 <text class="money c-red">{{filter.toFix(item.new_fir_rate,2)}}</text>
@@ -369,18 +369,20 @@
 						分成金额：
 						<text class="money c-red">{{filter.toFix(item.commission,2)}}</text>
 					</view> -->
-					<view class="fs24 c-a" wx:if="{{item.distribut_level >= 1 && item.new_fir_rate !=0}}">
-						一级分成：
-						<text class="money c-red">{{filter.toFix(item.new_fir_rate,2)}}</text>
-					</view>
-					<view class="fs24 c-a" wx:if="{{item.distribut_level >= 2 && item.new_sec_rate !=0}}">
-						二级分成：
-						<text class="money c-red">{{filter.toFix(item.new_sec_rate,2)}}</text>
-					</view>
-					<view class="fs24 c-a" wx:if="{{item.distribut_level >= 3 && item.new_thi_rate !=0}}">
-						三级分成：
-						<text class="money c-red">{{filter.toFix(item.new_thi_rate,2)}}</text>
-					</view>
+          <block wx:if="{{is_distribut || (!is_distribut && storeDistribut && storeDistribut.is_commission_displayed==1)}}">        
+            <view class="fs24 c-a" wx:if="{{item.distribut_level >= 1 && item.new_fir_rate !=0}}">
+              一级分成：
+              <text class="money c-red">{{filter.toFix(item.new_fir_rate,2)}}</text>
+            </view>
+            <view class="fs24 c-a" wx:if="{{item.distribut_level >= 2 && item.new_sec_rate !=0}}">
+              二级分成：
+              <text class="money c-red">{{filter.toFix(item.new_sec_rate,2)}}</text>
+            </view>
+            <view class="fs24 c-a" wx:if="{{item.distribut_level >= 3 && item.new_thi_rate !=0}}">
+              三级分成：
+              <text class="money c-red">{{filter.toFix(item.new_thi_rate,2)}}</text>
+            </view>
+          </block>
 				</view>
 			</view>
 		</view>
@@ -1159,22 +1159,43 @@ Page({
       console.log(e);
       let b = this.getInput(e);
       let reg=/^[0-9\-]*$/
+      // let reg=/^\d{4}-\d{1,2}-\d{1,2}$/
       if (!(reg.test(b))){
          return this.data.oldbirthday
       }
+
       let length = b.length;
       let oldBirtthDayLength=this.data.oldBirtthDayLength
       if (length > oldBirtthDayLength) {
+
         if (b.length==4) {
           b+='-' 
         }
+        if (b.length==6 && b[5] >1) {
+          console.log(b[5]);
+          return this.data.oldbirthday
+        }
+
         if (b.length==7) {
-          b+='-' 
+          if (b[6]=='-') {
+            let lb = b.split('');
+            lb.splice(5, 0, 0);
+            b = lb.join('');
+          }else{
+            b+='-' 
+          }
+
+        }
+       
+        if (b.length==10) {
+          let a=b[8]+b[9];
+          if (a*1>31) {
+            return this.data.oldbirthday
+          }
         }
-        // if (b.length==6 && b[5] >1) {
-        //   console.log(b[5]);
  
-        // }
+
+
       }
       this.setData({
         datet: b,
@@ -75,8 +75,8 @@ Page({
     load: 0,
     xmlist: null,
  
-    is_retail_price:0  //是否显示零售价
-
+    is_retail_price:0,  //是否显示零售价
+    banner: null, //分类广告
  
   },
  
@@ -173,7 +173,7 @@ Page({
     if (0 != this.data.cat_id) {
       url += "&cat_id=" + this.data.cat_id;
     }
-
+    
     // this.requestGoodsList(url);
     getApp().getConfig2(function (rs) {
       //计算等级价相关
@@ -202,9 +202,9 @@ Page({
     //调用底部导航
     //t.editTabBar(that,getApp().globalData.setting.stoid,getApp().globalData.url);
     //this.requestFirstCategoris();
-    setTimeout(function () {
+    // setTimeout(function () {
       //if (getApp().globalData.user_id) getApp().requestCardNum(that);
-    }, 500)
+    // }, 500)
  
     if (this.data.load) return false;
  
@@ -228,11 +228,17 @@ Page({
       if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); }
       if (e.categoryset.indexOf("," + 4 + ",") != -1) { that.setData({ is_show_xm: 1 }); }
       that.setData({ store_config: e, is_do: 1 });
-
+      //请求自定义分类数据
+      // that.requestFirstCategoris_diy()
       //---有勾品类---
       if (that.data.is_show_pl) {
-        that.requestFirstCategoris();
+        if (is_newsgoodstype==1) { //如果是风格2，则请求自定义分类
+          that.requestFirstCategoris_diy();
+        }else{
+          that.requestFirstCategoris();
+        }
       }
+
       if (that.data.is_show_xm != 1 && that.data.is_show_gb != 1 && that.data.is_show_pp != 1 && that.data.is_show_pl) {
         that.data.pl_timer = setInterval(function () {
           if (that.data.one_level_classify.length > 0) {
@@ -300,17 +306,159 @@ Page({
  
   },
  
+  
+  //---------------自定义分类请求接口,数据进行拼装------------------
+  requestFirstCategoris_diy: function () {
+    var t = this;
+    let that=this;
+    e.get("/api/weshop/customizeCategory/page", {
+      data: { store_id: oo.stoid, pageSize: 6600, is_show: 1 },
+      success: function (e) {
+
+        if (e.data.code !=0) {
+          that.requestFirstCategoris();
+          return
+        }
+        var arr = new Array();
+        var dda = e.data.data.pageData;
+        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) {
+              var item = { items: dda[i], array: new Array(),diy_class:1 } //增加一个diy_class 标识表示为自定义分类
+              arr.push(item);
+            } else if (parseInt(dda[i].level) == 2) {
+              for (var j = 0; j < arr.length; j++) {
+                if (parseInt(dda[i].parent_id) == parseInt(arr[j].items.id)) {
+                  arr[j].array.push(dda[i]); break;
+                }
+              }
+            } else {
+              continue;
+            }
+          }
+          t.setData({ catelist: arr });
+        } else if (t.data.is_used_share == 1 || t.data.is_used_share == 2) {
+
+          //---------新的版本----------------
+          for (var i = 0; i < dda.length; i++) {
+            //--要排队的元素---
+            var need_to_insert = dda[i];
+            if (parseInt(need_to_insert.level) == 1) {
+             //判断数组的长度看看有没有2级菜单
+              var item = { items: need_to_insert, array: new Array(),diy_class:1 } //增加一个diy_class 标识表示为自定义分类
+              arr.push(item);
+            } else if (parseInt(need_to_insert.level) == 2) {
+
+              for (var j = 0; j < arr.length; j++) {
+
+
+                if (parseInt(need_to_insert.parent_id) == parseInt(arr[j].items.id)) {
+
+                  var ishaf_two = { items: need_to_insert, arrays: new Array(),diy_class:1 };
+                  arr[j].array.push(ishaf_two); arr.ishaf_two = 0;
+                }
+              }
+            } else if (parseInt(need_to_insert.level) == 3) {//判断有3级的时候在二级里添加一个数组
+
+              for (var dd = 0; dd < arr.length; dd++) {
+                for (var pp = 0; pp < arr[dd].array.length; pp++) {
+                  //--判断二级--
+                  var two_item = arr[dd].array;
+
+                  if (two_item && two_item.length > 0) {
+
+                    if (parseInt(need_to_insert.parent_id) == parseInt(two_item[pp].items.id)) {
+
+                      arr[dd].array[pp].arrays.push(need_to_insert); arr.ishaf_three = 0; break;
+                    }
+                  }
+                }
+              }
+            }
+          }
+          for (var i = 0; i < arr.length; i++) {
+            arr[i]['items']['is_show_class'] = false;
+            var mobile_name = arr[i]['items']['name']
+            //if(mobile_name.length > 4){
+            //arr[i]['items']['name'] = mobile_name.substring(0, 4)
+            //}
+          }
+          if (t.data.is_show_pl == 1 && t.data.is_show_pp != 1 && t.data.is_show_gb != 1) {
+            arr[0]['items']['is_show_class'] = true;
+          }
+          //console.log(arr) 
+            t.setData({ one_level_classify: arr });
+          //---有勾品类---
+          // if (that.data.is_show_pl) {
+            that.requestFirstCategoris();
+          // }
+            if (t.data.select_classify_on == 0) {
+              var item = arr[0];
+  
+              var name = item.items.name;
+              var cid = item.items.id;
+              var arr = item.array;
+  
+              console.log("11111", item);
+              console.log(arr.length);
+  
+              if (arr.length == 0) {
+                t.setData({
+                  select_classify_on: 0, index: 0, classify_name: name, cat_id: cid,
+                  goodslist: null, is_level_three: 0
+                });
+  
+                if (t.data.is_used_share == 2)
+                  t.style(t.data.stylePage, cid)
+  
+                return false;
+              }
+              if (arr.length != 0) {
+                var is_lev_thr = 0
+                for (var i = 0; i < arr.length; i++) {
+                  if (arr[i].arrays.length > 0) { is_lev_thr = 1; break; }
+                }
+                t.setData({ is_level_three: is_lev_thr ,cat_id:cid});
+  
+                if (this.data.is_level_three != 1) {
+                  t.setData({ index: 0, classify_name: name, goodslist: arr });
+                  // t.setData({ index: 0, classify_name: name });
+                } else {
+                  // t.setData({ index: 0});
+                  t.setData({ index: 0, goodslist: arr });
+                }
+              }
+  
+              if (t.data.is_used_share == 2){
+                t.style(t.data.stylePage, cid)
+              }
+  
+            }
+          
+        }
+      }
+    });
+  },
+
   //---------------分类请求接口,数据进行拼装------------------
   requestFirstCategoris: function () {
+    
     var t = this;
     e.get("/api/weshop/goodscategory/page", {
       data: { store_id: oo.stoid, pageSize: 6600, is_show: 1 },
       success: function (e) {
+        if (e.data.code !=0) {
+          return
+        }
         var arr = new Array();
         var dda = e.data.data.pageData;
         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++) {
@@ -377,46 +525,53 @@ Page({
             arr[0]['items']['is_show_class'] = true;
           }
           //console.log(arr)
-          t.setData({ one_level_classify: arr });
-          if (t.data.select_classify_on == 0) {
-            var item = arr[0];
-
-            var name = item.items.name;
-            var cid = item.items.id;
-            var arr = item.array;
-
-            console.log("11111", item);
-            console.log(arr.length);
-
-            if (arr.length == 0) {
-              t.setData({
-                select_classify_on: 0, index: 0, classify_name: name, cat_id: cid,
-                goodslist: null, is_level_three: 0
-              });
-
-              if (t.data.is_used_share == 2)
-                t.style(t.data.stylePage, cid)
-
-              return false;
-            }
-            if (arr.length != 0) {
-              var is_lev_thr = 0
-              for (var i = 0; i < arr.length; i++) {
-                if (arr[i].arrays.length > 0) { is_lev_thr = 1; break; }
+          if (t.data.one_level_classify.length>0) {
+            let one_level_classify = t.data.one_level_classify;
+            one_level_classify.push(...arr)
+            t.setData({ one_level_classify: one_level_classify });
+          }else{
+            t.setData({ one_level_classify: arr });
+            if (t.data.select_classify_on == 0) {
+              var item = arr[0];
+  
+              var name = item.items.name;
+              var cid = item.items.id;
+              var arr = item.array;
+  
+              console.log("11111", item);
+              console.log(arr.length);
+  
+              if (arr.length == 0) {
+                t.setData({
+                  select_classify_on: 0, index: 0, classify_name: name, cat_id: cid,
+                  goodslist: null, is_level_three: 0
+                });
+  
+                if (t.data.is_used_share == 2)
+                  t.style(t.data.stylePage, cid)
+  
+                return false;
+              }
+              if (arr.length != 0) {
+                var is_lev_thr = 0
+                for (var i = 0; i < arr.length; i++) {
+                  if (arr[i].arrays.length > 0) { is_lev_thr = 1; break; }
+                }
+                t.setData({ is_level_three: is_lev_thr ,cat_id:cid});
+  
+                if (this.data.is_level_three != 1) {
+                  t.setData({ index: 0, classify_name: name, goodslist: arr });
+                } else {
+                  t.setData({ index: 0, goodslist: arr });
+                }
               }
-              t.setData({ is_level_three: is_lev_thr ,cat_id:cid});
+              if (t.data.is_used_share == 2){
  
-              if (this.data.is_level_three != 1) {
-                t.setData({ index: 0, classify_name: name, goodslist: arr });
-              } else {
-                t.setData({ index: 0, goodslist: arr });
+                t.style(t.data.stylePage, cid)
               }
+  
             }
-
-            t.style(t.data.stylePage, cid)
-
           }
-
         }
       }
     });
@@ -842,6 +997,14 @@ Page({
       }
       this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, cat_id: cid, stylePage: 1, lastMsg: false, });
     }
+    //==1的时候，样式2的时候分类广告切换
+    if (this.data.is_used_share==1) {
+      let banner=null;
+
+      this.setData({
+        banner
+      })
+    }
  
   },
  
@@ -906,6 +1069,7 @@ Page({
   requestGoodsList: function (t) {
     var that = this;
     that.data.requestUrl = t;
+    console.error(666666);
     e.get("/api/weshop/goods/page?1=1", {
       data: { page: that.data.stylePage, cat_id: that.data.cat_id, parent_id: 0, orderField: 'sort', orderType: 'asc', is_mainshow: 1, isonsale: 1, store_id: oo.stoid, is_recommend: 1 },
       success: function (data) {
@@ -1202,7 +1366,12 @@ Page({
   resetData: function () {
     a.resetConfig(), this.data.requestData = null, this.data.currentPage = 1;
   },
-
+  go_ad: function (e) {
+    var url = e.currentTarget.dataset.url;
+    if (!url || url == '') return;
+    if (url[0] != '/') url = '/' + url;
+    getApp().goto(url);
+  },
   //---回复最初的设置---
   restoreData: function () {
     this.setData({
@@ -296,11 +296,19 @@
         <!-- 品类-->
         <block wx:if="{{is_show_pl&&select_classify_on!=221&&select_classify_on!=220&&select_classify_on!=223}}">
           <!-- <block wx:if="{{select_classify_on!=221&&select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}"> -->
-
+          <view wx:if="{{one_level_classify && one_level_classify[select_classify_on] && one_level_classify[select_classify_on].items && one_level_classify[select_classify_on].items.ad_list && one_level_classify[select_classify_on].items.ad_list.length>0}}" style="width: 515rpx;height: 200rpx;margin: 0 auto;">
+            <swiper circular="true" indicator-dots indicator-active-color="#fff" autoplay="true" class="swiper_box" duration="1000" interval="3000" vertical="" bindchange="bannerSwiperChange" style="height:200rpx;min-height: 200rpx;">
+              <swiper-item wx:for="{{one_level_classify[select_classify_on].items.ad_list}}" wx:key="banner" class="swiperItem">
+                <view class="slide-image-frame">
+                  <image bindtap='go_ad' data-url="{{item.ad_weapplink}}" style="width: 100%;height:200rpx;" class="slide-image"  src="{{ iurl + item.ad_code}}"  data-index="{{index}}" lazy-load="true" ></image>
+                </view>
+              </swiper-item>
+            </swiper>
+          </view>
           <view class="my-container">
-            <view class="classify_name fs28 flex-space-between ai-center" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more'>
+            <view class="classify_name fs28 flex-space-between ai-center" data-pid="0" data-cid="{{cat_id}}" bindtap="{{(one_level_classify[select_classify_on].diy_class) ? '' :'select_more'}} ">
               <view class="classify_title ellipsis-1">{{classify_name}}</view>
-              <view class="flex select_more ai-center">
+              <view class="flex select_more ai-center" wx:if="{{!(one_level_classify[select_classify_on].diy_class)}}">
                 <view class="red-co fs24">更多</view>
                 <view class="bg_right width_height" style="margin-top: 0;"></view>
               </view>
@@ -332,10 +340,10 @@
               <block wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="inds">
               <view>
  
-                <view class="classify_name fs28 flex-space-between ai-center" data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'>
+                <view class="classify_name fs28 flex-space-between ai-center" data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap="{{one_level_classify[select_classify_on][diy_class] ? '' :'select_more'}} ">
  
                   <view class="classify_title ellipsis-1" style="margin-left: 25rpx;">{{goods.items.name}}</view>
-                  <view class="flex select_more ai-center">
+                  <view class="flex select_more ai-center" wx:if="{{!one_level_classify[select_classify_on].diy_class}}">
                     <view class="red-co fs24">更多</view>
                     <view class="bg_right width_height" style="margin-top: 0;"></view>
                   </view>
@@ -343,7 +351,7 @@
  
                 <block wx:if="{{goods.arrays.length>0}}">
                   <view class="classify_content-frame  flex-wrap" style="margin-left: 50rpx;">
-                    <view class="type_img_frame t-c ib" data-cid="{{item.id}}" data-pid="three" wx:for="{{goods.arrays}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate">
+                    <view class="type_img_frame t-c ib" data-cid="{{item.id}}" data-pid="three" wx:for="{{goods.arrays}}" data-url="{{item.weapp_path_url}}" wx:for-index="index" wx:for-item="item" bindtap="{{goods.diy_class ? 'go_ad':'go_cate'}}">
                       <image class=" type_img" src="{{item.icoimg==null||item.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':item.icoimg}}" binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
                       <view class="brand_img_name fs24 ellipsis-1 pdh10">{{item.name}}</view>
                     </view>
@@ -357,7 +365,7 @@
  
             <block wx:else>
               <view class="classify_content-frame  flex-wrap" style="margin-left: 50rpx;">
-                <view class="type_img_frame t-c ib" data-cid="{{item.items.id}}" data-pid="three" wx:for="{{goodslist}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate">
+                <view class="type_img_frame t-c ib" data-cid="{{item.items.id}}" data-pid="three" wx:for="{{goodslist}}" data-url="{{item.items.weapp_path_url}}" wx:for-index="index" wx:for-item="item" bindtap="{{item.diy_class ? 'go_ad':'go_cate'}}">
                   <image class=" type_img" src="{{item.items.icoimg==null||item.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':item.items.icoimg}}" binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
                   <view class="brand_img_name fs24 ellipsis-1 pdh10">{{item.items.name}}</view>
                 </view>
@@ -194,7 +194,7 @@ line-height: 50rpx;
 	z-index: 10;
 	background: #fff;
 	/* border-top: 4rpx solid #eee; */
-	border-bottom: 1rpx solid #f4f4f4;
+	/* border-bottom: 1rpx solid #f4f4f4; */
 	padding: 20rpx;
 }
  
@@ -27,6 +27,7 @@ Page({
     // nav_bg_color:'#e823e8', //导航按钮颜色
     //----------------
     is_show_top: 0, //是否置顶显示
+    is_fixed_nav:0,//是否显示固定底部导航
   },
  
   onLoad: function (e) {
@@ -192,7 +193,8 @@ Page({
           share_title: temp_data.page_title,
           template_arr: t_arr,
           isTemplate: 1,
-          bgcolor_t: temp_data.bkcolor
+          bgcolor_t: temp_data.bkcolor,
+          is_fixed_nav:temp_data.is_fixed_nav
         });
         setTimeout(() => {
           th.newGoodsGroup()
@@ -26,6 +26,7 @@
     "scan": "/components/diy_scan/diy_scan",
     "floatingWindow": "/components/diy_floatingWindow/diy_floatingWindow",
     "floatingBox": "/components/diy_floatingBox/diy_floatingBox",
+    "div_tab_bar": "/custom-tab-bar/index",
         "presell": "/components/diy_pregoods/diy_pregoods"
     }, 
   "enablePullDownRefresh": false,
@@ -180,7 +180,8 @@
     </view>
   </block>
 </view>
-<!-- 蒙尘 -->
+<div_tab_bar wx:if="{{is_fixed_nav==1}}"></div_tab_bar>
+<!-- 蒙尘 --> 
 <block wx:if="{{is_disgraceful}}">
   <view class="disgraceful">
     <!-- 新人礼领取图片 -->