Merge branch 'qa' into 'master'

Qa See merge request !448

Merge branch 'qa' into 'master'
Qa See merge request !448
后端研发-苏明海
2 parents 84104521 b5ef82dc
Showing 75 changed files with 1523 additions and 479 deletions
components/diy_seckill/diy_seckill.js
components/goods_list/goods_list.js
components/goods_list/goods_list.wxss
components/my_confirm/my_confirm.js
components/my_confirm/my_confirm.wxml
components/my_confirm/my_confirm.wxss
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/activity/pind_list/pind_list.js
pages/activity/pind_list/pind_list.json
pages/activity/pind_list/pind_list.wxml
pages/activity/seckill_list/seckill_list.js
pages/activity/seckill_list/seckill_list.json
pages/activity/seckill_list/seckill_list.wxml
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
pages/cart/cart2/cart2.js
@@ -57,6 +57,7 @@ Component({
         var item = {};
         goodsidlist+=val.goodsid+",";
       })
+      goodsidlist=ut.sub_last(goodsidlist);
       //--调用接口,读取秒杀--
       app.request.promiseGet("/api/ms/flash_sale/getGoodsList?store_id="
@@ -146,16 +146,17 @@ Component({
           var card_name_map = new Map();
           var user = getApp().globalData.userInfo;
-    
-          for (var i = 0; i < plusCard.length; i++) {
-            if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
-              continue;
+          if(plusCard) {
+            for (var i = 0; i < plusCard.length; i++) {
+              if (user && (user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
+                continue;
+              }
+              var name = "card" + plusCard[i].CorrPrice.toLowerCase();
+              card_name_map.set(name, plusCard[i].CardName);
+              new_arr.push(plusCard[i]);
+
+
             }
-             var name = "card" + plusCard[i].CorrPrice.toLowerCase();
-               card_name_map.set(name, plusCard[i].CardName);
-               new_arr.push(plusCard[i]);
-            
-            
           }
           var ob = {
             "card_list": new_arr,
 .collects {
   margin-top: 40rpx;
+  margin-bottom: 40rpx;
 }
 .ib {
@@ -29,10 +29,13 @@ Component({
          })
     },
     go_sure: function() {
-      this.data.success();
+      this.setData({ yu_e_show: 0})
+      if(this.data.success) this.data.success();
+
     },
     go_cancle: function() {
-      this.data.cancle();
+      this.setData({ yu_e_show: 0})
+      if(this.data.cancle) this.data.cancle();
     },
     close_yu_e: function() {
       this.setData({
@@ -4,7 +4,7 @@
   <view> 
 		<view class="xc-qr-frame">
 		<view class="shut" bindtap="close_yu_e">ⅹ</view>
-		 <view class="fs32 xc-black3 flex jc-center ai-center" style="width:100%;height:220rpx;">{{title}}</view> 
+			<view class="fs32 xc-black3 flex jc-center ai-center" style="padding: 10rpx 20rpx;min-height:220rpx;"><text>{{title}}</text></view>
 		 <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;">
 			   <view bindtap="go_sure" class="fs30 white flex jc-center ai-center ck_btn color color" style="margin-right: 20rpx;">{{s_text}}</view>
 		     <view bindtap='go_cancle' class="fs30 xc-ash flex jc-center ai-center ck_btn"style="background:#ececea;">{{c_text}}</view>
@@ -40,7 +40,7 @@
 }
 .xc-qr-frame{ 
 	width:560rpx;
-  height: 280rpx;
+  min-zoom: 280rpx;
 	background: #fff;
 	z-index: 55;
   position: fixed;
+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
@@ -43,8 +43,20 @@ Page({
   //------初始化加载----------
   onLoad: function(t) {
        var goods_id=t.goods_id;
-	   this.setData({gid:goods_id});	 
+	   this.setData({gid:goods_id});
 	   var ee=this,th=ee,that=ee;
+       var  first_leader=t.first_leader;
+	   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.id;
+			  }
+		  })
+	   }
+
+
 	   //----获取系统参数,并判断等级价格-----
 	   getApp().getConfig2(function(e) {	     
 	     var json_d = JSON.parse(e.switch_list);
@@ -216,7 +228,7 @@ Page({
 								  //--- 判断是等级会员，且在有效期范围内 ---
 								  if(user.card_field && now<end){
 									  var card_name=ob.name_map.get(user.card_field);
-									  if(card_name.length>5) card_name=card_name.substring(0,5);							
+									  if(card_name && card_name.length>5) card_name=card_name.substring(0,5);
 									  th.setData({card_field:user.card_field,card_name:card_name});
 									  if(t.data.data[user.card_field]>0)  t.data.data.shop_price=t.data.data[user.card_field];									 
 								  }									 
@@ -323,7 +335,6 @@ Page({
       a = 0,
       o = this.data.data;
       a = o.goods_id;
-
     //----------添加到购物车时，要判断限购数量，--------
     e.get_buy_num(o, function(ee) {
       //---判断商品是否超出限购---
@@ -370,6 +381,28 @@ 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;
+			}
+		}
+
+        //如果有导购ID的话
+		if(newd['guide_id'] && th.data.sele_collocation){
+             for(var jj in th.data.sele_collocation ){
+				 th.data.sele_collocation[jj]['guide_id']=newd['guide_id'];
+				 th.data.sele_collocation[jj]['guide_type']=newd['guide_type'];
+			 }
+		}
+
+
       //-----如果是秒杀，团购，积分购,拼团-----
       if (th.data.data.prom_type != 5) {
 		 return s.my_warnning("商品不是搭配活动！", 0, th);
@@ -612,22 +645,25 @@ Page({
   //--点击分享事件---
   onShareAppMessage: function(t) {
-    var th = this;
-    var price = th.data.data.shop_price;
-    if (th.data.prom_act) {
-      price = th.data.prom_act.price;
-    }
-    var title= th.data.data.goods_name;
-    var img=th.data.data.original_img;
-    if(th.data.prom_type==6){
-      title=th.data.prom_act.share_title;
-      img=th.data.iurl+th.data.prom_act.share_imgurl;
-    }
+	  var curPage=this;
+	  var pagePath = curPage.route; //当前页面url
+	  if (pagePath.indexOf('/') != 0) {
+		  pagePath = '/' + pagePath;
+	  }
+	  if(getApp().globalData.user_id){
+		  if(pagePath.indexOf("?")>0){
+			  pagePath+="&goods_id="+this.data.gid+" &first_leader="+getApp().globalData.user_id;
+		  }else{
+			  pagePath+="?goods_id="+this.data.gid+"&first_leader="+getApp().globalData.user_id;
+		  }
+	  }
+
+	  console.log("111");
+	  console.log(pagePath);
     return {
-      title: price + "元  " +title,
-      path: "/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid,
-      imageUrl: img,
+      title: "搭配购",
+      path: pagePath,
     }
   },
@@ -17,6 +17,24 @@ Page({
       iurl: os.imghost,
     },
+    //------初始化加载----------
+    onLoad: function(t) {
+        var  first_leader = t.first_leader;
+
+        console.log("------------");
+        console.log(first_leader);
+
+        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.id;
+                }
+            })
+        }
+    },
+
     onShow: function(t) {
        wx.setNavigationBarTitle({ title: "天天拼单",})
@@ -126,12 +144,34 @@ Page({
        this.reloadGoodList();
     },
-  //---------分享配置--------
-  onShareAppMessage: function (e) {
-    return {
-      title: "限时团购",
-    }
-  },
+
+
+    //---------分享配置--------
+    onShareAppMessage: function (e) {
+        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;
+            }
+        }
+
+        console.log("11"+pagePath);
+
+        return {
+            title: "限时团购",
+            path:pagePath,
+        }
+    },
+
+
+
     //图片失败，默认图片
     bind_bnerr2: function (e) {
 {
-    "navigationBarTitleText": "天天拼单"
+    "navigationBarTitleText": "天天拼单",
+    "usingComponents": {
+        "share_box": "/components/share_box/share_box"
+    }
 }
 \ No newline at end of file
@@ -84,4 +84,6 @@
 <view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view>
 </view>
-</block>
 \ No newline at end of file
+</block>
+
+<share_box id="share"></share_box>
 \ No newline at end of file
@@ -12,6 +12,26 @@ Page({
         ismore:1,  //是否可以加载更多
         isshow:0,
     },
+
+    //------初始化加载----------
+    onLoad: function(t) {
+        var  first_leader = t.first_leader;
+
+        console.log("------------");
+        console.log(first_leader);
+
+        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.id;
+                }
+            })
+        }
+    },
+
+
     onShow: function(t) {
         wx.setNavigationBarTitle({ title: "商品秒杀",})
@@ -123,12 +143,31 @@ Page({
        this.setData({type:a,goodlist:null});
        this.reloadGoodList();
     },
-  //---------分享配置--------
-  onShareAppMessage: function (e) {
-    return {
-      title: "疯狂秒杀",
-    }
-  },
+
+
+    //---------分享配置--------
+    onShareAppMessage: function (e) {
+        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;
+            }
+        }
+
+        console.log("11"+pagePath);
+        return {
+            title: "限时秒杀",
+            path:pagePath,
+        }
+    },
+
     //图片失败，默认图片
     bind_bnerr2: function (e) {
        var _errImg = e.target.dataset.errorimg;
 {
-    "navigationBarTitleText": "商品秒杀"
+    "navigationBarTitleText": "商品秒杀",
+    "usingComponents": {
+        "share_box": "/components/share_box/share_box"
+    }
 }
 \ No newline at end of file
@@ -73,3 +73,5 @@
 </view>
 </block>
+
+<share_box id="share"></share_box>
@@ -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: {
@@ -142,102 +145,105 @@ Page({
           carr = su.data.data.pageData;
         var all_num = 0;
-        for (var i = 0; i < carr.length; i++) {
-          var item = carr[i];
-          var good=null;
-          await getApp().request.promiseGet("/api/weshop/goods/get/"+os.stoid+"/"+item.goods_id,{}).then(res=>{
-              good=res.data.data;
-          })
-          var tt=ut.gettimestamp();
-          //如果商品下架了，或者商品是赠品，一开始都要清除
-          if((good.down_time>0 && good.down_time<tt) || good.is_on_sale==0 || item.is_gift ){
+        if(carr && carr.length>0) {
+          for (var i = 0; i < carr.length; i++) {
+            var item = carr[i];
+            var good = null;
+            await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + item.goods_id, {}).then(res => {
+              good = res.data.data;
+            })
+            var tt = ut.gettimestamp();
+            //如果商品下架了，或者商品是赠品，一开始都要清除
+            if ((good.down_time > 0 && good.down_time < tt) || good.is_on_sale == 0 || item.is_gift) {
               var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
               getApp().request.delete(url, {
-                  success: function(t) { }
+                success: function (t) {
+                }
               });
               //商品已经下架
               continue;
-          }
-          //如果秒杀活动都去掉了，或者结束了，那么这个商品也没有必要留着
-          if(item.prom_type==1){
-                var prom=null;
-                await getApp().request.promiseGet("/api/ms/flash_sale/get/"+os.stoid+"/"+item.prom_id,{
-                }).then(res=>{
-                  if(res.data.code==0) prom=res.data.data;
-                })
-                //---如果有活动，不算在一起---
-                if(!prom && prom.is_end==0 && prom.end_time>now && prom.start_time<now){
-                    var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
-                    a.delete(url, {
-                      success: function(t) { }
-                    });
-                    //商品已经下架
-                    continue;
-                }
-          }
-          //--判断优惠活动有没有过期--
-          else if(item.prom_type==3){
-              var isok=1;
-              await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+item.goods_id+"/1", {}).then(res => {
-                  if(res.data.code==0){
-                      var r_data=res.data.data;
-                      if(!r_data.promGoodsLists){
-                        var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
-                        a.delete(url, {});
-                        //商品已经下架
-                        isok=0;
-                      }
+            }
+            //如果秒杀活动都去掉了，或者结束了，那么这个商品也没有必要留着
+            if (item.prom_type == 1) {
+              var prom = null;
+              await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + item.prom_id, {}).then(res => {
+                if (res.data.code == 0) prom = res.data.data;
+              })
+              //---如果有活动，不算在一起---
+              if (!prom && prom.is_end == 0 && prom.end_time > now && prom.start_time < now) {
+                var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+                a.delete(url, {
+                  success: function (t) {
                   }
-                  else{
+                });
+                //商品已经下架
+                continue;
+              }
+            }
+            //--判断优惠活动有没有过期--
+            else if (item.prom_type == 3) {
+              var isok = 1;
+              await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1", {}).then(res => {
+                if (res.data.code == 0) {
+                  var r_data = res.data.data;
+                  if (!r_data.promGoodsLists) {
                     var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
-                    a.delete(url, { });
+                    a.delete(url, {});
                     //商品已经下架
-                    isok=0;
+                    isok = 0;
                   }
+                } else {
+                  var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+                  a.delete(url, {});
+                  //商品已经下架
+                  isok = 0;
+                }
               })
-              if(!isok) continue;
-          }
+              if (!isok) continue;
+            }
-          all_num += item.goods_num;
-          item.original_img = oo.imghost + item.original_img;
-          item.selected = 0;
+            all_num += item.goods_num;
+            item.original_img = oo.imghost + item.original_img;
+            item.selected = 0;
-          var pcid = item.pick_id;
-          var find = 0;
-          //---------循环查找门店---
-          if (arr.length > 0) {
-            for (var j = 0; j < arr.length; j++) {
-              if (arr[j].pid == pcid) {
-                arr[j].goods.push(item);
-                find = 1;
-                break;
+            var pcid = item.pick_id;
+            var find = 0;
+            //---------循环查找门店---
+            if (arr.length > 0) {
+              for (var j = 0; j < arr.length; j++) {
+                if (arr[j].pid == pcid) {
+                  arr[j].goods.push(item);
+                  find = 1;
+                  break;
+                }
               }
             }
-          }
-          //------如果没有找到-----
-          if (find == 0) {
-            var pikname = '';
-            //找到门店名称
-            for (var k = 0; k < th.data.allsto.length; k++) {
-              if (pcid == th.data.allsto[k].pickup_id) {
-                pikname = th.data.allsto[k].pickup_name;
-                break;
+            //------如果没有找到-----
+            if (find == 0) {
+              var pikname = '';
+              //找到门店名称
+              for (var k = 0; k < th.data.allsto.length; k++) {
+                if (pcid == th.data.allsto[k].pickup_id) {
+                  pikname = th.data.allsto[k].pickup_name;
+                  break;
+                }
               }
+              var narr = new Array();
+              narr.push(item);
+              var ie = {
+                pid: pcid,
+                pname: pikname,
+                goods: narr,
+                selected: 0
+              };
+              arr.push(ie);
             }
-            var narr = new Array();
-            narr.push(item);
-            var ie = {
-              pid: pcid,
-              pname: pikname,
-              goods: narr,
-              selected: 0
-            };
-            arr.push(ie);
           }
         }
+
         if(arr.length==0) {
           setTimeout(function () {
             var goods_list = th.selectComponent("#goods_list"); //组件的id
@@ -657,10 +663,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 +796,7 @@ Page({
           e.check_prom_activity(i)
         }
         e.doCheckAll();
+        getApp().requestCardNum(e);
       }
     });
   },
@@ -1294,4 +1302,5 @@ Page({
      getApp().goto(url);
   }
+
 });
 \ No newline at end of file
+<import src="../../tabbar/tabbar.wxml" />
+<template is="tabBar" data="{{tabBar}}" />
+
 <!-- 广告图片 -->
 <navigator class="picture" url="/pages/activity/seckill_list/seckill_list" wx:if="{{is_has_flash}}">
   <image class="picture" src="{{iurl}}miniapp/images/stores/Seckill.png"></image>
@@ -181,5 +184,3 @@
 <warn id="warn"></warn>
-<import src="../../tabbar/tabbar.wxml" />
-<template is="tabBar" data="{{tabBar}}" />
 \ No newline at end of file
@@ -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 });
         }
       }
@@ -479,6 +481,12 @@ Page({
                 if(gg.prom_type==5){
                       t.data.data.prom_id = gg.prom_id ;
                       t.data.data.prom_type =5;
+
+                      //--主商品要有导购id和导购类型--
+                      if(gg.guide_id){
+                          t.data.data.guide_id=gg.guide_id;
+                          t.data.data.guide_type=gg.guide_type;
+                      }
                       th.setData({collocation_goods:gg.collocation_goods});
                       var cart_arr=new  Array();
@@ -596,7 +604,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 +1431,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/getId/"+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 +1631,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/getId/"+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,7 +1654,7 @@ Page({
     if (pdata.length==0) return;
     var str = JSON.stringify(pdata);
-    
+
     wx.showLoading({title: "加载中"});
     wx.request({
       url: oo.url + '/api/weshop/order/createWxdOrder',
@@ -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 })
@@ -340,7 +353,7 @@ Page({
       });
     },
     //--------------------提交订单-----------------------
-    submitForm:function(t){
+    submitForm: async function(t){
         if(this.data.is_summit_ing==1) return false; //--提交中退出--
         this.data.is_summit_ing=1;
@@ -422,6 +435,20 @@ 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;
+            //调用接口判断是不是会员
+            await  getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/"+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;
+               }
+           })
+       }
+
        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)
@@ -26,8 +26,7 @@ Page({
 		if (openid == "" || openid == null || r==null ){
 		      getApp().globalData.user_id=null;
           getApp().globalData.userInfo=null;
-          console.log("openid");
-          wx.navigateTo({ url: '/pages/togoin/togoin', })
+          getApp().goto('/pages/togoin/togoin')
           return false;
     }
     var user_info=getApp().globalData.userInfo;
@@ -115,14 +115,22 @@ Page({
   },
   onLoad: function onLoad(options) {
+
     var th = this;
     th.setData({
       getActId: options.actId,
       giftID: options.giftBagId
     })
-    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) {
+      getApp().goto('/pages/getphone/getphone');
+      return false;
+    }
+    this.GetList();
   },
   GetReceive: function() {
@@ -27,6 +27,7 @@ Page({
     total: 0, //总数量
   },
   onLoad: function(options) {
+
     var th = this;
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     my_confirm.open_cancel(0);
@@ -34,9 +35,16 @@ Page({
       getStorageID: a.stoid,
       getUserID: d.user_id
     })
-    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) {
+      getApp().goto('/pages/getphone/getphone');
+      return false;
+    }
+    this.getList();
   },
@@ -36,7 +36,7 @@
             </block>
           </view>
           <view class="content_ware_price">
-            <text class="ellipsis-1">{{"原价:￥"+items.giftPosPrice}}</text>
+            <text class="ellipsis-1">{{"零售价:￥"+items.giftPosPrice}}</text>
           </view>
           <view class="content_ware_time">
             <text class="ellipsis-1">{{"活动结束时间:"+items.endTime}}</text>
@@ -120,6 +120,7 @@ Page({
     })
   },
   onLoad: function(options) {
+
     var th = this;
     th.setData({
       getActId: options.actId,
@@ -133,9 +134,17 @@ Page({
       th.setData({ orderType: orderType})
     }
-    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) {
+      getApp().goto('/pages/getphone/getphone');
+      return false;
+    }
+
+    this.GetList();
   },
   GetReceive: function() {
@@ -118,18 +118,26 @@ Page({
   },
   onLoad: function(options) {
+
     var th = this;
     th.setData({
       getActId: options.actId,
       giftID: options.giftBagId
     })
-    th.is_festival();
-    th.GetList();
+
     wx.setNavigationBarTitle({
       title: "节日有礼",
     });
   },
   onShow: function() {
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      getApp().goto('/pages/getphone/getphone');
+      return false;
+    }
+    this.is_festival();
+    this.GetList();
   },
   GetReceive: function() {
@@ -30,20 +30,30 @@ Page({
     is_lb: 0, //是否有礼包
   },
   onLoad: function(options) {
+
+
     var th = this;
     th.setData({
       isBuy: options.isBuy,
       getGiftID: options.lbId,
       orderSn: options.orderSn
     })
-    if (options.isBuy == 0) {
-      th.GetMyGiftList();
-    } else {
-      th.GetBuyGiftList();
-    }
+
     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) {
+      getApp().goto('/pages/getphone/getphone');
+      return false;
+    }
+
+    if (this.data.isBuy == 0) {
+      this.GetMyGiftList();
+    } else {
+      this.GetBuyGiftList();
+    }
   },
   GetBuyPrice: function(e) {
@@ -25,7 +25,7 @@
     </view>
     <view class="top_foot data-v-3a5b7e36">
       <view class="top_foot_price data-v-3a5b7e36">
-        <text class="data-v-3a5b7e36">{{"原价:"+giftPosPrice+"元"}}</text>
+        <text class="data-v-3a5b7e36">{{"零售价:"+giftPosPrice+"元"}}</text>
       </view>
       <view class="top_foot_qty data-v-3a5b7e36">
         <text class="data-v-3a5b7e36">{{"已售:"+giftQty+"件"}}</text>
@@ -28,6 +28,7 @@ Page({
   },
   onLoad: function(options) {
+
     var th = this;
     th.setData({
       getStorageID: a.stoid,
@@ -35,9 +36,16 @@ Page({
       loadingType: 0,
       getDate: i.formatTime(new Date().getTime())
     })
-    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) {
+      getApp().goto('/pages/getphone/getphone');
+      return false;
+    }
+    this.getList();
   },
   getList: function() {
@@ -68,7 +68,7 @@
             </block>
           </view>
           <view class="content_ware_price">
-            <text>{{"原价:￥"+item.giftPosPrice}}</text>
+            <text>{{"零售价:￥"+item.giftPosPrice}}</text>
           </view>
           <view class="content_ware_time">
             <block wx:if="{{getDate>item.endTime}}">
@@ -114,14 +114,22 @@ Page({
   },
   onLoad: function(options) {
+
     var th = this;
     th.setData({
       getActId: options.actId,
       giftID: options.giftBagId
     })
-    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) {
+      getApp().goto('/pages/getphone/getphone');
+      return false;
+    }
+    this.GetList();
   },
   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});
               } 
@@ -555,8 +599,57 @@ Page({
       this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
   },
+
+
+    //图片失败，默认图片
+    bind_bnerr_t3: function (e) {
+        var _errImg = e.target.dataset.errorimg;
+        var _errObj = {};
+        _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
+        this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+
+    },
+
+
+
   // 新的版本分类点击一级分类
  click_classify:function(e){
+  let cur = e.currentTarget.dataset.current;
+  if (this.data.currentTab == cur ) {
+     if(this.data.select_classify_on!=220&&this.data.select_classify_on!=223) {
+        return false;
+     }
+     else if(cur!=0){
+         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 +658,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 +682,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 +850,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 +859,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 +895,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 +913,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)
           }
@@ -870,5 +979,6 @@ Page({
       var ob = { "card_list": new_arr, "name_map": card_name_map };
       func(ob);
     })
-  },
+  }
+
 });
 \ No newline at end of file
+<import src="../../tabbar/tabbar.wxml" />
+<template is="tabBar" data="{{tabBar}}" />
+
 <!-- 风格1 -->
 <block wx:if="{{is_used_share==0}}">
   <view class='top_view' wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
@@ -98,7 +101,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 +116,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 +291,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 +318,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 +386,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,13 +399,13 @@
                 <!-- <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%':''}}">
                       <navigator class="choice_item" style="margin-bottom:{{dataLength -1 == index?'100px':'0'}}" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:for="{{requestData}}" data-id="{{index}}" wx:key="{{index}}">
                         <view class="img-wrap">
-                          <image src="{{url+item.original_img}}" binderror="bind_bnerr2" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
+                          <image src="{{url+item.original_img}}" binderror="bind_bnerr_t3" data-url="{{url+item.original_img}}" lazy-load="true" data-errorimg="requestData[{{index}}].original_img"></image>
                         </view>
                         <view class="item-cont">
                           <view class="title">{{item.goods_name}}</view>
@@ -488,5 +510,3 @@
     </block>
 </block>
-  <import src="../../tabbar/tabbar.wxml" />
-  <template is="tabBar" data="{{tabBar}}" />
 \ No newline at end of file
@@ -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.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) {
@@ -345,68 +365,81 @@ Page({
     //获取用户的默认门店
     getApp().get_user_store(function(ee) {
+      
       if(!ee) {
         th.data.fir_def_store={}; //赋值空对象
         return false;
       }
-	  var appd=getApp().globalData;
-      var w_time = setInterval(function() {
-        if (that.data.is_get_local_ok == 0) return false;
-		clearInterval(w_time);
-        var distance = null;
-		var e=JSON.parse(JSON.stringify(ee));
-		
-		//如果有开启近距离的话,同时距离优不一样了
-        if (that.data.lat != null) {        
-		  //如果经纬度有变化的话
-		  if( appd.lat==that.data.lat && appd.lon==that.data.lon  && e.distance>0 ){
-			  that.data.fir_def_store=e;
-			  that.setData({
-			    def_pick_store: e,
-			    sto_sele_name: e.pickup_name,
-			    sto_sele_id: e.pickup_id,
-			    sto_sele_distr: e.distr_type
-			  })
-		  }else{			    
-				//要用接口是获取距离，js的计算不准
-				getApp().request.promiseGet("/api/weshop/pickup/list",{
-					data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon}, 			 		  
-				}).then(res=>{				 
-					if(res.data.code==0){
-						   e=res.data.data.pageData[0];				 
-						   if (e){
-								appd.pk_store=e;	
-								that.data.fir_def_store=e;
-								that.setData({
-								  def_pick_store: e,
-								  sto_sele_name: e.pickup_name,
-								  sto_sele_id: e.pickup_id,
-								  sto_sele_distr: e.distr_type
-								})
-						   }
-																						  
-					}		 						 
-				})				  
-		  }
-		  		  
-          //e.distance = distance;
-		  appd.lat=that.data.lat; 
-		  appd.lon=that.data.lon; 	  
-		 	  
-        }else{
-			 if (e) {
-				 e.distance = null;
-				 that.data.fir_def_store=e;
-				 that.setData({
-				   def_pick_store: e,
-				   sto_sele_name: e.pickup_name,
-				   sto_sele_id: e.pickup_id,
-				   sto_sele_distr: e.distr_type
-				 })
-			 }			
-		}
-             
-      }, 500)
+
+      //--定时器推迟一下--
+      setTimeout(function () {
+        var g_distr_type=th.data.data.distr_type;
+        //--如果默认门店的配送方式不对，就不能被选择--
+        if(ee.distr_type!=0 && g_distr_type!=0 && ee.distr_type!=g_distr_type ){
+          th.data.fir_def_store={}; //赋值空对象
+          return false;
+        }
+
+        var appd=getApp().globalData;
+        var w_time = setInterval(function() {
+          if (that.data.is_get_local_ok == 0) return false;
+          clearInterval(w_time);
+          var distance = null;
+          var e=JSON.parse(JSON.stringify(ee));
+
+          //如果有开启近距离的话,同时距离优不一样了
+          if (that.data.lat != null) {
+            //如果经纬度有变化的话
+            if( appd.lat==that.data.lat && appd.lon==that.data.lon  && e.distance>0 ){
+              that.data.fir_def_store=e;
+              that.setData({
+                def_pick_store: e,
+                sto_sele_name: e.pickup_name,
+                sto_sele_id: e.pickup_id,
+                sto_sele_distr: e.distr_type
+              })
+            }else{
+              //要用接口是获取距离，js的计算不准
+              getApp().request.promiseGet("/api/weshop/pickup/list",{
+                data:{store_id:os.stoid,pickup_id:e.pickup_id,lat:th.data.lat,lon: th.data.lon},
+              }).then(res=>{
+                if(res.data.code==0){
+                  e=res.data.data.pageData[0];
+                  if (e){
+                    appd.pk_store=e;
+                    that.data.fir_def_store=e;
+                    that.setData({
+                      def_pick_store: e,
+                      sto_sele_name: e.pickup_name,
+                      sto_sele_id: e.pickup_id,
+                      sto_sele_distr: e.distr_type
+                    })
+                  }
+
+                }
+              })
+            }
+
+            //e.distance = distance;
+            appd.lat=that.data.lat;
+            appd.lon=that.data.lon;
+
+          }else{
+            if (e) {
+              e.distance = null;
+              that.data.fir_def_store=e;
+              that.setData({
+                def_pick_store: e,
+                sto_sele_name: e.pickup_name,
+                sto_sele_id: e.pickup_id,
+                sto_sele_distr: e.distr_type
+              })
+            }
+          }
+
+        }, 500)
+      },1000)
+
     });
   },
@@ -932,6 +965,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 +1074,6 @@ Page({
 	  			   }
 	  		   }
 	  }
-	  
-	  
 	  //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d);
 	  if ("add" == t.currentTarget.dataset.action) {
@@ -1064,7 +1108,6 @@ Page({
 						return s.my_warnning("库存不足！", 0, th);						 
 					}
 				}  	
-				
 	          var updata = {
 	            id: item.id,
@@ -1073,7 +1116,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 +1140,8 @@ Page({
 	            }
 	          });
 	        } else {
+
+
 	          i.post("/api/weshop/cart/save", {
 	            data: newd,
 	            success: function(t) {
@@ -1124,7 +1180,7 @@ Page({
 					      break;
 				  }				 
 			 }
-			
+
 		}  	
 	    newd['pick_name'] = th.data.sto_sele_name;
@@ -1133,9 +1189,7 @@ Page({
 	  }
   },
-  
-  
-  
+
   //----------购买虚拟商品------
   buyVirtualGoods: function(e) {
     Object.assign(e, {
@@ -1319,6 +1373,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 +1498,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,
     }
@@ -1657,7 +1721,7 @@ Page({
       if (th.data.is_get_local_ok == 0) return false;
       var dd = null,
         i = getApp().request;
-      var g_distr_type = th.data.data.distr_type;
+      var g_distr_type = th.data.sele_g.distr_type;
       if (g_distr_type != 0) {
         dd = {
           store_id: o.stoid,
@@ -1678,6 +1742,12 @@ Page({
         dd.lon = th.data.lon;
       }
       clearInterval(timer_get);
+
+      if(th.data.def_pick_store && g_distr_type!=0 && th.data.def_pick_store.distr_type!=0 && th.data.def_pick_store.distr_type!=g_distr_type ){
+         th.setData({def_pick_store:null});
+      }
+
+
       //----------获取门店----------------
       getApp().request.promiseGet("/api/weshop/pickup/list", {
         data: dd,
@@ -1697,7 +1767,7 @@ Page({
           }
           //-- 如果有默认选择门店的时候，要把默认门店放在第一位 --
-          if (th.data.def_pick_store) {
+          if (th.data.def_pick_store && (th.data.def_pick_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type )){
             for (var k = 0; k < e.data.data.pageData.length; k++) {
               if (e.data.data.pageData[k].pickup_id == th.data.def_pick_store.pickup_id) {
                 e.data.data.pageData.splice(k, 1); //删除
@@ -1729,6 +1799,9 @@ Page({
   //------------处理门店---------------
   deal_pickup(e){
 	  var th=this;
+
+	  var g_distr_type=th.data.sele_g.distr_type;
+
 	  //单总量超出5个的时候
 	  if (e.data.data.total > 5) {
 	     getApp().request.get("/api/weshop/storagecategory/page", {
@@ -1832,8 +1905,8 @@ Page({
 	               });
 	              //-----如果没有默认门店，要取第一个门店作为默认店.此时没有门店分类的情况------
 	              if (!th.data.def_pick_store) {
-	              th.setData({def_pick_store:e.data.data.pageData[0]})
-	            }
+	                 th.setData({def_pick_store:e.data.data.pageData[0]})
+	              }
 	          }
 	        } else {
 	          th.setData({
@@ -1863,7 +1936,6 @@ Page({
 	      })
 	    }
 	}
-	    
   },
   //------------处理线下门店库存--------
   deal_pickup_dline(e){
@@ -1880,7 +1952,9 @@ Page({
 	  var o_plist=e.data.data.pageData;
 	  var new_list=[];
 	  var is_find_def_store=0;
-	  
+
+
+	  var g_distr_type=th.data.sele_g.distr_type;
 	  var lock=[];
 	  //先读取门店的lock,采用链式写法，少用await
 	  getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
@@ -1911,8 +1985,8 @@ Page({
 									   if(n_item.CanOutQty>lock_num){									   
 										   o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num;														 
 										   new_list.push(o_plist[kk]);  
-										   //如果找到默认门店
-										   if(th.data.fir_def_store && n_item.StorageNo==th.data.fir_def_store.pickup_no){
+										   //--如果找到默认门店,同时也应该判断配送方式对不对--
+										   if(th.data.fir_def_store && n_item.StorageNo==th.data.fir_def_store.pickup_no  &&  (g_distr_type==0 ||  th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
 											   th.data.fir_def_store.CanOutQty=n_item.CanOutQty-lock_num;												   
 											   if(def_pick_store.pickup_id==th.data.fir_def_store.pickup_id)
 											        th.setData({def_pick_store:th.data.fir_def_store})											   
@@ -1927,9 +2001,10 @@ Page({
 						//数据组装下
 						var em={};em.data={};em.data.data={};
 						em.data.data.total=new_list.length;
-						em.data.data.pageData=new_list;																														
-						
-						if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id){
+						em.data.data.pageData=new_list;
+
+                        //--如果找到默认门店,同时也应该判断配送方式对不对--
+						if(th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id  &&  (g_distr_type==0 || th.data.fir_def_store.distr_type==0 || th.data.def_pick_store.distr_type==g_distr_type ) ){
 							  th.data.fir_def_store.CanOutQty=0;							  
 							  //--当选择的门店是客户默认的门店的时候--
 							  if(th.data.def_pick_store && th.data.fir_def_store.pickup_id==th.data.def_pick_store.pickup_id)	{
@@ -2748,6 +2823,19 @@ Page({
         sku: o.sku,
       };
+      //---是不是从收藏夹出来的---
+      if(th.data.c_guide_id){
+        newd['guide_id'] = th.data.c_guide_id;
+        newd['guide_type']=2;
+
+      }else{
+        if(getApp().globalData.guide_id){
+          newd['guide_id'] = getApp().globalData.guide_id;
+          newd['guide_type']=0;
+
+        }
+      }
+
 	  //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
 	  if(th.data.is_normal == 1){
@@ -3126,7 +3214,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";
@@ -3140,7 +3233,7 @@ Page({
           var vpath = res.path;
           var context = wx.createCanvasContext('share');
           //先画背景
-          var pg_path = "/pacj/images/share/share_bg.png";
+          var pg_path = "../../../images/share/share_bg.png";
           context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
           //--昵称---
           context.setFontSize(24 * unit)
@@ -241,12 +241,12 @@
 				     </view>
 				     <text class="rel yuan">￥</text>{{filters.toFix(data[card_field],2)}}
            <view class='yj' style="top:35rpx">
-                  <text>原价:￥{{data.market_price}}</text>
+                  <text>零售价:￥{{data.market_price}}</text>
                 </view>
 				  </block>
 				  <block wx:else>
                      <text class="rel yuan">￥</text>{{filters.toFix(data.shop_price,2)}}
-                     <view class='yj'><text>原价:￥{{data.market_price}}</text></view>
+                     <view class='yj'><text>零售价:￥{{data.market_price}}</text></view>
 				  </block>
               </view>
@@ -344,7 +344,8 @@
                   <view class="word-line fs24 xc-unit-price">零售价￥{{data.market_price}}</view>
                 </view>
                 <view class="xc-val-price"> 
-                  <view class="fs30" style='padding-left:13rpx;'>已抢:{{prom_act.buy_num+prom_act.virtual}}件</view>
+                  <view class="fs30" style='padding-left:13rpx;' wx:if="{{prom_st==1}}" >已抢:{{prom_act.buy_num+prom_act.virtual}}件</view>
+                  <view class="fs30" style='padding-left:13rpx;' wx:else >已抢:0件</view>
                   <view class="fs30 save t-c">秒杀立省￥{{filters.toFix(data.market_price-prom_price,2)}}</view>
                 </view>
               </view>
@@ -21,9 +21,25 @@ Page({
 		is_new:0,
 		is_hot:0,
         prom_goods_list:null,
+        rq_data:null,
     },
     onLoad: function(t) {
+
+       this.data.rq_data=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.id;
+                }
+            })
+        }
+
 	  var th=this;
       a.init(this, "", "requestData");
       var url = this.data.baseUrl;
@@ -194,9 +210,29 @@ Page({
     },
 //---------分享配置--------
   onShareAppMessage: function (e) {
-    return {
-      title: "商品列表",
-    }
+      var curPage=this;
+      var pagePath = curPage.route; //当前页面url
+      if (pagePath.indexOf('/') != 0) {
+          pagePath = '/' + pagePath;
+      }
+
+      if(this.data.rq_data && JSON.stringify(this.data.rq_data) != "{}") {
+          var parm = ut.ob_to_parm(this.data.rq_data);
+          pagePath += "?" + parm;
+      }
+
+      if(getApp().globalData.user_id){
+          if(pagePath.indexOf("?")>0){
+              pagePath+="&first_leader="+getApp().globalData.user_id;
+          }else{
+              pagePath+="?first_leader="+getApp().globalData.user_id;
+          }
+      }
+      console.log("11-11"+pagePath);
+      return {
+          title: "商品列表",
+          path:pagePath,
+      }
   },
     //---图片失败，默认图片---
     bind_bnerr2: function (e) {
  {
-    "navigationBarTitleText": "商品列表"
+    "navigationBarTitleText": "商品列表",
+     "usingComponents": {
+         "share_box": "/components/share_box/share_box"
+     }
 }
 \ No newline at end of file
@@ -142,6 +142,7 @@
             {{item.name}}</view>
         </view>
       </view>
+
       <view class="filter-box" wx:for="{{requestData.filter_attr}}" wx:key="{{index}}">
         <view class="filter-name">{{item.name}}</view>
         <view class="filter-items">
@@ -164,4 +165,6 @@
         </view>
       </view>
     </view>
-  </view>
 \ No newline at end of file
+  </view>
+
+<share_box id="share"></share_box>
 \ No newline at end of file
@@ -21,8 +21,23 @@ Page({
         tabname: "goods_id",   //排序的字段
         adname: "desc",    //升降的字段
+        rq_data:null,
     },
     onLoad: function(t) {
+        this.data.rq_data=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.id;
+                }
+            })
+        }
+
        var th=this;
        a.getConfig2(function(rs){
          var arr=new Array(),arr2=new Array();
@@ -40,8 +55,7 @@ Page({
             th.setData({ hotWords: arr});
          }
-		 
-		 
+
 		 //计算等级价相关
 		 var swithc_list=rs.switch_list;
 		 var sw_arr=JSON.parse(swithc_list);
@@ -173,14 +187,39 @@ Page({
     //-----点击搜索按钮----
     search: function(t) {
         if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词");
+        this.data.key_str=t;
         this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t));
     },
- //---------分享配置--------
-  onShareAppMessage: function (e) {
-    return {
-      title: "商品分类",
-    }
-  },
+
+    //---------分享配置--------
+    onShareAppMessage: function (e) {
+        var curPage=this;
+        var pagePath = curPage.route; //当前页面url
+        if (pagePath.indexOf('/') != 0) {
+            pagePath = '/' + pagePath;
+        }
+
+        if(this.data.key_str) {
+            pagePath += "?s_key=" + this.data.key_str;
+        }
+
+        if(getApp().globalData.user_id){
+
+            if(pagePath.indexOf("?")>0){
+                pagePath+="&first_leader="+getApp().globalData.user_id;
+            }else{
+                pagePath+="?first_leader="+getApp().globalData.user_id;
+            }
+        }
+
+        console.log("11-11"+pagePath);
+        return {
+            title: "商品搜索",
+            path:pagePath,
+        }
+    },
+
+
     //---------图片失败，默认图片--------
     bind_bnerr: function (e) {
       var _errImg = e.target.dataset.errorimg;
 {
     "navigationBarTitleText": "商品搜索",
-    "enablePullDownRefresh": false
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+        "share_box": "/components/share_box/share_box"
+    }
 }
 \ No newline at end of file
@@ -106,6 +106,9 @@
         </block>
       </view>
     </navigator>
+
+    <!-- 有商品列表的时候，要有分享攻击 -->
+    <share_box id="share"></share_box>
   </view>
   <view class="no-data" wx:if="{{!requestData||requestData.length==0}}">
     <image class="cart-image" src="{{url}}/miniapp/images/cart-null.png"></image>
@@ -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
@@ -821,5 +828,6 @@ Page({
 			})
 	  })
   }
-  
+
+
 });
 \ No newline at end of file
+<import src="../../tabbar/tabbar.wxml" />
+<template is="tabBar" data="{{tabBar}}"/>
+
 <!--普通界面-->
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
 <view class="container rel" wx:if="{{ishow}}">
@@ -360,8 +363,7 @@
   </view>
 </block>
-  <import src="../../tabbar/tabbar.wxml" />
-  <template is="tabBar" data="{{tabBar}}"/>
+
+
 <!--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 ? '172rpx' : '104rpx'}};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=='购物车'}}"  style="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;">
                     {{tabBar.cartGoodsNum}}
                 </view>
-              <view style="width:35%;height:30px;margin-left:33%;">
-                   <image src="{{item.src}}" wx:if="{{!item.active}}" mode="widthFix"  class="img" style="max-width:100%;max-height:100%"></image>
+              <view style="width:35%;height:58rpx;margin-left:33%;display: flex; justify-content: center;align-items: center">
+                   <!--<image src="{{item.src}}"  bindload="load_nav" data-index="{{ index }}"  class="img" style="max-width: 100%;  width:{{item.width?item.width:0}}rpx;height:{{item.height}}rpx"></image>-->
+                   <view class="nav_imgage" style="background-image: url({{item.src}});height: 50rpx; width: 50rpx;background-position: center;background-repeat: no-repeat;background-size: auto 85%;"></view>
               </view>
-              <view style="height:20px;line-height:15px; position: relative; top: -15rpx"><text class="tabbar_text" wx:if="{{item.nav_name}}" style="font-size:0.6rem">{{item.nav_name}}</text></view>
+              <view style="height:20px;line-height:15px; position: relative; top: -8rpx"><text class="tabbar_text" wx:if="{{item.nav_name}}" style="font-size:0.6rem">{{item.nav_name}}</text></view>
             </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=='购物车'}}"  style="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;">
                    {{tabBar.cartGoodsNum}}
                </view>
-               <view style="width:35%;height:30px;margin-left:33%;">
-                   <block wx:if="{{item.active}}">
-                       <image src="{{item.src_sele}}"  mode="widthFix"  class="img" style="max-width:100%;max-height:100%"></image>
-                   </block>
-                   <block wx:else>
-                       <navigator  url="{{item.weappurl}}">
-                           <image src="{{item.src}}" wx:if="{{!item.active}}" mode="widthFix"  class="img" style="max-width:100%;max-height:100%"></image>
-                       </navigator>
-                   </block>
+               <view style="width:35%;height:58rpx;margin-left:33%; display: flex; justify-content: center;align-items: center">
+                   <!--<image src="{{item.src_sele}}"  bindload="load_nav"  data-index="{{ index }}"  class="img" style="max-width: 100%;width:{{item.width?item.width:0}}rpx;height:{{item.height}}rpx"></image>-->
+                   <view class="nav_imgage" style="background-image: url({{item.src_sele}});height: 50rpx; width: 50rpx;background-position: center;background-repeat: no-repeat;background-size: auto 85%;"></view>
                </view>
-               <view style="height:20px;line-height:15px; position: relative; top: -15rpx"><text class="tabbar_text" wx:if="{{item.nav_name}}" style="font-size:0.6rem">{{item.nav_name}}</text></view>
+               <view style="height:20px;line-height:15px; position: relative; top: -8rpx"><text class="tabbar_text" wx:if="{{item.nav_name}}" style="font-size:0.6rem">{{item.nav_name}}</text></view>
            </view>
        </block>
@@ -43,7 +38,7 @@
     <!-- 1 -->
     <block wx:if="{{tabBar.active!='/pages/index/index/index'}}">
         <navigator url="/pages/index/index/index" class="tabbar_item {{item.clas}}" open-type="redirect" style="position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
-          <view style="width:30%;height:57rpx;margin-left:35%;">
+          <view style="width:30%;height:54rpx;margin-left:35%;">
                <image src="{{tabBar.url}}/miniapp/images/bar/index.png" class="img" style="width:100%;height:100%"></image>
           </view>
           <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text" style="font-size:0.6rem">首页</text></view>
@@ -51,7 +46,7 @@
     </block>
     <block wx:else>
         <view class="tabbar_item {{item.clas}}"  style="color:#f23030;position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
-            <view style="width:30%;height:57rpx;margin-left:35%;">
+            <view style="width:30%;height:54rpx;margin-left:35%;">
                 <image src="{{tabBar.url}}/miniapp/images/bar/index_on.png"  class="img" style="width:100%;height:100%"></image>
             </view>
             <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text" style="font-size:0.6rem">首页</text></view>
@@ -62,7 +57,7 @@
     <!-- 2 -->
     <block wx:if="{{tabBar.active!='/pages/goods/categoryList/categoryList'}}">
     <navigator  url="/pages/goods/categoryList/categoryList" class="tabbar_item {{tabBar.clas}}" open-type="redirect" style="position:relative;width:25%;height:100%;float:left;text-align:center;padding:2px 0;">
-      <view style="width:30%;height:57rpx;margin-left:35%;">
+      <view style="width:30%;height:54rpx;margin-left:35%;">
           <image src="{{tabBar.url}}/miniapp/images/bar/fl.png"  class="img" style="width:100%;height:100%"></image>
       </view>
       <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text" wx:if="分类" style="font-size:0.6rem">分类</text></view>
@@ -70,7 +65,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="width:30%;height:57rpx;margin-left:35%;">
+            <view style="width:30%;height:54rpx;margin-left:35%;">
                  <image src="{{tabBar.url}}/miniapp/images/bar/fl_on.png"  class="img" style="width:100%;height:100%"></image>
             </view>
             <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text" wx:if="分类" style="font-size:0.6rem">分类</text></view>
@@ -81,9 +76,9 @@
     <!-- 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 style="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%">
           {{tabBar.cartGoodsNum}}
-          </view><view style="width:30%;height:57rpx;margin-left:35%;">
+          </view><view style="width:30%;height:54rpx;margin-left:35%;">
               <image src="{{tabBar.url}}/miniapp/images/bar/car.png"  class="img" style="width:100%;height:100%"></image>
            </view>
           <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text" style="font-size:0.6rem">购物车</text></view>
@@ -91,9 +86,9 @@
      </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 style="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%">
                     {{tabBar.cartGoodsNum}}
-             </view><view style="width:30%;height:57rpx;margin-left:35%;">
+             </view><view style="width:30%;height:54rpx;margin-left:35%;">
                     <image src="{{tabBar.url}}/miniapp/images/bar/car_on.png"  class="img" style="width:100%;height:100%"></image>
             </view>
             <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text" style="font-size:0.6rem">购物车</text></view>
@@ -103,7 +98,7 @@
     <!-- 4 -->
     <block wx:if="{{tabBar.active!='/pages/user/index/index'}}">
         <navigator url="/pages/user/index/index" 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="width:30%;height:57rpx;margin-left:35%;">
+          <view style="width:30%;height:54rpx;margin-left:35%;">
                <image src="{{tabBar.url}}/miniapp/images/bar/user.png"  class="img" style="width:100%;height:100%"></image>
            </view>
           <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text"  style="font-size:0.6rem">我的</text></view>
@@ -111,8 +106,8 @@
     </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="width:30%;height:57rpx;margin-left:35%;">
-                 <image src="{{tabBar.url}}/miniapp/images/bar/user_on.png"  class="img" style="width:100%;height:100%"></image>
+            <view style="width:30%;height:54rpx;margin-left:35%;">
+                 <image src="{{tabBar.url}}/miniapp/images/bar/user_on.png"   class="img" style="width:100%;height:100%"></image>
             </view>
             <view style="height:40rpx;line-height:22rpx;"><text class="tabbar_text"  style="font-size:0.6rem">我的</text></view>
         </view>
+.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=options.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.id;
+        }
+      })
+    }
+
+
+    this.setData({tg_id: tg_id });
       getApp().globalData.to_group=null;
   },
@@ -568,7 +585,6 @@ Page({
     });
     setTimeout(th.countDown2, 1000);
   },
-
   //--获取门店---
   async get_sto(e) {
     var th = this, dd = null,i=getApp().request;
@@ -741,6 +757,20 @@ Page({
           goods_name: th.data.goods.goods_name,
           goods_sn: th.data.goods.goods_sn,
         };
+
+        //---是不是从收藏夹出来的---
+        if(th.data.c_guide_id){
+          newd['guide_id'] = th.data.c_guide_id;
+          newd['guide_type']=2;
+
+        }else{
+          if(getApp().globalData.guide_id){
+            newd['guide_id'] = getApp().globalData.guide_id;
+            newd['guide_type']=0;
+
+          }
+        }
+
         //-----拼团-----
         newd.goods_price = th.data.teamlist.price;
         newd.prom_type = 6;
@@ -767,8 +797,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 +916,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,11 @@ 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 +672,31 @@ Page({
         ob[err_img] = this.data.iurl + "/miniapp/images/default_g_img.gif";
         this.setData(ob);
-    }
+    },
+
+    //------ 分享配置 --------
+    onShareAppMessage: function (e) {
+        var th=this;
+        var scene=this.data.teamgroup.id;
+        var url="/pages/team/team_show/team_show?tg_id="+scene;
+        //--分享图片--
+        var 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;
+        }
+        console.log(url);
+
+        return {
+            path:url,
+            title: th.data.teamlist.title,
+            imageUrl: img,
+        }
+    },
+
 })
@@ -34,6 +34,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.set_name("助力", "/pages/user/assistance/assistance");
@@ -44,9 +45,17 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
+
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      getApp().goto('/pages/getphone/getphone');
+      return false;
+    }
+
     var th = this;
     // 助力活动
-    th.assistance();
+    this.assistance();
   },
   // 助力活动
   assistance() {
@@ -28,6 +28,7 @@ Page({
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad: function(options) {
+
 		var th = this;
 		var nav_b = th.selectComponent("#nav_b"); //组件的id
@@ -39,7 +40,6 @@ Page({
 		if (this.data.tasking == 0 || this.data.tasking == undefined) {
             this.data.tasking = decodeURIComponent(options.scene);
 		}
-		getApp().getUserFir(function() {});
 	},
@@ -54,6 +54,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) {
+			getApp().goto('/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 !=
@@ -38,6 +38,7 @@ Page({
     id: "", //一键领取的时候使用
   },
   onLoad: function(options) {
+
     var th = this;
     if (options.is_libao == 0) {
       th.setData({
@@ -67,6 +68,12 @@ Page({
     nav_b.set_name("助力", "/pages/user/assistance/assistance");
   },
   onShow: function() {
+    //--先判断会员状态--
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      getApp().goto('/pages/getphone/getphone');
+      return false;
+    }
   },
   //助力活动查看礼包详情调用
@@ -25,7 +25,7 @@
     </view>
     <view class="top_foot data-v-3a5b7e36">
       <view class="top_foot_price data-v-3a5b7e36">
-        <text class="data-v-3a5b7e36">{{"原价:"+giftPosPrice+"元"}}</text>
+        <text class="data-v-3a5b7e36">{{"零售价:"+giftPosPrice+"元"}}</text>
       </view>
       <view class="top_foot_qty data-v-3a5b7e36">
         <text class="data-v-3a5b7e36">{{"已售:"+giftQty+"件"}}</text>
@@ -69,6 +69,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+
     var th = this;
     var help_id = options.help_id;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
@@ -135,6 +136,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) {
+      getApp().goto('/pages/getphone/getphone');
+      return false;
+    }
+
     this.data.is_timer = 1;
     var th = this;
     var help_id = th.data.help_id;
@@ -42,7 +42,8 @@ Page({
     expiryDate:"",//卡到期时间
 	  is_guoqi:0,  //卡是不是过期
     IsStopBuy:0,  //卡是否停用
-	  yu_e_show:0,//装入余额的弹窗    
+	  yu_e_show:0,//装入余额的弹窗
+      is_show_change_pop:0,
   },
   /**
@@ -70,23 +71,37 @@ Page({
     //----------------------------获取最大的卡类-----------------------
     getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + o.stoid, {
-
     }).then(res => {
       var plusCard = res.data.data;
       var big_cards = null,big_card=null;
-      console.log(plusCard, "数据什么的", res);
+      if(!plusCard) return false;
+
+      var new_card_arr=[];
       for (var i = 0; i < plusCard.length; i++) {
         if (plusCard[i].CardImg == "") plusCard[i].CardImg = th.data.url + "/miniapp/images/plus/bg" + (i + 1) + ".jpg?v=1";
-        big_cards = Math.max(plusCard[i].CardFee)
-        if (plusCard[i].CardFee == big_cards) {
-          big_card = plusCard[i]
+        //big_cards = Math.max(plusCard[i].CardFee)
+        //if (plusCard[i].CardFee == big_cards) {
+        //  big_card = plusCard[i]
+        //}
+        if(!plusCard[i].IsStopBuy) {
+            new_card_arr.push(plusCard[i]);
         }
       }
-      
-	  console.log(big_cards, "是什么东西", big_card);
+
+       //对比函数
+        var compare = function (obj1, obj2) {
+            var val1 = obj1.CardFee;var val2 = obj2.CardFee;
+            if (val1 > val2) {
+                return -1;
+            }else if (val1 < val2) {
+                return 1;
+            }else{ return 0; }
+        }
+        new_card_arr.sort(compare);
+        big_card=  new_card_arr[0];
       ee.setData({
-        is_plusCard: plusCard,
-        big_card: big_card
+        is_plusCard: new_card_arr,
+        big_card: big_card,
       })
       //缓存分享卡的图片
@@ -101,7 +116,6 @@ Page({
     })
-
     //获取用户设备信息，屏幕宽度
     wx.getSystemInfo({
       success: res => {
@@ -138,12 +152,46 @@ Page({
 	  end = Date.parse(end) / 1000;
 	  var is_guoqi=0;
 	  if(end<now) is_guoqi=1;
-	  
-	  
+	  var cur_card=res.data.data[0];
+
       ee.setData({cardid: GradeCardID,
-        expiryDate: expiryDate,is_guoqi:is_guoqi,
+          expiryDate: expiryDate,is_guoqi:is_guoqi,
       });
+      //一秒后获取是升级还是变更卡的列表，因为是异步的关系
+      setTimeout(function () {
+          if(ee.data.is_plusCard){
+                var new_buy_list=[];
+                //如果是过期，就有变更的列表
+                if(is_guoqi){
+                    //--开始组装变更列表--
+                    for(var ii in ee.data.is_plusCard){
+                        var item=ee.data.is_plusCard[ii];
+                        if(item.CardId!=GradeCardID && !item.IsStopBuy){
+                            new_buy_list.push(item);
+                        }
+                    }
+                }else{
+                    //如果是没过期，就看是不是最高级版的卡
+                    if(GradeCardID!=ee.data.big_card.CardId){
+                        //--开始组装升级列表--
+                        for(var jj in ee.data.is_plusCard){
+                            var item=ee.data.is_plusCard[jj];
+                            //升级要那些价格比当前卡贵的卡
+                            if(item.CardId!=GradeCardID && !item.IsStopBuy && parseFloat(item.CardFee)>parseFloat(cur_card.CardFee)){
+                                new_buy_list.push(item);
+                            }
+                        }
+                    }
+                }
+
+                if(new_buy_list.length>0){
+                    th.setData({buy_list:new_buy_list});
+                }
+          }
+
+      },1800)
+
     })
     //-----------会员分佣-------------------
@@ -155,7 +203,6 @@ Page({
       }else{
         ee.setData({ free: 0 });
       }
-     
     })
     //-----------会员的卡类-------------------
     await getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/get?storeId=" + os.stoid + "&CardId=" + ee.data.cardid, {
@@ -164,12 +211,10 @@ Page({
       if (user_card.CardImg==""){
          var index =parseInt(user_card.CorrPrice.replace("Price",""));
          user_card.CardImg = th.data.url + "/miniapp/images/plus/bg" + index + ".jpg?v=1";
-
       }
       if (user_card.IsStopBuy==true){
         this.setData({IsStopBuy:1})
       }
-      
       console.log(user_card,"会员的卡类");
       ee.setData({user_card: user_card});
@@ -736,9 +781,9 @@ Page({
       return false;
     }
-	  
 	  end_time=ut.format(end_time,'yyyy-MM-dd');  
 	  var errmsg="";
+
       //--商家是不是有等级卡功能，开通的人数是不是够用，开通是时间是不是到期--
       await getApp().request.promiseGet("/api/weshop/plus/plus/card/register",
         { data: { storeId: os.stoid,isRenewal:1,endData: end_time,userId:getApp().globalData.user_id} }).then(res => {
@@ -746,7 +791,10 @@ Page({
 		 else errmsg=res.data.msg;
       })
-       if (is_card == 0){ getApp().my_warnning(errmsg?errmsg:"请联系商家升级plus功能", 0, th);}
+       if (is_card == 0){
+           getApp().my_warnning(errmsg?errmsg:"请联系商家升级plus功能", 0, th);
+           return false;
+       }
 	    var item = th.data.user_card;
 	    var req = {};
@@ -762,8 +810,74 @@ Page({
   },
   //--支付成功，跳转到等级卡续费页面--
-  success:function () {
-      getApp().my_warnning("支付成功",0,this);
+  success:function (ind) {
+      if(ind==1){
+          getApp().my_warnning("升级成功",0,this);
+      }else{
+          getApp().my_warnning("支付成功",0,this);
+      }
+      this.init();
   },
+
+
+
+
+ //------计算俩种卡的------
+ change_card:async function (e) {
+     var th = this,card_id =e.currentTarget.dataset.cid ,end_time=0;
+     await getApp().request.promiseGet("/store/storemoduleendtime/page?store_id="+os.stoid+"&type=3",
+         {1:1}).then(res => {
+         if (res.data.code == 0) {
+             end_time=res.data.data.pageData[0].end_time;
+         }
+     })
+     var now=ut.gettimestamp();
+     if(end_time<now){
+         getApp().my_warnning("请联系商家升级plus功能", 0, th);
+         return false;
+     }
+
+     th.data.s_card_id=card_id;
+     var days=e.currentTarget.dataset.days;
+     now=now+days*24*3600;
+     var time=ut.formar_no_full(now);
+     th.setData({is_show_change_pop:0});
+     var my_con = this.selectComponent("#my_con"); //组件的id
+
+     //如果是变更卡，就是显示提示喝到期时间
+     if(th.data.is_guoqi){
+         my_con.open(" \n 温馨提示：与原等级不符，是否变更！\n\n 有效时间："+time+"\n\n", "是", "否", th.sure_pay, null)
+     }else{
+         //如果是升级的话
+         await getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/updatePrice/get",
+             {data:{storeId: os.stoid,userId:getApp().globalData.user_id,OldCardId:th.data.user_card.CardId,NewCardId:card_id}}).then(res => {
+             if (res.data.code == 0) {
+                 my_con.open("\n 温馨提示，高于当前等级，是否立即升级！\n\n  升级价格：￥"+  res.data.data.payMoney.toFixed(2)+" \n 有效时间："+time+"\n\n", "是", "否", th.sure_pay, null)
+             }
+         })
+     }
+
+  },
+
+  sure_pay:function () {
+      var th=this;
+      var req = {};
+      req.cardId = th.data.s_card_id;
+      req.rechargeType = 5;
+      //如果不是你导购，也不是等级会员分享
+      req.storeId = os.stoid;
+      req.oldCardId=th.data.user_card.CardId;
+      req.userId = getApp().globalData.user_id;
+      t_pay.pay(req, th.success, function () {
+          getApp().my_warnning("支付失败", 0, th);
+      });
+  },
+  //显示弹出框
+  show_change:function () { this.setData({is_show_change_pop:1}); },
+  //关闭弹出框
+  close_card_change_pop:function () { this.setData({is_show_change_pop:0}); }
+  
+
+
 })
 \ No newline at end of file
@@ -2,8 +2,9 @@
   "usingComponents": {
     "pop_txt": "/components/userqy_pop_up/userqy_pop_up",
     "goods_recommend": "/components/goods_list/goods_list",
-	 "warn": "/components/long_warn/long_warn",
-    "nav_box": "/components/nav_box_card/nav_box"
+	"warn": "/components/long_warn/long_warn",
+    "nav_box": "/components/nav_box_card/nav_box",
+    "my_confirm": "/components/my_confirm/my_confirm"
   },
     "navigationBarTitleText": "plus会员"
 } 
 \ No newline at end of file
@@ -17,8 +17,20 @@
               <view wx:if="{{!is_guoqi}}" class="fs22 h22" style="margin-top:15rpx">会员将在{{filters.replace_time2(expiryDate)}}到期</view>
               <view wx:else class="fs22 h22" style="margin-top:15rpx">会员已在{{filters.replace_time2(expiryDate)}}过期</view>
             </view>
-            <view bindtap="xufei" class="renew fs28" style="background:{{user_card.CardColor}}">立即续费
-            </view>
+
+              <view>
+                <view bindtap="xufei" class="renew fs28" style="background:{{user_card.CardColor}}">立即续费</view>
+                <!-- 判断是不是过期，显示变更按钮，但是要看是不是多件 -->
+                <block wx:if="{{is_guoqi}}">
+                    <view  wx:if="{{buy_list.length>0}}"  bindtap="show_change" class="renew fs28" style="background:{{user_card.CardColor}}">卡类变更</view>
+                </block>
+                <block wx:else>
+                    <!-- 要判断是不是最高级的卡 -->
+                    <view  wx:if="{{cardid!=big_card.CardId}}"  bindtap="show_change" class="renew fs28" style="background:{{user_card.CardColor}}">卡类升级</view>
+                </block>
+              </view>
+
+
           </view>
           <view class="flex-vertical-between xs fs28">
@@ -145,6 +157,30 @@
     <goods_recommend id="goods_list"></goods_recommend>
     <!-- 商品列表 -->
   <!-- 画布 -->
-<canvas canvas-id='myCanvas' style="width:750rpx;height:1260rpx;"wx:if='{{!canvasHidden}}'></canvas>
-
-<warn id="warn"></warn>
 \ No newline at end of file
+<canvas canvas-id='myCanvas' style="width:750rpx;height:1260rpx;" wx:if='{{!canvasHidden}}'></canvas>
+
+<warn id="warn"></warn>
+<my_confirm id="my_con"></my_confirm>
+
+<!-- 购买更换,升级 -->
+<view class="card_change_pop" wx:if="{{is_show_change_pop==1}}">
+     <view class="cover-layer"></view>
+     <view class="content flex jc-center ai-center" bindtap="close_card_change_pop">
+            <view class="card_list">
+                  <image class="hg" src="{{url}}/miniapp/images/plus/plustopimg.png"></image>
+                  <view class="list">
+                        <view class="item flex ai-center jc_sb" wx:for="{{buy_list}}">
+                            <view class="flex ai-center"><image class="hg_img" src="{{url}}/miniapp/images/vip_hg0.png"></image>
+                                <text class="ellipsis-1 card_name">{{item.CardName}}</text></view>
+                            <view class="price_show flex ai-center">
+                                <view style="width: 100%; line-height: 24rpx" data-days="{{item.ExpiryDate}}"  catchtap="change_card" data-cid="{{item.CardId}}">
+                                   <view style="text-align: right" class="fs26">￥<text class="pri fs40">{{item.CardFee}}</text></view>
+                                   <view style="text-align: center" class="fs30" wx:if="{{is_guoqi}}">立即变更</view>
+                                   <view style="text-align: center" class="fs30" wx:else>立即升级</view>
+                                </view>
+                            </view>
+                        </view>
+                  </view>
+            </view>
+     </view>
+</view>
 \ No newline at end of file
@@ -225,4 +225,17 @@ align-items:center;
   width: 100%;
   height: 320rpx;
-}
 \ No newline at end of file
+}
+
+.content{ position: fixed; top: 0;left:0; width: 100%; height: 100%; z-index: 12; }
+.content  .card_list{ width: 700rpx; margin: 0 auto;  background-color: #ffe88b; border-radius: 15rpx}
+.content  .card_list .hg{ width: 100%;height: 156rpx}
+
+.content  .card_list .list{ max-height: 700rpx; padding: 0 25rpx; margin-bottom: 20rpx; overflow-y: auto}
+.content  .card_list .item{ margin-bottom: 10rpx; background: #fff; height: 150rpx; border-radius: 10rpx}
+.content  .card_list .item .hg_img{ width: 70rpx; height: 60rpx; margin-left: 40rpx; margin-right: 20rpx }
+.content  .card_list .item .price_show{ width: 200rpx; height: 110rpx; background: #ffd430;
+  border-top-left-radius: 55rpx;  border-bottom-left-radius:55rpx;  }
+ .content  .card_list .list .card_name{ max-width: 230rpx}
+
+ .price_show .thr{color: #999; text-decoration:line-through }
 \ No newline at end of file
@@ -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>
@@ -63,7 +63,7 @@
       <view wx:else>
         <view class="text">有效期:不限</view>
       </view>
-      <view class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null?"":",不包邮地区:"+region_list_name}}
+      <view class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}
       </view>
     </view>
@@ -102,7 +102,7 @@
       <view wx:else>
         <view class="text">有效期: 不限</view>
       </view>
-      <view class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{detail.UseObjectID==null?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用{{detail.region_list_name==null?"":",不包邮地区:"+region_list_name}}
+      <view class="textss">使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{detail.UseObjectID==null || detail.UseObjectID==''?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用{{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}
       </view>
     </view>
     </view>
@@ -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) {
+<import src="../../tabbar/tabbar.wxml" />
+<template is="tabBar" data="{{tabBar}}" />
+
 <view class="xc-page" style="margin-bottom:{{isIpx ? '168rpx' : '100rpx'}}">
   <view class="xc-user">
     <view class="xc-head rel">
@@ -297,5 +300,3 @@
 </view>
 <pop_txt id="pop_txt"></pop_txt>
-  <import src="../../tabbar/tabbar.wxml" />
-  <template is="tabBar" data="{{tabBar}}" />
 \ No newline at end of file
@@ -38,8 +38,8 @@
             <view class='time'>{{details.BillDate}}</view>
           </view>
         </view>
-        <view class="val" style='color:{{(details.InIntegral!="0")?"green":""}}'>
-          {{(details.OutIntegral==0)?"+":"-"}}{{(details.InIntegral==0)?details.OutIntegral:details.InIntegral}}积分 </view>
+        <view class="val" style='color:{{(details.InOutInt>0)?"green":""}}'>
+          {{(details.InOutInt>0)?"+":""}}{{filter.getNum(details.InOutInt)}}积分 </view>
         </view>
         <view style="clear:both"></view>
     </block>
@@ -63,8 +63,8 @@
             <view class='time'>{{details.BillDate}}</view>
           </view>
         </view>
-        <view class="val" style='color:{{(details.InIntegral!="0")?"green":""}}'>
-           {{(details.OutIntegral!=0)?"":"+"}}{{(details.InIntegral==0)?filter.getNum(details.OutIntegral):filter.getNum(details.InIntegral)}}积分  </view>
+        <view class="val" style='color:{{(details.InOutInt>0)?"green":""}}'>
+           {{(details.InOutInt>0)?"+":""}}{{filter.getNum(details.InOutInt)}}积分  </view>
       </view>
   </block>
@@ -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,
+      })
     },
   //--------跳转到退款详情-----------
@@ -312,7 +312,8 @@ Page({
   //--支付成功，跳转到等级卡续费页面--
   success:function () {
-    
+    var u_url = "/pages/user/cardinfo/cardinfo";
+    wx.reLaunch({url: u_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();
             }
         });
@@ -8,7 +8,11 @@ module.exports = {
             data: dd,
             success: function(t) {
                 if(t.data.code==0){
-                    i.weixinPay(t.data.data, succ,fail);
+                    if(t.data.data=="升级成功"){
+                        "function" == typeof succ && succ(1);
+                    }else{
+                        i.weixinPay(t.data.data, succ,fail);
+                    }
                 }else{
                     "function" == typeof fail && fail();
                 }
@@ -401,6 +401,15 @@ function base64_encode (str) { // 编码，配合encodeURIComponent使用
     return strin
 }
+function ob_to_parm(ob){
+  var parm="";
+  for( var key in ob){
+      parm+="&"+key+"="+ob[key];
+  }
+  parm = parm.substr(1);
+  return parm;
+}
+
 module.exports = {
     formatTime: function(e, r) {
         var t = e ? new Date(1e3 * e) : new Date(), n = t.getFullYear(), o = t.getMonth() + 1, a = t.getDate(), u = t.getHours(), i = t.getMinutes(), f = t.getSeconds(), s = function(e) {
@@ -505,5 +514,6 @@ module.exports = {
 	draw_circle:draw_circle,//绘制圆，
     mergeArray:mergeArray,    //数组合并
     isContained:isContained,  //是否包含
-    base64_encode:base64_encode  //64位加密
+    base64_encode:base64_encode,  //64位加密
+    ob_to_parm:ob_to_parm   //对象变成参数
 };
@@ -377,7 +377,7 @@
     </view>
 </template>
 <template name="wxParseImg">
-    <image bindload="wxParseImgLoad" bindtap="wxParseImgTap" class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-idx="{{item.imgIndex}}" data-src="{{item.attr.src}}" mode="widthFix" src="{{item.attr.src}}" style="width:{{item.width}}px;"></image>
+    <image bindload="wxParseImgLoad" bindtap="wxParseImgTap" class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-idx="{{item.imgIndex}}" data-src="{{item.attr.src}}" mode="widthFix" src="{{item.attr.src}}" style="width:100%;"></image>
 </template>
 <template name="wxParseVideo">
     <view class="{{item.classStr}} wxParse-{{item.tag}}" style="{{item.styleStr}}">