Merge branch 'dev' into 'test'

Dev See merge request !441

Merge branch 'dev' into 'test'
Dev See merge request !441
后端研发-苏明海
2 parents 2199d2f6 3e80d9d6
Showing 37 changed files with 775 additions and 182 deletions
components/share_box/share_box.js
components/share_box/share_box.json
components/share_box/share_box.wxml
components/share_box/share_box.wxss
packageA/pages/prom_list/prom_list.js
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart2_pt/cart2_pt.wxml
pages/cart/cart_wk/cart_wk.js
pages/giftpack/birthdaygift/birthdaygift.js
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/evaluategift/evaluategift.js
pages/giftpack/festival/festival.js
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/mygiftpack/mygiftpack.js
pages/giftpack/newvipgift/newvipgift.js
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
pages/goods/categoryList/categoryList.wxss
+var t = getApp(),os =t.globalData.setting;
+Component({
+  properties: {
+  },
+  data: {
+    iurl:os.imghost,
+  },
+  ready: function() {
+  },
+  methods: {
+    //--- 分享 ---
+    go_share:function () {
+      this.triggerEvent('go_share')
+    }
+
+  }
+
+})
 \ No newline at end of file
+{
+  "component": true,
+  "usingComponents": {}
+}
 \ No newline at end of file
+<button class="box_main" style="background-image:url({{iurl}}/miniapp/images/shareimg.png)"  data-id="shareBtn" open-type="share" plain="true">
+</button>
+
+.box_main{
+    width: 80rpx;height: 80rpx; background-color: #fff; border-radius: 50%; border: 1rpx solid #adadad; position: fixed;right: 0; top:50%;
+    background-repeat: no-repeat;background-position: center center; background-size: cover;
+}
+button.control[plain] {
+    border: 0;
+}
 \ No newline at end of file
@@ -370,6 +370,20 @@ Page({
 		prom_id:o.prom_id
       };
+		//---是不是从收藏夹出来的---
+		if(th.data.c_guide_id){
+			newd['guide_id'] = th.data.c_guide_id;
+			newd['guide_type']=2;
+			if ("add" == t.currentTarget.dataset.action)  newd['guide_type']=3;
+		}else{
+			if(getApp().globalData.guide_id){
+				newd['guide_id'] = getApp().globalData.guide_id;
+				newd['guide_type']=0;
+				if ("add" == t.currentTarget.dataset.action)  newd['guide_type']=1;
+			}
+		}
+
+
       //-----如果是秒杀，团购，积分购,拼团-----
       if (th.data.data.prom_type != 5) {
 		 return s.my_warnning("商品不是搭配活动！", 0, th);
@@ -57,9 +57,12 @@ Page({
     var th = this;
     //调用底部导航
     t.editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
-
     this.getCardList();
-    if(getApp().globalData.user_id)  getApp().requestCardNum();
+    //--强行等待，让购物车的数量能够正确的线上
+    setTimeout(function () {
+      if(getApp().globalData.user_id)  getApp().requestCardNum(th);
+    },500)
+
     //--获取是否又秒杀活动--
     getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
       data: {
@@ -657,10 +660,11 @@ Page({
 					  e.doCheckAll();
 					  t.goods_num=false_data.false_data.buy_limit;
-					  e.update_cart(t, pitem, item);	
-					  
+					  e.update_cart(t, pitem, item);
 					  return false;
 					}
+                    e.update_cart(t, pitem, item);
+
 				}else{
 					//--- 看一下是不是线下库存 ---
 					if(th.data.sales_rules==2){
@@ -789,6 +793,7 @@ Page({
           e.check_prom_activity(i)
         }
         e.doCheckAll();
+        getApp().requestCardNum(e);
       }
     });
   },
@@ -152,6 +152,7 @@ Page({
         console.log("getuser_addr")
         console.log(ie)
+
          //地址切换要把包邮券清空
         if( !th.data.user_addr ||  th.data.user_addr.address_id!=ie.address_id){
             var using_quan=th.data.using_quan;
@@ -167,6 +168,7 @@ Page({
        //更换地址回来要重新调用计算价钱的接口
        if(!th.data.user_addr ||  th.data.user_addr.address_id!=ie.address_id){
+           th.setData({user_addr: ie });
            if (th.data.is_b_now == 1) {
                if(th.data.bn_goods) {
                    th.calculatePrice2();
@@ -176,9 +178,9 @@ Page({
                    th.calculatePrice();
                }
            }
+       }else{
+           th.setData({user_addr: ie });
        }
-
-       th.setData({user_addr: ie });
        var going=0;
@@ -280,7 +282,7 @@ Page({
       success: function (su) {
         if (su.data.code == 0) {
           var yuer = parseFloat(th.data.userinfo.user_money -
-            th.data.userinfo.frozen_money - su.data.data.summoney).toFixed(2);
+              (th.data.userinfo.frozen_money>0?th.data.userinfo.frozen_money:0) - su.data.data.summoney).toFixed(2);
           th.setData({ txmon: su.data.data.summoney, yuer: yuer });
         }
       }
@@ -596,7 +598,7 @@ Page({
         var all_cutprice=0;        //所有的优惠减件
         var all_order_prom=0;      //所有的订单优惠
-        var umoney = th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money;
+        var umoney = th.data.userinfo.user_money - th.data.txmon - (th.data.userinfo.frozen_money?th.data.userinfo.frozen_money:0);
         var freight_free = ee.freight_free;   //全场满多少包邮
 		var no_ex_id=ee.no_ex_id;
 		var no_ex_good=null;
@@ -1423,7 +1425,20 @@ Page({
         'prom_type':th.data.bn_goods.prom_type,  //促销活动类型
         'prom_id': th.data.bn_goods.prom_id,     //促销活动id
       };
-	  
+
+      //-- 把导购的信息填入--
+      if(gg.guide_id){
+          goods.guide_id=gg.guide_id;
+          goods.guide_type=gg.guide_type;
+          //调用接口判断是不是会员
+          await  getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+gg.guide_id,{}).then(res=>{
+              if(res.data.code==0){
+                  goods.guide_name=res.data.data.salesman;
+                  goods.guide_sn=res.data.data.salesman_no;
+              }
+          })
+      }
+
 	  //如果不立即购买或者秒杀，如果是线下库存购买的时候
 	  if(goods.prom_type!=1 && goods.prom_type!=6 && th.data.sales_rules==2){
 		  var isok=1;
@@ -1610,6 +1625,19 @@ Page({
 		  			  return false;
 		  		  }
 		  }
+
+		  //导购ID
+		  if(g_item.guide_id){
+              goods.guide_id=g_item.guide_id;
+              goods.guide_type=g_item.guide_type;
+              //调用接口判断是不是会员
+              await  getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+g_item.guide_id,{}).then(res=>{
+                  if(res.data.code==0){
+                      goods.guide_name=res.data.data.salesman;
+                      goods.guide_sn=res.data.data.salesman_no;
+                  }
+              })
+          }
           item.order_goods.push(goods);
         }
@@ -1620,6 +1648,7 @@ Page({
     if (pdata.length==0) return;
     var str = JSON.stringify(pdata);
+
     wx.showLoading({title: "加载中"});
     wx.request({
@@ -56,7 +56,8 @@ Page({
         qh:'',       //期号
         pt_listno:'',//期号
         is_normal:0,
-      is_express:0,//选择物流的控制器
+        is_express:0,//选择物流的控制器
+        yuer:0,
     },
     onLoad: function(t) {
         console.log("onLoad_pt_cart");
@@ -128,6 +129,18 @@ Page({
           th.setData({ userinfo: to.globalData.userInfo});
           //获取立即购买的商品信息
           th.get_buy_goods();
+
+          //获取提现金额
+          getApp().request.get("/api/weshop/withdrawals/summoney", {
+            data: { user_id: to.globalData.user_id, store_id: oo.stoid, status: 0 },
+            success: function (su) {
+                if (su.data.code == 0) {
+                    var yuer = parseFloat(th.data.userinfo.user_money -
+                        (th.data.userinfo.frozen_money>0?th.data.userinfo.frozen_money:0) - su.data.data.summoney).toFixed(2);
+                    th.setData({ txmon: su.data.data.summoney, yuer: yuer });
+                }
+            }
+        });
     },
     //-----获取立即购买的商品信息----
@@ -325,12 +338,12 @@ Page({
                   var txt2 = "formData.order_amount";
                   //--------------如果使用余额---------------------
                   if (th.data.bn_use_money == 1) {
-                      if (th.data.userinfo.user_money > total_m) {
+                      if ( parseFloat(th.data.yuer) > total_m) {
                           th.setData({ [txt]: total_m, [txt2]:0 })
                       }else{
-                          order_m = order_m - th.data.userinfo.user_money;
+                          order_m = order_m - parseFloat(th.data.yuer);
                           order_m = order_m.toFixed(2);
-                          th.setData({ [txt]: th.data.userinfo.user_money, [txt2]: order_m })
+                          th.setData({ [txt]: th.data.userinfo.yuer, [txt2]: order_m })
                       }
                   }else{
                     th.setData({ [txt]: 0, [txt2]: order_m })
@@ -422,6 +435,13 @@ Page({
           'prom_type':th.data.bn_goods.prom_type,  //促销活动类型
           'prom_id': th.data.bn_goods.prom_id,     //促销活动id
        };
+
+       //--导购分享过来的id--
+       if(gg.guide_id){
+            goods.guide_id=gg.guide_id;
+            goods.guide_type=gg.guide_type;
+       }
+
        item.order_goods.push(goods);
        pdata.push(item);
@@ -105,7 +105,7 @@
                 <view class="set-mes" wx:if="{{userinfo.user_money>0}}">
                   <view class="use-item" bindtap='set_bn_useyuer'>
                           <icon  color="{{bn_use_money?'red':'gray'}}" size="16" type="success"></icon>
-                          <view class="yu_er">使用余额 :￥{{userinfo.user_money}} </view>
+                          <view class="yu_er">使用余额 :￥{{yuer}} </view>
                   </view>
                 </view>
@@ -389,7 +389,7 @@ Page({
               getApp().my_warnning("支付成功",1,th);
               setTimeout(function () {
                 th.setData({ isclose: 0 });
-                wx.navigateTo({
+                wx.redirectTo({
                   url: "/pages/user/order_list/order_list"
                 })
               }, 1000)
@@ -123,6 +123,14 @@ Page({
     th.GetList();
   },
   onShow: function onShow() {
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      wx.navigateTo({
+        url: '/pages/getphone/getphone',
+      })
+      return false;
+    }
   },
   GetReceive: function() {
@@ -37,6 +37,14 @@ Page({
     th.getList();
   },
   onShow: function() {
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      wx.navigateTo({
+        url: '/pages/getphone/getphone',
+      })
+      return false;
+    }
   },
@@ -136,6 +136,14 @@ Page({
     th.GetList();
   },
   onShow: function() {
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      wx.navigateTo({
+        url: '/pages/getphone/getphone',
+      })
+      return false;
+    }
   },
   GetReceive: function() {
@@ -130,6 +130,14 @@ Page({
     });
   },
   onShow: function() {
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      wx.navigateTo({
+        url: '/pages/getphone/getphone',
+      })
+      return false;
+    }
   },
   GetReceive: function() {
@@ -44,6 +44,14 @@ Page({
     th.close();
   },
   onShow: function() {
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      wx.navigateTo({
+        url: '/pages/getphone/getphone',
+      })
+      return false;
+    }
   },
   GetBuyPrice: function(e) {
@@ -38,6 +38,14 @@ Page({
     th.getList();
   },
   onShow: function() {
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      wx.navigateTo({
+        url: '/pages/getphone/getphone',
+      })
+      return false;
+    }
   },
   getList: function() {
@@ -122,6 +122,14 @@ Page({
     th.GetList();
   },
   onShow: function() {
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      wx.navigateTo({
+        url: '/pages/getphone/getphone',
+      })
+      return false;
+    }
   },
   GetReceive: function() {
 var t = getApp(), e = t.request, oo = t.globalData.setting;
-
 var i = function (i) {
   return i && i.__esModule ? i : {
     default: i
@@ -7,65 +6,87 @@ var i = function (i) {
 }(require("../../../utils/LoadMore.js")), a = new i.default(), ut = require("../../../utils/util.js");
 //t = i,e = t
 Page({
-    data: {
-      is_date:true,
-      scrollHeight: 0,
-      currentTab:-1,
-      abc:0,
-      windowHeight:0,
-      windowWidth: 0,
-      eachLetterHeight:0,
-      lettersPosition:0, 
-      catelist:null,   //分类读取
-      nationlist: null,//国家读取
-      groups: null,    //品牌读取
-      iurl: oo.imghost,//图片地址
-
-      // 当前选择的导航字母
-      selected: 0,
-      // 选择字母视图滚动的位置id
-      scrollIntoView: 'A',
-      // 导航字母
-      letters: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-        'U', 'V', 'W', 'X', 'Y', 'Z'],
-     //控制新旧分类版本
-      is_used_share:0,
-      //国家的控制属性
-      is_country:1,
-      //品牌的控制属性
-      is_brand:1,
-      //选择分类的控制属性
-      select_classify_on:223,
-      index:223,
-      classify_name:"国家",//项目类型
-      brand_list:null,//品牌列表
-
-      one_level_classify:[],// 新的版本左边的边分类1级
-      is_level_three:0,//判断有没有3级
-      cat_id:0,
-      pl_timer: null,//只有品类的定时器
-      is_pl_time:0,
-      requestData:null, //风格三的商品数据列表 分页
-      stylePage:1, //商品列表分页标识
-
-      //风格三使用
-      url: t.globalData.setting.imghost,
-      currentPage: 1,
-      requestData: null,
-      allData: null,
-      openFilterModal: !1,
-      baseUrl: "api/weshop/goods/page?1=1&cat_id=1&parent_id=0&orderField=goods_id&orderType=desc&page=1&is_mainshow=1&isonsale=1&store_id="+oo.stoid+"&is_recommend=1",
-      requestUrl: "",
-      tabname: "goods_id",   //排序的字段
-      adname: "desc",        //升降的字段
-      is_new: 0,
-      is_hot: 0,
-      msgStatus:false,  //页面显示暂无数据状态
-      countDownNum: 3,
-      timer: '', //定时器
-      lastMsg:false,
-      toView:"",
-    },
+  data: {
+    is_date:true,
+    scrollHeight: 0,
+    currentTab:-1,
+    abc:0,
+    windowHeight:0,
+    windowWidth: 0,
+    eachLetterHeight:0,
+    lettersPosition:0, 
+    catelist:null,   //分类读取
+    nationlist: null,//国家读取
+    groups: null,    //品牌读取
+    iurl: oo.imghost,//图片地址
+
+    // 当前选择的导航字母
+    selected: 0,
+    // 选择字母视图滚动的位置id
+    scrollIntoView: 'A',
+    // 导航字母
+    letters: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+      'U', 'V', 'W', 'X', 'Y', 'Z'],
+   //控制新旧分类版本
+    is_used_share:0,
+    //国家的控制属性
+    is_country:1,
+    //品牌的控制属性
+    is_brand:1,
+    //选择分类的控制属性
+    select_classify_on:223,
+    index:223,
+    classify_name:"国家",//项目类型
+    brand_list:null,//品牌列表
+
+    one_level_classify:[],// 新的版本左边的边分类1级
+    is_level_three:0,//判断有没有3级
+    cat_id:0,
+    pl_timer: null,//只有品类的定时器
+    is_pl_time:0,
+    requestData:null, //风格三的商品数据列表 分页
+    stylePage:1, //商品列表分页标识
+
+    //风格三使用
+    url: t.globalData.setting.imghost,
+    currentPage: 1,
+    allData: null,
+    openFilterModal: !1,
+    baseUrl: "api/weshop/goods/page?1=1&cat_id=1&parent_id=0&orderField=goods_id&orderType=desc&page=1&is_mainshow=1&isonsale=1&store_id="+oo.stoid+"&is_recommend=1",
+    requestUrl: "",
+    tabname: "goods_id",   //排序的字段
+    adname: "desc",        //升降的字段
+    is_new: 0,
+    is_hot: 0,
+    msgStatus:false,  //页面显示暂无数据状态
+    countDownNum: 3,
+    timer: '', //定时器
+    lastMsg:false,
+    toView:"",
+    is_show_class:false,//是否添加新样式
+    status_show:0,
+    currentTab: 0, //预设当前项的值
+  },
+
+
+  //判断当前滚动超过一屏时，设置tab标题滚动条。
+  checkCor: function() {
+    let that = this;
+    //这里计算按照实际情况进行修改，动态数据要进行动态分析
+    //思路：窗体高度/单个分类高度 200rpx 转px计算 =>得到一屏幕所显示的个数，结合后台传回分类总数进行计算
+    //数据很多可以多次if判断然后进行滚动距离计算即可
+    if (that.data.currentTab > 7) {
+      that.setData({
+        scrollTop: 500
+      })
+    } else {
+      that.setData({
+        scrollTop: 0
+      })
+    }
+  },
+
+
     onLoad: function(tt) { 
       var that = this;
       that.get_brand();
@@ -156,8 +177,11 @@ Page({
       //调用底部导航
       t.editTabBar(that,getApp().globalData.setting.stoid,getApp().globalData.url);
       //this.requestFirstCategoris();
-      if(getApp().globalData.user_id)  getApp().requestCardNum();
-      getApp().getConfig2(function (e) {
+        setTimeout(function () {
+            if (getApp().globalData.user_id) getApp().requestCardNum(that);
+        },500)
+
+        getApp().getConfig2(function (e) {
         var data=e;
         var switch_list_data = data.switch_list;
@@ -189,10 +213,14 @@ Page({
                          }
                          that.setData({ is_level_three: is_lev_thr });
                          if (is_lev_thr!=1) {
-                             that.setData({ select_classify_on: 0, index: 0, classify_name: item.items.name, goodslist: item.array });
-                         } else {
-                             that.setData({ select_classify_on: 0, index: 0, goodslist: arr });
-                         }
+                          that.setData({ select_classify_on: 0, index: 0, classify_name: item.items.name,cat_id: item.items.id,goodslist: item.array });
+                          console.log("id:="+item.items.id)
+                          that.style(that.data.stylePage,that.data.cat_id);
+                     } else {
+                          that.setData({ select_classify_on: 0, index: 0, classify_name: item.items.name,cat_id: item.items.id,goodslist: arr });
+                          console.log("id:="+item.items.id)
+                          that.style(that.data.stylePage,that.data.cat_id);
+                     }
                      }
                      else{
                          that.setData({ select_classify_on: 0, index: 0, goodslist: null,classify_name:item.items.name,is_level_three: 0});
@@ -222,6 +250,12 @@ Page({
         } else if (that.data.is_show_pl) {
           that.setData({ currentTab: 0 });
         }
+        // 获取默认选中的第一个
+        if(that.data.is_show_gb && that.data.select_classify_on == 223){
+          that.setData({ status_show: 1 });
+        }else if(that.data.is_show_pp && that.data.select_classify_on == 220){
+          that.setData({ status_show: 2 });
+        }
       })
     },
@@ -291,8 +325,18 @@ Page({
                     }
                   }
                 }
-
               }
+              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});
               } 
@@ -557,6 +601,37 @@ Page({
   },
   // 新的版本分类点击一级分类
  click_classify:function(e){
+  let cur = e.currentTarget.dataset.current;
+  if (this.data.currentTab == cur) {
+    return false;
+  } else {
+    wx.pageScrollTo({
+      scrollTop: 0
+    })
+    this.setData({
+      currentTab: cur,
+      select_classify_on:cur
+    })
+    this.checkCor();
+  }
+  // if(e.currentTarget.dataset.index == 223){
+  //   this.setData({ status_show: 1});
+  //  }else if(e.currentTarget.dataset.index == 220){
+  //   this.setData({ status_show: 2});
+  //  }else{
+  //   this.setData({ status_show: 0});
+  //  }
+   var arr2 = this.data.one_level_classify
+   for(var i=0;i<arr2.length;i++){
+     if(i == e.currentTarget.dataset.index){
+      arr2[i]['items']['is_show_class'] = true
+     }else{
+      arr2[i]['items']['is_show_class'] = false
+     }
+   }
+   this.setData({ one_level_classify: arr2});
+   //this.data.one_level_classify[e.currentTarget.dataset.index]['items']['is_show_class'] = true
+  console.log(e.currentTarget.dataset.index)
    clearInterval(this.data.timer);
    this.setData({ countDownNum: 3, stylePage: 1, scrollTop: 0});
    this.data.ishaf_three = 0;
@@ -565,12 +640,13 @@ Page({
    var cid = e.currentTarget.dataset.cid;
    var pid = e.currentTarget.dataset.pid;
    var arr = e.currentTarget.dataset.arr;
-   console.log("cid:=" + cid)
+   console.log("cid:=" + name)
    if (indexs == 220) { this.get_brand(); }
    //==2的时候 请求数据为商品，不为分类
    if (this.data.is_used_share == 2) {
-     this.style(this.data.stylePage, cid)
-     this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, cat_id: cid,lastMsg: false, });
+    this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, cat_id: cid,lastMsg: false, });
+    console.log("edqdqw:="+this.data.select_classify_on)
+    this.style(this.data.stylePage, cid)
    }else{
      if (arr != "undefined" && arr != undefined) {
        if (arr.length == 0) {
@@ -588,10 +664,10 @@ Page({
          this.setData({ is_level_three: is_lev_thr });
          if (this.data.is_level_three != 1) {
-           this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, goodslist: arr });
-         } else {
-           this.setData({ select_classify_on: indexs, index: indexs, goodslist: arr });
-         }
+          this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, goodslist: arr });
+        } else {
+          this.setData({ select_classify_on: indexs, index: indexs, goodslist: arr });
+        }
        }
      }
      this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, cat_id: cid, stylePage: 1,lastMsg: false,});
@@ -756,6 +832,8 @@ Page({
           if (page != 1) {
             var dataArray = s.data.one_level_classify
             var index = s.data.index
+            dataArray[index]['items']['is_show_class'] = false
+            dataArray[index+1]['items']['is_show_class'] = true
             console.log(dataArray[index + 1]['items'])
             s.setData({
               msgStatus: true,
@@ -763,7 +841,8 @@ Page({
               index: index + 1,
               select_classify_on: index + 1,
               cat_id: dataArray[index + 1]['items']['id'],
-              classify_name: dataArray[index + 1]['items']['name']
+              classify_name: dataArray[index + 1]['items']['name'],
+              one_level_classify: dataArray
             });
             s.style(s.data.stylePage, dataArray[index + 1]['items']['id'])
           }else{
@@ -798,12 +877,15 @@ Page({
                     lastMsg: true
                   });
                 }else{
+                  dataArray[index]['items']['is_show_class'] = false
+                  dataArray[index+1]['items']['is_show_class'] = true
                   s.setData({
                     stylePage: 1,
                     index: index + 1,
                     select_classify_on: index + 1,
                     cat_id: dataArray[index + 1]['items']['id'],
-                    classify_name: dataArray[index + 1]['items']['name']
+                    classify_name: dataArray[index + 1]['items']['name'],
+                    one_level_classify:dataArray
                   });
                   s.style(s.data.stylePage, dataArray[index + 1]['items']['id']);
                 }
@@ -813,6 +895,15 @@ Page({
               s.setData({
                 countDownNum: countDownNum
               })
+              var arr2 = s.data.one_level_classify
+              for(var i=0;i<arr2.length;i++){
+                if(i == s.data.index){
+                arr2[i]['items']['is_show_class'] = true
+                }else{
+                arr2[i]['items']['is_show_class'] = false
+                }
+              }
+              s.setData({ one_level_classify: arr2});
             }, 1000)
           }
-<!-- 风格1 -->
+<!-- 风格1 --> 
 <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" >
@@ -98,7 +98,7 @@
 <block wx:elif="{{is_used_share == 1}}">
     <block wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
           <!-- 新版分类头部 -->
-          <view class="xc-search-box flex-center white_b">
+          <view class="xc-search-box flex-center white_b" style="position:fixed;top:0;z-index:99999">
                 <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">
@@ -113,46 +113,46 @@
                 </view>
         </view>
-          <!-- 分类项目内容 -->
-          <view class="flex project_height" style="margin-left:-10rpx;margin-bottom:120rpx">
+        
+          <!-- 分类项目内容  22 -->
+          <view class="flex project_height" style="margin-left:-10rpx;margin-bottom:120rpx"  id="two_type">
                <!-- 分类项目的类型 -->
-               <view class="project_type" style="background-color:#eee">
-           <view class="project_type-frame" style="margin-bottom:120rpx">
-           <view wx:if="{{is_show_gb}}">
-              <view  bindtap="click_classify"  class="share_type fs30 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 class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:999999;top:126rpx;">
+           <view class="project_type-frame" style="margin-bottom:120rpx;">
+           <view wx:if="{{is_show_gb}}" class="{{status_show == 1?'':''}}">
+           <!-- <view  style="{{status_show == 1?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
+              <view  bindtap="click_classify"  style="{{status_show == 1?'margin-top:0':'margin-top:40rpx'}}" class="fs30 flex-space-between  {{select_classify_on==223?'select_classify':''}}"data-index="223"data-name="国家" wx:if="{{is_country}}">
+            
+              <view  class="tab-bar-item sort-name ellipsis-1" style="letter-spacing:50rpx;">国家</view>
               </view>
               </view>
-              <view wx:if="{{is_show_pp}}">
-                  <view bindtap="click_classify" class="{{select_classify_on==220?'select_classify':''}} share_type fs30 flex-space-between xc-letter-spacing" wx:if="{{is_brand}}"data-index="220"data-name="品牌">
-             <text>品</text><text>牌</text>
+              <view wx:if="{{is_show_pp}}" class="{{status_show == 2?'':''}}">
+              <!-- <view  style="{{status_show == 2?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
+                <view bindtap="click_classify" class="{{select_classify_on==220?'select_classify':''}}   fs30 flex-space-between " wx:if="{{is_brand}}"data-index="220"data-name="品牌">
+              
+              <view  class="tab-bar-item sort-name ellipsis-1" style="letter-spacing:50rpx;">品牌</view>
               </view>
               </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 fs30 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>
-                 {{name}}
-                 </view>
-                 </view>
-
-                 </view>
-                   <view wx:else class="sort-name ellipsis-1">{{ittms.items.name}}
-                 </view>
+                <view class="{{ittms.items.is_show_class == true?'is_show_class':''}}">
+                 <!-- 添加左边红色条 -->
+                 <!-- <view  style="{{ittms.items.is_show_class == true?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
+                 <view bindtap="click_classify" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" class="{{select_classify_on==index?'select_classify width80':''}}  fs30 t-c  {{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.mobile_name}}">
+               
+                   <view  class="tab-bar-item sort-name ellipsis-1">{{ittms.items.name}}</view>
                  </view>
               </view>
-
+          </view>
         </view>
            </view>
         </view>
                <!-- 分类项目的内容 -->
-                <view class="classify_content">
+                <view class="classify_content" style="margin-left:27%;margin-top:130rpx">
         <!-- 国家的样式 -->
         <block wx:if="{{select_classify_on==223&&is_show_gb}}">
         <view class="classify_name fs28 flex-space-between">
@@ -288,21 +288,25 @@
           <!-- 分类项目内容 -->
           <view class="flex project_height" style="margin-left:-10rpx;">
             <!-- 分类项目的类型 -->
-            <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:999999;top:120rpx;">
+            <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:999999;top:126rpx;" id="thress_type3">
               <view class="project_type-frame" style="margin-bottom:120rpx;">
                 <view wx:if="{{is_show_gb}}">
-                  <view  bindtap="click_classify"  class="share_type fs30 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  bindtap="click_classify"  class="tab-bar-item {{select_classify_on==223 ? 'active' : ''}}"  data-current="223" data-index="223" data-name="国家" wx:if="{{is_country}}">
+                    <text style="letter-spacing:50rpx;">国家</text>
                   </view>
                 </view>
                 <view wx:if="{{is_show_pp}}">
-                  <view bindtap="click_classify" class="{{select_classify_on==220?'select_classify':''}} share_type fs30 flex-space-between xc-letter-spacing" wx:if="{{is_brand}}"data-index="220"data-name="品牌">
-                    <text>品</text><text>牌</text>
+                
+                  <view bindtap="click_classify"  class="tab-bar-item {{select_classify_on==220 ? 'active' : ''}}" wx:if="{{is_brand}}"  data-current="220" data-index="220" data-name="品牌">
+                    <text style="letter-spacing:50rpx;">品牌</text>
                    </view>
                 </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 fs30 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 wx:for="{{one_level_classify}}" wx:for-item="ittms" class="class_set_height"> -->
+                  <!-- <view class="{{ittms.items.is_show_class == true?'is_show_class':''}}"> -->
+                    <!-- 添加左边红色条 -->
+                    <!-- <view  style="{{ittms.items.is_show_class == true?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
+                    <!-- <view bindtap="click_classify"  style="{{status_show == 0 && ittms == 0 ?'margin-top:0':'margin-top:0rpx'}}" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" class="{{select_classify_on==index?'select_classify width80':''}} share_type fs30 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.mobile_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>
@@ -311,11 +315,26 @@
                         </view>
                       </view>
                       <view wx:else class="sort-name ellipsis-1">{{ittms.items.name}}</view>
+                    </view> -->
+                  <!-- </view> -->
+                  <scroll-view scroll-y scroll-with-animation class="tab-view" scroll-top="{{scrollTop}}" style="height:88%">
+                    <view wx:for="{{one_level_classify}}" wx:for-item="ittms" wx:key="{{index}}" class="tab-bar-item {{select_classify_on==index ? 'active' : ''}}" data-current="{{index}}" catchtap="click_classify" data-arr="{{ittms.array}}" data-cid="{{ittms.items.id}}" data-pid="0" data-index="{{index}}"data-name="{{ittms.items.mobile_name}}">
+                      <text>{{ittms.items.name}}</text>
+                      <!-- <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">
+                          <text>
+                          {{name}}
+                          </text>
+                        </view>
+                      </view>
+                      <text wx:else class="sort-name ellipsis-1">{{ittms.items.name}}</text> -->
                     </view>
-                  </view>
-                </view>
+                  </scroll-view>
+                  
+                <!-- </view> -->
               </view>
             </view>
+             </view>
             <!-- 分类项目的内容 -->
             <view class="classify_content" style="margin-left:27%;margin-top:130rpx">
         <!-- 国家的样式 -->
@@ -364,7 +383,7 @@
         </block>
         <!-- 品类-->
         <block  wx:if="{{is_show_pl}}">
-          <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
+          <block wx:if="{{select_classify_on!=220&&select_classify_on!=223}}">
               <view style="width:100%;height:100%;">
                 <view class="classify_name fs28 flex-space-between" id="header" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more' style="position:fixed;z-index:999999;top:130rpx;width:70%;background-color:#ffffff;left:27%;padding:0 10rpx;">
                   <view class="classify_title ellipsis-1">{{classify_name}}</view>
@@ -377,7 +396,7 @@
                 <!-- <view class="classify_content-frame flex-wrap" style="width:100%;overflow:hidden;heigth:100%;"> -->
                <!-- <view class="null" style="width:100%;margin-top:70rpx;"></view> -->
-                <scroll-view scroll-y scroll-top="{{scrollTop}}" bindscrolltolower='scrollLower' style="height:{{windowHeight}};position:absolute;margin-top:70rpx;top:120rpx;bottom:0;rigth:0;left:26%;width:73%;margin-bottom:50px;">
+                <scroll-view scroll-y scroll-top="{{scrollTop}}" bindscrolltolower='scrollLower' style="height:{{windowHeight}};position:absolute;margin-top:70rpx;top:140rpx;bottom:0;rigth:0;left:26%;width:73%;margin-bottom:100rpx;">
                 <view class="null" style="width:100%;height:1px;"></view>
                 <!-- goodslist -->
                     <view class="choice_list" style="height:{{msgStatus != true?'100%':''}}">
@@ -20,7 +20,7 @@ page{height: 100%; background: #fff;}
 }
 .active{
     color:#F65959;
-    border-bottom: 4rpx solid #F65959;
+    /* border-bottom: 4rpx solid #F65959; */
 }
 swiper{
   text-align: center;
@@ -223,7 +223,7 @@ overflow-y: scroll;
 .share_type{
   margin: auto;
   width: 58%;
-  margin-top: 40rpx;
+  /* margin-top: 40rpx; */
 }
 .xc-letter-spacing{
 padding-left: 20rpx;
@@ -231,10 +231,29 @@ padding-right: 29rpx;
 width: 58%;
 margin: auto;
 margin-top: 40rpx;
-margin-left:28rpx; 
+margin-left:28rpx;
+}
+#two_type .xc-letter-spacing{
+  padding-left: 20rpx;
+  padding-right: 29rpx;
+  width: 58%;
+  margin: auto;
+  margin-top: 40rpx;
+  margin-left:28rpx;
+  }
+
+/* 左边菜单点击样式 20200601 luca */
+.is_show_class{
+width: 100%;
+background-color: white;
+height: 50rpx;
+line-height: 50rpx;
+color:black;
+font-weight: 700;
 }
+
 .world_sn{
 white-space: nowrap;
 overflow: hidden;
@@ -243,25 +262,28 @@ width: 58%;
 margin: auto;
 margin-top: 35rpx;
 }
-.select_classify{
-  /* 20200530 update */
-/* background: #d60021; */
-background:white;
-/* border-radius: 30rpx; */
-/* color: #fff; */
-color:black;
+/* .select_classify{ */
+  /* 20200530 update 转用.is_show_class*/
+/* background: #d60021;
+border-radius: 30rpx;
+color: #fff;
 height: 48rpx;
-line-height: 45rpx;
-font-weight:700;
+line-height: 45rpx; */
+/* font-weight:700; */
-}
-.select_classify.width80{
+/* } */
+/* .select_classify.width80{ */
   /* 20200530updata */
   /* width: 74.5%; */
-  width: 100%;
-  height: 100rpx;
-  line-height: 100rpx;
+  /* height: 100rpx;
+  line-height: 100rpx; */
+/* } */
+.class_set_height{
+  height: 50rpx;
+  line-height: 50rpx;
+  padding: 20rpx 0;
 }
+
  .select_classify.width80.text-indent{
  text-indent: 38rpx;
  padding-right: 20px;
@@ -412,5 +434,89 @@ margin: auto;
 .brand_img_name {color: #666;}
+
+.tab-view {
+  /* height: 100%; */
+  width: 200rpx;
+  /* position: fixed;
+  left: 0;
+  top: 92rpx;
+  z-index: 10; */
+}
+
+#thress_type3 .tab-bar-item {
+  width: 200rpx;
+  height: 110rpx;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: left;
+  font-size: 30rpx;
+  padding-left: 30rpx;
+  color: #444;
+  font-weight: 400;
+} 
+
+#thress_type3 .active {
+  position: relative;
+  color: #000;
+  font-size: 30rpx;
+  font-weight: 600;
+  background: #fff;
+} 
+
+#thress_type3 .active::before {
+  content: "";
+  position: absolute;
+  border-left: 8rpx solid #E41F19;
+  height: 50rpx;
+  left: 0;
+} 
+
+
+
+
+
+
+#two_type .tab-bar-item {
+  width: 200rpx;
+  height: 110rpx;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: left;
+  font-size: 30rpx;
+  padding-left: 30rpx;
+  color: #444;
+  font-weight: 400;
+} 
+#two_type .select_classify {
+  position: relative;
+  color: #000;
+  font-size: 30rpx;
+  font-weight: 600;
+  background: #fff;
+} 
+
+#two_type .select_classify::before {
+  content: "";
+  position: absolute;
+  border-left: 8rpx solid #E41F19;
+  height: 50rpx;
+  left: 0;
+  top:26rpx;
+} 
+
+
+
+#two_type .is_show_class{
+  width: 100%;
+  background-color: white;
+  color:black;
+  font-weight: 700;
+  height: 110rpx;
+
+  }
+
 /* 风格三商品列表样式引入 */
 @import "../goodsList/goodsList.wxss";
 \ No newline at end of file
@@ -251,14 +251,34 @@ Page({
     var ee = this,
       that = ee,
       th = ee,
-      gid = t.goods_id;
+      gid = t.goods_id,
+      first_leader=t.first_leader;
     //---获取手机地址坐标--
     //--如果tg_id是空的话，分享回来--
     if (gid == undefined || gid == null || gid == "") {
-      gid = decodeURIComponent(t.scene);
+      var  gid_str = decodeURIComponent(t.scene);
+      gid_str.split("_");
+      gid=gid_str[0];
+      if(gid_str.length>1){
+        first_leader=gid_str[1];
+      }
     }
     ee.setData({ gid: gid});
+    if(first_leader){
+        getApp().globalData.first_leader=first_leader;
+        //调用接口判断是不是会员
+        getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
+           if(res.data.code==0){
+              getApp().globalData.guide_id=res.data.data.bind_user_id;
+           }
+        })
+    }
+
+    var c_guide_id=t.c_guide_id;
+    if(c_guide_id){
+      th.data.c_guide_id=c_guide_id;
+    }
     //----获取系统参数-----
     getApp().getConfig2(function(e) {
@@ -932,6 +952,19 @@ Page({
         sku: o.sku,
       };
+      //---是不是从收藏夹出来的---
+      if(th.data.c_guide_id){
+        newd['guide_id'] = th.data.c_guide_id;
+        newd['guide_type']=2;
+        if ("add" == t.currentTarget.dataset.action)  newd['guide_type']=3;
+      }else{
+        if(getApp().globalData.guide_id){
+          newd['guide_id'] = getApp().globalData.guide_id;
+          newd['guide_type']=0;
+          if ("add" == t.currentTarget.dataset.action)  newd['guide_type']=1;
+        }
+      }
+
       //如果是积分够，is_integral_normal就要有积分购普通购买字段
       if(o.prom_type==4){
         newd.is_integral_normal=1;
@@ -1028,8 +1061,6 @@ Page({
 	  			   }
 	  		   }
 	  }
-	  
-	  
 	  //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d);
 	  if ("add" == t.currentTarget.dataset.action) {
@@ -1064,7 +1095,6 @@ Page({
 						return s.my_warnning("库存不足！", 0, th);						 
 					}
 				}  	
-				
 	          var updata = {
 	            id: item.id,
@@ -1073,7 +1103,18 @@ Page({
 				member_goods_price:newd.goods_price,
 	            store_id: th.data.stoid,
 	          };
-	  
+
+              //---是不是从收藏夹出来的---
+              if(th.data.c_guide_id){
+                  updata['guide_id'] = th.data.c_guide_id;
+                  updata['guide_type']=3;   //加入购物车之后就变成了3
+              }else {
+                if (getApp().globalData.guide_id) {
+                   updata['guide_id'] = getApp().globalData.guide_id;
+                   updata['guide_type'] = 0;
+                }
+              }
+
 	          i.put("/api/weshop/cart/update", {
 	            data: updata,
 	            success: function(t) {
@@ -1086,6 +1127,8 @@ Page({
 	            }
 	          });
 	        } else {
+
+
 	          i.post("/api/weshop/cart/save", {
 	            data: newd,
 	            success: function(t) {
@@ -1124,7 +1167,7 @@ Page({
 					      break;
 				  }				 
 			 }
-			
+
 		}  	
 	    newd['pick_name'] = th.data.sto_sele_name;
@@ -1133,9 +1176,7 @@ Page({
 	  }
   },
-  
-  
-  
+
   //----------购买虚拟商品------
   buyVirtualGoods: function(e) {
     Object.assign(e, {
@@ -1319,6 +1360,12 @@ Page({
           store_id: o.stoid,
           add_time: timestamp,
         };
+        //加入收藏夹就是导购的ID
+        if(getApp().globalData.guide_id){
+          d.guide_id=getApp().globalData.guide_id;
+          d.guide_type=2;
+        }
+
         i.post("/api/weshop/goodscollect/save", { //添加收藏
           data: d,
           success: function(e) {
@@ -1438,10 +1485,14 @@ Page({
       title=th.data.prom_act.share_title;
       img=th.data.iurl+th.data.prom_act.share_imgurl;
     }
+    var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
+    if(getApp().globalData.user_id){
+       url+="&first_leader="+getApp().globalData.user_id;
+    }
     return {
       title: price + "元  " +title,
-      path: "/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid,
+      path:url,
       imageUrl: img,
     }
@@ -3126,7 +3177,12 @@ Page({
     var app = getApp();
     var unit = that.data.screenWidth / 750 * 1.35;
     var path2 = that.data.data.original_img;
-    var scene = th.data.gid;
+    var scene = th.data.gid+"";
+    var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
+    if(user_id>0){
+      scene+="_"+user_id;
+    }
+
     ///二微码
     var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
       os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
@@ -24,6 +24,19 @@ Page({
     },
     onLoad: function(t) {
+
+       //接受有没有导购的参数
+       var first_leader=t.first_leader;
+       if(first_leader){
+            getApp().globalData.first_leader=first_leader;
+            //调用接口判断是不是会员
+            getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+first_leader,{}).then(res=>{
+                if(res.data.code==0){
+                    getApp().globalData.guide_id=res.data.data.bind_user_id;
+                }
+            })
+        }
+
 	  var th=this;
       a.init(this, "", "requestData");
       var url = this.data.baseUrl;
@@ -194,9 +207,23 @@ Page({
     },
 //---------分享配置--------
   onShareAppMessage: function (e) {
-    return {
-      title: "商品列表",
-    }
+      var curPage=this;
+      var pagePath = curPage.route; //当前页面url
+      if (pagePath.indexOf('/') != 0) {
+          pagePath = '/' + pagePath;
+      }
+      if(getApp().globalData.user_id){
+
+          if(pagePath.indexOf("?")>0){
+              pagePath+="&first_leader="+getApp().globalData.user_id;
+          }else{
+              pagePath+="?first_leader="+getApp().globalData.user_id;
+          }
+      }
+      return {
+          title: "商品列表",
+          path:pagePath,
+      }
   },
     //---图片失败，默认图片---
     bind_bnerr2: function (e) {
  {
-    "navigationBarTitleText": "商品列表"
+    "navigationBarTitleText": "商品列表",
+     "usingComponents": {
+         "share_box": "/components/share_box/share_box"
+     }
 }
 \ No newline at end of file
@@ -164,4 +164,6 @@
         </view>
       </view>
     </view>
-  </view>
 \ No newline at end of file
+  </view>
+
+<share_box id="share"></share_box>
 \ No newline at end of file
@@ -23,6 +23,18 @@ Page({
         adname: "desc",    //升降的字段
     },
     onLoad: function(t) {
+        //接受有没有导购的参数
+        var first_leader=t.first_leader;
+        if(first_leader){
+            getApp().globalData.first_leader=first_leader;
+            //调用接口判断是不是会员
+            getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+oo.stoid+"/"+first_leader,{}).then(res=>{
+                if(res.data.code==0){
+                    getApp().globalData.guide_id=res.data.data.bind_user_id;
+                }
+            })
+        }
+
        var th=this;
        a.getConfig2(function(rs){
          var arr=new Array(),arr2=new Array();
@@ -112,7 +112,6 @@ Page({
     t.editTabBar(th,o.stoid,th.data.url);
-    if (getApp().globalData.user_id) getApp().requestCardNum();
     await this.init_load();
     //显示的时候要开启计时器
     this.data.is_timer = 1;
@@ -125,6 +124,9 @@ Page({
 		   if (new_nav == "") {
 		     th.is_new();
 		   }
+           setTimeout(function () {
+               if (getApp().globalData.user_id) getApp().requestCardNum(th);
+            },500)
 	  });
     } else {
@@ -405,6 +407,11 @@ Page({
 		if (new_nav == "") {
 		  th.is_new();
 		}
+
+      setTimeout(function () {
+        if (getApp().globalData.user_id) getApp().requestCardNum(th);
+      },500)
+
     });
     var goods_list = this.selectComponent("#goods_list"); //组件的id
 <!--pages/tabbar.wxml-->
   <template name="tabBar">
     <!-- 如果是自定义的话 -->
-    <view hidden="{{tabBar.iscustom=='2'}}" class="tab-bar" style="width:100%;height:{{tabBar.isIpx ? '168rpx' : '100rpx'}};position:fixed;color: {{tabBar.color}}; background: {{tabBar.backgroundColor}}; bottom: 0;z-index:9999999;padding:2px 0;">
+    <view hidden="{{tabBar.iscustom=='2'}}" class="tab-bar" style="width:100%;height:{{tabBar.isIpx ? '168rpx' : '100rpx'}};position:fixed;color: {{tabBar.color}}; background: {{tabBar.backgroundColor}}; bottom: 0;z-index:9999999;">
       <block wx:for="{{tabBar.list}}" wx:key="weappurl">
        <block wx:if="{{!item.active}}">
-            <navigator url="{{item.weappurl}}" open-type="redirect"  class="tabbar_item {{item.clas}}" style="position:relative;width:{{100 / tabBar.length}}%;height:100%;float:left;text-align:center;padding:2px 0;">
-                <view wx:if="{{item.nav_name=='购物车'}}" style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 40rpx;width: 50rpx;height: 30rpx;padding: 5rpx;position: absolute;z-index: 100;right: 0">
+            <navigator url="{{item.weappurl}}" open-type="redirect"  class="tabbar_item {{item.clas}}" style="position:relative;width:{{100 / tabBar.length}}%;height:100%;float:left;text-align:center;padding:5px 0;">
+                <view wx:if="{{item.nav_name=='购物车'}}"  class="menu_red">
                     {{tabBar.cartGoodsNum}}
                 </view>
               <view style="width:35%;height:30px;margin-left:33%;">
@@ -16,8 +16,8 @@
             </navigator>
        </block>
        <block wx:else>
-           <view  class="tabbar_item {{item.clas}}" style="color: {{item.selectedColor? item.selectedColor :tabBar.selectedColor}};position:relative;width:{{100 / tabBar.length}}%;height:100%;float:left;text-align:center;padding:2px 0;">
-               <view wx:if="{{item.nav_name=='购物车'}}" style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 40rpx;width: 50rpx;height: 30rpx;padding: 5rpx;position: absolute;z-index: 100;right:0">
+           <view  class="tabbar_item {{item.clas}}" style="color: {{item.selectedColor? item.selectedColor :tabBar.selectedColor}};position:relative;width:{{100 / tabBar.length}}%;height:100%;float:left;text-align:center;padding:5px 0;">
+               <view wx:if="{{item.nav_name=='购物车'}}"  class="menu_red">
                    {{tabBar.cartGoodsNum}}
                </view>
                <view style="width:35%;height:30px;margin-left:33%;">
@@ -81,7 +81,7 @@
     <!-- 3 -->
     <block wx:if="{{tabBar.active!='/pages/cart/cart/cart'}}">
         <navigator url="/pages/cart/cart/cart" open-type="redirect" class="tabbar_item {{tabBar.clas}}" style="position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
-          <view style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 40rpx;width: 50rpx;height: 30rpx;padding: 5rpx;position: fixed;z-index: 100;left:63%">
+          <view class="menu_default_red">
           {{tabBar.cartGoodsNum}}
           </view><view style="width:30%;height:57rpx;margin-left:35%;">
               <image src="{{tabBar.url}}/miniapp/images/bar/car.png"  class="img" style="width:100%;height:100%"></image>
@@ -91,7 +91,7 @@
      </block>
      <block wx:else>
           <view class="tabbar_item {{tabBar.clas}}" style="color:  #f23030;position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
-             <view style="background-color: red;color: #fff;font-size: 20rpx;border-radius: 40rpx;width: 50rpx;height: 30rpx;padding: 5rpx;position: fixed;z-index: 100;left:63%">
+             <view class="menu_default_red">
                     {{tabBar.cartGoodsNum}}
              </view><view style="width:30%;height:57rpx;margin-left:35%;">
                     <image src="{{tabBar.url}}/miniapp/images/bar/car_on.png"  class="img" style="width:100%;height:100%"></image>
+.menu_red{
+
+  top:0;background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;line-height:40rpx;height: 40rpx;position: absolute;z-index: 100;right:30rpx;
+}
+
+.menu_default_red{
+  background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;height: 40rpx;line-heith:40rpx;position: fixed;z-index: 100;left:63%
+}
 \ No newline at end of file
@@ -66,12 +66,29 @@ Page({
       wx.setNavigationBarTitle({ title: "拼团订单",})
       //var postdata=getApp().globalData.to_group;
       var postdata=options;
-      var tg_id = postdata.tg_id;
+      var tg_id = postdata.tg_id, first_leader=t.first_leader;
       //如果tg_id是空的话
       if(tg_id==undefined || tg_id==null || tg_id==""){
-        tg_id=decodeURIComponent(postdata.scene);
+        var tg_id_str=decodeURIComponent(postdata.scene);
+        tg_id_str=tg_id_str.split("_");
+        tg_id=tg_id_str[0];
+        if(tg_id_str.length>1){
+          first_leader=tg_id_str[1];
+        }
       }
-      this.setData({tg_id: tg_id });
+      //--判断一下是不是导购--
+      if(first_leader){
+      getApp().globalData.first_leader=first_leader;
+      //调用接口判断是不是会员
+      getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
+        if(res.data.code==0){
+          getApp().globalData.guide_id=res.data.data.bind_user_id;
+        }
+      })
+    }
+
+
+    this.setData({tg_id: tg_id });
       getApp().globalData.to_group=null;
   },
@@ -767,8 +784,12 @@ Page({
         }
         newd['pick_dis'] = th.data.pick_dis;
-        s.set_b_now(newd);
+        if(getApp().globalData.guide_id){
+          newd['guide_id'] = getApp().globalData.guide_id;
+          newd['guide_type']=0;
+        }
+        s.set_b_now(newd);
         wx.navigateTo({
           url: "/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + th.data.goods.goods_id,
         });
@@ -882,4 +903,30 @@ Page({
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
   },
+  //------ 分享配置 --------
+  onShareAppMessage: function (e) {
+    var curPage=this;
+    var pagePath = curPage.route; //当前页面url
+    if (pagePath.indexOf('/') != 0) {
+      pagePath = '/' + pagePath;
+    }
+    var url=pagePath;
+
+    //--分享图片--
+    img=th.data.iurl+th.data.teamlist.share_imgurl;
+    //--把会员分享出去--
+    if(getApp().globalData.user_id){
+      if(url.indexOf("?")>0)
+        url+="&first_leader="+getApp().globalData.user_id;
+      else
+        url+="?first_leader="+getApp().globalData.user_id;
+    }
+
+    return {
+      path:url,
+      title: "商品分类",
+      imageUrl: img,
+    }
+  },
+
 })
 \ No newline at end of file
@@ -355,6 +355,12 @@ Page({
         var app = getApp();
         var unit = that.data.screenWidth / 750 * 1.35;
         var scene=th.data.teamgroup.id;
+        var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0;
+        if(user_id>0){
+           scene+="_"+user_id;
+        }
+
+
         //二微码
         var path3 = os.url+ "/api/wx/open/app/user/getWeAppEwm/"+
            os.stoid+"?sceneValue="+scene+"&pageValue=pages/team/team_show/team_show";
@@ -667,7 +673,30 @@ Page({
         ob[err_img] = this.data.iurl + "/miniapp/images/default_g_img.gif";
         this.setData(ob);
-    }
+    },
+
+
+    //------ 分享配置 --------
+    onShareAppMessage: function (e) {
+        var scene=th.data.teamgroup.id;
+        var url="/pages/team/team_show/team_show?tg_id="+scene;
+        //--分享图片--
+        img=th.data.iurl+th.data.teamlist.share_imgurl;
+        //--把会员分享出去--
+        if(getApp().globalData.user_id){
+            if(url.indexOf("?")>0)
+                url+="&first_leader="+getApp().globalData.user_id;
+            else
+                url+="?first_leader="+getApp().globalData.user_id;
+        }
+
+        return {
+            path:url,
+            title: "商品分类",
+            imageUrl: img,
+        }
+    },
+
 })
@@ -54,6 +54,16 @@ Page({
 	 * 生命周期函数--监听页面显示
 	 */
 	onShow: function() {
+		//--先判断会员状态--
+		var user_info = getApp().globalData.userInfo;
+		if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+			wx.navigateTo({
+				url: '/pages/getphone/getphone',
+			})
+			return false;
+		}
+
+
 		var th=this;
 		if (!th.data.user) th.setData({ user: getApp().globalData.userInfo});
 		if (this.data.tasking != null && this.data.tasking != 'undefined' && this.data.tasking != "" && this.data.tasking !=
@@ -8,6 +8,7 @@ var t = function(t) {
   o = new t.default();
 var oo = e.globalData.setting,
   app_d = e.globalData;
+var ut = require('../../../utils/util.js');
 Page({
   data: {
@@ -153,6 +154,19 @@ Page({
   iconClick: function(e) {
     var th = this.data;
     var index = e.currentTarget.dataset.index;
+    var url = e.currentTarget.dataset.url;
+
+    var item=this.data.collects[index];
+    if(url){
+      console.log("---");
+      console.log(item.add_time);
+      console.log(ut.gettimestamp());
+
+      if(ut.gettimestamp()-item.add_time<3600*24 && item.guide_id>0)
+          url+="&c_guide_id="+item.guide_id;
+      getApp().goto(url);
+      return false;
+    }
     var collect = "collects[" + index + "].checked";
     if (this.data.collects[index].checked == true) {
       this.setData({
@@ -21,7 +21,8 @@
     </view>
     <!-- 商品集合 -->
     <view class="{{editEd?'collects_max colls_max':'collects_max'}}">
-      <navigator class="collect flex-vertical" bindtap="iconClick" data-index="{{index}}" wx:for="{{collects}}" wx:key="{{index}}" url="{{editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id:''}}">
+      <navigator class="collect flex-vertical" bindtap="iconClick" data-index="{{index}}" wx:for="{{collects}}" wx:key="{{index}}"
+                 data-url="{{editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id:''}}">
         <view class="radioCheck iconClick" wx:if="{{editEd}}">
           <radio color="rgb(214,1,33)" class="scale" checked="{{item.checked==true?true:false}}"></radio>
@@ -84,10 +84,12 @@ Page({
       need_money = 0,
       cur_g_num = 0;
-      //调用底部导航
-      getApp().editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
+    //调用底部导航
+    getApp().editTabBar(th,getApp().globalData.setting.stoid,getApp().globalData.url);
     getApp().get_isbuy(th.setappdata);
-    if (getApp().globalData.user_id) getApp().requestCardNum();
+    setTimeout(function () {
+        if (getApp().globalData.user_id) getApp().requestCardNum(th);
+    },500)
     /*------会员登录------*/
     app.getUserFir(async function(e) {
       if (e != undefined && e != null && e.mobile) {
@@ -522,7 +522,9 @@ Page({
     zfwk:function(){
       var url = "/pages/cart/cart_wk/cart_wk?order_id=" + this.data.order.order_id;
-      getApp().goto(url);
+      wx.redirectTo({
+          url:url,
+      })
     },
   //--------跳转到退款详情-----------
@@ -87,7 +87,7 @@ var e = function() {
                              g[ii].original_img = oo.imghost + g[ii].original_img;
                       }
-                      if (g[ii].add_time != undefined){
+                      if (g[ii].add_time != undefined && rurl.indexOf("goodscollect")<0){
                         var tx = g[ii].add_time + "";
                         if (tx.indexOf('-') == -1) {
                           g[ii].add_time = ut.formatTime(g[ii].add_time, 'yyyy-MM-dd hh:mm:ss');
@@ -34,7 +34,7 @@ module.exports = {
                 if(t.data.code==0){
                     i.weixinPay(t.data.data, e, a);
                 }else{
-                    getApp().showWarning(t.data.msg);
+                    getApp().confirmBox(t.data.msg);
                     setTimeout(function(){
                         wx.redirectTo({
                             url: "/pages/user/order_list/order_list",
@@ -62,7 +62,8 @@ module.exports = {
                 console.log(n), t.showSuccess("支付成功！", e);
             },
             fail: function(n) {
-                console.log(n), "requestPayment:fail" == n.errMsg ? t.showWarning("支付失败") : "requestPayment:fail cancel" == n.errMsg ? t.showWarning("您已取消支付") : t.showWarning("支付失败：" + n.errMsg.substr("requestPayment:fail ".length)), 
+                console.log(n), "requestPayment:fail" == n.errMsg ? t.showWarning("支付失败") : "requestPayment:fail cancel" == n.errMsg ? t.showWarning("您已取消支付") :
+                    t.confirmBox("支付失败：" + n.errMsg.substr("requestPayment:fail ".length)),
                 "function" == typeof a && a();
             }
         });