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

yvan.ni
2 parents 86d7cb9f a20a0a44
Showing 3 changed files with 228 additions and 49 deletions
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
pages/goods/categoryList/categoryList.wxss
@@ -35,6 +35,9 @@ Page({
       index:223,
       classify_name:"国家",//项目类型
       brand_list:null,//品牌列表
+
+      one_level_classify:[],// 新的版本左边的边分类1级
+      ishaf_three:0//判断有没有3级
     },
     onLoad: function(tt) { 
       const res = wx.getSystemInfoSync(),
@@ -68,9 +71,9 @@ Page({
       this.setData({
         lettersPosition: temp
       });
-      console.log(this.data.is_used_share,"是什么东西啊");
+   
       if (this.data.is_used_share==0){
-        console.log("有进来m");
+       
         this.get_nation();
       }
@@ -78,9 +81,15 @@ Page({
     },
     onShow:function(){
+      getApp
       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);
+        var is_newsgoodstype = switch_list.is_newsgoodstype;
+        that.setData({ is_used_share :is_newsgoodstype});
         if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); }
         if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); }
         if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); }
@@ -115,13 +124,15 @@ Page({
             success: function(e) {   
                 var arr=new Array();
                 var dda = e.data.data.pageData;
-                console.log(dda.length);
+             
+              console.log(dda, "所有的数据");
+              if (this.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()}
                        arr.push(item);
                   } else if (parseInt(dda[i].level) == 2){
-                     for (var j = 0; j < arr.length;j++ ){
+                      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;
                          }
@@ -131,6 +142,50 @@ Page({
                   }
                 }
                 t.setData({ catelist: arr});
+                }else{
+                  //新的版本
+                for (var i = 0; i < dda.length; i++) {
+                 
+                 
+                  //--要排队的元素---
+                  var need_to_insert=dda[i];
+
+                  if (parseInt(need_to_insert.level) == 1) {
+                    var item = { items: need_to_insert, array: new Array() }//判断数组的长度看看有没有2级菜单
+                    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() };
+                            arr[j].array.push(ishaf_two); arr.ishaf_two = 0; break;
+                        }
+                     }
+                  } 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;
+                          }
+
+                      }
+
+                    }
+                  }
+                  }
+
+              }
+                
+                console.log("现在是1级与2级所有的数据", arr)
+                t.setData({one_level_classify:arr});
+                }
             }
         });
     },
@@ -271,7 +326,8 @@ Page({
       },
       success: function (e) {
         var dda = e.data.data.pageData;
-      
+       
+       
         s.setData({ nationlist:dda})
       }
     });
@@ -368,15 +424,52 @@ Page({
       this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
   },
-  // 新的版本分类
+  // 新的版本分类点击一级分类
  click_classify:function(e){
+   this.data.ishaf_three=0;
   var indexs=e.currentTarget.dataset.index;
    var name = e.currentTarget.dataset.name;
-   console.log("获取当前下标",indexs);
-   this.setData({ select_classify_on: indexs, index: indexs, classify_name:name});
+   var cid = e.currentTarget.dataset.cid;
+   var pid = e.currentTarget.dataset.pid;
+   var arr = e.currentTarget.dataset.arr;
+   
    if (indexs==220){
      this.get_brand();
    }
+
+   if (arr!="undefined" && arr!=undefined){
+   if (arr.length==0){
+     var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid;
+     wx.navigateTo({ url: lurl });   
+     return false;
+   }
+   if (arr.length != 0){
+     
+     for(var i=0;i<arr.length;i++){
+          if(arr[i].arrays.length<0){
+             console.log(arr,"二级数据");
+						 this.setData({select_classify_on: indexs, index: indexs, classify_name: name, goodslist:arr});
+						 
+          }else{ 
+           
+            console.log("aaaaaaaaaaaaaaaaa", arr[i].length);
+            this.setData({ select_classify_on: indexs, index: indexs, goodslist: arr });
+            // if (arr[i].length>0){
+              console.log("000000");
+            // for (var z = 0;z<arr[i].length;z++){
+            //   var arr = arr[i];
+            //   console.log(z,"三级的数据", arr);
+            //   this.setData({ select_classify_on: indexs, index: indexs,goodslist: arr});
+            // }
+            console.log("这是什么东西", this.data.goodslist);
+            // } 
+             }
+          // }
+     }
+   }
+   }
+   
+   this.setData({ select_classify_on: indexs, index: indexs, classify_name: name });
  },
 //  图片失败
@@ -387,7 +480,33 @@ Page({
     var _errObj = {};
     _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
-
+  },
+  //选择更多
+  select_more:function(e){
+    var cid = e.currentTarget.dataset.cid;
+    var pid = e.currentTarget.dataset.pid;
+    console.log("选择更多"+cid);
+    var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid;
+    wx.navigateTo({ url: lurl });
+   
+  },
+//扫一扫
+  getScancode:function(){
+      var _this = this;
+    // 允许从相机和相册扫码
+    wx.scanCode({
+      success: (res) => {
+        //   var result = res.result;
+        // console.log("扫一扫返回",result);
+          // wx.navigateTo({
+       
+          //   url: "/pages/goods/search/search?s_key=" + result,
+          // });
+      }
+    })
+  },
+   onUnload: function () {
+    this.destroyActivityTimer();
   },
 });
 \ No newline at end of file
-<block wx:if="{{is_used_share}}">
+<block wx:if="{{is_used_share==0}}">
 <view class='top_view' wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
   <view class="swiper-tab" >
       <view wx:if="{{is_show_pl}}" class="swiper-tab-item {{currentTab==0?'active':''}}" 
@@ -102,9 +102,9 @@
 </block>
 <block wx:else>
 <!-- 新版分类头部 -->
-<view class="xc-search-box flex-center white_b"  bindtap="goseach">
-        <view class="share-height t-c">
-        <image class="scanning_black-img"src="../../../images/scanning_black.png"></image>
+<view class="xc-search-box flex-center white_b">
+        <view class="share-height t-c" bindtap="getScancode" >
+        <image class="scanning_black-img"src="{{iurl}}/miniapp/images/goodscategory/scanning_black.png"></image>
         <view class="fs24">
          扫一扫
         </view>
@@ -122,28 +122,41 @@
 <!-- 分类项目的类型 -->
 <view class="project_type">
    <view class="project_type-frame">
-      <view  bindtap="click_classify" class="share_type fs32 flex-space-between xc-letter-spacing {{select_classify_on==223?'select_classify':''}}"data-index="223"data-name="国家" wx:if="{{is_country}}">
-      <text>国</text><text>家</text>
+   <view wx:if="{{is_show_gb}}">
+      <view  bindtap="click_classify"  class="share_type fs32 flex-space-between xc-letter-spacing {{select_classify_on==223?'select_classify':''}}"data-index="223"data-name="国家" wx:if="{{is_country}}">
+       <text>国</text><text>家</text>
+       <!-- <view wx:for="{{classify_name}}" wx:for-item="name"wx:for-index="index">
+         <view>
+         {{name}}
+         </view>
+         </view> -->
+      </view>
       </view>
+      <view wx:if="{{is_show_pp}}">
           <view bindtap="click_classify" class="{{select_classify_on==220?'select_classify':''}} share_type fs32 flex-space-between xc-letter-spacing" wx:if="{{is_brand}}"data-index="220"data-name="品牌">
      <text>品</text><text>牌</text>
       </view>
-      <block wx:for="{{name}}" wx:for-item="ittm"wx:for-index="index">
-         <view bindtap="click_classify" class="{{select_classify_on==index?'select_classify width80':''}} share_type fs32 t-c {{ittm.names.length==2? 'world_sn':''}} {{select_classify_on==index&&ittm.names.length==2?'text-indent':''}} {{select_classify_on==index&&ittm.names.length==3?'text3':''}}"data-index="{{index}}"data-name="{{ittm.names}}">
-         <view class="{{ittm.names.length==3?'flex-center-around':'flex-space-between'}}" wx:if="{{ittm.names.length<4}}">    
-         <view wx:for="{{ittm.names}}" wx:for-item="names"wx:for-index="index">
+      </view>
+      <view wx:if="{{is_show_pl}}">
+     
+        <view wx:for="{{one_level_classify}}" wx:for-item="ittms" >
+         <view bindtap="click_classify" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" class="{{select_classify_on==index?'select_classify width80':''}} share_type fs32 t-c {{ittms.items.name.length==2? 'world_sn':''}} {{select_classify_on==index&&ittms.items.name.length==2?'text-indent':''}} {{select_classify_on==index&&ittms.items.name.length==3?'text3':''}}"data-index="{{index}}"data-name="{{ittms.items.name}}">
+         <view class="{{ittms.items.name.length==3?'flex-center-around':'flex-space-between'}}" wx:if="{{ittms.items.name.length<4}}">    
+         <view wx:for="{{ittms.items.name}}" wx:for-item="name"wx:for-index="index">
          <view>
-         {{names}}
+         {{name}} 
          </view>
          </view>
          </view>
-         <view wx:else>
-         {{ittm.names}}
+         <view wx:else class="sort-name">
+         {{ittms.items.name}}
          </view>
          </view>
-      </block>
-
+      
+      </view>
+     
+</view>
    </view>
 </view>
@@ -152,18 +165,18 @@
 <!-- 分类项目的内容 -->
-<view class="classify_content">
-<view class="classify_name fs32 flex-space-between">
-<view>{{classify_name}}</view>
-<view class="flex select_more"> 
-  <view class="red-co fs32">选择更多</view>
-  <view class="bg_right width_height"></view>
-</view>
-</view>
+<view class="classify_content"> 
 <!-- 国家的样式 -->
 <block wx:if="{{select_classify_on==223}}">
-  <view class="flex classify_content-frame" >
+<view class="classify_name fs32 flex-space-between">
+<view>{{ishaf_three==1?good_list.name:classify_name}}</view>
+<!-- <view class="flex select_more" > 
+  
+  <view class="bg_right width_height"></view>
+</view> -->
+</view>
+  <view class=" classify_content-frame flex-space-between" >
      <view bindtap="go_nation" class="country_img-frame rel outer_location"wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx" data-nid="{{bitem.id}}" >
                 <image class="country_img" src="{{iurl}}{{bitem.logo}}"></image>
                 <view class='nation_box abs box'>
@@ -174,9 +187,26 @@
                 </view>
        </view>
 </view>
+
+<!-- <view class="classify_content-frame  flex-wrap">
+  <view  class="brand_img_frame t-c ib" data-cid="{{item.items.id}}" data-pid="0"wx:for="{{ishaf_three==1?goodslist.arrays:goodslist}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate">
+     <image class="brand_img"src="{{ishaf_three==1?(item.items.icoimg==null?iurl+'/miniapp/images/no_cate_def.png':item.items.icoimg):(item.image==null?iurl+'/miniapp/images/no_cate_def.png':item.image)}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
+   <view class="brand_img_name fs24">{{ishaf_three==1?item.name:item.items.name}}</view>
+  </view>
+</view> -->
+
 </block>
 <!-- 品牌 -->
 <block wx:if="{{select_classify_on==220}}">
+
+<view class="classify_name fs32 flex-space-between">
+<view>{{classify_name}}</view>
+<!-- <view class="flex select_more" > 
+  
+  <view class="bg_right width_height"></view>
+</view> -->
+</view>
+
 <view class="classify_content-frame flex flex-wrap">
  <block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
@@ -187,22 +217,40 @@
         <view class="brand_img_name fs24">{{user.name}}</view>
    </view>
  </view>
+
+
 </block>
 </view>
 </block>
+
+
+
 <!-- 商品 -->
 <block wx:if="{{select_classify_on!=220&&select_classify_on!=223}}">
-<view class="classify_content-frame flex flex-wrap">
-  
+<block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="inds">
+<view>
-  <view class="brand_img_frame t-c"wx:for="{{goodslist}}" wx:for-index="index" wx:for-item="item" >
-     <image class="brand_img"src="{{item.logo}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
-   <view class="brand_img_name fs24">{{item.good_name}}</view>
-  </view>
-  
+<view class="classify_name fs32 flex-space-between"data-pid="0"data-cid="{{goods.items.id}}" bindtap='select_more'>
+<view>{{goods.items.name}}</view>
+<view class="flex select_more" > 
+  <view class="red-co fs32" >选择更多</view>
+  <view class="bg_right width_height"></view>
+</view>
+</view>
+
+<block wx:if="{{goods.arrays.length>0}}">
+<view class="classify_content-frame  flex-wrap">
+  <view  class="brand_img_frame t-c ib" data-cid="{{item.items.id}}" data-pid="0"wx:for="{{goods.arrays}}" wx:for-index="index" wx:for-item="item" bindtap="go_cate">
+     <image class="brand_img"src="{{item.items.icoimg==null?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">{{item.name}}</view>
+  </view>
 </view>
+<view class="divider_line"></view>
+</block>
+</view>
+</block>
 </block>
 </view>
@@ -203,17 +203,20 @@ margin-top: 8rpx;
   width: 33%;
   height: 100%;
   border-right: 1rpx solid #eee;
+  white-space: nowrap;
+
 }
 .share_type{
   margin: auto;
-  width: 60%;
+  width: 58%;
   margin-top: 35rpx;
+overflow: hidden;
 }
 .xc-letter-spacing{
 padding-left: 29rpx;
 padding-right: 29rpx;
-width: 52%;
+width: 51%;
 margin: auto;
 margin-top: 35rpx;
@@ -222,7 +225,7 @@ margin-top: 35rpx;
 .world_sn{
 white-space: nowrap;
 overflow: hidden;
-width: 50%;
+width: 58%;
 /* letter-spacing: 60rpx; */
 margin: auto;
 margin-top: 35rpx;
@@ -262,8 +265,8 @@ width: 60%;
  width: 90%;
  margin: auto;
  flex-wrap:wrap;
- justify-content:space-between;
- height: 90%;
+ max-height: 90%;
+
  overflow-y:scroll;
  overflow: hidden scroll;
@@ -271,7 +274,7 @@ width: 60%;
  .country_img-frame{
    width: 48%;
    height: 140rpx;
-   
+    
  }
  .country_img{
    width: 100%;
@@ -318,12 +321,13 @@ line-height: 65rpx;
    width: 30%;
    height: 220rpx;
    margin-top: 18rpx;
+   margin-right: 15rpx;
  }
  .brand_img{
    width:100%;
-   height: 70%;
+   height: 61.5%;
    margin-bottom: 10rpx
  }
   .brand_img-name{
@@ -344,6 +348,14 @@ width: 62%;
 line-height: 37rpx;
 height: 35rpx;
 margin-top: 24rpx;
+ }
+ .divider_line{
+   width: 100%;
+   border-bottom: 6rpx solid #eee;
+ }
+ .sort-name{
+  width: 132rpx;
+overflow: hidden;
+margin: auto;
-
- }
 \ No newline at end of file
+}
 \ No newline at end of file