diff --git a/app.json b/app.json
index 9adcee3..7ba0a7f 100644
--- a/app.json
+++ b/app.json
@@ -91,44 +91,45 @@
          "pages/quan_pro/quan_pro",
          "pages/liveStream/liveStream",
          "pages/liveStreamDetails/liveStreamDetails",
-		 "pages/addCustomer/addCustomer",
-		 "pages/goods_share/goods_share",
-		 "pages/activity_share/activity_share",
-		 "pages/live_share/live_share",				
-		 "pages/quan/quan",
-		 "pages/chongzhi/chongzhi",
-		 "pages/chongzhiDetails/chongzhiDetails",
-		 "pages/jfbuy/jfbuy",
-		 "pages/hongBao/hongBao",
-		 "pages/hongBaoDetails/hongBaoDetails",
-		 "pages/service_record/service_record",
-		 "pages/checkin/checkin",
-		 "pages/distribution/myteam/myteam",
-		 "pages/distribution/order/order",
-		 "pages/distribution/commision/commision",
-		 "pages/distribution/rank/rank",
-		 "pages/distribution/card/card",
-		 "pages/distribution/goods/goods",
-		 "pages/distribution/shop/shop",
-		 "pages/distribution/rookie/rookie",
-		 "pages/service_share/service_share",
-		 "pages/cardList/cardList",
-		 "pages/goodsInfo/goodsInfo",
-		 "pages/my_service/appment_main",
-		 "pages/my_service/i_service",
-		 "pages/my_service/cosmetology_list",
-		 "pages/my_service/hist_service",
-		 "pages/my_service/tment_details",
-		 "pages/my_service/tment_eval",
-		 "pages/my_service/tment_order_list",
-		 "pages/my_service/beauty_deta",
-		 "pages/my_service2/appment_main",
-		 "pages/profile/profile",
-		 "pages/parseHtml/parseHtml",
-		 "pages/myGift/myGift",
-		 "pages/myGiftDetails/myGiftDetails",
-		 "pages/cart2_ser/cart2_ser",
-          "pages/libao_payment/payment"
+				 "pages/addCustomer/addCustomer",
+				 "pages/goods_share/goods_share",
+				 "pages/activity_share/activity_share",
+				 "pages/live_share/live_share",				
+				 "pages/quan/quan",
+				 "pages/chongzhi/chongzhi",
+				 "pages/chongzhiDetails/chongzhiDetails",
+				 "pages/jfbuy/jfbuy",
+				 "pages/hongBao/hongBao",
+				 "pages/hongBaoDetails/hongBaoDetails",
+				 "pages/service_record/service_record",
+				 "pages/checkin/checkin",
+				 "pages/distribution/myteam/myteam",
+				 "pages/distribution/order/order",
+				 "pages/distribution/commision/commision",
+				 "pages/distribution/rank/rank",
+				 "pages/distribution/card/card",
+				 "pages/distribution/goods/goods",
+				 "pages/distribution/shop/shop",
+				 "pages/distribution/rookie/rookie",
+				 "pages/service_share/service_share",
+				 "pages/cardList/cardList",
+				 "pages/goodsInfo/goodsInfo",
+				 "pages/my_service/appment_main",
+				 "pages/my_service/i_service",
+				 "pages/my_service/cosmetology_list",
+				 "pages/my_service/hist_service",
+				 "pages/my_service/tment_details",
+				 "pages/my_service/tment_eval",
+				 "pages/my_service/tment_order_list",
+				 "pages/my_service/beauty_deta",
+				 "pages/my_service2/appment_main",
+				 "pages/profile/profile",
+				 "pages/parseHtml/parseHtml",
+				 "pages/myGift/myGift",
+				 "pages/myGiftDetails/myGiftDetails",
+				 "pages/cart2_ser/cart2_ser",
+         "pages/libao_payment/payment",
+				 "pages/details_serviceCard/details_serviceCard"
       ]
       
   },
@@ -151,7 +152,9 @@
 			"pages/zuhegou/list/list",
       "pages/user/binding_info/binding_info",
       "pages/user/choice_guide/choice_guide",
-      "pages/video/index"
+      "pages/video/index",
+      "pages/boxes-list/boxes-list",
+			"pages/boxes-details/boxes-details"
     ] 
 },
 {
diff --git a/app.wxss b/app.wxss
index 0807496..b593c38 100644
--- a/app.wxss
+++ b/app.wxss
@@ -135,6 +135,7 @@
 	box-sizing: border-box;
 }
 
+
 .c-green {
 	color: #7CFC00;
 }
@@ -159,6 +160,14 @@
 	color: #c7c7c7;
 }
 
+.c-6 {
+	color: #666;
+}
+
+.c-9 {
+	color: #999;
+}
+
 
 
 .c-d {
@@ -232,6 +241,11 @@
 	margin-top: 30rpx;
 }
 
+.mgt40 {
+	margin-top: 40rpx;
+}
+
+
 .h68 {
 	height: 68rpx;
 }
@@ -729,9 +743,9 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* Project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_kwrwze5y6c.woff2?t=1635844276600') format('woff2'),
-       url('//at.alicdn.com/t/font_2054717_kwrwze5y6c.woff?t=1635844276600') format('woff'),
-       url('//at.alicdn.com/t/font_2054717_kwrwze5y6c.ttf?t=1635844276600') format('truetype');
+  src: url('//at.alicdn.com/t/font_2054717_y42sikta7lc.woff2?t=1642407649188') format('woff2'),
+       url('//at.alicdn.com/t/font_2054717_y42sikta7lc.woff?t=1642407649188') format('woff'),
+       url('//at.alicdn.com/t/font_2054717_y42sikta7lc.ttf?t=1642407649188') format('truetype');
 }
 
 .iconfont {
@@ -742,6 +756,18 @@ background: #ffe3e2;
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shangpin:before {
+  content: "\e661";
+}
+
+.icon-bankcard:before {
+  content: "\e693";
+}
+
+.icon-tongbu:before {
+  content: "\e6ca";
+}
+
 .icon-luck:before {
   content: "\e621";
 }
diff --git a/components/diy_serviceCard/diy_serviceCard.js b/components/diy_serviceCard/diy_serviceCard.js
index cf3ce1b..5d74dd5 100644
--- a/components/diy_serviceCard/diy_serviceCard.js
+++ b/components/diy_serviceCard/diy_serviceCard.js
@@ -1,582 +1,646 @@
 var t = getApp(),
-  a = t.request,
-  o = t.globalData.setting,
-  os = o,
-  i = require("../../utils/util.js"),
-  ut = i,
-  s = require("../../utils/common.js");
+	a = t.request,
+	o = t.globalData.setting,
+	os = o,
+	i = require("../../utils/util.js"),
+	ut = i,
+	s = require("../../utils/common.js");
 var regeneratorRuntime = require('../../utils/runtime.js');
 
 Component({
 	options: {
 		addGlobalClass: true,
 	},
-  properties: {
-    // 这里定义了innerText属性，属性值可以在组件使用时指定
-    object: {
-      type: Object,
-      value: null,
-    },
-
-  },
-  data: {
-    // 这里是一些组件内部数据
-    group: false,
-    imghost: o.imghost,
-    is_recommend: 0,
-    is_hot: 0,
-    is_new: 0,
-    baseUrl: "/api/weshop/goods/page",
-    resourceUrl: t.globalData.setting.resourceUrl,
-    url: t.globalData.setting.imghost,
-    currentPage: 1,
-    requestData: null,
-    requestUrl: "",
-    goods_array: null,
-    total: null,
-    prom_id: 0,
-    classstyle_id: null,
-    g_id: null,
-    wgroup: null,
-    goods_btn: null,
-    loadText: '加载更多',
-    someData: {},
-    goodscount: null,
-    firist_type_data: null,
-    firist_type_curr: 0,
-	is_nav:0,
-	nav_list:null,
-	title_index:0,
-	swiper_hei:0,
-	title_class:"",
-  },
-
-  ready: function () {},
-  
-  lifetimes: {
-    attached: function() {
-
-
-	  //要兼容性的写法，因为有些商家都还未更新商品分组的最新的效果~~3.0公众号的html页面所以不用兼容写法	
-	  var nav_item=this.data.object;					
-	  var nav_list=	this.data.object.nav_list;
-
-	  if(parseInt(nav_item.is_automore)){
-          if(!getApp().globalData.func_list) getApp().globalData.func_list=[];
-          getApp().globalData.func_list.push(this);
-	  }
-
-
-	  //最新的版本才有nav_list
-	  if(nav_list){
-		  nav_item=nav_list[0];
-		  //要算一下商品goodsid   
-		  for(var ij in nav_list){
-		  		  var item=nav_list[ij];
-		  		  var idlist="";
-		  		  //如果商品有手动选择的时候
-		  		  if(item.data && item.data.length>0){
-		  			  for(var im in item.data){
-		  				 idlist+= item.data[im]+",";
-		  			  }
-		  		  }
-		  		  if(idlist) idlist=ut.sub_last(idlist);
-		  		  nav_list[ij].idlist=idlist;
-		  }		  	  
-		  this.setData({nav_list:nav_list,is_nav:parseInt(this.data.object.is_nav)});
-	  }
-	   	   		
-      // 在组件实例进入页面节点树时执行
-	  if(nav_item) {
-		   this.data.classstyle_id = nav_item.classstyle;  
-		   this.data.wgroup =nav_item.wgroup;
-	  } 
-        
-      this.data.goodscount = this.data.object.goodscount;
-    
-	  
-	  var hei=280;
-	  if(this.data.object.goodstit) hei+=80;
-	  if(this.data.object.goodsprice) hei+=80;
-	  if(this.data.object.goodsnum)  hei+=80;
-  
-	  if(this.data.object.title_color){
-				this.data.title_class=`color:${this.data.object.title_color};`
-		}
+	properties: {
+		// 这里定义了innerText属性，属性值可以在组件使用时指定
+		object: {
+			type: Object,
+			value: null,
+		},
 
-		if(this.data.object.title_font_size){
-			this.data.title_class=this.data.title_class.concat(`font-size:${this.data.object.title_font_size}px;`)
-		}
-		this.setData({
-			swiper_hei:hei,
-			title_class:this.data.title_class,
-		});
-	  
-      if (nav_item && nav_item.goodsclass == 1) {
-        this.data.is_recommend = 1
-      }
-      if (nav_item && nav_item.goodsclass == 2) {
-        this.data.is_hot = 1
-      }
-      if (nav_item && nav_item.goodsclass == 3) {
-        this.data.is_new = 1
-      }
-	  
-      this.data.requestData = new Array();
-      this.data.g_id = nav_item.data;
-      var arr = [];
-
-      for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
-        arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
-      }
-      this.data.firist_type_data = arr;
-      this.init(this.data.classstyle_id, this.data.wgroup);
-    },
-    detached: function() {
-      // 在组件实例被从页面节点树移除时执行
-    },
-  },
-
-  pageLifetimes: {
-    //游客登录后，只要更新卡的情况
-    show: function () {
-        //--初始化卡类--
-        this.card_init();
-    },
-  },
-
-  methods: {
-    // 这里是一个自定义方法
-    init:async function (classstyle_id, wgroup) {
-		
-	  this.setData({classstyle_id:classstyle_id})	
-		
-      var th = this;
-      var g_id = this.data.g_id;
-	  var len=this.data.firist_type_data.length;
-      if (classstyle_id == 1) {
-        //---手动选择的时候---
-        g_id = this.data.firist_type_data[th.data.firist_type_curr];
-        th.data.firist_type_curr++;
-      }
-
-      var th = this,
-          app = getApp(),
-          index = 0,
-          gdata = [];
-
-        var user_id=getApp().globalData.user_id;
-        if(!user_id) user_id=0;
-
-      //--初始化卡类--
-      th.card_init();
-      var os=getApp().globalData.setting;
-      classstyle_id = classstyle_id + "";
-      switch (classstyle_id) {
-        //---手动选择商品---
-        case "1":      
-          var str="";
-          for (var i = 0; i < g_id.length; i++) {
-            str += g_id[i].goodsid + ",";           
-          }
-          str=str.substring(0, str.length - 1);
-
-          await app.request.get("/api/weshop/goods/getgoodslistOrdby?store_id=" + os.stoid + "&goodsidlist=" + str,  {
-          	    data:{user_id:user_id},
-			    isShowLoading:false,  
-			    success: function(res) {
-                     th.data.loading=0;
-				
-					 if(res.data.code==0 && res.data.data){
-
-                            var goods = res.data.data;
-                            /*--
-						   var rData = th.data.requestData;
-						   if (rData == null) rData=[];
-						   var now=ut.gettimestamp();
-						   
-						   var new_arr=[];
-						   for (var ii in res.data.data){
-							    var item=res.data.data[ii];
-								item.goods_img=th.data.imghost + item.original_img;
-								if(item.e_time<now) {item.prom_type=0; item.prom_price=0;}
-							    if(item.warm_uptime>now) {item.prom_type=0; item.prom_price=0;}
-								new_arr.push(item);
-						   }   
-						   rData = rData.concat(new_arr);
-
-						   th.data.requestData = rData;
-						   
-						   if(th.data.object.column==5){
-							   var arr = new Array();
-							   //--三个三个一组---
-							   for(var i=0;i< rData.length;i+=3){
-							     arr.push(rData.slice(i,i+3));
-							   }
-							   th.setData({ goods_array: arr  });  
-						   }else{
-							   th.setData({ goods_array: rData  });  
-						   }--*/
-
-                         th.set_good(goods);
-
-						 //---控制有没有加载更多的按钮---
-						 if (th.data.firist_type_curr >= len) {th.setData({ goods_btn: [] }); }
-						 else  th.setData({ goods_btn: [1,2]});                   
+	},
+	data: {
+		// 这里是一些组件内部数据
+		group: false,
+		imghost: o.imghost,
+		is_recommend: 0,
+		is_hot: 0,
+		is_new: 0,
+		baseUrl: "/api/weshop/goods/page",
+		resourceUrl: t.globalData.setting.resourceUrl,
+		url: t.globalData.setting.imghost,
+		currentPage: 1,
+		requestData: null,
+		requestUrl: "",
+		goods_array: null,
+		total: null,
+		prom_id: 0,
+		classstyle_id: null,
+		g_id: null,
+		wgroup: null,
+		goods_btn: null,
+		loadText: '加载更多',
+		someData: {},
+		goodscount: null,
+		firist_type_data: null,
+		firist_type_curr: 0,
+		is_nav: 0,
+		nav_list: null,
+		title_index: 0,
+		swiper_hei: 0,
+		title_class: "",
+	},
+
+	ready: function() {},
+
+	lifetimes: {
+		attached: function() {
+			let myStyle = '';
+			//要兼容性的写法，因为有些商家都还未更新商品分组的最新的效果~~3.0公众号的html页面所以不用兼容写法	
+			var nav_item = this.data.object;
+			var nav_list = this.data.object.nav_list;
+
+			if (parseInt(nav_item.is_automore)) {
+				if (!getApp().globalData.func_list) getApp().globalData.func_list = [];
+				getApp().globalData.func_list.push(this);
+			}
+
+
+			//最新的版本才有nav_list
+			if (nav_list) {
+				nav_item = nav_list[0];
+				//要算一下商品goodsid   
+				for (var ij in nav_list) {
+					var item = nav_list[ij];
+					var idlist = "";
+					//如果商品有手动选择的时候
+					if (item.data && item.data.length > 0) {
+						for (var im in item.data) {
+							idlist += item.data[im] + ",";
+						}
 					}
+					if (idlist) idlist = ut.sub_last(idlist);
+					nav_list[ij].idlist = idlist;
 				}
-			  
-		  })
-       
-          break;
-        case "2":
-          var item = {};
-           var  r_data={
-                    store_id: os.stoid ,
-                    pageSize: th.data.goodscount,
-                    page: th.data.currentPage,
-                    isonsale: 1,
-					orderField: "sort",
-					orderType: 'asc',
-            };
-           if(th.data.is_recommend) r_data.is_recommend=th.data.is_recommend;
-           if(th.data.is_hot) r_data.is_hot=th.data.is_hot;
-           if(th.data.is_new) r_data.is_new=th.data.is_new;
-
-            var user_id=getApp().globalData.user_id;
-            if(!user_id) user_id=0;
-            r_data.user_id=user_id;
-
-         await app.request.promiseGet("/api/weshop/goods/page", {
-              data:r_data
-          }).then(res => {
-            th.data.loading=0;
-            //商品地址
-            var goods = res.data.data.pageData;
-            th.setData({
-              goods_btn: res.data.data.pageData,
-              total: res.data.data.total
-            })
-            th.data.currentPage++;
-            //设置商品熏染
-            th.set_good(goods);
-
-          })
-          break;
-        case "3":
-          var item = {};
-          await app.request.promiseGet("/api/weshop/goodsGroup/pageGoodsList", {
-            data: {
-              store_id:os.stoid  ,
-              gpid: wgroup,
-              pageSize: th.data.goodscount,
-              page: th.data.currentPage,
-			  isonsale: 1,
-			  orderField: "sort",
-			  orderType: 'asc',
-			  user_id:user_id
-            }
-          }).then(res => {
-            th.data.loading=0;
-            //商品地址
-            var goods = res.data.data.pageData;
-            th.setData({
-              goods_btn: res.data.data.pageData, total: res.data.data.total
-            })
-
-            th.data.currentPage++;		
-			//设置商品熏染	
-			th.set_good(goods);
-            
-          })
-          break;
-      }
-    },
-
-    setLoading: function () {
-      var that = this;
-      if(this.data.loading) return false;
-      this.data.loading=1;
-      that.init(that.data.classstyle_id, that.data.wgroup);
-    },
-
-    //图片失败，默认图片
-    bind_bnerr3: function (e) {
-      var _errImg = e.target.dataset.errorimg;
-      var _errObj = {};
-      _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";
-      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
-    },
-	
-	//---卡的初始化----
-	card_init: function() {
-	  var th = this,os=getApp().globalData.setting;
-	  if(!getApp().globalData.user_id) return false;  
-	  getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
-		isShowLoading:false,  
-	    success: function(e) {
-	      getApp().globalData.userInfo = e.data.data;
-	      getApp().getConfig2(function(e) {
-	        var swithc_list = e.switch_list;
-	        var sw_arr = JSON.parse(swithc_list);
-	        //---如果后台又开等级卡的开关---
-	        if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
-	          th.setData({
-	            rank_switch: true
-	          });
-	          //---回调卡的列表---
-	          th.getPlusCardType(function(ob) {
-	            th.setData({
-	              card_list: ob.card_list
-	            });
-	            var ti = setInterval(function() {
-	              var user = getApp().globalData.userInfo;
-	              if (!user) return false;
-	              clearInterval(ti);
-	
-	              if (user.card_field && user['card_expiredate']) {
-	                var str = user['card_expiredate'].replace(/-/g, '/');
-	                var end = new Date(str);
-	                end = Date.parse(end) / 1000;
-	                var now = ut.gettimestamp();
-	
-	                //--- 判断是等级会员，且在有效期范围内 ---
-	                if (user.card_field && now < end) {
-	                  var card_name = ob.name_map.get(user.card_field);
-	                  if (card_name.length > 4) card_name = card_name.substring(0, 4);
-	                  th.setData({
-	                    card_field: user.card_field,
-	                    card_name: card_name,
-	                    card_list: ob.card_list
-	                  });
-	                }
-
-	              }
-
-	            }, 500)
-	          })
-	
-	        }
-	      })
-	    }
-	  })
-	
-	},
-	
-	//---  获取卡类列表 ---
-	getPlusCardType: function(func) {
-	  var storid = o.stoid;
-	  var th = this;
-	  getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
-	    var plusCard = res.data.data;
-	    var arr = [1219, 2089, 3031];
-	    var new_arr = new Array();
-	    var card_name_map = new Map();
-		
-		  var user = getApp().globalData.userInfo;
-		  
-		  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]);
+				this.setData({
+					nav_list: nav_list,
+					is_nav: parseInt(this.data.object.is_nav)
+				});
+			}
+
+			// 在组件实例进入页面节点树时执行
+			if (nav_item) {
+				this.data.classstyle_id = nav_item.classstyle;
+				this.data.wgroup = nav_item.wgroup;
+			}
+
+			this.data.goodscount = this.data.object.goodscount;
+
+
+			var hei = 280;
+			if (this.data.object.goodstit) hei += 80;
+			if (this.data.object.goodsprice) hei += 80;
+			if (this.data.object.goodsnum) hei += 80;
+
+			if (this.data.object.title_color) {
+				// this.data.title_class = `color:${this.data.object.title_color};`
+			}
+
+			if (this.data.object.font_size) {
+				this.data.title_class = this.data.title_class.concat(`font-size:${this.data.object.font_size}px;`);
+			}
+			
+			if (this.data.object.font_color) {
+				this.data.title_class = this.data.title_class.concat(`color:${this.data.object.font_color};`);
+			}
+			
+			if (this.data.object.acitve_font_color) {
+				this.setData({
+					myStyle: `
+						--border-color:${this.data.object.acitve_font_color};
+						--font-color:${this.data.object.acitve_font_color};
+					`,
+				});	
+			}
+			
+			if (this.data.object.list_border_type == 0) {
+				this.data.title_class = this.data.title_class.concat('border-radius: 80rpx;');
+			}
+			
+			if (this.data.object.list_border_type == 1) {
+				this.data.title_class = this.data.title_class.concat('border-radius: 0;');
+			}
+			
+			if (this.data.object.list_border_type == 2) {
+				this.data.title_class = this.data.title_class.concat('border-width: 0;');
+			}
+			
+			
+			
+			this.setData({
+				swiper_hei: hei,
+				title_class: this.data.title_class,
+			});
+
+			if (nav_item && nav_item.goodsclass == 1) {
+				this.data.is_recommend = 1
+			}
+			if (nav_item && nav_item.goodsclass == 2) {
+				this.data.is_hot = 1
+			}
+			if (nav_item && nav_item.goodsclass == 3) {
+				this.data.is_new = 1
 			}
-		  }
-	
-	    var ob = {
-	      "card_list": new_arr,
-	      "name_map": card_name_map
-	    };
-	    func(ob);
-	  })
+
+			this.data.requestData = new Array();
+			this.data.g_id = nav_item.data;
+			var arr = [];
+
+			for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
+				arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
+			}
+			this.data.firist_type_data = arr;
+			this.init(this.data.classstyle_id, this.data.wgroup);
+		},
+		detached: function() {
+			// 在组件实例被从页面节点树移除时执行
+		},
 	},
-	
-	//--- 点击tab的事件 ---
-	gr_set_nav:function(e){
-		
-		var title_idx=e.currentTarget.dataset.index;
-		if(title_idx==this.data.title_index) return false;	
-		wx.showLoading();
-						
-		var nav_item=this.data.object.nav_list[title_idx];	
-		this.data.g_id =[];
-		if(this.data.object.nav_list && this.data.object.nav_list[title_idx] && this.data.object.nav_list[title_idx].data)
-		     this.data.g_id=this.data.object.nav_list[title_idx].data;
-		var arr = [];		
-		for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
-		  arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
-		}
-		this.data.firist_type_data = arr;
-		this.data.firist_type_curr=0;		
-		this.data.requestData=[];
-				
-		// 在组件实例进入页面节点树时执行
-		if(nav_item){
-			this.data.classstyle_id = nav_item.classstyle;
-			this.data.wgroup =nav_item.wgroup;	
-		}
-		
-		
-		this.data.is_recommend = this.data.is_hot=this.data.is_new=0;		
-		//推荐，热卖，新品			
-		if (nav_item && nav_item.goodsclass == 1) {
-		  this.data.is_recommend = 1
-		}
-		if (nav_item && nav_item.goodsclass == 2) {
-		  this.data.is_hot = 1
-		}
-		if (nav_item && nav_item.goodsclass == 3) {
-		  this.data.is_new = 1
-		}		
-				
-				
-		this.data.currentPage=1;	
-		this.setData({goods_array:null,total:null,title_index:title_idx});	
-		//初始化 	
-		this.init(this.data.classstyle_id, this.data.wgroup);
-		setTimeout(function(){ wx.hideLoading();},1000) 
+
+	pageLifetimes: {
+		//游客登录后，只要更新卡的情况
+		show: function() {
+			//--初始化卡类--
+			// this.card_init();
+		},
 	},
 
-    //--- 设置 ---
-    set_good:async function(goods){
-		var now=ut.gettimestamp();		
-		var th=this;		
-		if(!goods || goods.length==0) return false;
-        var user_id=getApp().globalData.userInfo.user_id;
-        if(!user_id) user_id=0;
-		for(var i in goods){		
-			var val=goods[i];
-			var item = {};
-			var prom_id = null;
-			//app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
-
-            var url="/api/weshop/activitylist/getGoodActInfo";
-            var req_data={
-                store_id:os.stoid,goodsidlist:val.goods_id,is_detail:1,user_id:user_id
-            };
-
-            //获取商品的实际活动
-            await getApp().request.promiseGet(url, {data:req_data}).then(res=>{
-                if(res.data.code==0 && res.data.data && res.data.data.length==1){
-                    item.prom_type=res.data.data[0].prom_type;
-                    item.prom_id=res.data.data[0].act_id;
-                }
-            })
-
-			item.goods_name = val.goods_name;
-			item.goods_img = th.data.imghost + val.original_img;
-			item.market_price = val.market_price;
-			item.shop_price = val.shop_price;
-			item.sales_sum = val.sales_sum;
-			item.goods_id = val.goods_id;
-					
-			item.cardprice1 = val.cardprice1;
-			item.cardprice2 = val.cardprice2;
-			item.cardprice3 = val.cardprice3;
-			item.prom_type = val.prom_type;
-			item.prom_id = val.prom_id;
-
-			if(val.prom_price)    item.prom_price = val.prom_price;
-			if(val.prom_integral) item.prom_integral = val.prom_integral;
-							
-			prom_id = val.prom_id;
-					
-			var prom_type = val.prom_type; //0普通商品  1秒杀  6拼单 2团购 4积分购
-					
-			var url = "";
-
-			 switch (prom_type){
-			 	case 1:
-                    var user_id=getApp().globalData.user_id;
-                    if(!user_id) user_id=0;
-                    url = "/api/ms/flash_sale/getNew/" +os.stoid + "/" +user_id+"/"+ prom_id;
-			 		break;
-			 	case 2:
-                    url ="/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +val.goods_id+"/"+ prom_id
-			 		break;
-                case 4:
-                    url ="/api/weshop/integralbuy/get/"+os.stoid +"/"+prom_id;
-                    break;
-                case 6:
-                     url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
-                     break;
-                case 8:
-                    var presell_id = prom_id;
-                    var url1 = "/api/weshop/marketing/marketingPresellList/list";
-                    var rd= {
-                        store_id: os.stoid,
-                        presell_id: presell_id,
-                        goods_id: val.goods_id
-                    }
-                    //------获取预售从表----------
-                    await getApp().request.promiseGet(url1, {
-                        data: rd
-                    }).then(res => {
-                        if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
-                            var arr = res.data.data[0];
-                            item.prom_price = arr.luck_goods_price;
-                            item.sales_sum=arr.buy_goodnum+(arr.virtual_qty?arr.virtual_qty:0);
-                        }
-                    })
-                    break;
-			 	default:
-			 	 	break
-			 }
-
-			if(url!=null && url!=''){
-			 await getApp().request.promiseGet(url, {}).then(res => {
-			    var prom =null;
-			    if(res && res.data) prom=res.data.data;
-			    if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
-			        item.prom_price = res.data.data.price;
-			        if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
-			        var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0;
-			        var vNum1=res.data.data.virtualNum?res.data.data.virtualNum:0;
-			        var vNum2=res.data.data.virtual?res.data.data.virtual:0;
-                    item.sales_sum=res.data.data.buy_num+(vNum+vNum1+vNum2);
-			    }else{
-			    	item.prom_type=0;
-			    	item.prom_id=0;
-			    	item.prom_price=null;
-				}
+	methods: {
+		// 这里是一个自定义方法
+		init: async function(classstyle_id, wgroup) {
+
+			this.setData({
+				classstyle_id: classstyle_id
+			})
+
+			var th = this;
+			var g_id = this.data.g_id;
+			var len = this.data.firist_type_data.length;
+			if (classstyle_id == 1) {
+				//---手动选择的时候---
+				g_id = this.data.firist_type_data[th.data.firist_type_curr];
+				th.data.firist_type_curr++;
+			}
 
-			    th.data.requestData.push(item);
-			  })
-			}else{
-			  th.data.requestData.push(item);
+			var th = this,
+				app = getApp(),
+				index = 0,
+				gdata = [];
+
+			var user_id = getApp().globalData.user_id;
+			if (!user_id) user_id = 0;
+
+			//--初始化卡类--
+			// th.card_init();
+			
+			var os = getApp().globalData.setting;
+			classstyle_id = classstyle_id + "";
+			switch (classstyle_id) {
+				//---手动选择商品---
+				case "1":
+					var str = "";
+					for (var i = 0; i < g_id.length; i++) {
+						str += g_id[i].goodsid + ",";
+					}
+					str = str.substring(0, str.length - 1);
+
+					// await app.request.get("/api/weshop/serviceCard/page?store_id=" + os.stoid + "&goodsidlist=" + str, {
+					await app.request.get("/api/weshop/serviceCard/page?store_id=" + os.stoid + "&ids=" + str, {
+						data: {
+							user_id: user_id
+						},
+						isShowLoading: false,
+						success: function(res) {
+							th.data.loading = 0;
+
+							if (res.data.code == 0 && res.data.data) {
+									
+								var goods = res.data.data.pageData;
+								// console.log('goods', goods);
+						  //  var rData = th.data.requestData;
+						  //  if (rData == null) rData=[];
+						  //  var now=ut.gettimestamp();
+						   
+						  //  var new_arr=[];
+						  //  for (var ii in res.data.data){
+							 //    var item=res.data.data[ii];
+								// item.goods_img=th.data.imghost + item.original_img;
+								// if(item.e_time<now) {item.prom_type=0; item.prom_price=0;}
+							 //    if(item.warm_uptime>now) {item.prom_type=0; item.prom_price=0;}
+								// new_arr.push(item);
+						  //  }   
+						  //  rData = rData.concat(new_arr);
+
+						  //  th.data.requestData = rData;
+						   
+						  //  if(th.data.object.column==5){
+							 //   var arr = new Array();
+							 //   //--三个三个一组---
+							 //   for(var i=0;i< rData.length;i+=3){
+							 //     arr.push(rData.slice(i,i+3));
+							 //   }
+							 //   th.setData({ goods_array: arr  });  
+						  //  }else{
+							 //   th.setData({ goods_array: rData  });  
+						  //  }--
+
+								th.set_good(goods);
+
+								//---控制有没有加载更多的按钮---
+								if (th.data.firist_type_curr >= len) {
+									th.setData({
+										goods_btn: []
+									});
+								} else th.setData({
+									goods_btn: [1, 2]
+								});
+							}
+						}
+
+					})
+
+					break;
+				case "2":
+					var item = {};
+					var r_data = {
+						store_id: os.stoid,
+						pageSize: th.data.goodscount,
+						page: th.data.currentPage,
+						isonsale: 1,
+						orderField: "sort",
+						orderType: 'asc',
+					};
+					if (th.data.is_recommend) r_data.is_recommend = th.data.is_recommend;
+					if (th.data.is_hot) r_data.is_hot = th.data.is_hot;
+					if (th.data.is_new) r_data.is_new = th.data.is_new;
+
+					var user_id = getApp().globalData.user_id;
+					if (!user_id) user_id = 0;
+					r_data.user_id = user_id;
+
+					await app.request.promiseGet("/api/weshop/goods/page", {
+						data: r_data
+					}).then(res => {
+						th.data.loading = 0;
+						//商品地址
+						var goods = res.data.data.pageData;
+						th.setData({
+							goods_btn: res.data.data.pageData,
+							total: res.data.data.total
+						})
+						th.data.currentPage++;
+						//设置商品熏染
+						th.set_good(goods);
+
+					})
+					break;
+				case "3":
+					var item = {};
+					await app.request.promiseGet("/api/weshop/goodsGroup/pageGoodsList", {
+						data: {
+							store_id: os.stoid,
+							gpid: wgroup,
+							pageSize: th.data.goodscount,
+							page: th.data.currentPage,
+							isonsale: 1,
+							orderField: "sort",
+							orderType: 'asc',
+							user_id: user_id
+						}
+					}).then(res => {
+						th.data.loading = 0;
+						//商品地址
+						var goods = res.data.data.pageData;
+						th.setData({
+							goods_btn: res.data.data.pageData,
+							total: res.data.data.total
+						})
+
+						th.data.currentPage++;
+						//设置商品熏染	
+						th.set_good(goods);
+
+					})
+					break;
 			}
-		}
-		
-		if(th.data.object.column==5){
-			   var arr = new Array();
-			   var rData=th.data.requestData;
-			   //--三个三个一组---
-			   for(var i=0;i< rData.length;i+=3){
-				 arr.push(rData.slice(i,i+3));
-			   }
-			   th.setData({ goods_array: arr,page: th.data.currentPage - 1, });  
-		}else{
-			th.setData({
-				goods_array: th.data.requestData,
-				page: th.data.currentPage - 1,
+			
+		},
+
+		setLoading: function() {
+			var that = this;
+			if (this.data.loading) return false;
+			this.data.loading = 1;
+			that.init(that.data.classstyle_id, that.data.wgroup);
+		},
+
+		//图片失败，默认图片
+		bind_bnerr3: function(e) {
+			var _errImg = e.target.dataset.errorimg;
+			var _errObj = {};
+			_errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";
+			this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+		},
+
+		//---卡的初始化----
+		card_init: function() {
+			// var th = this,
+			// 	os = getApp().globalData.setting;
+			// if (!getApp().globalData.user_id) return false;
+			// getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+			// 	isShowLoading: false,
+			// 	success: function(e) {
+			// 		getApp().globalData.userInfo = e.data.data;
+			// 		getApp().getConfig2(function(e) {
+			// 			var swithc_list = e.switch_list;
+			// 			var sw_arr = JSON.parse(swithc_list);
+			// 			//---如果后台又开等级卡的开关---
+			// 			if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
+			// 				th.setData({
+			// 					rank_switch: true
+			// 				});
+			// 				//---回调卡的列表---
+			// 				th.getPlusCardType(function(ob) {
+			// 					th.setData({
+			// 						card_list: ob.card_list
+			// 					});
+			// 					var ti = setInterval(function() {
+			// 						var user = getApp().globalData.userInfo;
+			// 						if (!user) return false;
+			// 						clearInterval(ti);
+
+			// 						if (user.card_field && user['card_expiredate']) {
+			// 							var str = user['card_expiredate'].replace(/-/g, '/');
+			// 							var end = new Date(str);
+			// 							end = Date.parse(end) / 1000;
+			// 							var now = ut.gettimestamp();
+
+			// 							//--- 判断是等级会员，且在有效期范围内 ---
+			// 							if (user.card_field && now < end) {
+			// 								var card_name = ob.name_map.get(user.card_field);
+			// 								if (card_name.length > 4) card_name = card_name.substring(0, 4);
+			// 								th.setData({
+			// 									card_field: user.card_field,
+			// 									card_name: card_name,
+			// 									card_list: ob.card_list
+			// 								});
+			// 							}
+
+			// 						}
+
+			// 					}, 500)
+			// 				})
+
+			// 			}
+			// 		})
+			// 	}
+			// })
+
+		},
+
+		//---  获取卡类列表 ---
+		getPlusCardType: function(func) {
+			// var storid = o.stoid;
+			// var th = this;
+			// getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
+			// 	var plusCard = res.data.data;
+			// 	var arr = [1219, 2089, 3031];
+			// 	var new_arr = new Array();
+			// 	var card_name_map = new Map();
+
+			// 	var user = getApp().globalData.userInfo;
+
+			// 	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 ob = {
+			// 		"card_list": new_arr,
+			// 		"name_map": card_name_map
+			// 	};
+			// 	func(ob);
+			// })
+		},
+
+
+		//--- 点击tab的事件 ---
+		gr_set_nav: function(e) {
+
+			var title_idx = e.currentTarget.dataset.index;
+			if (title_idx == this.data.title_index) return false;
+			wx.showLoading();
+
+			var nav_item = this.data.object.nav_list[title_idx];
+			this.data.g_id = [];
+			if (this.data.object.nav_list && this.data.object.nav_list[title_idx] && this.data.object.nav_list[title_idx].data)
+				this.data.g_id = this.data.object.nav_list[title_idx].data;
+			var arr = [];
+			for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) {
+			// for (var i = 0; i < this.data.g_id.length; i ++) {
+				arr.push(this.data.g_id.slice(i, i + this.data.goodscount));
+			}
+			this.data.firist_type_data = arr;
+			this.data.firist_type_curr = 0;
+			this.data.requestData = [];
+
+			// 在组件实例进入页面节点树时执行
+			if (nav_item) {
+				this.data.classstyle_id = nav_item.classstyle;
+				this.data.wgroup = nav_item.wgroup;
+			}
+
+
+			this.data.is_recommend = this.data.is_hot = this.data.is_new = 0;
+			//推荐，热卖，新品			
+			if (nav_item && nav_item.goodsclass == 1) {
+				this.data.is_recommend = 1
+			}
+			if (nav_item && nav_item.goodsclass == 2) {
+				this.data.is_hot = 1
+			}
+			if (nav_item && nav_item.goodsclass == 3) {
+				this.data.is_new = 1
+			}
+
+
+			this.data.currentPage = 1;
+			this.setData({
+				goods_array: null,
+				total: null,
+				title_index: title_idx
 			});
+			//初始化 	
+			this.init(this.data.classstyle_id, this.data.wgroup);
+			setTimeout(function() {
+				wx.hideLoading();
+			}, 1000)
+		},
+
+		//--- 设置 ---
+		set_good: async function(goods) {
+			var now = ut.gettimestamp();
+			var th = this;
+			if (!goods || goods.length == 0) return false;
+			var user_id = getApp().globalData.userInfo.user_id;
+			if (!user_id) user_id = 0;
+			for (var i in goods) {
+				var val = goods[i];
+				var item = {};
+				var prom_id = null;
+				//app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
+
+				// var url = "/api/weshop/activitylist/getGoodActInfo";
+				// var req_data = {
+				// 	store_id: os.stoid,
+				// 	goodsidlist: val.goods_id,
+				// 	is_detail: 1,
+				// 	user_id: user_id
+				// };
+
+				//获取商品的实际活动
+				// await getApp().request.promiseGet(url, {
+				// 	data: req_data
+				// }).then(res => {
+				// 	if (res.data.code == 0 && res.data.data && res.data.data.length == 1) {
+				// 		item.prom_type = res.data.data[0].prom_type;
+				// 		item.prom_id = res.data.data[0].act_id;
+				// 	}
+				// })
+				// console.log('val++++++<<<<<', val);
+				item.goods_name = val.serviceName;
+				item.goods_img = th.data.imghost + val.imgUrl;
+				item.market_price = val.show_price;
+				item.shop_price = val.money;
+				item.sales_sum = val.sales_sum;
+				item.goods_id = val.id;
+
+				// item.cardprice1 = val.cardprice1;
+				// item.cardprice2 = val.cardprice2;
+				// item.cardprice3 = val.cardprice3;
+				// item.prom_type = val.prom_type;
+				// item.prom_id = val.prom_id;
+
+				if (val.prom_price) item.prom_price = val.prom_price;
+				if (val.prom_integral) item.prom_integral = val.prom_integral;
+
+				prom_id = val.prom_id;
+
+				var prom_type = val.prom_type; //0普通商品  1秒杀  6拼单 2团购 4积分购
+
+				var url = "";
+
+				// switch (prom_type) {
+				// 	case 1:
+				// 		var user_id = getApp().globalData.user_id;
+				// 		if (!user_id) user_id = 0;
+				// 		url = "/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id;
+				// 		break;
+				// 	case 2:
+				// 		url = "/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + val.goods_id + "/" + prom_id
+				// 		break;
+				// 	case 4:
+				// 		url = "/api/weshop/integralbuy/get/" + os.stoid + "/" + prom_id;
+				// 		break;
+				// 	case 6:
+				// 		url = "/api/weshop/teamlist/get/" + os.stoid + "/" + prom_id;
+				// 		break;
+				// 	case 8:
+				// 		var presell_id = prom_id;
+				// 		var url1 = "/api/weshop/marketing/marketingPresellList/list";
+				// 		var rd = {
+				// 			store_id: os.stoid,
+				// 			presell_id: presell_id,
+				// 			goods_id: val.goods_id
+				// 		}
+				// 		//------获取预售从表----------
+				// 		await getApp().request.promiseGet(url1, {
+				// 			data: rd
+				// 		}).then(res => {
+				// 			if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+				// 				var arr = res.data.data[0];
+				// 				item.prom_price = arr.luck_goods_price;
+				// 				item.sales_sum = arr.buy_goodnum + (arr.virtual_qty ? arr.virtual_qty : 0);
+				// 			}
+				// 		})
+				// 		break;
+				// 	default:
+				// 		break
+				// }
+
+				if (url != null && url != '') {
+					await getApp().request.promiseGet(url, {}).then(res => {
+						var prom = null;
+						if (res && res.data) prom = res.data.data;
+						if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time &&
+								prom.show_time < now))) {
+							item.prom_price = res.data.data.price;
+							if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
+							var vNum = res.data.data.virtual_num ? res.data.data.virtual_num : 0;
+							var vNum1 = res.data.data.virtualNum ? res.data.data.virtualNum : 0;
+							var vNum2 = res.data.data.virtual ? res.data.data.virtual : 0;
+							item.sales_sum = res.data.data.buy_num + (vNum + vNum1 + vNum2);
+						} else {
+							item.prom_type = 0;
+							item.prom_id = 0;
+							item.prom_price = null;
+						}
+
+						th.data.requestData.push(item);
+					})
+				} else {
+					th.data.requestData.push(item);
+				}
+			}
+
+			if (th.data.object.column == 5) {
+				var arr = new Array();
+				var rData = th.data.requestData;
+				//--三个三个一组---
+				for (var i = 0; i < rData.length; i += 3) {
+					arr.push(rData.slice(i, i + 3));
+				}
+				th.setData({
+					goods_array: arr,
+					page: th.data.currentPage - 1,
+				});
+			} else {
+				th.setData({
+					goods_array: th.data.requestData,
+					page: th.data.currentPage - 1,
+				});
+			}
+			
+			
+			// console.log('goods_array0000000000====>>>', th.data.goods_array);
+
+		},
+
+		re_show: function() {
+			if (this.data.object.goodscount * this.data.page < this.data.total) {
+				this.setLoading()
+			}
 		}
-				
-	},
 
-	re_show:function () {
-        if(this.data.object.goodscount *this.data.page <this.data.total ){
-            this.setLoading()
-        }
-    }
 
 
 
-	
-  }
-})
\ No newline at end of file
+	}
+})
diff --git a/components/diy_serviceCard/diy_serviceCard.wxml b/components/diy_serviceCard/diy_serviceCard.wxml
index 27c86a5..92b3ec9 100644
--- a/components/diy_serviceCard/diy_serviceCard.wxml
+++ b/components/diy_serviceCard/diy_serviceCard.wxml
@@ -12,36 +12,33 @@
 </block> -->
 
 <!-- 服务卡项顶部标题 -->
-<scroll-view scroll-x="true" enhanced="true" fast-deceleration="true" show-scrollbar="false">
-	<view class="flex fs28">
-		<view class="scroll-view-item active">标题1</view>
-		<view class="scroll-view-item">标题标题2</view>
-		<view class="scroll-view-item">标题3</view>
-		<view class="scroll-view-item">标题标题标题4</view>
-		<view class="scroll-view-item">标题5</view>
-		<view class="scroll-view-item">标题6</view>
-		<view class="scroll-view-item">标题题7</view>
-		<view class="scroll-view-item">标题8</view>
-		<view class="scroll-view-item">标题题9</view>
-		<view class="scroll-view-item">标题10</view>
-		<view class="scroll-view-item">标题11</view>
-		<view class="scroll-view-item">标题12222</view>
+<!-- class="scroll-view-item {{index == title_index ? 'active':''}}" -->
+<scroll-view scroll-x="true" enhanced="true" fast-deceleration="true" show-scrollbar="false" wx:if="{{is_nav}}">
+	<view class="flex" style="{{myStyle}}">
+		<view
+		wx:for="{{nav_list}}"
+		data-index="{{index}}"
+		data-idlist="{{item.idlist}}"
+		data-wgroup="{{item.wgroup}}"
+		data-classstyle="{{item.classstyle}}"
+		bindtap="gr_set_nav"
+		class="scroll-view-item {{index == title_index ? 'active':''}}"
+		style="{{title_class}}">{{item.title}}</view>
 	</view>
 </scroll-view>
 
 
 <!--1个列表的时候-->
 <view class="zs_goods_wai" wx:if='{{object.column==1}}'>
-       <block wx:for="{{goods_array}}" >
+       <block wx:for="{{goods_array}}">
             <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'>
-							<navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
-                <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> -->
+							<!-- <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> -->
+                <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
                     <view class='zs_top rel'>
 
                         <block wx:if="{{object.big_order_type==3}}">
                             <view style="position: relative; width: 100%; height: 100%">
-                                <image class='zs_t_img' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true"
-                                       binderror="bind_bnerr3"></image>
+                                <image class='zs_t_img' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image>
                                 <image class="n_box"  style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%"  src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true"  binderror="bind_bnerr3"></image>
                             </view>
                         </block>
@@ -68,7 +65,8 @@
                         </block>
                     </view>
                     <view class='zs_center'>
-                        <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view>
+												<!-- <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> -->
+                        <view class='zs_wz1'>{{item.goods_name}}</view>
                         <!--如果有显示价格 -->
                         <view class='zs_wz2' wx:if="{{object.goodsprice}}">
                              <block wx:if="{{item.prom_price || item.prom_integral}}">
@@ -190,7 +188,7 @@
 <view class="flex flex-wrap" wx:if="{{object.column==2}}" style="padding: 0 10rpx 20rpx 10rpx;">
   <block wx:for="{{goods_array}}" >
 		<view class="nav-container">
-			<navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1 {{g_filter.get_border_type(object.big_order_type)}}">
+			<navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1 {{g_filter.get_border_type(object.big_order_type)}}">
 			    <view class="zs_goods_wai_ban">
 			        <!-- <view class="zs_goods_ban"> -->
 			            <!-- <view class='zs_goods_2l'> -->
@@ -352,7 +350,7 @@
    <view class="flex wrap pdh10">
     <block wx:for="{{goods_array}}" >
 			<view class="nav-box">
-				<navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
+				<navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
 				    <view class="zs_goods_wai_san {{g_filter.get_border_type(object.big_order_type)}}" >
 				        <view class="zs_goods_san">
 				            <view class='zs_goods_3l'>
@@ -511,7 +509,7 @@
 <!-- 列表显示 -->
 <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'>
     <block wx:for="{{goods_array}}" >
-        <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1">
+        <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" class="s1_gk_a1">
             <view class="{{object.noboder==0?'zs_goods_xiao_bottom':'zs_goods_xiao'}}" >
                 <view class='zs_top_x'>
                     <block wx:if="{{object.big_order_type==3}}">
@@ -694,7 +692,7 @@
     <view class="sp">
       <swiper-item class="s_it" wx:for="{{goods_array}}">
         <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
-          <navigator url="{{g_filter.get_url_by_type(aitem)}}" style="width: 32%" >
+          <navigator url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" style="width: 32%" >
             <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}">
               <view class='sp_top'>
                 <view class='s_img' style="position: relative; width: 100%">
diff --git a/components/diy_serviceCard/diy_serviceCard.wxss b/components/diy_serviceCard/diy_serviceCard.wxss
index 3b53fcb..3efe07d 100644
--- a/components/diy_serviceCard/diy_serviceCard.wxss
+++ b/components/diy_serviceCard/diy_serviceCard.wxss
@@ -1,4 +1,7 @@
 /* pages/diy_zs/diy_zs.wxss */
+:root {
+	
+}
 
 .zwp_3 {
   margin-top: 10rpx;
@@ -104,7 +107,7 @@
   width: 56rpx;
   height: 56rpx;
   position: absolute;
-  left: 0rpx;
+  left: 10rpx;
   top: 10rpx;
 }
 
@@ -112,7 +115,7 @@
   width: 56rpx;
   height: 56rpx;
   position: absolute;
-  right: 0rpx;
+  right: 10rpx;
   top: 10rpx;
 }
 
@@ -120,7 +123,7 @@
   width: 56rpx;
   height: 56rpx;
   position: absolute;
-  left: 0rpx;
+  left: 10rpx;
   bottom: 10rpx;
 }
 
@@ -128,7 +131,7 @@
   width: 56rpx;
   height: 56rpx;
   position: absolute;
-  right: 20rpx;
+  right: 10rpx;
   bottom: 10rpx;
 }
 
@@ -237,11 +240,12 @@
 }
 
 .zs_t1_x {
+	position: absolute;
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 62rpx;
-  top: 6rpx;
+  /* position: relative; */
+  right: 10rpx;
+  top: 10rpx;
 }
 
 .zs_t1_x1 {
@@ -254,19 +258,21 @@
 }
 
 .zs_t1_x2 {
+	position: absolute;
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 56rpx;
-  top: 0rpx;
+  /* position: relative; */
+  right: 10rpx;
+  top: 10rpx;
 }
 
 .zs_t1_x3 {
+	position: absolute;
   width: 56rpx;
   height: 56rpx;
-  position: relative;
-  right: 288rpx;
-  top: 234rpx;
+  /* position: relative; */
+  left: 10rpx;
+  bottom: 10rpx;
 }
 
 /*1列2个*/
@@ -906,17 +912,22 @@ top: 10rpx;
 
 .scroll-view-item {
 	flex-shrink: 0;
-	border: 2rpx solid #ddd;
+	border-width: 2rpx;
+	border-style: solid;
+	border-color: #ddd;
 	border-radius: 80rpx;
-	padding: 10rpx 20rpx;
+	padding: 10rpx 30rpx;
 	margin: 20rpx 10rpx;
 	/* font-size: 28rpx; */
 	box-sizing: border-box;
+	text-align: center;
+	/* flex: 1; */
+	flex-grow: 1;
 }
 
 .scroll-view-item.active {
-	color: red;
-	border-color: red;
+	color: var(--font-color) !important;
+	border-color: var(--border-color) !important;
 }
 
 
@@ -925,7 +936,7 @@ top: 10rpx;
 	padding-top: 20rpx;
 	padding-left: 10rpx;
 	padding-right: 10rpx;
-	flex: 1;
+	/* flex: 1; */
 	flex-basis: 50%;
 }
 
diff --git a/components/serviceCard_list/g_filter.wxs b/components/serviceCard_list/g_filter.wxs
new file mode 100644
index 0000000..3155059
--- /dev/null
+++ b/components/serviceCard_list/g_filter.wxs
@@ -0,0 +1,85 @@
+var g_filters = {
+	    //-- 判断是不是有等级价 --
+	    is_has_rank:function(rank_switch,item){
+	    	 if(!rank_switch) return false;
+	    	 if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true}
+	    	 return false;	 
+	    },
+       	
+	    //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
+		get_card_price:function(goods,all_card,type){		
+			     var price1=parseFloat(goods['cardprice1']);
+           var price2 = parseFloat(goods['cardprice2']);
+           var price3 = parseFloat(goods['cardprice3']);					   
+			     if(!all_card){
+			         if(type==0) return 0;
+			         return "";
+			     }	  
+				 
+			     var min_price=null;
+				 var min_name=null;	   
+			     //---设置对应的价格名字----	   
+				 for(var i=0;i<3;i++) {						
+					var vl=all_card[i];			
+				   if(!vl) continue;			
+							
+					if(vl['CorrPrice']=="Price1" && price1>0)
+					{	 	 		  
+					   if(min_price==null) {
+						     min_price=price1;min_name=vl['CardName'];
+					   }
+					   else if(price1<min_price) {
+							min_price=price1;min_name=vl['CardName'];					  
+					   }
+					}
+					if(vl['CorrPrice']=="Price2" && price2>0)
+					{
+						if(min_price==null) {
+							min_price=price2;min_name=vl['CardName'];
+						}
+						else if(price2<min_price) {
+							min_price=price2;min_name=vl['CardName'];					  
+						}					
+					}
+											
+					if(vl['CorrPrice']=="Price3" && price3>0)
+					{						
+						if(min_price==null) {
+							min_price=price3;min_name=vl['CardName'];
+						}
+						else if(price3<min_price) {
+							min_price=price3;min_name=vl['CardName'];					  
+						}
+					}
+														
+				 } 
+				 if(min_price==null){
+					 if(type==0) return 0;
+					 return "";
+				 }	
+				 			   
+			     if(type==0) return min_price;	
+				 if(min_name.length>4 )	min_name=min_name.substring(0, 8);	 
+			     return min_name;
+		},
+
+		get_url_by_type: function(item) {
+        			var url = '';
+        			if(item.prom_type == 9) {
+        				url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id;
+        			}
+        			else if(item.prom_type==8){
+                           url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id
+                     }
+        			else {
+        				url = '/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id + '&prom_id=' + item.prom_id + '&prom_type=' + item.prom_type;
+        			};
+        			return url;
+        		},
+
+}
+module.exports = {
+	  is_has_rank:g_filters.is_has_rank,
+	  get_card_price:g_filters.get_card_price,   
+	  get_url_by_type:g_filters.get_url_by_type,
+}
\ No newline at end of file
diff --git a/components/serviceCard_list/serviceCard_list.js b/components/serviceCard_list/serviceCard_list.js
new file mode 100644
index 0000000..d642be6
--- /dev/null
+++ b/components/serviceCard_list/serviceCard_list.js
@@ -0,0 +1,226 @@
+var t = getApp(),
+  a = t.request,
+  o = t.globalData.setting,
+  os = o,
+  i = require("../../utils/util.js"),
+  ut = i,
+  s = require("../../utils/common.js");
+Component({
+  data: {
+    url: o.imghost,
+    object: null,
+    curPage: 1,
+    is_no_more: 1, //加载完所有数据的控制器
+    load_complete: 0, //加载完成,
+    rank_switch: false,
+    card_field: "",
+    card_name: "",
+    max_card_field: "",
+    card_list: null
+  },
+  properties: {
+    // 这⾥定义了innerText属性，属性值可以在组件使⽤时指定
+  },
+  ready: function () {},
+  pageLifetimes: {
+    //要处理一下，游客登录后的界面的变化,主要还该是改变会员
+    show: function () {
+			console.log('page-show');
+      this.init();
+      if(getApp().globalData.login_back==1){
+          getApp().globalData.login_back==0;
+          this.data.curPage=1;
+          this.setData({ recommend: [] });
+          this.get_list();
+      }
+    }
+  },
+
+  methods: {
+    init: function () {
+      var th = this;
+      if (!getApp().globalData.user_id) return false;
+      getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+        isShowLoading: false,
+        success: function (e) {
+          if (e.data.code == 0 && e.data && e.data.data) {
+            getApp().globalData.userInfo = e.data.data;
+            getApp().getConfig2(function (e) {
+              var swithc_list = e.switch_list;
+              var sw_arr = JSON.parse(swithc_list);
+              //---如果后台有开等级卡的开关---
+              if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
+                th.setData({
+                  rank_switch: true
+                });
+                //---回调卡的列表---
+                th.getPlusCardType(function (ob) {
+                  th.setData({
+                    card_list: ob.card_list
+                  });
+                  var ti = setInterval(function () {
+                    var user = getApp().globalData.userInfo;
+                    if (!user) return false;
+                    clearInterval(ti);
+                    if (user.card_field && user['card_expiredate']) {
+                      var str = user['card_expiredate'].replace(/-/g, '/');
+                      var end = new Date(str);
+                      end = Date.parse(end) / 1000;
+                      var now = ut.gettimestamp();
+                      //--- 判断是等级会员，且在有效期范围内 ---
+                      if (user.card_field && now < end) {
+                        var card_name = ob.name_map.get(user.card_field);
+                        if (card_name.length > 4) card_name = card_name.substring(0, 8);
+                        th.setData({
+                          card_field: user.card_field,
+                          card_name: card_name,
+                          card_list: ob.card_list
+                        });
+                      }
+                    }
+                  }, 500)
+                })
+              }
+            })
+
+          }
+
+
+
+        }
+      })
+    },
+    // get_list: function () {
+    //   var th = this;
+    //   var url = "http://172.20.0.233:8022/api/weshop/display";
+    //   wx.request({
+    //     url: url,
+    //     success: function (res) {
+    //       th.setData({
+    //         recommend: res.data.data.pageData
+    //       })
+    //     }
+    //   })
+    // },
+    get_list: function () {
+      var that = this;
+      if (that.data.is_no_more == 0) return false;
+      var user_id=getApp().globalData.user_id;
+      if(!user_id) user_id=0;
+
+      var curPage = that.data.curPage;
+			
+			// page: curPage,
+			// 					pageSize: 6,
+			// 					orderField: "sort",
+			// 					orderType: 'asc',
+			// 					// user_id: user_id,
+			// //      is_mainshow: 1,
+			// //      isonsale: 1,
+			// //      is_on_sale: 1,
+			//      is_recommend: 1,
+			//      store_id: o.stoid,
+			
+      getApp().request.get('/api/weshop/serviceCard/page', {
+        isShowLoading: false,
+        data: {
+          is_recommend: 1,
+          store_id: o.stoid,
+        },
+        success: function (res) {
+					console.log('获取卡项推荐', res.data.data);
+          var data = res.data;
+          var total = data.data.total;
+          if (total <= curPage * 6) {
+            that.setData({
+              is_no_more: 0
+            });
+          } else {
+            that.data.curPage++;
+          }
+          //加载完成
+          if (data.data.pageData) {
+
+            for(let i in data.data.pageData){
+            	let item=data.data.pageData[i];
+            	if(item.user_price)
+            	   item.prom_price=item.user_price;
+            }
+
+            that.setData({
+              load_complete: 1
+            });
+          }
+          if (that.data.recommend != null) {
+            var ra = that.data.recommend.concat(data.data.pageData);
+            that.setData({
+              recommend: ra
+            });
+          } else {
+            that.setData({
+              recommend: data.data.pageData
+            });
+          }
+					
+					console.log('卡项推荐按~~~~~~', that.data.recommend)
+        }
+      })
+    },
+    bind_bnerr_xc: function (e) {
+      var _errImg = e.target.dataset.errorimg;
+      var _errurl = e.target.dataset.url;
+      var _errObj = {};
+      _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
+      this.setData(_errObj) //注意这⾥的赋值⽅式,只是将数据列表中的此项图⽚路径值替换掉 ; 
+    },
+    reset: function () {
+      curPage = 1;
+    },
+    //--- 获取卡类列表 ---
+    getPlusCardType: function (func) {
+      var storid = o.stoid;
+      var th = this;
+      getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
+
+        if (res.data.code != 0 || !res.data.data) {
+          var ob = {
+            "card_list": [],
+            "name_map": ""
+          };
+          func(ob);
+          return false;
+        }
+
+        var plusCard = res.data.data;
+        var arr = [1219, 2089, 3031];
+        var new_arr = new Array();
+        var card_name_map = new Map();
+
+        var user = getApp().globalData.userInfo;
+        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 ob = {
+          "card_list": new_arr,
+          "name_map": card_name_map
+        };
+        func(ob);
+      })
+    },
+
+      go_url:function (e) {
+          var url=e.currentTarget.dataset.url;
+					console.log('url===>>>>', url);
+          getApp().goto(url);
+      }
+
+  },
+})
\ No newline at end of file
diff --git a/components/serviceCard_list/serviceCard_list.json b/components/serviceCard_list/serviceCard_list.json
new file mode 100644
index 0000000..7e37c03
--- /dev/null
+++ b/components/serviceCard_list/serviceCard_list.json
@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/serviceCard_list/serviceCard_list.wxml b/components/serviceCard_list/serviceCard_list.wxml
new file mode 100644
index 0000000..86919ed
--- /dev/null
+++ b/components/serviceCard_list/serviceCard_list.wxml
@@ -0,0 +1,154 @@
+<!-- 商品列表 -->
+<wxs module="filter" src="../../utils/filter.wxs"></wxs>
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
+<view class="collects">
+  <view class="hang ">
+    <!-- 商品详情 -->
+
+    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="/packageA/pages/goodsInfo/goodsInfo?goods_id={{item.id}}">
+    <!--<view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}">-->
+      <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}" hover-class="none"> -->
+			<navigator  hover-class="none">
+        <!-- 商品图⽚ -->
+        <image class="sp" src="{{url+item.imgUrl}}" mode="aspectFill" binderror="bind_bnerr_xc" data-url="{{url+item.original_img}}" data-errorimg="recommend[{{index}}].imgUrl"></image>
+        <view class="bottom">
+          <!-- 商品名称 -->
+          <view class="goods_name ellipsis-2 fs28">{{item.serviceName}}</view>
+          <!-- 判断是否有活动价 -->
+          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10}}">
+						<view class="pdt10">
+							<view class="money flex xc-wc" >
+							<text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
+							<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
+							      <!-- 活动价 -->
+							      <view class="flex xc-wc" wx:if="{{item.prom_price}}">
+							        <view class="fs24">￥</view>
+							        <view class="fs35">{{item.prom_price}}</view>
+							      </view>
+							    </view>
+							    <view class="flex">
+							      <!-- 原价 -->
+							      <view class="price flex xc-ash line_th">
+							        <view class="fs22">￥</view>
+							        <view class="fs22">{{item.market_price}}</view>
+							      </view>
+							    </view>
+						</view>
+            
+          </block>
+          <block wx:else>
+            <!-- 商品价格,先判断下是后⼜等级价-->
+            <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+              <!-- 当会员是等级卡的时候 -->
+              <block wx:if="{{card_field}}">
+                <!-- 等级价>0 -->
+                <block wx:if="{{item[card_field]>0}}">
+                  <view class="money flex">
+                    <!-- 办卡价 -->
+                    <view class="flex xc-wc ai_and">
+                      <view class="fs24">￥</view>
+                      <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
+                      <view class="card_bg ellipsis-1">
+                        <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+                        <text class="card_name">{{card_name}}</text>
+                      </view>
+                    </view>
+                  </view>
+                  <view class="flex">
+                    <!-- 原价 -->
+                    <view class="price flex xc-ash line_th">
+                      <view class="fs22">￥</view>
+                      <view class="fs22">{{item.market_price}}</view>
+                    </view>
+                  </view>
+                </block>
+                <blocK wx:else>
+                  <view class="money flex">
+                    <!-- 办卡价 -->
+                    <view class="flex xc-wc">
+                      <view class="fs24">￥</view>
+                      <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+                    </view>
+                  </view>
+                  <view class="flex">
+                    <!-- 原价 -->
+                    <view class="price flex xc-ash line_th">
+                      <view class="fs22">￥</view>
+                      <view class="fs22">{{item.market_price}}</view>
+                    </view>
+                  </view>
+                </blocK>
+              </block>
+              <block wx:else>
+                <!-- 如果商品有设置等级价⼤于0的 -->
+                <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+                  <view class="money flex">
+                    <!-- 办卡价 -->
+                    <view class="flex xc-wc">
+                      <view class="fs24">￥</view>
+                      <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+                    </view>
+                    <!-- 原价 -->
+                    <view class="price flex xc-ash line_th">
+                      <view class="fs22">￥</view>
+                      <view class="fs22">{{item.market_price}}</view>
+                    </view>
+                  </view>
+                  <view class="flexr" style="">
+                    <!-- 等级价 -->
+										<view class="price flex ai-center">
+										  <view class="fs22">￥</view>
+										  <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+										  <view class="card_bg ellipsis-1">
+										    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>
+												<text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+											</view>
+										</view>
+                  </view>
+                </block>
+                <block wx:else>
+                  <view class="money flex">
+                    <!-- 办卡价 -->
+                    <view class="flex xc-wc">
+                      <view class="fs24">￥</view>
+                      <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+                    </view>
+                  </view>
+                  <view class="flex">
+                    <!-- 原价 -->
+                    <view class="price flex xc-ash line_th">
+                      <view class="fs22">￥</view>
+                      <view class="fs22">{{item.market_price}}</view>
+                    </view>
+                  </view>
+                </block>
+              </block>
+            </block>
+            <!-- 商品压根就没有等级价 -->
+            <view class="pdt10" wx:else>
+              <view class="money flex">
+                <!-- 办卡价 -->
+                <view class="flex xc-wc">
+                  <view class="fs24">￥</view>
+                  <view class="fs35">{{filter.toFix(item.money,2)}}</view>
+                </view>
+              </view>
+              <view class="flex" style="">
+                <!-- 原价 -->
+                <view class="price flex xc-ash line_th">
+                  <view class="fs22">￥</view>
+                  <view class="fs22">{{item.show_price}}</view>
+                </view>
+              </view>
+            </view>
+          </block>
+        </view>
+      </navigator>
+    </view>
+  </view>
+  <view class="nothing flex-center" wx:if="{{is_no_more==0}}">
+    <view class="Foil"></view>
+    <view class="no_content fs24">没有更多内容了</view>
+    <view class="Foil"></view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/components/serviceCard_list/serviceCard_list.wxss b/components/serviceCard_list/serviceCard_list.wxss
new file mode 100644
index 0000000..7982238
--- /dev/null
+++ b/components/serviceCard_list/serviceCard_list.wxss
@@ -0,0 +1,236 @@
+.collects {
+  /* margin-top: 40rpx; */
+  /* margin-bottom: 40rpx; */
+}
+
+.pdt10 {
+	padding-top: 10rpx;
+}
+
+.ai-center{
+  align-items: center;
+}
+
+.ib {
+  display: inline-block;
+}
+
+.fs20 {
+  font-size: 20rpx;
+}
+
+.fs22 {
+  font-size: 22rpx;
+}
+
+.fs24 {
+  font-size: 24rpx;
+}
+
+.fs26 {
+  font-size: 26rpx;
+}
+
+.fs28 {
+  font-size: 28rpx;
+}
+
+.fs35 {
+  font-size: 35rpx;
+}
+
+.flex-center {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.ellipsis-1 {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+/* .ellipsis-1x {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+} */
+
+.xc-wc {
+  color: #d60021;
+}
+
+.xc-ash {
+  color: #b9b9b9;
+}
+
+.choice_box .choice_list .choice_footer .price {
+  color: #f23030;
+  height: 10px;
+}
+
+.flex {
+  display: flex;
+}
+
+.ellipsis-2 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+}
+
+.goods_name {
+  height: 62rpx;
+  /* margin-top: 6rpx; */
+  line-height: 1.2;
+	margin-bottom: 10rpx;
+}
+
+.hang {
+ /* width: 100%; */
+  /* margin: auto;
+  padding-left: 21rpx; */
+	display: flex;
+	flex-wrap: wrap;
+	/* margin: 0 auto; */
+	padding: 0 20rpx;
+	box-sizing: border-box;
+	/* justify-content: space-evenly; */
+}
+
+.hang .collect {
+  width: calc((100% - 20rpx) / 2);
+  /* height: 520rpx; */
+  border-radius: 25rpx;
+  border: 2rpx solid #ebedf0;
+  overflow: hidden;
+	box-sizing: border-box;
+	margin-top: 20rpx;
+  /* margin-right: 14rpx;
+  margin-bottom: 5rpx; */
+}
+
+.hang .collect:nth-child(2n+1) {
+	margin-right: 20rpx;
+}
+
+.collect .bottom {
+  padding: 20rpx;
+}
+
+.collect .sp {
+  width: 100%;
+  height: 340rpx;
+	display: block;
+}
+
+.collect .money {
+  /* margin-top: 28rpx;
+  margin-bottom: 8rpx;
+  line-height: 28rpx;
+  align-items: baseline; */
+}
+
+.collect .money view {
+  line-height: 28rpx;
+}
+
+.collect .money .flex {
+  font-weight: bold;
+}
+
+.collect .money .flex .fs24 {
+  padding-top: 5rpx;
+}
+
+.collect .Discount {
+  width: 156rpx;
+  height: 28rpx;
+  border-radius: 20rpx;
+  background-color: rgb(56, 56, 56);
+  font-size: 18rpx;
+  color: rgb(255, 255, 255);
+}
+
+.collect .Discount image {
+  height: 18rpx;
+  width: 18rpx;
+  line-height: 28rpx;
+  margin-right: 3rpx;
+}
+
+.collect.ml20 {
+  margin-left: 13rpx;
+}
+
+.fs24.dollar {
+  padding: 0rpx;
+}
+
+.money .price {
+  margin-left: 12rpx;
+  text-decoration: line-through;
+  line-height: 23rpx;
+}
+
+.province {
+  line-height: 26rpx;
+}
+
+.nothing {
+  height: 75rpx;
+  width: 100%;
+}
+
+.nothing .no_content {
+  margin: 0rpx 11rpx;
+  color: rgb(138, 138, 138);
+}
+
+.nothing .Foil {
+  width: 80rpx;
+  height: 2rpx;
+  background-color: #ebedf0;
+}
+
+.line_th {
+  text-decoration: line-through;
+}
+
+.card_bg {
+	box-sizing: border-box;
+  padding: 2rpx 10rpx;
+  height: 28rpx;
+  border-radius: 26rpx;
+  font-size: 18rpx;
+  line-height: 28rpx;
+	max-width: 210rpx;
+  background: #333;
+  color: #fff;
+  margin-left: 8rpx;
+}
+
+.card_bg image {
+  width: 19rpx;
+  height: 19rpx;
+  margin-right: 8rpx;
+}
+
+/* .card_bg .card_name {
+  max-width: 76rpx;
+  width: auto;
+  overflow: hidden;
+  white-space: nowrap;
+} */
+
+.card_name {
+	position: relative;
+	top: -4rpx;
+}
+
+
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index e229a34..ad7d3e8 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -5,13 +5,14 @@ Component({
 		fontcolor:'#6e6d6b',
 		fontcolor_sele:'#f23030',
 		backgroundColor:'#ffffff',	
-		active:-1,	
 		list:app.def_list,		
 		cartGoodsNum:0,
+		active: 0,
 	},
 
 	lifetimes: {
 	  attached: function() {
+			
 		   var th=this;
 		   getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{
 		   	  var dis=rs.data.data;	
@@ -51,7 +52,8 @@ Component({
 		   var th=this;
 		   		 	 	  
 		   var is_read=getApp().globalData.is_read;
-		   var custum_data=getApp().globalData.custum_data;		   
+		   var custum_data=getApp().globalData.custum_data;	
+			 
 		   if(is_read){
 			    if(custum_data){
 					 this.set_list(custum_data);
@@ -105,16 +107,33 @@ Component({
 				fontcolor:data.fontcolor,
 				is_custum:1
 			})
-						
+			// console.log('abc=======<<<<<', this.data.list);		
 		},
 		
 		nav_goto:function(e){
+			// const data = e.currentTarget.dataset
+			// this.setData({
+			// 	active: data.index
+			// })
+			// console.log('active***********<<<<<', this.data.active);
 			var url=e.currentTarget.dataset.url;
 			if(!url) return false;
 			if(url[0]!='/') url='/'+url;
 			//wx.switchTab({url:url,})			
 			getApp().goto(url);		
-		}
+		},
+		
+		
+		// switchTab(e) {
+		// 	const data = e.currentTarget.dataset
+		// 	const url = data.path
+		// 	wx.switchTab({url})
+		// 	this.setData({
+		// 		selected: data.index
+		// 	})
+		// }
+		
+
 		
   }
   
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index cfe266f..0c417bb 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -1,32 +1,40 @@
 <!-- 如果是自定义的话 -->
 <view  class="main_bar {{is_custum?'custom':''}}" style=" background: {{backgroundColor}}; font-size: 22rpx;">
-       <block wx:for="{{list}}" wx:for-index="idx"> 	  
-		   <block wx:if="{{item.nav_name !== '分销' && item.weappurl!= '/pages/distribution/distribution'}}">
-				 <view data-url="{{item.weappurl}}" bindtap="nav_goto"  class="tabbar_item"  data-act="{{active==idx?1:0}}"
-				    style="color: {{active==idx?fontcolor_sele:fontcolor}};">
-				<!-- <view data-url="{{item.weappurl}}" bindtap="nav_goto"  class="tabbar_item"  data-act="{{active==idx?1:0}}" 
-				   style="width:{{100 / list.length}}%;color: {{active==idx?fontcolor_sele:fontcolor}};"> -->
-				   
-				   <view class="tab_img">
-						 <view wx:if="{{item.nav_name=='购物车' && cartGoodsNum != 0}}"  class="cart_num" >{{cartGoodsNum}}</view>
-					   <view class="nav_imgage" style="background-image: url({{active==idx?item.src_sele:item.src}});"></view>
-				   </view>
-				   <view>{{item.nav_name}}</view>
-				</view>
-			</block>
-			<!-- 是分销商且没有关闭，可以显示 -->
+      <block wx:for="{{list}}" wx:for-index="idx"> 	  
+				 <block wx:if="{{item.nav_name !== '分销' && item.weappurl != '/pages/distribution/distribution'}}">
+					 <view data-url="{{item.weappurl}}" bindtap="nav_goto" class="tabbar_item" data-act="{{active==idx?1:0}}"
+							style="color: {{active==idx?fontcolor_sele:fontcolor}};">
+					<!-- <view data-url="{{item.weappurl}}" bindtap="nav_goto"  class="tabbar_item"  data-act="{{active==idx?1:0}}" 
+						 style="width:{{100 / list.length}}%;color: {{active==idx?fontcolor_sele:fontcolor}};"> -->
+						 <!-- <view class="tabbar_item_wrapper"> -->
+						<view class="{{item.specific ? 'tabbar_item_wrapper':''}}" style="background-color: {{item.specific ? item.button_background:'transparent'}};">
+							 <view class="tab_img">
+									<view wx:if="{{item.nav_name=='购物车' && cartGoodsNum != 0}}"  class="cart_num" >{{cartGoodsNum}}</view>
+								 <view class="nav_imgage" style="background-image: url({{active==idx?item.src_sele:item.src}});"></view>
+							 </view>
+							 <view>{{item.nav_name}}</view>
+						</view>
+						 
+					</view>
+				</block>
+				
+				
+				<!-- 是分销商且没有关闭，可以显示 -->
 		    <block wx:if="{{(item.nav_name === '分销' || item.weappurl === '/pages/distribution/distribution') && !is_no_distri}}">
 					<view data-url="{{item.weappurl}}" bindtap="nav_goto"  class="tabbar_item"  data-act="{{active==idx?1:0}}"
 					   style="color: {{active==idx?fontcolor_sele:fontcolor}};">
 				   <!-- <view data-url="{{item.weappurl}}" bindtap="nav_goto"  class="tabbar_item"  data-act="{{active==idx?1:0}}"
 				      style="width:{{100 / list.length}}%;color: {{active==idx?fontcolor_sele:fontcolor}};"> -->
-				      <view class="tab_img">
-				   	   <view class="nav_imgage" style="background-image: url({{active==idx?item.src_sele:item.src}});"></view>
-				      </view>
-				      <view>{{item.nav_name}}</view>
-				   </view>
+							<view class="{{item.specific ? 'tabbar_item_wrapper':''}}" style="background-color: {{item.specific ? item.button_background:'transparent'}};">
+								<view class="tab_img">
+								 <view class="nav_imgage" style="background-image: url({{active==idx?item.src_sele:item.src}});"></view>
+								</view>
+								<view>{{item.nav_name}}</view>
+							</view>
+				      
+				  </view>
 			 </block>	 			
-      </block>
+    </block>
 </view >	
 
 
diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss
index 71558c6..eb2618d 100644
--- a/custom-tab-bar/index.wxss
+++ b/custom-tab-bar/index.wxss
@@ -7,6 +7,7 @@
 	z-index: 10000;
 	display: flex;
 	justify-content: space-around;
+	align-items: center;
 	height: 100rpx;
 }
 .main_bar.custom {
@@ -19,14 +20,14 @@
 	/* float: left; */
 	text-align: center;
 	padding: 0;
-	display: flex;
+	/* display: flex; */
 	flex: 1;
-	flex-direction: column;
-	justify-content: center;
+	/* flex-direction: column; */
+	/* justify-content: center; */
 }
 
 .tab_img {
-	display: flex;
+	/* display: flex; */
 	justify-content: center;
 	position: relative;
 }
@@ -39,6 +40,7 @@
 	/* background-position: center;
 	background-repeat: no-repeat; */
 	background-size: 100%;
+	margin: 0 auto;
 }
 
 .cart_num {
@@ -55,3 +57,17 @@
 	right: 34rpx;
 	/* margin-right: -70rpx; */
 }
+
+.tabbar_item_wrapper {
+	background-color: white;
+	position: relative;
+	width: 120rpx;
+	height: 120rpx;
+	border-radius: 50%;
+	bottom: 14rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	margin: 0 auto;
+}
+
diff --git a/packageA/pages/cardList/cardList.js b/packageA/pages/cardList/cardList.js
index 60c419c..377fcf6 100644
--- a/packageA/pages/cardList/cardList.js
+++ b/packageA/pages/cardList/cardList.js
@@ -24,6 +24,7 @@ Page({
    */
   onLoad: function (options) {
 		self = this;//保存全局指针
+		this.data.options = options;
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
 				userInfo: data,
@@ -60,7 +61,9 @@ Page({
 					imghost: app.globalData.setting.imghost,
 					isLogin: true,
 				});
-				
+				if(this.data.options.cat_id) {
+					currentQuery.cat_id = this.data.options.cat_id;
+				};
 				currentQuery.page=1;			
 				this.getData(true, url, currentQuery);			
 				// app.request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + app.globalData.setting.stoid, {
diff --git a/packageA/pages/cardList/cardList.wxml b/packageA/pages/cardList/cardList.wxml
index efb3a19..9a3eaf5 100644
--- a/packageA/pages/cardList/cardList.wxml
+++ b/packageA/pages/cardList/cardList.wxml
@@ -52,7 +52,7 @@
 		</block>				
 	
 	<nodata class="t-c" wx:if="{{list.pageData.length == 0  && list.pageData}}"></nodata>
-	<view wx:if="{{noMore}}" class="noMore">- 已经到底了 -</view>
+	<view class="noMore" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">- 已经到底了 -</view>
 	</view>
 </block>
 
@@ -85,7 +85,7 @@
 			<nodata class="t-c" wx:if="{{list.pageData.length == 0 || list == null}}"></nodata>
 		</view>
 
-		<view wx:if="{{noMore}}" class="noMore">- 已经到底了 -</view>
+		<view class="noMore" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">- 已经到底了 -</view>
 	</scroll-view>
 </view>
 </block>
diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js
index 4c6f9f9..157b074 100644
--- a/packageA/pages/cart2_ser/cart2_ser.js
+++ b/packageA/pages/cart2_ser/cart2_ser.js
@@ -1,579 +1,655 @@
-var t = getApp(),app=t, a = t.request, e = require("../../../utils/common.js"),
-  s = require("../../../utils/util.js"), o = require("../../../utils/md5.js"), to = getApp();
-var oo=t.globalData.setting,os=oo;
+var t = getApp(),
+	app = t,
+	a = t.request,
+	e = require("../../../utils/common.js"),
+	s = require("../../../utils/util.js"),
+	o = require("../../../utils/md5.js"),
+	to = getApp();
+var oo = t.globalData.setting,
+	os = oo;
 var regeneratorRuntime = require('../../../utils/runtime.js');
 var util_pay = require("../../../utils/pay.js");
 
 Page({
-    data: {
-        url: t.globalData.setting.url,
-        resourceUrl: t.globalData.setting.resourceUrl,
-        imgUrl: t.globalData.setting.imghost,
-       
-        invoiceToggle: !0,
-        payWithUserMoney: !0,
-        payWithPoints: !0,
-        maxWord: 0,
-        enterAddressPage: !1,
-     
-        //页面获取的参数
-        param:null,
-        postdata:null,
-        //提交订单的格式
-        formData: {
-            order_amount:0,//支付金额
-            total_amount:0,//总价
-            all_price:0,//商品卖的总价
-            pay_points: 0,//使用积分
-            user_money: 0,//使用余额
-            couponCode: "",//使用优惠券(多单就用逗号隔开)
-            shipping_price:0,//物流费用
-        },
-
-        /*----------------立即购买---------------------*/
-        is_b_now:0,    //0是购物车结算  1立即购买
-        bn_goods:null, //立即购买时候的调用商品
-        bn_use_money:0,//是否使用余额     
-        bn_pick:0,     //选择的门店
-        bn_pickname: "", //选择的门店名称
-      
-        /*------------------------*/
-        yuer:0,
-        is_cart:0, //是不是购物车进来的购买
-    },
-    onLoad: function(t) {	
+	data: {
+		url: t.globalData.setting.url,
+		resourceUrl: t.globalData.setting.resourceUrl,
+		imgUrl: t.globalData.setting.imghost,
+
+		invoiceToggle: !0,
+		payWithUserMoney: !0,
+		payWithPoints: !0,
+		maxWord: 0,
+		enterAddressPage: !1,
+
+		//页面获取的参数
+		param: null,
+		postdata: null,
+		//提交订单的格式
+		formData: {
+			order_amount: 0, //支付金额
+			total_amount: 0, //总价
+			all_price: 0, //商品卖的总价
+			pay_points: 0, //使用积分
+			user_money: 0, //使用余额
+			couponCode: "", //使用优惠券(多单就用逗号隔开)
+			shipping_price: 0, //物流费用
+		},
+
+		/*----------------立即购买---------------------*/
+		is_b_now: 0, //0是购物车结算  1立即购买
+		bn_goods: null, //立即购买时候的调用商品
+		bn_use_money: 0, //是否使用余额     
+		bn_pick: 0, //选择的门店
+		bn_pickname: "", //选择的门店名称
+
+		/*------------------------*/
+		yuer: 0,
+		is_cart: 0, //是不是购物车进来的购买
+	},
+	onLoad: function(t) {
 		wx.setNavigationBarTitle({
-		  title: "填写订单",
+			title: "填写订单",
 		});
-		
-        var appD=getApp().globalData.service_now;
-        this.data.postdata=appD;
-        this.data.param=t;
-        if(t.is_cart){
-            this.setData({is_cart:1});
-        }
-
-		var th=this;  
-		
+
+		var appD = getApp().globalData.service_now;
+		this.data.postdata = appD;
+		this.data.param = t;
+		if (t.is_cart) {
+			this.setData({
+				is_cart: 1
+			});
+		}
+
+		var th = this;
+
 		getApp().promiseGet("/api/wx/weappSendlist/page", {
-		  data: {
-		    store_id: os.stoid,
-		    typeid: "1001"
-		  }}).then(res=>{
-			  if (res.data.code == 0 && res.data.data.pageData.length > 0) {
-			    var template_id = res.data.data.pageData[0].template_id;
-			    th.setData({template_id:template_id});
-			  }  
-		  })
-		
-    },
-    onUnload: function () { this.setData({ isclose: 1 })},
-
-    //------获取会员信息-----先获取用户信息，在进行下一步---
-    get_info:function(func){
-       var user_id = t.globalData.user_id;
-       to.auth.get_u(func);
-    },
-
-    //----------------展示页面,是再获取用户信息之后--------------
-    show_page:function(){
-          var th=this;
-          //th.setData({ userinfo: to.globalData.userInfo});  会员信息要时时获取		  
-		  var user=getApp().globalData.userInfo;
-		  getApp().request.get("/api/weshop/users/get/" + oo.stoid + "/" + user.user_id, {
-		  		data:{r:Math.random()},	
-		    success: function (e) {	
-				
-				      getApp().globalData.userInfo = e.data.data;
-				      th.setData({userinfo:e.data.data});
-					  //获取立即购买的商品信息
-                      if(th.data.is_cart){
-                          //读取门店
-                          to.get_allsto(function (e) {
-                              th.setData({ allsto: e });
-                              th.get_cart();
-                          })
-                      }else{
-                         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 });
+			data: {
+				store_id: os.stoid,
+				typeid: "1001"
+			}
+		}).then(res => {
+			if (res.data.code == 0 && res.data.data.pageData.length > 0) {
+				var template_id = res.data.data.pageData[0].template_id;
+				th.setData({
+					template_id: template_id
+				});
+			}
+		})
+
+	},
+	onUnload: function() {
+		this.setData({
+			isclose: 1
+		})
+	},
+
+	//------获取会员信息-----先获取用户信息，在进行下一步---
+	get_info: function(func) {
+		var user_id = t.globalData.user_id;
+		to.auth.get_u(func);
+	},
+
+	//----------------展示页面,是再获取用户信息之后--------------
+	show_page: function() {
+		var th = this;
+		//th.setData({ userinfo: to.globalData.userInfo});  会员信息要时时获取		  
+		var user = getApp().globalData.userInfo;
+		getApp().request.get("/api/weshop/users/get/" + oo.stoid + "/" + user.user_id, {
+			data: {
+				r: Math.random()
+			},
+			success: function(e) {
+
+				getApp().globalData.userInfo = e.data.data;
+				th.setData({
+					userinfo: e.data.data
+				});
+				//获取立即购买的商品信息
+				if (th.data.is_cart) {
+					//读取门店
+					to.get_allsto(function(e) {
+						th.setData({
+							allsto: e
+						});
+						th.get_cart();
+					})
+				} else {
+					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
+							});
+						}
+					}
+				});
+			}
+		});
+	},
+
+	//-----获取购物车,入口--------
+	get_cart: function() {
+		var th = this,
+			app = getApp();
+		a.get("/api/weshop/cartService/page", {
+			data: {
+				user_id: to.globalData.user_id,
+				selected: 1,
+				store_id: oo.stoid,
+				pageSize: 600
+			},
+			success: async function(su) {
+				//按门店分类的数组
+				var arr = new Array();
+				var carr = su.data.data.pageData;
+				th.data.cartlist_y = carr; //存储原始购物车列表
+
+				//---是不是购买等级卡成功的返回---等级卡显示的判断---
+				var is_card_back = getApp().globalData.is_card_back;
+
+
+				//在分组的时候，就不要再调用接口，await
+				for (var i = 0; i < carr.length; i++) {
+					var good = null;
+					var item = carr[i];
+					await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + item.service_id, {}).then(
+						res => {
+							good = res.data.data;
+						})
+
+					item.img_url = oo.imghost + good.imgUrl;
+					item.erpItemID = good.erpItemID;
+
+					/*----接口要弄出来的，先顶着-----*/
+					var pcid = item.pick_id;
+					var find = 0;
+					//----如果有就加进去，没有就新增一个----
+					//-----------循环查找门店-------------
+					if (arr.length > 0) {
+						for (var j = 0; j < arr.length; j++) {
+							if (arr[j].pickup_id == pcid) {
+								arr[j].goods.push(item);
+								find = 1;
+								break;
+							}
+						}
+					}
+					//------如果没有找到-----
+					if (find == 0) {
+						var pikname = '',
+							sto = null;
+						//----找到门店名称-----
+						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;
+								sto = th.data.allsto[k];
+								break;
 							}
 						}
-					});
+						var narr = new Array();
+						narr.push(item);
+						var ie = {
+							pickup_id: pcid,
+							pname: pikname,
+							goods: narr,
+							keyid: sto.keyid,
+							goods_price: 0,
+							shipping_price: 0,
+							user_money: 0,
+							total_amount: 0,
+							order_amount: 0
+						};
+						arr.push(ie);
+
+					}
+				}
+
+				//深拷贝
+				th.data.old_cartlist = JSON.parse(JSON.stringify(arr));
+				th.setData({
+					cartlist: arr,
+				});
+				th.calculatePrice();
+			}
+		});
+	},
+
+	//-----获取立即购买的商品信息----
+	get_buy_goods: function() {
+		var th = this,
+			a = getApp().request;
+		var gg = th.data.postdata;
+		var url = "/api/weshop/serviceCard/get/" + oo.stoid + "/" + gg.id
+		//调用商品
+		a.get(url, {
+			success: function(t) {
+				var gd = t.data.data;
+				t.data.data.original_img = oo.imghost + t.data.data.imgUrl;
+				t.data.data['buynum'] = gg.goods_num;
+				t.data.data.shop_price = gd.money;
+
+				th.setData({
+					bn_goods: t.data.data,
+					bn_pickname: gg.pick_name,
+					bn_pick: gg.pick_id
+				});
+				th.calculatePrice2();
+
+			}
+		});
+	},
+
+	//----------子页返回父页触发----------
+	onShow: function() {
+		var th = this;
+		if (th.data.isclose == 0) {
+			wx.navigateTo({
+				url: "/pages/index/index/index"
+			})
+		}
+		//先获取是否有关闭使用优惠券
+		getApp().getConfig2(function(ee) {
+			//var json_d = JSON.parse(ee.switch_list);
+			//th.data.ispt_goods=json_d.ispt_goods;  //是不是平摊到单品的控制参数赋值
+			//th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch});
+			th.show_page();
+		})
+	},
+
+
+	showInvoice: function() {
+		this.setData({
+			invoiceToggle: !this.data.invoiceToggle
+		});
+	},
+
+
+	//-------------------计算购物车订单价格-------------------
+	calculatePrice: function() {
+		var th = this;
+		to.getConfig2(async function(ee) {
+			wx.showLoading({
+				title: "处理中."
+			})
+			var all_price = 0; //所有的商品总价
+			var all_shipping_m = 0; //所有的物流总价
+			var all_total_m = 0; //所有的订单应付总价
+			var all_order_m = 0; //所有的订单应付总价
+			var all_user_m = 0; //所有的订单用户使用金额
+			var all_coupon_price_m = 0; //所有的订单用户使用优惠券价格
+			var all_cutprice = 0; //所有的优惠减件
+			var all_order_prom = 0; //所有的订单优惠
+
+			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;
+			var by_qc = {};
+			var c_arr = JSON.parse(JSON.stringify(th.data.old_cartlist));
+
+			//---循环购物车---
+			for (var i in c_arr) {
+
+				var cart_item = c_arr[i]; //就是每一单的意思
+				var pickid = cart_item.pickup_id;
+				var o_price = 0;
+				var o_shipping_price = 0,
+					goods_weight = -1,
+					goods_piece = -1;
+				var item = c_arr[i].goods; //就是每一单的从表的意思
+
+				//---如果有选择优惠券的情况下---
+				var quan_price = 0;
+				var coupon_price = 0;
+				var quan_no = null;
+
+				//--------循环计算总价-----------
+				for (var j = 0; j < item.length; j++) {
+					o_price += item[j].money * item[j].goods_num;
+				}
+				var f_o_price = o_price;
+				cart_item.goods_price = f_o_price.toFixed(2); //商品总费用,用f_o_price来计算
+				//计算物流费用
+				cart_item.shipping_price = 0;
+
+				//总价计算,总价不包含运费
+				cart_item.order_amount = (o_price - quan_price).toFixed(2);
+				cart_item.total_amount = f_o_price.toFixed(2);
+
+				var order_prom_amount = 0;
+				var order_prom_id = 0;
+				var o_condition = cart_item.order_amount;
+				var order_m = 0;
+				cart_item.order_prom_amount = 0;
+				coupon_price = quan_price;
+
+
+				cart_item.total_amount = parseFloat(cart_item.total_amount) + parseFloat(cart_item.shipping_price); //总金额
+				cart_item.order_amount = parseFloat(cart_item.order_amount) + parseFloat(cart_item.shipping_price); //总金额
+				cart_item.total_amount = cart_item.total_amount.toFixed(2);
+				cart_item.order_amount = cart_item.order_amount.toFixed(2);
+
+				//搭配购在使用余额
+				if (th.data.bn_use_money == 1 && th.data.is_b_now == 1) {
+
+					if (umoney > cart_item.order_amount) {
+						cart_item.user_money = cart_item.order_amount;
+						umoney = umoney - cart_item.order_amount;
+					} else {
+						cart_item.user_money = umoney;
+						umoney = 0;
+					}
+
+				} else {
+					//--------------如果使用余额,购物车购买---------------------
+					if (th.data.js_use_money == 1) {
+						if (umoney > cart_item.order_amount) {
+							cart_item.user_money = cart_item.order_amount;
+							umoney = umoney - cart_item.order_amount;
+						} else {
+							cart_item.user_money = umoney;
+							umoney = 0;
+						}
+					} else {
+						cart_item.user_money = 0;
+					}
+				}
+				all_price += parseFloat(f_o_price);
+				all_total_m += parseFloat(cart_item.total_amount);
+				all_shipping_m += parseFloat(cart_item.shipping_price);
+				all_order_m += parseFloat(cart_item.order_amount);
 			}
-		});			
-    },
-
-    //-----获取购物车,入口--------
-    get_cart: function () {
-        var th = this,app=getApp();
-        a.get("/api/weshop/cartService/page", {
-            data: {
-                user_id: to.globalData.user_id, selected:1,
-                store_id: oo.stoid, pageSize: 600 },
-            success:async function (su) {
-                //按门店分类的数组
-                var arr = new Array();
-                var carr = su.data.data.pageData;
-                th.data.cartlist_y = carr;  //存储原始购物车列表
-
-                //---是不是购买等级卡成功的返回---等级卡显示的判断---
-                var is_card_back=getApp().globalData.is_card_back;
-
-
-                //在分组的时候，就不要再调用接口，await
-                for (var i = 0; i < carr.length; i++) {
-                    var good=null;
-                    var item = carr[i];
-                    await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + item.service_id, {}).then(res => {
-                        good = res.data.data;
-                    })
-
-                    item.img_url = oo.imghost + good.imgUrl;
-                    item.erpItemID=good.erpItemID;
-
-                    /*----接口要弄出来的，先顶着-----*/
-                    var pcid = item.pick_id;
-                    var find = 0;
-                    //----如果有就加进去，没有就新增一个----
-                    //-----------循环查找门店-------------
-                    if (arr.length > 0) {
-                        for (var j = 0; j < arr.length; j++) {
-                            if (arr[j].pickup_id == pcid) {
-                                arr[j].goods.push(item);
-                                find = 1;break;
-                            }
-                        }
-                    }
-                    //------如果没有找到-----
-                    if (find == 0) {
-                        var pikname = '',sto=null;
-                        //----找到门店名称-----
-                        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; sto = th.data.allsto[k]; break;
-                            }
-                        }
-                        var narr = new Array(); narr.push(item);
-                        var ie = {
-                            pickup_id: pcid, pname: pikname, goods: narr,keyid:sto.keyid,
-                            goods_price: 0, shipping_price: 0, user_money: 0, total_amount: 0, order_amount: 0};
-                        arr.push(ie);
-
-                    }
-                }
-
-                //深拷贝
-                th.data.old_cartlist= JSON.parse(JSON.stringify(arr));
-                th.setData({
-                    cartlist: arr,
-                });
-                th.calculatePrice();
-            }
-        });
-    },
-
-    //-----获取立即购买的商品信息----
-    get_buy_goods: function (){
-          var th=this,a=getApp().request;
-          var gg =  th.data.postdata;	  
-		  var url="/api/weshop/serviceCard/get/" + oo.stoid + "/" + gg.id  
-          //调用商品
-          a.get(url, {
-             success: function (t) {
-                     var gd = t.data.data;
-                     t.data.data.original_img = oo.imghost + t.data.data.imgUrl;
-                     t.data.data['buynum'] = gg.goods_num;    			   
-			         t.data.data.shop_price=gd.money;
-			 					 
-                     th.setData({
-                        bn_goods: t.data.data, bn_pickname: gg.pick_name,
-                        bn_pick: gg.pick_id
-                     });										 			 					 
-                     th.calculatePrice2();
-               
-             }
-         });
-    },
-
-    //----------子页返回父页触发----------
-    onShow: function() {
-       var th=this;
-       if (th.data.isclose==0){
-         wx.navigateTo({
-           url: "/pages/index/index/index"
-         })
-       }   	  	   
-	   //先获取是否有关闭使用优惠券
-	   getApp().getConfig2(function (ee) {
-	        //var json_d = JSON.parse(ee.switch_list);
-	        //th.data.ispt_goods=json_d.ispt_goods;  //是不是平摊到单品的控制参数赋值
-	        //th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch});
-	        th.show_page();				  	   		    		 	       
-	    })	  	   
-    },
-    
-	
-    showInvoice: function() {
-        this.setData({
-            invoiceToggle: !this.data.invoiceToggle
-        });
-    },
-
-
-    //-------------------计算购物车订单价格-------------------
-    calculatePrice: function() {
-        var th = this;
-        to.getConfig2(async function(ee){
-                wx.showLoading({
-                    title:"处理中."
-                })
-                var all_price=0;           //所有的商品总价
-                var all_shipping_m= 0;     //所有的物流总价
-                var all_total_m = 0;       //所有的订单应付总价
-                var all_order_m = 0;       //所有的订单应付总价
-                var all_user_m=0;          //所有的订单用户使用金额
-                var all_coupon_price_m=0;  //所有的订单用户使用优惠券价格
-                var all_cutprice=0;        //所有的优惠减件
-                var all_order_prom=0;      //所有的订单优惠
-
-                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;
-                var by_qc={};
-                var c_arr=JSON.parse(JSON.stringify(th.data.old_cartlist));
-
-                //---循环购物车---
-                for(var i in c_arr){
-
-                    var cart_item=c_arr[i];      //就是每一单的意思
-                    var pickid=cart_item.pickup_id;
-                    var o_price=0;
-                    var o_shipping_price=0,goods_weight=-1, goods_piece=-1;
-                    var item=c_arr[i].goods;   //就是每一单的从表的意思
-
-                    //---如果有选择优惠券的情况下---
-                    var quan_price=0;
-                    var coupon_price=0;
-                    var quan_no= null;
-
-                    //--------循环计算总价-----------
-                    for(var j=0;j<item.length;j++){
-                        o_price += item[j].money * item[j].goods_num;
-                    }
-                    var f_o_price=o_price;
-                    cart_item.goods_price = f_o_price.toFixed(2);      //商品总费用,用f_o_price来计算
-                    //计算物流费用
-                    cart_item.shipping_price = 0;
-
-                    //总价计算,总价不包含运费
-                    cart_item.order_amount= (o_price -quan_price).toFixed(2);
-                    cart_item.total_amount= f_o_price.toFixed(2);
-
-                    var order_prom_amount=0; var order_prom_id=0; var o_condition=cart_item.order_amount;
-                    var  order_m=0;
-                    cart_item.order_prom_amount=0;
-                    coupon_price=quan_price;
-
-
-                    cart_item.total_amount= parseFloat(cart_item.total_amount)+parseFloat(cart_item.shipping_price);  //总金额
-                    cart_item.order_amount=parseFloat(cart_item.order_amount)+parseFloat(cart_item.shipping_price);  //总金额
-                    cart_item.total_amount= cart_item.total_amount.toFixed(2);
-                    cart_item.order_amount=cart_item.order_amount.toFixed(2);
-
-                    //搭配购在使用余额
-                    if(th.data.bn_use_money==1 && th.data.is_b_now==1){
-
-                        if (umoney > cart_item.order_amount) {
-                            cart_item.user_money = cart_item.order_amount;
-                            umoney = umoney - cart_item.order_amount;
-                        }else {
-                            cart_item.user_money = umoney;
-                            umoney=0;
-                        }
-
-                    }else{
-                        //--------------如果使用余额,购物车购买---------------------
-                        if (th.data.js_use_money == 1) {
-                            if (umoney > cart_item.order_amount) {
-                                cart_item.user_money = cart_item.order_amount;
-                                umoney = umoney - cart_item.order_amount;
-                            }else {
-                                cart_item.user_money = umoney;
-                                umoney=0;
-                            }
-                        }else{
-                            cart_item.user_money=0;
-                        }
-                    }
-                    all_price += parseFloat(f_o_price);
-                    all_total_m +=  parseFloat(cart_item.total_amount);
-                    all_shipping_m +=  parseFloat(cart_item.shipping_price);
-                    all_order_m +=  parseFloat(cart_item.order_amount);
-                }
-
-
-                all_total_m =  parseFloat(all_total_m).toFixed(2);
-                all_order_m = parseFloat(all_order_m).toFixed(2);
-                all_price = parseFloat(all_price).toFixed(2);
-                all_total_m = parseFloat(all_total_m).toFixed(2);
-
-                var atxt = "formData.total_amount";
-                var atxt1 = "formData.order_amount";
-                var atxt2 = "formData.all_price";
-
-                th.setData({ [atxt]: all_total_m, [atxt1]: all_order_m,
-                    [atxt2]: all_price,show_submit:1
-                })
-                th.data.order_prom_list_cart=c_arr;
-                wx.hideLoading();
-        });
-    },
-
-    //---------计算立即购买----------
-    calculatePrice2: function () {
-		  console.log('calculatePrice2');
-		  var th = this, good = this.data.bn_goods;
-		  //-----------计算商品总价--------------
-		  var allpice = good.shop_price * good.buynum;
-		  allpice=parseFloat(allpice).toFixed(2);
-		  var txt = "formData.all_price";
-		  th.setData({ [txt]: allpice, });
-  
-		  var o_shipping_price = 0, goods_weight = -1, goods_piece = -1;	  
-		  //-----------------总价-----------------
-		  var total_m = parseFloat(allpice) + parseFloat( th.data.formData.shipping_price);
-		  total_m = parseFloat(total_m).toFixed(2);
-
-		  var atxt= "formData.total_amount";
-		  th.setData({ [atxt]: total_m, })
-		  var order_m = total_m;
-		  var txt = "formData.user_money";
-		  var txt2 = "formData.order_amount";
-		 
-		  th.setData({ [txt]: 0, [txt2]: order_m })
-		    
-    },
-	
-	submitForm:function(){
-		var th=this;
-		this.sendsm(function(){
+
+
+			all_total_m = parseFloat(all_total_m).toFixed(2);
+			all_order_m = parseFloat(all_order_m).toFixed(2);
+			all_price = parseFloat(all_price).toFixed(2);
+			all_total_m = parseFloat(all_total_m).toFixed(2);
+
+			var atxt = "formData.total_amount";
+			var atxt1 = "formData.order_amount";
+			var atxt2 = "formData.all_price";
+
+			th.setData({
+				[atxt]: all_total_m,
+				[atxt1]: all_order_m,
+				[atxt2]: all_price,
+				show_submit: 1
+			})
+			th.data.order_prom_list_cart = c_arr;
+			wx.hideLoading();
+		});
+	},
+
+	//---------计算立即购买----------
+	calculatePrice2: function() {
+		console.log('calculatePrice2');
+		var th = this,
+			good = this.data.bn_goods;
+		//-----------计算商品总价--------------
+		var allpice = good.shop_price * good.buynum;
+		allpice = parseFloat(allpice).toFixed(2);
+		var txt = "formData.all_price";
+		th.setData({
+			[txt]: allpice,
+		});
+
+		var o_shipping_price = 0,
+			goods_weight = -1,
+			goods_piece = -1;
+		//-----------------总价-----------------
+		var total_m = parseFloat(allpice) + parseFloat(th.data.formData.shipping_price);
+		total_m = parseFloat(total_m).toFixed(2);
+
+		var atxt = "formData.total_amount";
+		th.setData({
+			[atxt]: total_m,
+		})
+		var order_m = total_m;
+		var txt = "formData.user_money";
+		var txt2 = "formData.order_amount";
+
+		th.setData({
+			[txt]: 0,
+			[txt2]: order_m
+		})
+
+	},
+
+	submitForm: function() {
+		var th = this;
+		this.sendsm(function() {
 			th.submit_func();
 		})
 	},
-	
-    //--------------------提交订单-----------------------
-    submit_func: async function(){
-
-        if(this.data.is_summit_ing==1) return false; //--提交中退出--
-        this.data.is_summit_ing=1;
-        var th=this,pdata=new Array();
-
-        var item={
-            'user_id': to.globalData.user_id,
-            'account': th.data.formData.order_amount,          //使用余额
-            'store_id':oo.stoid,                               //商家
-            'list':new Array(),
-        };
-
-        //判断是不是购物车购买还是立即购买
-        if(this.data.is_cart){
-            var list= th.data.cartlist;
-            for(var i in list){
-                var gglist = list[i].goods;
-                for(var j in gglist){
-                    var gg=gglist[j];
-                    if(!gg.pick_id){
-                        getApp().showWarning("未找到门店");
-                        return false;
-                    }
-
-                    var goods={
-                        'card_id': gg.service_id,
-                        'itemid': gg.erpItemID,
-                        'qty': gg.goods_num,
-                        'price': gg.money,
-                        'pickup_id':gg.pick_id,
-                        'pickup_keyid':list[i].keyid,
-                    };
-                    //--导购分享过来的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.list.push(goods);
-                }
-            }
-        }else{
-            var gg = getApp().globalData.service_now;
-            if(!gg.pick_id){
-                getApp().showWarning("未找到门店");
-                return false;
-            }
-
-            var goods={
-                'card_id': th.data.bn_goods.id,
-                'itemid': th.data.bn_goods.erpItemID,
-                'qty': gg.goods_num,
-                'price': th.data.formData.order_amount,
-                'pickup_id':gg.pick_id,
-                'pickup_keyid':gg.keyid,
-            };
-
-            //--导购分享过来的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.list.push(goods);
-      }
-
-
-      pdata=item;
-      var str = JSON.stringify(pdata);
-      console.log("支付数据");
-      console.log(str);
-      //return false;
-      wx.showLoading({title: "加载中"});
-      wx.request({
-        url: oo.url + '/api/weshop/recharge/saveRecharge',
-        data: str,
-        method: 'POST',
-        header: {
-          'content-type': 'application/json'
-        },// 设置请求的 header
-        success: function (res) {
-       
-          wx.hideLoading();
-          if (res.statusCode == 200) {
-              var data=res.data;
-              if(data.code==0){
-                if(th.data.is_cart){
-                    var list = th.data.cartlist_y;
-                    for (var i = 0; i < list.length; i++) {
-                        //删除购物车
-                        a.delete("/api/weshop/cartService/del/" + oo.stoid + "/" + list[i].id, {});
-                    }
-                }
-                var order_amount = pdata.account;        
-                //要进行判断，如果是用微信支付，就要跳转到支付界面
-                if (order_amount > 0) {
-                    th.setData({ isclose: 0 });
-                    		
-					getApp().request.post("/api/weshop/order/pay/createRechargeOrder", {
-					  data: {
-					    parentSn: data.data.order_sn,
-					    store_id: oo.stoid
-					  },
-					  success: function (su) {					    
-					    var n=su.data.data;					  
-					    th.weixinPay(n,
-					      function () {
-					         getApp().showWarning("购买成功");			         
-					         setTimeout(function () {
-					             wx.reLaunch({
-					         	   url: "/pages/user/my_service/i_service",
-					             })
-					         },1000)
-					      }, function () {
-					         getApp().showWarning("支付失败");
-							 setTimeout(function () {
-							    wx.reLaunch({
-								   url: "/packageA/pages/cardList/cardList",
-							    })
-							 },1000)
-					      })
-					  }
-					})			
-                } 
-              }
-              else{
-				 th.data.is_summit_ing=0;  //是否提交中
-                 getApp().confirmBox(data.msg);
-              }
-          } else {
-			th.data.is_summit_ing=0;  //是否提交中
-            console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
-          }
-        },
-        fail: function () {
-		  th.data.is_summit_ing=0;  //是否提交中	
-          wx.hideLoading();
-          console.log("index.js wx.request CheckCallUser fail");
-        },
-        complete: function () {}
-      })
-    },
-
-	cart_set_err: function (e) {
+
+	//--------------------提交订单-----------------------
+	submit_func: async function() {
+
+		if (this.data.is_summit_ing == 1) return false; //--提交中退出--
+		this.data.is_summit_ing = 1;
+		var th = this,
+			pdata = new Array();
+
+		var item = {
+			'user_id': to.globalData.user_id,
+			'account': th.data.formData.order_amount, //使用余额
+			'store_id': oo.stoid, //商家
+			'list': new Array(),
+		};
+
+		//判断是不是购物车购买还是立即购买
+		if (this.data.is_cart) {
+			var list = th.data.cartlist;
+			for (var i in list) {
+				var gglist = list[i].goods;
+				for (var j in gglist) {
+					var gg = gglist[j];
+					if (!gg.pick_id) {
+						getApp().showWarning("未找到门店");
+						return false;
+					}
+					var goods = {
+						'card_id': gg.service_id,
+						'itemid': gg.erpItemID,
+						'qty': gg.goods_num,
+						'price': gg.money,
+						'pickup_id': gg.pick_id,
+						'pickup_keyid': list[i].keyid,
+					};
+					//--导购分享过来的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.list.push(goods);
+				}
+			}
+		} else {
+			var gg = getApp().globalData.service_now;
+			if (!gg.pick_id) {
+				getApp().showWarning("未找到门店");
+				return false;
+			}
+			var goods = {
+				'card_id': th.data.bn_goods.id,
+				'itemid': th.data.bn_goods.erpItemID,
+				'qty': gg.goods_num,
+				'price': th.data.bn_goods.money,
+				// 'price': th.data.formData.order_amount,
+				'pickup_id': gg.pick_id,
+				'pickup_keyid': gg.keyid,
+			};
+
+			//--导购分享过来的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.list.push(goods);
+		}
+
+
+		pdata = item;
+		var str = JSON.stringify(pdata);
+		console.log("支付数据");
+		console.log(str);
+		//return false;
+		wx.showLoading({
+			title: "加载中"
+		});
+		wx.request({
+			url: oo.url + '/api/weshop/recharge/saveRecharge',
+			data: str,
+			method: 'POST',
+			header: {
+				'content-type': 'application/json'
+			}, // 设置请求的 header
+			success: function(res) {
+
+				wx.hideLoading();
+				if (res.statusCode == 200) {
+					var data = res.data;
+					if (data.code == 0) {
+						// console.log('myyyyyyyyyyyyyyyyyy', data.data);
+						if (th.data.is_cart) {
+							var list = th.data.cartlist_y;
+							for (var i = 0; i < list.length; i++) {
+								//删除购物车
+								a.delete("/api/weshop/cartService/del/" + oo.stoid + "/" + list[i].id, {});
+							}
+						}
+						var order_amount = pdata.account;
+						//要进行判断，如果是用微信支付，就要跳转到支付界面
+						if (order_amount > 0) {
+							th.setData({
+								isclose: 0
+							});
+
+							getApp().request.post("/api/weshop/order/pay/createRechargeOrder", {
+								data: {
+									parentSn: data.data.order_sn,
+									store_id: oo.stoid
+								},
+								success: function(su) {
+									var n = su.data.data;
+									let order_id = data.data.order_id;
+									th.weixinPay(n,
+										function() {
+											getApp().showWarning("购买成功");
+											setTimeout(function() {
+												wx.reLaunch({
+													url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
+												})
+											}, 1000)
+										},
+										function() {
+											getApp().showWarning("支付失败");
+											setTimeout(function() {
+												wx.reLaunch({
+													url: "/pages/user/order_list/order_list?index=2&tabindex=1",
+												})
+											}, 1000)
+										})
+								}
+							})
+						}
+					} else {
+						th.data.is_summit_ing = 0; //是否提交中
+						getApp().confirmBox(data.msg);
+					}
+				} else {
+					th.data.is_summit_ing = 0; //是否提交中
+					console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode);
+				}
+			},
+			fail: function() {
+				th.data.is_summit_ing = 0; //是否提交中	
+				wx.hideLoading();
+				console.log("index.js wx.request CheckCallUser fail");
+			},
+			complete: function() {}
+		})
+	},
+
+	cart_set_err: function(e) {
 		var txt = e.currentTarget.dataset.err;
 		var ob = {};
 		ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif";
 		this.setData(ob);
 	},
-	
+
 	//------调起支付框--------
-	weixinPay: function (n, success, fail) {
-	  if(!n) return false;	
-	  wx.requestPayment({
-	    timeStamp: String(n.timeStamp),
-	    nonceStr: n.nonceStr,
-	    package: n.packageValue,
-	    signType: n.signType,
-	    paySign: n.paySign,
-	    success: function (n) {
-	      console.log(n), getApp().showSuccess("支付成功！");
-	      "function" == typeof success && success();
-	      wx.redirectTo({
-	        url: "../deposit/deposit"
-	      });
-	    },
-	    fail: function (n) {
-	      console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") : "requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n.errMsg.substr("requestPayment:fail ".length)),
-	        "function" == typeof fail && fail();
-	    }
-	  });
+	weixinPay: function(n, success, fail) {
+		if (!n) return false;
+		wx.requestPayment({
+			timeStamp: String(n.timeStamp),
+			nonceStr: n.nonceStr,
+			package: n.packageValue,
+			signType: n.signType,
+			paySign: n.paySign,
+			success: function(n) {
+				console.log(n), getApp().showSuccess("支付成功！");
+				"function" == typeof success && success();
+				wx.redirectTo({
+					url: "../deposit/deposit"
+				});
+			},
+			fail: function(n) {
+				console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") :
+					"requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n
+						.errMsg.substr("requestPayment:fail ".length)),
+					"function" == typeof fail && fail();
+			}
+		});
 	},
-	
+
 	//订阅消息提醒
-	sendsm:function(func)
-	  {  
-	         var template_id = this.data.template_id;    
-	          // //授权订阅
-	          wx.requestSubscribeMessage({
-	            tmplIds: [template_id],
-	            success(res) {
-	                func();
-	            },
-	            fail(res) {
-	                func();
-	            }
-	          })
-	        
-	  },
-
-   
+	sendsm: function(func) {
+		var template_id = this.data.template_id;
+		// //授权订阅
+		wx.requestSubscribeMessage({
+			tmplIds: [template_id],
+			success(res) {
+				func();
+			},
+			fail(res) {
+				func();
+			}
+		})
+
+	},
+
+
 });
diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js
index 4cd640e..94e7fd0 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.js
+++ b/packageA/pages/details_serviceCard/details_serviceCard.js
@@ -1,66 +1,487 @@
 // packageA/pages/details_serviceCard/details_serviceCard.js
+const app = getApp();
+const os = app.globalData.setting;
+let self = null;
+
 Page({
 
-  /**
-   * 页面的初始数据
-   */
-  data: {
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		is_summit_ing: 0,
+	},
+
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad: function(options) {
+		self = this;
+		this.data.options = options;
+		
+		wx.setNavigationBarTitle({
+			title: '订单详情',
+		});
+		
+		app.isLogin().then(function(data) {
+			self.setData({
+				userInfo: data,
+			});
+			self.getConfig();
+		});
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady: function() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow: function() {
+		if (app.globalData.userInfo) {
+			if (!this.data.isLogin) {
+				this.setData({
+					userInfo: app.globalData.userInfo,
+					imghost: app.globalData.setting.imghost,
+					isLogin: true,
+				});
+
+				let url = '/api/weshop/recharge/user/page'
+				let data = {
+					store_id: app.globalData.setting.stoid,
+					user_id: this.data.userInfo.user_id,
+					order_id: this.data.options.order_id,
+				};
+
+				// 请求数据
+				app.promiseGet(url, {
+					data: data,
+				}).then(res => {
+					if (res.data.code == 0) {
+						// console.log('请求成功', res);
+						this.setData({
+							details: res.data.data.pageData[0],
+						});
+					} else {
+						throw (res);
+					};
+				}).catch(err => {
+					wx.showToast({
+						title: err.data.data,
+						icon: 'error',
+					});
+				});
+
+			};
+		};
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide: function() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload: function() {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh: function() {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom: function() {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function() {
+
+	},
+
+
+	// 内容复制到剪贴板
+	copy() {
+		// console.log('点击了复制按钮');
+		wx.setClipboardData({
+			data: this.data.details.order_sn,
+			success(res) {
+				wx.getClipboardData({
+					success(res) {
+						console.log(res.data);
+					}
+				})
+			}
+		})
+	},
+
+
+	// 图片异常时加载默认图片
+	bind_bnerr(e) {
+		var errImg = e.currentTarget.dataset.errorimg;
+		var errObj = {};
+		errObj[errImg] = 'public/images/default_goods_image_240.gif';
+		this.setData(errObj); // this.setData({ details.list[0].img_url});    
+	},
+
+
+	// 查看商品详情
+	viewDetails(e) {
+		let goods_id = e.currentTarget.dataset.gid;
+		let url = '/packageA/pages/goodsInfo/goodsInfo?goods_id=' + goods_id;
+		app.goto(url);
+	},
+
+	// 获取系统参数
+	getConfig() {
+		app.getConfig2(function(e) {
+			// console.log('101',e);
+			let json_d = JSON.parse(e.switch_list);
+			self.setData({
+				sys_switch: json_d,
+				// weapp_customertype: json_d.weapp_customertype,
+			});
+		}, 1);
+	},
+
+
+	// 联系微信客服
+	contact_wx() {
+		var url = this.data.sys_switch.weapp_customertype_url;
+		var id = this.data.sys_switch.weapp_customertype_appid;
+		wx.openCustomerServiceChat({
+			extInfo: {
+				url: url
+			},
+			corpId: id,
+			success(res) {}
+		})
+	},
+
+
+	// 联系电话客服
+	contactService() {
+		app.getConfig(function(t) {
+			if (t.store_tel == undefined) {
+				app.request.get('/api/weshop/store/get/' + os.stoid, {
+					isShowLoading: 1,
+					data: {},
+					success: function(rs) {
+						app.globalData.config = rs.data.data;
+						if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
+							app.my_warnning('商家未设置电话', 0, self);
+							return false;
+						}
+						app.confirmBox('请联系客服:' + rs.data.data.store_tel);
+					}
+				})
+			} else {
+				app.confirmBox('请联系客服:' + t.store_tel);
+			}
+		});
+	},
+
+
+	// 评价商品
+	access() {
+		let listLength = this.data.details.list.length;
+		let order_id = this.data.details.order_id;
+		let url = '';
+
+		// 卡项订单跳转到评论页要多加个参数card=1
+		// 卡项订单goods_id要带card_id
+		if (listLength == 1) {
+			let price = this.data.details.list[0].price;
+			let card_id = this.data.details.list[0].card_id;
+			url =
+				`/packageB/pages/user/add_comment/add_comment?card=1&goods_id=${card_id}&order_id=${order_id}&price=${price}`
+		};
+		if (listLength > 1) {
+			url = `/packageB/pages/user/comment/comment?card=1&status=0&order_id=${order_id}`;
+		};
+		f
+		// console.log('url', url);
+		app.goto(url);
+	},
+
+
+	// 查看评论
+	viewComment() {
+		let order_id = this.data.details.order_id;
+		let card_id = this.data.details.list[0].card_id;
+		let listLength = this.data.details.list.length;
+		let url = '';
+
+		// 卡项订单单个商品
+		if (listLength == 1) {
+			url = `/packageB/pages/user/view_comment/view_comment?card=1&goods_id=${card_id}&order_id=${order_id}`;
+		};
+		// 卡项订单多个商品
+		if (listLength > 1) {
+			// status控制评论列表页的activeStatus
+			url = `/packageB/pages/user/comment/comment?card=1&status=1&order_id=${order_id}`;
+		};
+
+		app.goto(url);
+	},
+
+
+	// 再来一单
+	buy2(t) {
+		let details = this.data.details;
+		var th = this;
+		var ind = 1; // 1：加入购物车
+		// var ind = t.currentTarget.dataset.openSpecModal_ind;
+		// var action= t.currentTarget.dataset.action;
+		var action = 'add'; //
+		// if(!ind)  ind = t.currentTarget.dataset.openspecmodal_ind;
+
+		th.setData({
+			open_ind_store: ind
+		});
+
+		// if(!th.data.sto_sele_name){
+		//       getApp().my_warnning('请选择门店', 1, th, 450);
+		//       return false;
+		//   }
+
+
+		if (action == "buy") {
+			//--------------此时操作的数据------------
+			// var newd = {
+			//   id: th.data.data.id,
+			//   goods_num: th.data.goodsInputNum,
+			//   pick_id: th.data.sto_sele_id,		
+			//   keyid: th.data.sto_sele_keyid,		
+			// };	  
+			// newd['pick_name'] = th.data.sto_sele_name;		
+			// newd['guide_id'] = getApp().globalData.guide_id;
+			// newd['guide_type']=0;
+			// th.buyNow(newd);
+		} else {
+
+			var newd = {
+				// service_id: th.data.data.id,
+				// service_sn:th.data.data.service_sn,
+				// service_name:th.data.data.goods_name,
+				// goods_num: th.data.goodsInputNum,
+				// pick_id: th.data.sto_sele_id,
+				// user_id:oo.user_id,
+				// store_id:os.stoid,
+				// money:th.data.data.shop_price,
+
+				service_id: details.list[0].card_id,
+				service_sn: details.list[0].service_sn,
+				service_name: details.list[0].service_name,
+				goods_num: details.list[0].qty,
+				pick_id: details.list[0].pickup_id,
+				user_id: this.data.userInfo.user_id,
+				store_id: app.globalData.setting.stoid,
+				money: details.list[0].price,
+			};
+			if (getApp().globalData.guide_id) {
+				newd['guide_id'] = getApp().globalData.guide_id;
+				newd['guide_type'] = 0;
+			}
+
+			//----先看会员在购物车中是否加入了该商品-----
+			app.request.get("/api/weshop/cartService/page", {
+				data: {
+					store_id: app.globalData.setting.stoid,
+					user_id: this.data.userInfo.user_id,
+					service_id: details.list[0].card_id,
+					pick_id: details.list[0].pickup_id,
+				},
+				success: function(re) {
+
+					//-------如果购物车中有相关的数据---------
+					if (re.data.data.total > 0) {
+						var item = re.data.data.pageData[0];
+						var updata = {
+							id: item.id,
+							goods_num: details.list[0].qty + item.goods_num,
+							money: details.list[0].price,
+							store_id: app.globalData.setting.stoid,
+						};
+
+						if (getApp().globalData.guide_id) {
+							updata['guide_id'] = getApp().globalData.guide_id;
+							updata['guide_type'] = 1;
+						}
+						getApp().request.put("/api/weshop/cartService/update", {
+							data: updata,
+							success: function(t) {
+								// getApp().my_warnning('加入购物车成功', 1, th, 450);
+								var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
+								th.setData({
+									cartGoodsNum: c_num
+								});
+								app.goto('/pages/cart/cart/cart');
+								// th.closeSpecModal();
+							}
+						});
+					} else {
+
+						getApp().request.post("/api/weshop/cartService/save", {
+							data: newd,
+							success: function(t) {
+								// getApp().my_warnning('加入购物车成功', 1, th, 450);
+								var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
+								th.setData({
+									cartGoodsNum: c_num
+								});
+								app.goto('/pages/cart/cart/cart');
+								// th.closeSpecModal();
+							}
+						});
+					}
+				}
+			});
+
+		}
+	},
+
+
+	// 取消订单
+	// api/weshop/recharge/update?store_id=&order_id=&order_status=3
+	cancle() {
+		wx.showModal({
+			title: '提示',
+			content: '确定取消订单吗？',
+			success(res) {
+				if (res.confirm) {
+					console.log('用户点击确定');
+					let order_id = self.data.details.order_id;
+					let order_sn = self.data.details.order_sn;
+					app.request.put('/api/weshop/recharge/update', {
+						data: {
+							store_id: os.stoid,
+							order_id: order_id,
+							order_sn: order_sn,
+							order_status: 3,
+						},
+						success: function(res) {
 
-  },
+							//取消成功刷新订单
+							let url = '/api/weshop/recharge/user/page'
+							let data = {
+								store_id: app.globalData.setting.stoid,
+								user_id: self.data.userInfo.user_id,
+								order_id: self.data.options.order_id,
+							};
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
+							// 请求数据
+							app.promiseGet(url, {
+								data: data,
+							}).then(res => {
+								if (res.data.code == 0) {
+									console.log('请求成功', res);
+									wx.showToast({
+										title: '取消成功',
+									});
+									self.setData({
+										details: res.data.data.pageData[0],
+									});
+								} else {
+									throw (res);
+								};
+							}).catch(err => {
+								wx.showToast({
+									title: err.data.data,
+									icon: 'error',
+								});
+							});
 
-  },
+						},
+					})
+				} else if (res.cancel) {
+					console.log('用户点击取消');
+				}
+			}
+		});
+	},
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
 
-  },
+	// 立即支付
+	pay() {
+		let order_sn = this.data.details.order_sn;
+		let order_id = this.data.details.order_id;
+		let store_id = app.globalData.setting.stoid;
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
+		app.request.post('/api/weshop/order/pay/createRechargeOrder', {
+			data: {
+				parentSn: order_sn,
+				store_id: store_id,
+			},
 
-  },
+			success: function(res) {
+				var n = res.data.data;
+				self.weixinPay(n, function() {
+					app.showWarning('支付成功');
+					setTimeout(function() {
+						wx.reLaunch({
+							url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
+						})
+					}, 1000)
+				}, function() {
+					app.showWarning('支付失败');
+					// setTimeout(function() {
+					// 	wx.reLaunch({
+					// 		url: '/packageA/pages/cardList/cardList',
+					// 	})
+					// }, 1000)
+				});
+			}
+		})
+	},
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
 
-  },
+	//------调起支付框--------
+	weixinPay: function(n, success, fail) {
+		if (!n) return false;
+		wx.requestPayment({
+			timeStamp: String(n.timeStamp),
+			nonceStr: n.nonceStr,
+			package: n.packageValue,
+			signType: n.signType,
+			paySign: n.paySign,
+			success: function(n) {
+				console.log(n), getApp().showSuccess("支付成功！");
+				"function" == typeof success && success();
+				wx.redirectTo({
+					url: "../deposit/deposit"
+				});
+			},
+			fail: function(n) {
+				console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") :
+					"requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n
+						.errMsg.substr("requestPayment:fail ".length)),
+					"function" == typeof fail && fail();
+			}
+		});
+	},
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
 
-  },
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
 
-  },
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
 
-  },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
 
-  }
-})
\ No newline at end of file
+})
diff --git a/packageA/pages/details_serviceCard/details_serviceCard.wxml b/packageA/pages/details_serviceCard/details_serviceCard.wxml
index a3825a8..40b576b 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.wxml
+++ b/packageA/pages/details_serviceCard/details_serviceCard.wxml
@@ -1,46 +1,88 @@
+<wxs module="filter" src="../../../utils/filter.wxs"></wxs>
+
 <view class="main">
 	<view class="bg-white pdh20 bdr12">
-		<!-- 门店名称栏 -->
-		<view class="flex jc_sb ai_c pdv20">
-			<view class="ellipsis-1 pdr40 fs30"><text class="iconfont icon-shop c-red pdr10"></text>门店名称名称名称名称名称名称名称名称名称名称</view>
-			<text class="c-red shrink0 fs26">待评价</text>
-		</view>
-		<!-- 列表栏 -->
-		<view>
-			<view class="flex pdv20">
-				<view class="pic-box shrink0"><image class="img-block" src="../../images/wx2.png"></image></view>
-				<view class="pdl20 f1">
-					<view class="flex jc_sb ai_c">
-						<view class="title ellipsis-2 pdr40">我是商品标题</view>
-						<text class="rmb c-6">10</text>
+		<block wx:for="{{details.list}}">
+			<!-- 门店名称栏 -->
+			<view class="flex jc_sb ai_c pdv20">
+				<view class="ellipsis-1 pdr40 fs30"><text class="iconfont icon-shop c-red pdr10"></text>{{item.pickup_name}}</view>
+				<!-- 订单状态 -->
+				<block>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 0}}">待支付</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 1}}">待评价</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 2}}">已评价</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 3}}">已取消</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 5}}">已作废</text>
+				</block>
+			</view>
+			
+			<!-- 列表栏 -->
+			<view>
+				<!-- <view class="flex pdv20" wx:for="{{details.list}}" bindtap="viewDetails" data-gid="{{item.card_id}}"> -->
+				<view class="flex pdv20" bindtap="viewDetails" data-gid="{{item.card_id}}">
+					<view class="pic-box shrink0">
+						<image class="img-block" src="{{imghost + item.img_url}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="details.list[{{index}}].img_url"></image>
 					</view>
-					<view class="flex jc_sb ai_c c-9 fs24">
-						<text>10个/蓝色</text>
-						<text>x1</text>
+					<view class="pdl20 f1">
+						<view class="flex jc_sb ai_c">
+							<view class="title ellipsis-2 pdr40">{{item.service_name}}</view>
+							<text class="rmb c-6">{{item.price}}</text>
+						</view>
+						<view class="flex jc_sb ai_c c-9 fs24">
+							<!-- <text>10个/蓝色</text> -->
+							<text>x{{item.qty}}</text>
+						</view>
 					</view>
 				</view>
 			</view>
-		</view>
+		</block>
+		
+		
 		<!-- 统计栏 -->
-		<view class="t-r bdt pdv20">共2件商品，合计：<text class="rmb c-red bold fs30">21.00</text></view>
+		<view class="t-r bdt pdv20">共{{filter.count(details.list)}}件商品，合计：<text class="rmb c-red bold fs30">{{details.account}}</text></view>
 	</view>
+	
+	
 	<view class="bg-white pdh20 mgt20 bdr12">
 		<!-- 订单信息栏 -->
 		<view class="pdv20">订单信息</view>
+		
 		<view class="flex jc_sb pdb20 ai_c">
-			<view><text class="c-9">订单编号：</text>fwk20221252125222212 </view>
-			<text class="btn-copy">复制</text>
+			<view><text class="c-9">订单编号：</text>{{details.order_sn}}</view>
+			<text class="btn-copy" bindtap="copy">复制</text>
 		</view>
-		<view class="pdb20"><text class="c-9">下单时间：</text>2021-12-27 18:00:00</view>
+		<view class="pdb20"><text class="c-9">下单时间：</text>{{filter.format_time(details.ctime, 1)}}</view>
+		
 		<!-- 联系客服栏 -->
 		<view class="flex t-c bdt">
-			<view class="f1 pd20"><text class="iconfont icon-kefu c29f pdr20"></text>联系客服</view>
-			<view class="f1 pd20 separator"><text class="iconfont icon-tongbu c-orange pdr20"></text>卡项同步</view>
+			<!-- 客服 -->
+			<block>
+				<button class="f1" wx:if="{{sys_switch.weapp_customertype == 1}}" hover-class="none" open-type="contact"
+			 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</button>
+				<view class="f1 pd20" wx:elif="{{sys_switch.weapp_customertype== 2}}" bindtap="contact_wx"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</view>
+				<view class="f1 pd20" wx:else bindtap="contactService"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</view>
+			</block>
+			<!-- 卡项同步先不做 -->
+			<!-- <view class="f1 pd20 separator"><text class="iconfont icon-tongbu c-orange pdr20"></text>卡项同步</view> -->
 		</view>
 	</view>
+	
 	<!-- 底部按钮栏 -->
 	<view class="btn-bar t-r bg-white pd20">
-		<text class="btn btn-border">立即评价</text>
-		<text class="btn bg-red white mgl20">再来一单</text>
+		<!-- 待支付 -->
+		<block wx:if="{{details.order_status == 0}}">
+			<text class="btn btn-border" bindtap="cancle">取消订单</text>
+			<text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
+		</block>
+		<!-- 已支付/未评价 -->
+		<block wx:if="{{details.order_status == 1}}">
+			<text class="btn bg-orange white" bindtap="buy2">再来一单</text>
+			<text class="btn bg-red white mgl20" bindtap="access">立即评价</text>
+		</block>
+		<!-- 已评价 -->
+		<block wx:if="{{details.order_status == 2}}">
+			<text class="btn bg-orange white" bindtap="buy2">再来一单</text>
+			<text class="btn bg-red white mgl20" bindtap="viewComment">查看评价</text>
+		</block>
 	</view>
 </view>
diff --git a/packageA/pages/details_serviceCard/details_serviceCard.wxss b/packageA/pages/details_serviceCard/details_serviceCard.wxss
index 91b3ce2..ca4f2b6 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.wxss
+++ b/packageA/pages/details_serviceCard/details_serviceCard.wxss
@@ -18,6 +18,7 @@ page {
 	border: 2rpx solid #808080;
 }
 
+
 .bg-red {
 	background-image: -webkit-linear-gradient(315deg,#f2140c,#f2270c 70%,#f24d0c);
 	background-image: linear-gradient(135deg,#f2140c,#f2270c 70%,#f24d0c);
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 379e3f8..038dd73 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -8,6 +8,9 @@ var t = require("../../../utils/util.js"),
     oo = s.globalData,
     o = s.globalData.setting,
     os = o;
+
+let self = null;
+
 //评价加载更多
 var more = function(e) {
       return e && e.__esModule ? e : {
@@ -54,11 +57,14 @@ Page({
     shippingCost: 0,
     enterAddressPage: !1,
     categories: [{
-      name: "商品",
+      name: "卡项",
       id: 0
     }, {
       name: "详情",
       id: 1
+    },{
+      name: "评价",
+      id: 2
     }],
     activeCategoryId2: 0,
     categories2: [{
@@ -68,7 +74,7 @@ Page({
       name: "规格参数",
       id: 1
     }],
-    activeCategoryId3: 1,
+    activeCategoryId3: 1, // 点击评价-全部、有图、好评、中评时对应的id
     categories3: [{
       name: "全部",
       id: 1,
@@ -148,7 +154,16 @@ Page({
     current: 0, //图片计数
     swiperCurrent: 0, //轮播的下标
     hiddenn: 0, //控制轮播计数显示
-
+    
+    currentTab: 0, // 选择器控制参数
+    mapurl: "",
+    mapurl_f_img: "",
+    videopicture: 0, //视频图片的控制
+    
+    video: 0, //视频图片切换器
+    index: 0,
+    noon: 0, //开始视频的隐藏
+    
     screenWidth: 0,
     canvasHidden: 1,
 
@@ -195,60 +210,62 @@ Page({
 
   //------初始化加载----------
   onLoad: function(t) {
-	 
-	// console.log("--服务卡项--");  
-	// console.log('fdsfasfasf111111111111111====================',t);  
-	
-	
-   
+		
+		self = this;
+		this.data.options = t; // { goods_id: ...}
+		  
+ 
     var ee = this,
         that = ee,
         th = ee,
         gid = t.goods_id,
         first_leader=t.first_leader;
 	
+	
 	//-- 自定义海报 --
-	getApp().request.promiseGet("/api/weshop/goods/poster/page", {	
-		data:{store_id:os.stoid, type:1, is_use:1}
-	}).then(res=>{
-		if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]){			
-			var poster_data=res.data.data.pageData[0];
-			var json_str=poster_data.jsonStr;			
-			if(json_str){
-				var json_data=JSON.parse(json_str);		
-				if(json_data.bg_img){				
-					//-- 把图片那到本地 --
-					wx.getImageInfo({
-					  src:json_data.bg_img,
-					  success: function(res) {
-					    var path= res.path;
-						th.setData({share_b_img:path})
-					  },
-					  fail: function(res) {}
-					});
-				}								
-				th.setData({poster:json_data})												
-			}			
-		}
-	})	
+	// getApp().request.promiseGet("/api/weshop/goods/poster/page", {	
+	// 	data:{store_id:os.stoid, type:1, is_use:1}
+	// }).then(res=>{
+	// 	if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData[0]){			
+	// 		var poster_data=res.data.data.pageData[0];
+	// 		var json_str=poster_data.jsonStr;			
+	// 		if(json_str){
+	// 			var json_data=JSON.parse(json_str);		
+	// 			if(json_data.bg_img){				
+	// 				//-- 把图片那到本地 --
+	// 				wx.getImageInfo({
+	// 				  src:json_data.bg_img,
+	// 				  success: function(res) {
+	// 				    var path= res.path;
+	// 					th.setData({share_b_img:path})
+	// 				  },
+	// 				  fail: function(res) {}
+	// 				});
+	// 			}								
+	// 			th.setData({poster:json_data})												
+	// 		}			
+	// 	}
+	// })	
+			
 				
     //---获取手机地址坐标--
     //--如果tg_id是空的话，分享回来--
     if (gid == undefined || gid == null || gid == "") {
-      var  gid_str = decodeURIComponent(t.scene);
+      var gid_str = decodeURIComponent(t.scene);
       gid_str=gid_str.split("_");
       gid=gid_str[0];
       if(gid_str.length>1){
         first_leader=gid_str[1];
       }	  
-	  //-- 如果有room_id的获取 --
-	  if(gid_str.length>2 && gid_str[2]){
-		  room_id=gid_str[2];
-		  room_user_share=1;		  
-	  }
-	  
-    }
+			//-- 如果有room_id的获取 --
+			if(gid_str.length>2 && gid_str[2]){
+				room_id=gid_str[2];
+				room_user_share=1;		  
+			}
+    };
+		
     ee.setData({ gid: gid});
+		
     if(first_leader){ 	
       getApp().globalData.first_leader=first_leader;
       //调用接口判断是不是会员
@@ -268,21 +285,76 @@ Page({
 	})
 
     //----获取系统参数-----
-    getApp().getConfig2(function(e) {
-     
+    getApp().getConfig2(function (e) {
+      ee.setData({
+        bconfig: e,
+        sales_rules: e.sales_rules,
+      });
+    
+      if (e.categoryset.indexOf("," + 1 + ",") != -1) {
+        ee.setData({
+          is_show_pl: 1
+        });
+      }
+      if (e.categoryset.indexOf("," + 3 + ",") != -1) {
+        ee.setData({
+          is_show_pp: 1
+        });
+      }
+      if (e.categoryset.indexOf("," + 2 + ",") != -1) {
+        ee.setData({
+          is_show_gb: 1
+        });
+      }
+      console.log(e);
       var json_d = JSON.parse(e.switch_list);
       ee.setData({
         store_config: e,
-        sys_switch:json_d,
+        sys_switch: json_d,
+        is_closecoupon: json_d.is_closecoupon,
+        is_newsales_rules: json_d.is_newsales_rules
       });
-     
-      
+      ee.init(gid);
+      //------几人评价-------
+      //n.init(th, "", "comments");
+    
       th.requestCardNum(), wx.pageScrollTo && th.setData({
         supportPageScroll: !0
       });
-
-     
-    },1);
+    
+      //计算等级价相关
+    //   var swithc_list = e.switch_list;
+    //   var sw_arr = JSON.parse(swithc_list);
+    //   //---如果后台又开等级卡的开关---
+    //   if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
+    //     th.setData({ rank_switch: true });
+    //     //---回调卡的列表---
+    //     th.getPlusCardType(function (ob) {
+    //       th.setData({ card_list: ob.card_list });
+    //       var ti = setInterval(function () {
+    //         var user = getApp().globalData.userInfo;
+    //         if (!user) return false;
+    //         clearInterval(ti);
+    //         if (user.card_field && user['card_expiredate']) {
+    //           var str = user['card_expiredate'].replace(/-/g, '/');
+    //           var end = new Date(str);
+    //           end = Date.parse(end) / 1000;
+    //           var now = ut.gettimestamp();
+    //           //--- 判断是等级会员，且在有效期范围内 ---
+    //           if (user.card_field && now < end) {
+    //             var card_name = ob.name_map.get(user.card_field);
+    //             //if(card_name.length>6) card_name=card_name.substring(0,6);
+    
+    //             var is_near_date = 0;
+    //             if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天
+    //             th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list, is_near_date: is_near_date });
+    //           }
+    //         }
+    //       }, 500)
+    //     })
+    //   }
+    
+    }, 1);
 
     //获取用户设备信息，屏幕宽度
     wx.getSystemInfo({
@@ -376,20 +448,175 @@ Page({
 	 
   },
   //------------程序初始化入口-------------
-  async init(gid) {},
+  async init(gid) {
+    var ee = this,
+      th = ee,
+      gallery = null,
+      is_collect = 0,
+      collect_id = 0,
+      categories3 = ee.data.categories3,
+      fir_com = null,
+      fir_quan = null,
+      mapurl = null,
+      mapurl_f_img = null;
+
+
+    //------图片滚动----------
+    // await getApp().request.promiseGet("/api/weshop/goodsimages/page", {
+    //   data: {
+    //     store_id: os.stoid,
+    //     goods_id: gid,
+    //   },
+    // }).then(res => {
+
+    //   var t = res;
+    //   var g = t.data.data.pageData;
+    //   if (g.length == 0) {
+    //     var ie = {
+    //       "image_url": o.imghost + "/public/images/default_goods_image_240.gif"
+    //     };
+    //     g.push(ie);
+    //     gallery = g;
+    //     return;
+    //   }
+    //   for (var i = 0; i < g.length; i++) {
+    //     if (g[i].image_url.indexOf(o.imghost) == -1)
+    //       g[i].image_url = o.imghost + g[i].image_url;
+    //   }
+    //   gallery = g;
+    // })
+		
+		
+    //------是否收藏----------
+    await getApp().request.promiseGet("/api/weshop/goodscollect/page", {
+      data: {
+        store_id: os.stoid,
+        goods_id: gid,
+        user_id: oo.user_id,
+      }
+    }).then(res => {
+      var t = res;
+      var data = t.data.data.pageData;
+      if (data && data.length > 0) {
+        //ee.setData({ is_collect: 1, collect_id: data[0].collect_id, });
+        is_collect = 1;
+        collect_id = data[0].collect_id;
+      }
+    })
+
+    //------获取评价的统计数量----
+    await getApp().request.promiseGet("/api/weshop/serviceComment/countlist/", {
+      data: {
+        store_id: os.stoid,
+        service_id: gid
+      },
+      //failRollback: !0,
+
+    }).then(res => {
+			console.log('get评价统计数量', res.data.data);
+      var t = res;
+      var g = t.data.data[0];
+      if (g != null && g != undefined) {
+        var allnum = g.c0 + g.c1 + g.c2 + g.c3 + g.c4 + g.c5;
+        var num2 = g.c4 + g.c5;
+        var num3 = g.c3;
+        var num4 = g.c0 + g.c1 + g.c2;
+
+        var dd = ee.data.categories3;
+        dd[0].num = allnum;
+        dd[1].num = g.cimg;
+        dd[2].num = num2;
+        dd[3].num = num3;
+        dd[4].num = num4;
+
+        categories3 = dd;
+      }
+    })
+
+    //----获取详情页的评价----
+    await getApp().request.promiseGet("/api/weshop/serviceComment/pageComment", {
+      data: {
+        store_id: os.stoid,
+        service_id: gid,
+        pageSize: 3,
+        parent_id: 0,
+        page: 1,
+        is_show: 1,
+      },
+    }).then(res => {
+			console.log('get详情页评价', res.data.data);
+      fir_com = res.data.data.pageData;
+    })
+
+    if (fir_com) {
+      for (var ind in fir_com) {
+        if (fir_com[ind].head_pic == "") fir_com[ind].head_pic = ee.data.iurl + "/miniapp/images/hui_hear_pic.png";
+        if (fir_com[ind].img) fir_com[ind].img = ut.unserialize(fir_com[ind].img);
+        if (fir_com[ind].weapp_img) fir_com[ind].weapp_img = JSON.parse(fir_com[ind].weapp_img);
+      }
+    }
+
+    // if (th.data.is_closecoupon != 1 && (!th.data.fir_quan || th.data.fir_quan.length<=0)) {
+    //   //----获取详情页的券的数量----
+    //   await getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", {
+    //     data: {
+    //       store_id: os.stoid,
+    //       type: 1,
+    //       pageSize: 3,
+    //       page: 1,
+    //       is_share: 0,
+    //     },
+    //   }).then(res1 => {
+    //     fir_quan = res1.data.data.pageData;
+    //   })
+    // }
+
+    
+    //this.getHistoryBuy(); //获取历史购买
+    ee.setData({
+      is_collect: is_collect,
+      collect_id: collect_id,
+      categories3: categories3,
+      fir_quan: fir_quan,
+      fir_comments: fir_com,
+			// cardComments: fir_com,
+    });
+
+  },
 
   //---展示---
+	// gid 在onload阶段已经保存在this.data中
   onShow: function() {
     var that=this;
-    this.data.is_timer = 1;
     var ee = this,gid = this.data.gid, i = getApp().request;
-	this.wait_for_store_config();
+    this.data.is_timer = 1;
+		this.wait_for_store_config();
 
     i.get("/api/weshop/serviceCard/get/" + o.stoid + "/" + ee.data.gid, {
       failRollback: !0,
       success: function(t) {
         if (t.data.code == 0) {
-								
+					// console.log('GET pic and video');
+					if(t.data.data.listServiceVideos && t.data.data.listServiceVideos[0] && t.data.data.listServiceVideos[0].video_url) {
+						that.setData({
+							mapurl: t.data.data.listServiceVideos[0].video_url,
+						});
+					};
+					if(t.data.data.listServiceVideos && t.data.data.listServiceVideos[0] && t.data.data.listServiceVideos[0].video_img) {
+						that.setData({
+							 mapurl_f_img: t.data.data.listServiceVideos[0].video_img,
+						});
+					};
+					if(t.data.data.listServiceImages) {
+						that.setData({
+							 gallery: t.data.data.listServiceImages,
+						});
+					};
+					if(t.data.data.listServiceItem) {
+						that.setData({
+							 listServiceItem: t.data.data.listServiceItem,
+						});
+					};
 					that.setData({
 						'data.goods_name': t.data.data.serviceName,
 						'data.shop_price': t.data.data.money,
@@ -401,9 +628,14 @@ Page({
 						'data.sales_sum': t.data.data.sales_sum,
 						'data.storageId':t.data.data.storageId,
 						'data.service_sn':t.data.data.serviceSn,
+						'data.listServiceVideos': t.data.data.listServiceVideos,
+						// gallery: t.data.data.listServiceImages,
+						// mapurl: t.data.data.listServiceVideos[0].video_url,
+						// mapurl_f_img: t.data.data.listServiceVideos[0].video_img,
+						//listServiceItem: t.data.data.listServiceItem,
 					});
 								
-					
+					console.log('0xxxxx999999', t.data.data);
 					//-----商品详情---
 					if(!t.data.data.serviceContent) t.data.data.serviceContent="  ";
 					a.wxParse("content", "html", t.data.data.serviceContent, ee, 6);
@@ -433,9 +665,10 @@ Page({
 			}
     });
     this.data.enterAddressPage && (this.data.enterAddressPage = !1);
-	this.get_sto();
+		this.get_sto();
 
   },
+	
   enterAddress: function() {
     this.data.enterAddressPage = !0, wx.navigateTo({
       url: "/pages/user/address_list/address_list?operate=selectAddress"
@@ -697,6 +930,7 @@ Page({
           user_id: s.globalData.user_id,
           store_id: o.stoid,
           add_time: timestamp,
+					type: 1,
         };
         //加入收藏夹就是导购的ID
         if(getApp().globalData.guide_id){
@@ -797,7 +1031,7 @@ Page({
     }
 
 	
-    var url="/pages/goods/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
+    var url="/packageA/pages/goodsInfo/goodsInfo?goods_id=" + th.data.gid;
     if(getApp().globalData.user_id){
       url+="&first_leader="+getApp().globalData.user_id;
     }
@@ -815,25 +1049,25 @@ Page({
       path:url,
       imageUrl: img,
     };	
-	if(th.data.prom_type==6){		
-		title+='\n'+th.data.prom_act.share_remark;
-		ob.title=title;
-		ob.desc=th.data.prom_act.share_remark;
-	}
+	// if(th.data.prom_type==6){		
+	// 	title+='\n'+th.data.prom_act.share_remark;
+	// 	ob.title=title;
+	// 	ob.desc=th.data.prom_act.share_remark;
+	// }
 	
 	//如果是积分购的时候
-	if(th.data.prom_type==4){
-		var name = th.data.prom_act.name;
-		//-- 积分购的 --
-		var pri0 = th.data.prom_act.addmoney;
-		var integral=th.data.prom_act.integral;				 	  
-		var text="";			  
-		if(integral){text=integral+"积分";  }				  
-		if(pri0 && integral){ text+="+";}
-		if(pri0){ text+="￥"+pri0;}
+	// if(th.data.prom_type==4){
+	// 	var name = th.data.prom_act.name;
+	// 	//-- 积分购的 --
+	// 	var pri0 = th.data.prom_act.addmoney;
+	// 	var integral=th.data.prom_act.integral;				 	  
+	// 	var text="";			  
+	// 	if(integral){text=integral+"积分";  }				  
+	// 	if(pri0 && integral){ text+="+";}
+	// 	if(pri0){ text+="￥"+pri0;}
 			
-		ob.title= text+" "+name;		
-	}
+	// 	ob.title= text+" "+name;		
+	// }
 	
     return ob;
 	
@@ -1642,7 +1876,7 @@ Page({
 
   // ----视频图片----
   // 图片计数器
-  swiperChange: function(e) {
+  swiperChange: function (e) {
     var that = this;
     if (e.detail.current > 0) {
       that.setData({
@@ -1661,6 +1895,31 @@ Page({
       })
     }
   },
+  
+  /*---视频相关--*/
+  videopicture: function (e) {
+    var vipi = e.currentTarget.dataset.vipi;
+    this.setData({
+      videopicture: vipi,
+      swiperCurrent: vipi,
+      noon: 0,
+      current: 1
+    });
+  },
+  
+  videoPlay: function (e) {
+    var _index = e.currentTarget.id
+    this.setData({
+      _index: _index,
+      noon: 1
+    })
+  
+    setTimeout(function () {
+      //将点击视频进行播放
+      var videoContext = wx.createVideoContext(_index)
+      videoContext.play();
+    }, 500)
+  },
 
   //--获取头像的本地缓存,回调写法--
   get_head_temp: function(tt, func) {
@@ -2244,10 +2503,210 @@ Page({
             corpId: id,
             success(res) {}
         })
-    }
-	     
-
+    },
+		
+	//评论的调用
+	requestComments_new: async function () {
+	  var e = this, th = e, ee = e; var tp = e.data.activeCategoryId3;
+	  var t = '/api/weshop/serviceComment/pageComment?page=' + e.data.c_curr_p;
+	
+	  wx.showLoading();
+	  var req_where = {
+	    store_id: o.stoid, pageSize: 5, is_show: 1,
+	    parent_id: 0, goods_id: th.data.gid, commenttype: tp,
+			service_id: this.data.gid,
+	  }
+	  if (getApp().globalData.userInfo) {
+	    req_where.userId = getApp().globalData.user_id;
+	  }
+	
+	  var rs_data = null;
+	  await getApp().request.promiseGet(t, { data: req_where }).then(res => {
+	    var tot = res.data.data.total;
+	    e.data.c_curr_p++;
+	    e.setData({
+	      com_num: tot, //已经有加载
+	    });
+	    if (res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
+	      rs_data = res.data.data.pageData;
+	    } else {
+	      th.setData({ comments_no_more: 1, auto: 1 });
+	    }
+	  })
+	
+	  if (rs_data) {
+	    //var cda = th.data.comments;
+	    var cda = rs_data, com_data = th.data.comments;
+	    for (var ind in cda) {
+	      var ep = cda[ind];
+	      if (cda[ind].head_pic == '') {
+	        cda[ind].head_pic = th.data.iurl + "/miniapp/images/hui_hear_pic.png";
+	      }
+	      if (ep.weapp_img != "" && ut.isString(ep.weapp_img)) {
+	        cda[ind].weapp_img = JSON.parse(ep.weapp_img);
+	      }
+	      if (ep.img != "" && ut.isString(ep.img)) {
+	        cda[ind].img = ut.unserialize(ep.img);
+	      }
+	
+	      //--测量多有字的宽带，计算有多少行--
+	      var widh = ut.measureText(ep.content, 30);
+	      var lines = widh / 712;
+	      cda[ind].seeMore = false;
+	      if (lines > 3) cda[ind].seeMore = true;
+	
+	      await getApp().request.promiseGet("/api/weshop/serviceComment/pageComment", {
+	        data: {
+						store_id: o.stoid,
+						parent_id: ep.comment_id,
+						service_id: this.data.gid,
+					}
+	      }).then(res => {
+	        if (res.data.data.pageData && res.data.data.pageData.length > 0) {
+	          cda[ind].replay_list = res.data.data.pageData;
+	        }
+	      })
+	    }
+	
+	    if (!com_data) com_data = cda;
+	    else com_data = com_data.concat(cda);
+	
+	    th.setData({ comments: com_data });
+	  }
+	  th.setData({ get_c: 1 });
+	  wx.hideLoading();
+	},
+	
+	
+	
+	//--点赞功能--
+	click_zan: function (e) {
+	  var com_id = e.currentTarget.dataset.com_id;
+	  var item_id = e.currentTarget.dataset.item_id;
+	  var app = getApp(),
+	    th = this;
+	
+	  if (app.globalData.userInfo == null || app.globalData.userInfo == undefined) {
+	    app.confirmBox("您还未登录");
+	    return false;
+	  }
+	
+	  var iszan = th.data.comments[item_id].userZanNum;
+	  if (this.data.iszaning) return false;
+	  this.data.iszaning = 1;
+	
+		
+	  app.request.post("/api/weshop/serviceCommentZan/save", {
+	    data: {
+	      store_id: o.stoid,
+	      user_id: app.globalData.user_id,
+	      goods_id: th.data.gid,
+				service_id: th.data.gid,
+	      comment_id: com_id
+	    },
+	    success: function (ee) {
+	
+	      if (ee.data.code == "-1") {
+	        app.my_warnning("不能给自己点赞", 0, th);
+	        th.data.iszaning = 0;
+	        return;
+	      }
+	
+	      if (ee.data.code == 0 && iszan != 1) {
+	        var num = th.data.comments[item_id].zan_num;
+	        num++;
+	        var text = "comments[" + item_id + "].zan_num";
+	        var text1 = "comments[" + item_id + "].userZanNum";
+	        var _errObj = {};
+	        _errObj[text] = num;
+	        _errObj[text1] = 1;
+	        th.setData(_errObj);
+	
+	      } else {
+	        var num = th.data.comments[item_id].zan_num;
+	        num--;
+	        var text = "comments[" + item_id + "].zan_num";
+	        var text1 = "comments[" + item_id + "].userZanNum";
+	        var _errObj = {};
+	        _errObj[text] = num;
+	        _errObj[text1] = 0;
+	        th.setData(_errObj);
+	      }
+	
+	      setTimeout(function () {
+	        th.data.iszaning = 0;
+	      }, 500)
+	
+	    }
+	  })
+	},
+	
+	
+	//--外侧评价的点击效果---
+	clik_evaluate: function (e) {
+	  var val = e.currentTarget.dataset.val;
+	  this.setData({
+	    activeCategoryId: 2,
+	    activeCategoryId3: val,
+	    comments: null
+	  });
+	  this.requestComments_new();
+	},
+	
+	
+	//显示全部
+	toggleHandler: function (e) {
+	  var that = this,
+	    index = e.currentTarget.dataset.index;
+	  for (var i = 0; i < that.data.comments.length; i++) {
+	    if (index == i) {
+	      for (var i = 0; i < that.data.comments.length; i++) {
+	        that.data.comments[index].auto = true;
+	        that.data.comments[index].seeMore = false;
+	      }
+	    }
+	  }
+	  that.setData({
+	    comments: that.data.comments
+	  })
+	},
+	
+	//收起更多
+	toggleContent: function (e) {
+	  var that = this,
+	    index = e.currentTarget.dataset.index;
+	  for (var i = 0; i < that.data.comments.length; i++) {
+	    if (index == i) {
+	      that.data.comments[index].auto = true;
+	      that.data.comments[index].seeMore = true;
+	    }
+	  }
+	  that.setData({
+	    comments: that.data.comments
+	  })
+	},
+	
+	//--查看评价--
+	look_pj: function () {
+	  this.tabComment();
+	  this.doScrollTop();
+	},
+	
+	previewCommentImgs_w: function (t) {
+	  var e = this.data.comments[t.currentTarget.dataset.cidx].weapp_img;
+	  var b = e.slice()
+	  // for (var i in b) {
+	  //   b[i] = this.data.iurl + e[i];
+	  // }
+	  this.data.show_prew_img = 1;
+	  wx.previewImage({
+	    current: b[t.currentTarget.dataset.id],
+	    urls: b
+	  });
+	},
+	
 
+	  
 });
 
 
diff --git a/packageA/pages/goodsInfo/goodsInfo.json b/packageA/pages/goodsInfo/goodsInfo.json
index ab98d72..d201627 100644
--- a/packageA/pages/goodsInfo/goodsInfo.json
+++ b/packageA/pages/goodsInfo/goodsInfo.json
@@ -4,6 +4,6 @@
     "usingComponents": {
         "nav_box": "/components/nav_box/nav_box",
         "warn": "/components/long_warn/long_warn",
-        "goods_recommend": "/components/goods_list/goods_list"
+        "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list"
     }
 }
\ No newline at end of file
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index 4b1d717..b6516a5 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -15,7 +15,44 @@
 		</view>
 		<view class="goods-detail">
 			<view class="goods-info" hidden="{{activeCategoryId==0?false:true}}">
-				<view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove">
+				
+				<view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove" wx:if="{{mapurl}}">
+				  <view class="xc-videos-picture rel">
+				    <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box  swiperContainer rel" duration="{{1000}}" indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange">
+				      <swiper-item wx:if="{{mapurl}}">
+				        <view wx:if="{{noon == 0}}">
+				          <image class="xc-picturess" src="{{iurl+mapurl_f_img}}" mode="aspectFit">
+				            <image id="{{index}}" class="xc-play" src="{{iurl}}/miniapp/images/pofang.png" bindtap="videoPlay"></image>
+				          </image>
+				        </view>
+				        <view wx:else>
+				          <video class="xc-videos" src="{{iurl+mapurl}}" id="{{index}}" wx:if="{{_index == index}}"></video>
+				        </view>
+				      </swiper-item>
+				      <swiper-item wx:for="{{gallery}}" wx:key="gallery">
+				        <view class="wh100 g_img_box" style="background-image:url({{iurl}}{{data.image_url?data.image_url:'miniapp/images/default_g_img.gif'}});"></view>
+				      </swiper-item>
+				    </swiper>
+				    <block wx:if="{{mapurl}}">
+				      <view wx:if="{{hiddenn==1}}">
+				        <view class="xc-imageCount">{{current}}/{{gallery.length}}</view>
+				      </view>
+				      <view class="xc-video-picture abs">
+				        <view class="xc-video" data-vipi="0" bindtap="videopicture">
+				          <view class="{{videopicture==0 ? 'xc-video-button':'xc-video-buttons'}}  {{videopicture==0 ? 'xc-sn':''}}">
+				            视频
+				          </view>
+				        </view>
+				        <view class="xc-picture  {{videopicture==1 ? 'xc-sn':''}}" data-vipi="1" bindtap="videopicture">
+				          <view>图片</view>
+				        </view>
+				      </view>
+				    </block>
+				  </view>
+				</view>
+				
+				
+				<view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove" wx:else>
 					<view class="xc-videos-picture rel">
 						<swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box  swiperContainer rel" duration="{{1000}}"
 						 indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange">
@@ -27,7 +64,8 @@
 					</view>
 				</view>
 
-				<block>
+
+				<!-- <block> -->
 
 					<view class="goods-price rel">
 						<view class="co-red" style="overflow: hidden">
@@ -35,7 +73,7 @@
 						</view>
 
 						<view>
-							<view class="co-red"><text class="rel yuan">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
+							<view class="co-red"><text class="rel yuan fs28">￥</text>{{filters.toFix(data.shop_price,2)}}</view>
 							<view class="goods-title">
 								<view class="goods-name elli">{{data.goods_name}}</view>
 							</view>
@@ -47,7 +85,7 @@
 						</view>
 
 					</view>
-				</block>
+				<!-- </block> -->
 
 
 
@@ -101,7 +139,60 @@
 
 
 
-
+				<!-- - 宝贝评价 -- -->
+				<view class="bdt16">
+				  <view class="bb_view">
+				    <view class="bold">宝贝评价({{categories3[0].num}})</view>
+				    <view class="red_bb fs26" bindtap="look_pj">
+				      查看全部
+				      <text class="bg_jj"></text>
+				    </view>
+				  </view>
+				  <view class="xc_comment">
+				    <view class="xc_comment-have-pictures" data-val="5" bindtap="clik_evaluate">
+				      有图({{categories3[1].num}})
+				    </view>
+				    <view class="xc_comment-discuss" data-val="2" bindtap="clik_evaluate">
+				      好评({{categories3[2].num}})
+				    </view>
+				    <view class="xc_comment-discuss" data-val="3" bindtap="clik_evaluate">
+				      中评({{categories3[3].num}})
+				    </view>
+				    <view class="xc_comment-discuss" data-val="4" bindtap="clik_evaluate">
+				      差评({{categories3[4].num}})
+				    </view>
+				  </view>
+				  <scroll-view scroll-x="true" class="pj_scroll">
+				    <view class="flex">
+				      <view class="xc_comment-detail" style="" wx:for="{{fir_comments}}" wx:key="{{item}}">
+				        <view class="xc_comment-left">
+				          <view class="xc_comment-user">
+				            <view class="xc_user-img">
+				              <image class="xc_imgs" src='{{item.is_anonymous!=1?item.head_pic:iurl+"/miniapp/images/hui_hear_pic.png"}}' binderror="bind_bnerr2" data-errorimg="fir_comments[{{index}}].head_pic"></image>
+				            </view>
+				            <view class="xc_user">
+				              <view class="xc_user-name five-level-word">
+				                {{item.is_anonymous!=1?item.username:'匿名'}}
+				              </view>
+				              <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
+				            </view>
+				          </view>
+				          <view class="xc_comment-font pj_word_size ellipsis-1 pdt12">
+				            <text class="ellipsis-1">{{item.content?item.content:'此用户没有填写评价。'}}</text>
+				          </view>
+				          <view class="xc_comment-val">
+				            <view class="xc_comment-time">{{item.add_time}}</view>
+				          </view>
+				        </view>
+				        <view class="xc_goods-img-frame">
+				          <image wx:if="{{item.img[0]!=undefined && item.img[0]!=null}}" class="xc_goods-img" src='{{iurl+item.img[0]}}'></image>
+				          <image wx:elif="{{item.weapp_img[0]!=undefined && item.weapp_img[0]!=null}}" class="xc_goods-img" src='{{item.weapp_img[0]}}'></image>
+				          <image wx:else class="xc_goods-img" src='{{gallery[0].image_url}}'></image>
+				        </view>
+				      </view>
+				    </view>
+				  </scroll-view>
+				</view>
 
 
 
@@ -110,7 +201,25 @@
 				  <view class="red_shu"></view>
 				  <view class="fs30 bold">商品详情</view>
 				</view>
-				<view class="pd20"> 
+				<view class="pdh20">
+					
+					<view wx:if="{{listServiceItem && listServiceItem.length > 0}}">
+						<view class="card fs28" wx:for="{{listServiceItem}}">
+							<view class="flex ai_c jc_sb" style="height: 88rpx;">
+								<view class="ellipsis-2">{{item.projectName}}（{{item.frequency}}次）</view>
+								<view class="pdl30 t-r">
+										<view class="rmb fs36 bold c-red" wx:if="{{item.money}}">{{item.money}}</view>
+										<view class="fs22 c-9" wx:if="{{item.showPrice}}">零售价：￥{{item.showPrice}}</view>
+								</view>
+							</view>
+							<view class="flex ai_c jc_sb fs24 c-6">
+								<view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
+								<!-- <view class="pdl30 shrink0">有效期:50天/2022-02-02</view> -->
+							</view>
+						</view>
+					
+					</view>
+					
 					<view class="table_s" wx:if="{{service_list}}">
           <view class="tb_item tb-l">
             <view class="item_left f1">
@@ -141,8 +250,20 @@
 					</view>
 
 				</view>
+				
+				<!-- 推荐商品 -->
+				<view class="flex-center rel xc-linellae-frame">
+				  <view class="xc-linellae"></view>
+				  <view class="abs flex-center xc-recommend-frame ">
+				    <image class=" xc-recommend" src="{{iurl}}/miniapp/images/diamond.png"></image>
+				    <view class="xc-recommend-word">推荐</view>
+				  </view>
+				</view>
+				<serviceCard_recommend id="goods_list"></serviceCard_recommend>
+				
 			</view>
 			
+			
 			<view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}">
 				<view class="pd20">
 					<view class="table_s" wx:if="{{service_list}}">
@@ -176,36 +297,122 @@
 				
 				</view>
 			</view>
-
+			
+			<view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">
+			  <view class="topframe">
+			    <view class="topframe-top">
+			      <view class="topframe-top-content">
+			        <view>宝贝评价</view>
+			        <view class="topframe-top-val">({{categories3[0].num}})</view>
+			      </view>
+			      <view class="topframe-praise" wx:if="{{categories3[0].num}}">
+			        好评{{ filters.toFix(categories3[2].num/categories3[0].num*100,2) }}%
+			      </view>
+			      <view wx:else>好评 0%</view>
+			    </view>
+			    <view class="buttem-list">
+			      <view bindtap="tabClick3" id="{{item.id}}" wx:for="{{categories3}}" wx:key="categories3" class="item {{activeCategoryId3==item.id?'red':''}}">
+			        {{item.name}}({{item.num}})
+			      </view>
+			    </view>
+			  </view>
+			  <block wx:for="{{comments}}" wx:for-index="cIdx" wx:key="{{cIdx}}">
+			    <view style='border-bottom:4rpx solid #eee;'>
+			      <view class="middle">
+			        <view class="middle-img-frame">
+			          <image class="middle-img" src="{{item.is_anonymous!=1?item.head_pic:iurl+'/miniapp/images/hui_hear_pic.png'}}" binderror="bind_bnerr2" data-errorimg="comments[{{cIdx}}].head_pic"></image>
+			          <view class="middle-user-frame">
+			            <view class="middle-user">
+			              {{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}}
+			            </view>
+			            <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
+			          </view>
+			        </view>
+			        <view class="xc-pirces">
+			          <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}" style="word-break: break-all;">
+			            {{item.content?item.content:'此用户没有填写评价。'}}
+			          </view>
+			        </view>
+			        <view wx:if='{{item.seeMore}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleHandler'>
+			          全部显示
+			        </view>
+			        <view wx:if='{{!item.seeMore && item.auto}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleContent'>
+			          收起
+			        </view>
+			        <view class="img-ul">
+			          <block wx:if="{{item.source_type==0}}">
+			            <view class="img-li" wx:for="{{item.img}}" wx:key="{{index}}">
+			              <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}" data-img="{{iurl}}{{item}}" data-id="{{index}}" src="{{iurl}}{{item}}"></image>
+			            </view>
+			          </block>
+			          <block wx:if="{{item.source_type==1}}">
+			            <view class="img-li" wx:for="{{item.weapp_img}}" wx:if="{{aitem.length>10}}" wx:key="{{index}}" wx:for-item="aitem">
+			              <image bindtap="previewCommentImgs_w" class="wh100" data-cidx="{{cIdx}}" data-img="{{aitem}}" data-id="{{index}}" src="{{aitem}}"></image>
+			            </view>
+			          </block>
+			        </view>
+			        <view class="z_parameter">
+			          <view class="parameter-font">{{item.add_time}}</view>
+			          <view class="parameter-dian" bindtap="click_zan" data-com_id="{{item.comment_id}}" data-item_id="{{cIdx}}">
+			            <image wx:if="{{item.userZanNum==1}}" class="parameter-img" src="{{iurl}}/miniapp/images/zan_red.png"></image>
+			            <image wx:else class="parameter-img" src="{{iurl}}/miniapp/images/dianzan.png"></image>
+			            <view class="parameter-val" style='color:{{item.userZanNum==1? "#d60022":"#999" }}'>
+			              {{item.zan_num}}
+			            </view>
+			          </view>
+			        </view>
+			      </view>
+			      <view class="reply rel" wx:if="{{item.replay_list}}">
+			        <view class="line_bulge"></view>
+			        <view class="shop-reply">店家回复:</view>
+			        <view class="shop-font" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="{{index}}">
+			          {{r_item.content}}
+			        </view>
+			      </view>
+			    </view>
+			  </block>
+			  <block wx:if="{{(!comments || comments.length==0) && get_c }}">
+			    <text class="no_pj_list">暂无评价</text>
+			  </block>
+			  <block wx:if="{{comments.length>10 && comments_no_more}}">
+			    <text class="no_pj_list">已经加载到底部</text>
+			  </block>
+			</view>
 		</view>
 	</view>
 	<!---滚动到顶部---->
-	<view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}">
+	<!-- <view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}">
 		<image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image>
-	</view>
+	</view> -->
 
 	<!-- 底部按钮 -->
-	<view class="join-cart jc_sb">
+	<view class="join-cart jc_sb ai_c">
 
 		<view class="flex">
-			<button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split f1" open-type="contact"
-			 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}" style="text-align: center">
+			<button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split pdh20" open-type="contact"
+			 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
 				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
 				<view>客服</view>
 			</button>
 
-			<view wx:elif="{{sys_switch.weapp_customertype==2}}" class="custom-service cart-ico new_split f1" bindtap="con_weixin"
+			<view wx:elif="{{sys_switch.weapp_customertype==2}}" class="custom-service cart-ico new_split pdh20" bindtap="con_weixin"
 			 style="text-align: center">
 				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
 				<view>客服</view>
 			</view>
 
-			<view wx:else class="custom-service cart-ico new_split f1" bindtap="contactService" style="text-align: center">
+			<view wx:else class="custom-service cart-ico new_split pdh20" bindtap="contactService" style="text-align: center">
 				<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
 				<view>客服</view>
 			</view>
+			
+			<view bindtap="collectGoods" class="custom-service cart-ico new_split t-c pdh20">
+			  <image hidden="{{is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart.png"></image>
+			  <image hidden="{{!is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart-h.png"></image>
+			  <view>收藏</view>
+			</view>
 
-			<view class="shopping-cart cart-ico new_split f1">
+			<view class="shopping-cart cart-ico new_split pdh20">
 				<navigator open-type="switchTab" url="/pages/cart/cart/cart" style="text-align: center">
 					<image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image>
 					<view class="cart-num ellipsis-1"> {{cartGoodsNum}} </view>
@@ -215,8 +422,7 @@
 		</view>
 
 
-		<view class="flex f1 pdh20">
-
+		<view class="flex f1 btn-group">
 			<view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn f1">加入购物车</view>
 			<view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn f1">立即购买</view>
 		</view>
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxss b/packageA/pages/goodsInfo/goodsInfo.wxss
index 8893bfe..1893f20 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxss
+++ b/packageA/pages/goodsInfo/goodsInfo.wxss
@@ -361,15 +361,18 @@ image {
 
 }
 
-.join-cart>view {
-    width: 29%;
+.join-cart > view {
+    /* width: 29%; */
 }
 
-.join-cart>.new_split {
-    width: 13%;
-    text-align: center;
-    padding: 0;
-    margin: 0;
+.join-cart .new_split {
+    /* width: 13%; */
+    /* text-align: center; */
+		/* padding: 20rpx; */
+		/* box-sizing: border-box; */
+		/* flex-shrink: 0; */
+    /* padding: 0;
+    margin: 0; */
 }
 
 .cart-ico {
@@ -384,13 +387,13 @@ image {
 .cs-img {
     width: 45rpx;
     height: 40rpx;
-    margin-top: 15rpx;
+    /* margin-top: 15rpx; */
 }
 
 .sc-img {
     width: 42rpx;
     height: 40rpx;
-    margin-top: 15rpx;
+    /* margin-top: 15rpx; */
 }
 
 .cart-num {
@@ -410,7 +413,7 @@ image {
     font-size: 28rpx;
     color: #fff;
     line-height: 70rpx;
-   margin-top: 16rpx;
+   /* margin-top: 16rpx; */
    text-align: center;
 
 
@@ -419,8 +422,8 @@ image {
 .join-btn {
     background-color: #ffb03f;
     height: 70rpx;
-border-radius: 55rpx 0rpx 0rpx 55rpx;
-margin-top: 16rpx;
+/* border-radius: 55rpx 0rpx 0rpx 55rpx;
+margin-top: 16rpx; */
 
 
 }
@@ -432,7 +435,7 @@ view.cart-btn-lg {
 .buy-btn {
     background-color: #f23030;
     height: 70rpx;
-border-radius: 0 56rpx 55rpx 0;
+/* border-radius: 0 56rpx 55rpx 0; */
 
 }
 
@@ -1206,7 +1209,7 @@ left:31rpx;}
 /* 回复 */
 .reply{
     width: 95%;
-    height: 120rpx;
+    /* height: 120rpx; */
    padding-top: 14rpx;
     border-top:3rpx solid #eeeeee;
     margin:0 auto;
@@ -1331,7 +1334,8 @@ left:31rpx;}
 }
 
 .xc_goods-img{
-    width: 180rpx;height: 180rpx;
+    width: 190rpx;
+		height: 190rpx;
 }
 .xc_comment-left{
     display:inline-block;
@@ -2848,4 +2852,43 @@ button.custom-service::after{
 	flex: 1;
 }
 
-.gray{ background-color: #dcdcdc !important;}
\ No newline at end of file
+.gray{ background-color: #dcdcdc !important;}
+
+
+.card {
+	position: relative;
+	padding: 20rpx;
+	margin-bottom: 20rpx;
+	border-radius: 8rpx;
+	background: #ffdcdc;
+	overflow: hidden;
+	/* background: #ffdcdc url(https://mshopimg.yolipai.net/miniapp/images/fwk/crown_bg.png) no-repeat left top;
+	background-position: 10rpx 10rpx;
+	background-size: 206rpx 136rpx; */
+}
+
+.card::before {
+	position: absolute;
+	font-family: iconfont;
+	content: '\e630';
+	color: rgba(255,0,0,.1);
+	font-size: 260rpx;
+	/* transform: rotateZ(45deg); */
+	top: -110rpx;
+	left: -70rpx;
+}
+
+.rmb::before {
+	content: '￥';
+	font-size: 24rpx;
+}
+
+.c-red {
+	color: #f23030;
+}
+
+.btn-group {
+	border-radius: 70rpx;
+	overflow: hidden;
+	margin-right: 10rpx;
+}
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js
index f0eaebb..d432b6b 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.js
+++ b/packageA/pages/myGiftDetails/myGiftDetails.js
@@ -15,6 +15,7 @@ Page({
 		  content: "当前核销码仅限当面使用！"
 	  },
 		showBtn: true,
+		isClick: false,
   },
 
   /**
@@ -332,27 +333,35 @@ Page({
 
 	//一键领取券
     show_get_quan:function (e) {
-		var th=this;
-        var json = {
-            store_id:os.stoid,
-            user_id:getApp().globalData.user_id,
-			id:this.data.id
-        };
-        var url = "/api/weshop/libao/libaoFormvip/saveLibaoQuan";
-        getApp().request.post(url,{
-            data:json,
-            success:function(res) {
-                if (res.data.code == 0) {
-                    th.setData({'details.isget':1});
-                } else {
-                    wx.showToast({
-                        title: res.data.msg,
-                        icon: 'none',
-                        duration: 2000
-                    })
-                }
-            },
-        })
+			if(this.data.isClick) return false;
+			if(!this.data.isClick) {
+					this.data.isClick = true;
+					let th=this;
+				  let json = {
+				      store_id:os.stoid,
+				      user_id:getApp().globalData.user_id,
+							id:this.data.id
+				  };
+				  let url = "/api/weshop/libao/libaoFormvip/saveLibaoQuan";
+				  getApp().request.post(url,{
+				      data:json,
+				      success:function(res) {
+				          if (res.data.code == 0) {
+				              th.setData({'details.isget':1});
+				          } else {
+				              wx.showToast({
+				                  title: res.data.msg,
+				                  icon: 'none',
+				                  duration: 2000
+				              })
+											th.data.isClick = false;
+				          }
+									
+				      },
+				  });
+					
+			}
+				
 
     }
 
diff --git a/packageB/pages/boxes-details/boxes-details.js b/packageB/pages/boxes-details/boxes-details.js
new file mode 100644
index 0000000..65c0f1d
--- /dev/null
+++ b/packageB/pages/boxes-details/boxes-details.js
@@ -0,0 +1,504 @@
+// packageA/pages/details_serviceCard/details_serviceCard.js
+const app = getApp();
+const os = app.globalData.setting;
+let self = null;
+
+Page({
+
+	/**
+	 * 页面的初始数据
+	 */
+	data: {
+		is_summit_ing: 0,
+		
+		showQr: false,
+	},
+
+	/**
+	 * 生命周期函数--监听页面加载
+	 */
+	onLoad: function(options) {
+		self = this;
+		this.data.options = options;
+		app.isLogin().then(function(data) {
+			self.setData({
+				userInfo: data,
+			});
+			self.getConfig();
+		});
+	},
+
+	/**
+	 * 生命周期函数--监听页面初次渲染完成
+	 */
+	onReady: function() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面显示
+	 */
+	onShow: function() {
+		if (app.globalData.userInfo) {
+			if (!this.data.isLogin) {
+				this.setData({
+					userInfo: app.globalData.userInfo,
+					imghost: app.globalData.setting.imghost,
+					isLogin: true,
+				});
+
+				let url = '/api/weshop/recharge/user/page'
+				let data = {
+					store_id: app.globalData.setting.stoid,
+					user_id: this.data.userInfo.user_id,
+					order_id: this.data.options.order_id,
+				};
+
+				// 请求数据
+				app.promiseGet(url, {
+					data: data,
+				}).then(res => {
+					if (res.data.code == 0) {
+						console.log('请求成功', res);
+						this.setData({
+							details: res.data.data.pageData[0],
+						});
+					} else {
+						throw (res);
+					};
+				}).catch(err => {
+					wx.showToast({
+						title: err.data.data,
+						icon: 'error',
+					});
+				});
+
+			};
+		};
+	},
+
+	/**
+	 * 生命周期函数--监听页面隐藏
+	 */
+	onHide: function() {
+
+	},
+
+	/**
+	 * 生命周期函数--监听页面卸载
+	 */
+	onUnload: function() {
+
+	},
+
+	/**
+	 * 页面相关事件处理函数--监听用户下拉动作
+	 */
+	onPullDownRefresh: function() {
+
+	},
+
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom: function() {
+
+	},
+
+	/**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function() {
+
+	},
+
+
+	// 内容复制到剪贴板
+	copy() {
+		console.log('点击了复制按钮');
+		wx.setClipboardData({
+			data: this.data.details.order_sn,
+			success(res) {
+				wx.getClipboardData({
+					success(res) {
+						console.log(res.data);
+					}
+				})
+			}
+		})
+	},
+
+
+	// 图片异常时加载默认图片
+	bind_bnerr(e) {
+		var errImg = e.currentTarget.dataset.errorimg;
+		var errObj = {};
+		errObj[errImg] = 'public/images/default_goods_image_240.gif';
+		this.setData(errObj); // this.setData({ details.list[0].img_url});    
+	},
+
+
+	// 查看商品详情
+	viewDetails(e) {
+		let goods_id = e.currentTarget.dataset.gid;
+		let url = '/packageA/pages/goodsInfo/goodsInfo?goods_id=' + goods_id;
+		app.goto(url);
+	},
+
+	// 获取系统参数
+	getConfig() {
+		app.getConfig2(function(e) {
+			// console.log('101',e);
+			let json_d = JSON.parse(e.switch_list);
+			self.setData({
+				sys_switch: json_d,
+				// weapp_customertype: json_d.weapp_customertype,
+			});
+		}, 1);
+	},
+
+
+	// 联系微信客服
+	contact_wx() {
+		var url = this.data.sys_switch.weapp_customertype_url;
+		var id = this.data.sys_switch.weapp_customertype_appid;
+		wx.openCustomerServiceChat({
+			extInfo: {
+				url: url
+			},
+			corpId: id,
+			success(res) {}
+		})
+	},
+
+
+	// 联系电话客服
+	contactService() {
+		app.getConfig(function(t) {
+			if (t.store_tel == undefined) {
+				app.request.get('/api/weshop/store/get/' + os.stoid, {
+					isShowLoading: 1,
+					data: {},
+					success: function(rs) {
+						app.globalData.config = rs.data.data;
+						if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
+							app.my_warnning('商家未设置电话', 0, self);
+							return false;
+						}
+						app.confirmBox('请联系客服:' + rs.data.data.store_tel);
+					}
+				})
+			} else {
+				app.confirmBox('请联系客服:' + t.store_tel);
+			}
+		});
+	},
+
+
+	// 评价商品
+	access() {
+		let listLength = this.data.details.list.length;
+		let order_id = this.data.details.order_id;
+		let url = '';
+
+		// 卡项订单跳转到评论页要多加个参数card=1
+		// 卡项订单goods_id要带card_id
+		if (listLength == 1) {
+			let price = this.data.details.list[0].price;
+			let card_id = this.data.details.list[0].card_id;
+			url =
+				`/packageB/pages/user/add_comment/add_comment?card=1&goods_id=${card_id}&order_id=${order_id}&price=${price}`
+		};
+		if (listLength > 1) {
+			url = `/packageB/pages/user/comment/comment?card=1&status=0&order_id=${order_id}`;
+		};
+		f
+		// console.log('url', url);
+		app.goto(url);
+	},
+
+
+	// 查看评论
+	viewComment() {
+		let order_id = this.data.details.order_id;
+		let card_id = this.data.details.list[0].card_id;
+		let listLength = this.data.details.list.length;
+		let url = '';
+
+		// 卡项订单单个商品
+		if (listLength == 1) {
+			url = `/packageB/pages/user/view_comment/view_comment?card=1&goods_id=${card_id}&order_id=${order_id}`;
+		};
+		// 卡项订单多个商品
+		if (listLength > 1) {
+			// status控制评论列表页的activeStatus
+			url = `/packageB/pages/user/comment/comment?card=1&status=1&order_id=${order_id}`;
+		};
+
+		app.goto(url);
+	},
+
+
+	// 再来一单
+	buy2(t) {
+		let details = this.data.details;
+		var th = this;
+		var ind = 1; // 1：加入购物车
+		// var ind = t.currentTarget.dataset.openSpecModal_ind;
+		// var action= t.currentTarget.dataset.action;
+		var action = 'add'; //
+		// if(!ind)  ind = t.currentTarget.dataset.openspecmodal_ind;
+
+		th.setData({
+			open_ind_store: ind
+		});
+
+		// if(!th.data.sto_sele_name){
+		//       getApp().my_warnning('请选择门店', 1, th, 450);
+		//       return false;
+		//   }
+
+
+		if (action == "buy") {
+			//--------------此时操作的数据------------
+			// var newd = {
+			//   id: th.data.data.id,
+			//   goods_num: th.data.goodsInputNum,
+			//   pick_id: th.data.sto_sele_id,		
+			//   keyid: th.data.sto_sele_keyid,		
+			// };	  
+			// newd['pick_name'] = th.data.sto_sele_name;		
+			// newd['guide_id'] = getApp().globalData.guide_id;
+			// newd['guide_type']=0;
+			// th.buyNow(newd);
+		} else {
+
+			var newd = {
+				// service_id: th.data.data.id,
+				// service_sn:th.data.data.service_sn,
+				// service_name:th.data.data.goods_name,
+				// goods_num: th.data.goodsInputNum,
+				// pick_id: th.data.sto_sele_id,
+				// user_id:oo.user_id,
+				// store_id:os.stoid,
+				// money:th.data.data.shop_price,
+
+				service_id: details.list[0].card_id,
+				service_sn: details.list[0].service_sn,
+				service_name: details.list[0].service_name,
+				goods_num: details.list[0].qty,
+				pick_id: details.list[0].pickup_id,
+				user_id: this.data.userInfo.user_id,
+				store_id: app.globalData.setting.stoid,
+				money: details.list[0].price,
+			};
+			if (getApp().globalData.guide_id) {
+				newd['guide_id'] = getApp().globalData.guide_id;
+				newd['guide_type'] = 0;
+			}
+
+			//----先看会员在购物车中是否加入了该商品-----
+			app.request.get("/api/weshop/cartService/page", {
+				data: {
+					store_id: app.globalData.setting.stoid,
+					user_id: this.data.userInfo.user_id,
+					service_id: details.list[0].card_id,
+					pick_id: details.list[0].pickup_id,
+				},
+				success: function(re) {
+
+					//-------如果购物车中有相关的数据---------
+					if (re.data.data.total > 0) {
+						var item = re.data.data.pageData[0];
+						var updata = {
+							id: item.id,
+							goods_num: details.list[0].qty + item.goods_num,
+							money: details.list[0].price,
+							store_id: app.globalData.setting.stoid,
+						};
+
+						if (getApp().globalData.guide_id) {
+							updata['guide_id'] = getApp().globalData.guide_id;
+							updata['guide_type'] = 1;
+						}
+						getApp().request.put("/api/weshop/cartService/update", {
+							data: updata,
+							success: function(t) {
+								// getApp().my_warnning('加入购物车成功', 1, th, 450);
+								var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
+								th.setData({
+									cartGoodsNum: c_num
+								});
+								app.goto('/pages/cart/cart/cart');
+								// th.closeSpecModal();
+							}
+						});
+					} else {
+
+						getApp().request.post("/api/weshop/cartService/save", {
+							data: newd,
+							success: function(t) {
+								// getApp().my_warnning('加入购物车成功', 1, th, 450);
+								var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
+								th.setData({
+									cartGoodsNum: c_num
+								});
+								app.goto('/pages/cart/cart/cart');
+								// th.closeSpecModal();
+							}
+						});
+					}
+				}
+			});
+
+		}
+	},
+
+
+	// 取消订单
+	// api/weshop/recharge/update?store_id=&order_id=&order_status=3
+	cancle() {
+		wx.showModal({
+			title: '提示',
+			content: '确定取消订单吗？',
+			success(res) {
+				if (res.confirm) {
+					console.log('用户点击确定');
+					let order_id = self.data.details.order_id;
+					let order_sn = self.data.details.order_sn;
+					app.request.put('/api/weshop/recharge/update', {
+						data: {
+							store_id: os.stoid,
+							order_id: order_id,
+							order_sn: order_sn,
+							order_status: 3,
+						},
+						success: function(res) {
+
+							//取消成功刷新订单
+							let url = '/api/weshop/recharge/user/page'
+							let data = {
+								store_id: app.globalData.setting.stoid,
+								user_id: self.data.userInfo.user_id,
+								order_id: self.data.options.order_id,
+							};
+
+							// 请求数据
+							app.promiseGet(url, {
+								data: data,
+							}).then(res => {
+								if (res.data.code == 0) {
+									console.log('请求成功', res);
+									wx.showToast({
+										title: '取消成功',
+									});
+									self.setData({
+										details: res.data.data.pageData[0],
+									});
+								} else {
+									throw (res);
+								};
+							}).catch(err => {
+								wx.showToast({
+									title: err.data.data,
+									icon: 'error',
+								});
+							});
+
+						},
+					})
+				} else if (res.cancel) {
+					console.log('用户点击取消');
+				}
+			}
+		});
+	},
+
+
+	// 立即支付
+	pay() {
+		let order_sn = this.data.details.order_sn;
+		let store_id = app.globalData.setting.stoid;
+
+		app.request.post('/api/weshop/order/pay/createRechargeOrder', {
+			data: {
+				parentSn: order_sn,
+				store_id: store_id,
+			},
+
+			success: function(res) {
+				var n = res.data.data;
+				self.weixinPay(n, function() {
+					app.showWarning('支付成功');
+					// setTimeout(function() {
+					// 	wx.reLaunch({
+					// 		url: '/pages/user/my_service/i_service',
+					// 	})
+					// }, 1000)
+				}, function() {
+					app.showWarning('支付失败');
+					// setTimeout(function() {
+					// 	wx.reLaunch({
+					// 		url: '/packageA/pages/cardList/cardList',
+					// 	})
+					// }, 1000)
+				});
+			}
+		})
+	},
+
+
+	//------调起支付框--------
+	weixinPay: function(n, success, fail) {
+		if (!n) return false;
+		wx.requestPayment({
+			timeStamp: String(n.timeStamp),
+			nonceStr: n.nonceStr,
+			package: n.packageValue,
+			signType: n.signType,
+			paySign: n.paySign,
+			success: function(n) {
+				console.log(n), getApp().showSuccess("支付成功！");
+				"function" == typeof success && success();
+				wx.redirectTo({
+					url: "../deposit/deposit"
+				});
+			},
+			fail: function(n) {
+				console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") :
+					"requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n
+						.errMsg.substr("requestPayment:fail ".length)),
+					"function" == typeof fail && fail();
+			}
+		});
+	},
+	
+	
+	
+	
+	
+	
+	
+	
+	showQr() {
+		this.setData({
+			showQr: true,
+		});
+	},
+	
+	closeQr() {
+		this.setData({
+			showQr: false,
+		});
+	},
+	
+	touchMove() {}
+
+
+
+
+
+
+
+
+})
diff --git a/packageB/pages/boxes-details/boxes-details.json b/packageB/pages/boxes-details/boxes-details.json
new file mode 100644
index 0000000..af2acc1
--- /dev/null
+++ b/packageB/pages/boxes-details/boxes-details.json
@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "订单详情",
+  "usingComponents": {
+		"nodata": "/components/nodata/nodata",
+		"share_button": "/components/share/share"
+	},
+	"enablePullDownRefresh": false
+}
\ No newline at end of file
diff --git a/packageB/pages/boxes-details/boxes-details.wxml b/packageB/pages/boxes-details/boxes-details.wxml
new file mode 100644
index 0000000..22c7abf
--- /dev/null
+++ b/packageB/pages/boxes-details/boxes-details.wxml
@@ -0,0 +1,89 @@
+<wxs module="filter" src="../../../utils/filter.wxs"></wxs>
+
+<view class="main">
+	<view class="bg-white pdh20 bdr12">
+		<block>
+			<!-- 门店名称栏 -->
+			<!-- <view class="flex jc_sb ai_c pdv20">
+				<view class="ellipsis-1 pdr40 fs30"><text class="iconfont icon-shop c-red pdr10"></text>{{item.pickup_name}}</view>
+				<block>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 0}}">待支付</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 1}}">待评价</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 2}}">已评价</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 3}}">已取消</text>
+					<text class="c-red shrink0 fs26" wx:if="{{details.order_status == 5}}">已作废</text>
+				</block>
+			</view> -->
+			
+			<!-- 列表栏 -->
+			<view>
+				<!-- <view class="flex pdv20" wx:for="{{details.list}}" bindtap="viewDetails" data-gid="{{item.card_id}}"> -->
+				<view class="flex pdv20" bindtap="viewDetails" data-gid="{{item.card_id}}" wx:for="{{14}}">
+					<view class="pic-box shrink0">
+						<text class="iconfont icon-shangpin fs60 white"></text>
+					</view>
+					<view class="pdl20 f1">
+						<view class="flex jc_sb ai_c">
+							<view class="title ellipsis-2 pdr40">商品名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称名称</view>
+							<text class="c-6">x1{{item.price}}</text>
+						</view>
+						<view class="flex ai_c c-9 fs26">
+							<!-- <text>10个/蓝色</text> -->
+							<text class="rmb c-red">2{{filters.price(item.group_price)}}</text>
+							<view class="fs22 del pdl10 c-c7">零售价<text class="rmb">3{{item.market_price}}</text></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		
+		
+		<!-- 统计栏 -->
+		<!-- <view class="t-r bdt pdv20">共{{filter.count(details.list)}}件商品，合计：<text class="rmb c-red bold fs30">{{details.account}}</text></view> -->
+	</view>
+	
+	
+
+	
+	<!-- 底部按钮栏 -->
+	<view class="btn-bar bg-white pd20 t-c">
+			<!-- <text class="btn bg-orange white" bindtap="buy2">再来一单</text> -->
+			<text class="btn bg-red white" bindtap="showQr">立即兑换</text>
+	</view>
+</view>
+
+
+
+
+
+
+<!-- 遮罩层 -->
+<view class="mask" hidden="{{!showQr}}" catchtouchmove="touchMove"></view>
+<!-- 码 -->
+<view class="popup-container" hidden="{{!showQr}}" catchtouchmove="touchMove">
+	<view class="t-r pdb20"><text class="iconfont icon-close fs40" bindtap="closeQr"></text></view>
+	<view class="popup">
+		<!-- <view class="popup-title">
+			<block wx:if="{{details[useIndex].isby == 1}}">包邮券</block>
+			<block wx:else>
+				{{filter.getNum(details[useIndex].Sum)}}元微券
+			</block>
+		</view> -->
+		<!-- <view class="pdt20 c-fe0000"><text class="rmb fs80" wx:if="{{details[useIndex].isby != 1}}">{{filter.getNum(details[useIndex].Sum)}}</text></view> -->
+		<!-- 条形码 -->
+		<view class="bar-container">
+			<canvas class="barcode" canvas-id="barcode"/>
+			<view class="pdt20 fs26" wx:if="{{details[useIndex].CashRepNo}}">{{details[useIndex].CashRepNo}}</view>
+			<view class="pdt20 fs26" wx:else>{{details[useIndex].no}}</view>
+		</view>
+		<!-- 二维码 -->
+		<view class="qr-container">
+		  <canvas class="qrcode" canvas-id="qrcode"/>
+		</view>
+		<view class="pdv20 c-7b fs26 bdt">
+			<text  wx:if="{{details[useIndex].ValidDate}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text>
+			<text  wx:elif="{{details[useIndex].use_end_time}}" class="ellipsis-1x">有效期:{{details[useIndex].use_start_time==null ? " " : time.format_time(details[useIndex].use_start_time)}} 至 {{time.format_time(details[useIndex].use_end_time)}}</text>
+			<text wx:else>有效期:不限</text>
+		</view>
+	</view>
+</view>
diff --git a/packageB/pages/boxes-details/boxes-details.wxss b/packageB/pages/boxes-details/boxes-details.wxss
new file mode 100644
index 0000000..dca743b
--- /dev/null
+++ b/packageB/pages/boxes-details/boxes-details.wxss
@@ -0,0 +1,199 @@
+page {
+	box-sizing: border-box;
+	padding: 20rpx 20rpx 0;
+	background-color: #f2f2f2;
+	font-size: 28rpx;
+}
+
+.bdr12 {
+	border-radius: 12rpx;
+}
+
+.w40 {
+	width: 40%;
+	box-sizing: border-box;
+}
+
+.btn-border {
+	border: 2rpx solid #808080;
+}
+
+
+.bg-red {
+	background-image: -webkit-linear-gradient(315deg,#f2140c,#f2270c 70%,#f24d0c);
+	background-image: linear-gradient(135deg,#f2140c,#f2270c 70%,#f24d0c);
+}
+
+.bg-orange {
+	background-image: -webkit-linear-gradient(315deg,#ffba0d,#ffc30d 69%,#ffcf0d);
+	background-image: linear-gradient(135deg,#ffba0d,#ffc30d 69%,#ffcf0d);
+}
+
+.c-orange {
+	color: #ff9000;
+}
+
+.main {
+	padding-bottom: 134rpx;
+}
+
+.pic-box {
+	width: 130rpx;
+	height: 130rpx;
+	border-radius: 12rpx;
+	overflow: hidden;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	background-color: pink;
+}
+
+.rmb::before {
+	content: '￥';
+}
+
+.title {
+	height: 88rpx;
+}
+
+.separator {
+	position: relative;
+}
+
+.separator::before {
+	content: '';
+	position: absolute;
+	width: 2rpx;
+	height: 30%;
+	background-color: #f8f8f8;
+	left: 0;
+	top: 0;
+	bottom: 0;
+	margin: auto;
+}
+
+.btn-bar {
+	box-sizing: border-box;
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	font-size: 26rpx;
+	border-top: 2rpx solid #f2f2f2;
+}
+
+.btn {
+	width: 50%;
+	box-sizing: border-box;
+	display: inline-block;
+	height: 70rpx;
+	line-height: 70rpx;
+	padding: 0 40rpx;
+	border-radius: 100rpx;
+}
+
+.btn-copy {
+	display: block;
+	color: #666;
+	font-size: 22rpx;
+	padding: 0 20rpx;
+	border-radius: 6rpx;
+	background-color: #f0f0f0;
+}
+
+.del {
+	text-decoration: line-through;
+}
+
+
+
+
+
+.mask {
+ 	position: fixed;
+ 	width: 100%;
+ 	height: 100%;
+ 	top: 0;
+	left: 0;
+ 	background-color: rgba(0,0,0,.7);
+ 	z-index: 1;
+ }
+ 
+ .popup-container {
+	 position: fixed;
+	 width: 70%;
+	 border-radius: 12rpx;
+	 top: 50%;
+	 left: 50%;
+	 transform: translate(-50%, -50%);
+	 z-index: 3;
+ }
+ 
+ .popup {
+	 text-align: center;
+	 border-radius: 12rpx;
+	 background-color: white;
+	 overflow: hidden;
+	 /* width: 80%; */
+ }
+ 
+ .popup-container .icon-close {
+	 color: rgba(255,255,255,.6);
+ }
+ 
+ .popup-title {
+	 padding: 40rpx 0;
+	 color: #fe0000;
+	 background-color: #FFD3D6;
+	 position: relative;
+ }
+ 
+ .popup-title::after {
+	 content: '';
+	 position: absolute;
+	 left: -20rpx;
+	 bottom: -12rpx;
+	 width: 130%;
+	 height: 20rpx;
+	 background: -webkit-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
+	 background: -moz-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
+	 background: -o-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
+	 background: radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
+	 background-size: 40rpx 40rpx;
+	 transform: rotate(180deg);
+	 -webkit-transform: rotate(180deg);
+ }
+ 
+ 
+ .popup .rmb::before {
+	 font-size: 40rpx;
+ }
+ 
+ .img-qr {
+	 display: block;
+	 width: 300rpx;
+	 height: 300rpx;
+	 margin: 0 auto;
+	 background-color: pink;
+ }
+ 
+ .qrcode {
+	 width: 300rpx;
+	 height: 300rpx;
+	 margin: 0 auto;
+ }
+ 
+ 
+ .noMore {
+	 padding: 20rpx;
+	 color: #bbb;
+	 text-align: center;
+	 font-size: 22rpx;
+ }
+ 
+ .breakall {
+	 word-break: break-all;
+ }
+
+
+
diff --git a/packageB/pages/boxes-list/boxes-list.js b/packageB/pages/boxes-list/boxes-list.js
new file mode 100644
index 0000000..b81d0c5
--- /dev/null
+++ b/packageB/pages/boxes-list/boxes-list.js
@@ -0,0 +1,330 @@
+const app = getApp();
+let self = null;
+
+Page({
+  data: {
+		tabArr: ['待核销','已核销'],
+		currentTabIndex: 0,
+		
+		isLogin: false,
+		list: null,
+		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
+		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
+		pageNum: 1, // 当前页数
+		
+		// showReward: false,
+		// prizesArr: [],
+		
+		// typeArr: [{
+		// 	key: 'point',
+		// 	name: '积分',
+		// },{
+		// 	key: 'grow',
+		// 	name: '成长值',
+		// },{
+		// 	key: 'point',
+		// 	name: '优惠券',
+		// },{
+		// 	key: 'prestore_name',
+		// 	name: '项目服务',
+		// },{
+		// 	key: 'prestore_money',
+		// 	name: '预存金额',
+		// }],
+  },
+	
+  onLoad: function () {
+		self = this;
+		app.isLogin().then(function(data) {
+			self.setData({
+				userInfo: data,
+			});
+		});
+  },
+	
+  onShow: function() {
+		if(app.globalData.userInfo) {
+			if(!this.data.isLogin) {
+				this.setData({
+					userInfo: app.globalData.userInfo,
+					imghost: app.globalData.setting.imghost,
+					isLogin: true,
+				});
+								
+				let data = {
+					store_id: app.globalData.setting.stoid,
+					user_id: this.data.userInfo.user_id,
+				};
+				
+				// 默认获取'全部'
+				this.getData(true, '/api/weshop/prom/luckyOrder/page', data)
+				.then(()=>{
+					this.setData({
+						currentData: data,
+					});
+				});
+				
+			};
+		};
+  },
+	
+	
+	/**
+	 * 页面上拉触底事件的处理函数
+	 */
+	onReachBottom: function () {
+		this.scrollToLower('/api/weshop/prom/luckyOrder/page', this.data.currentData);
+	},
+	
+	
+	// 图片异常时加载默认图片
+	bind_bnerr: function (e) {
+	  var _errImg = e.target.dataset.errorimg;
+	  var val = e.target.dataset.val;
+	  if(val!=undefined && val!=null && val!='null' ){
+	    var _errObj = {};
+	    _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
+	    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+	  }
+	},
+	
+	
+
+	// 点击tab选项卡
+	clickTab(e) {
+		this.setData({
+			currentTabIndex: e.target.dataset.index,
+			noMore: false,
+			pageNum: 1,
+			list: null,
+		});
+		
+		let currentTabIndex = parseInt(this.data.currentTabIndex);
+		let currentData = this.data.currentData;
+		
+		delete currentData.page;
+		
+		switch(currentTabIndex) {
+			case 0: {
+				delete currentData.team_status;
+				break;
+			};
+			case 1: {
+				currentData.team_status = 0;
+				break;
+			};
+			case 2: {
+				currentData.team_status = 2;
+				break;
+			};
+			case 3: {
+				currentData.team_status = 1;
+				break;
+			};
+		};
+		
+		// 请求
+		this.getData(true, '/api/weshop/prom/luckyOrder/page', currentData);
+		
+	},
+	
+	
+	/**
+	 * 请求数据
+	 */
+	getData: function(isInit, url, data) {
+		let p = app.request.promiseGet(url, {
+			data: data,
+			isShowLoading: true,
+		})
+		.then(function(res) {
+			if(res.data.code == 0) {
+				
+				self.setData({
+					isLoading: false
+				});
+				
+				if(isInit) {// 第一次加载
+					self.setData({
+						list: res.data.data
+					});
+				} else {
+					self.setData({
+						'list.pageData': self.data.list.pageData.concat(res.data.data.pageData)
+					});
+				};
+				
+				if((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) {
+					self.setData({
+						noMore: true
+					});
+				};
+				
+			} else {
+				self.setData({
+					'list.pageData': []
+				});
+			};
+			
+		});
+	
+		return p;
+	},
+	
+	
+	/**
+	 * 上拉加载
+	 */
+	scrollToLower(url, requestData) {
+		// 数据总量
+		let total = this.data.list.total;
+		// 单页最大数据量
+		let pageSize = this.data.list.pageSize;
+		// 如果数据总量不为0且小于或等于单页最大数据量，说明数据已全部加载，显示‘没有更多了’
+		if((total != 0)&&(total <= pageSize)) {
+			this.setData({
+				noMore: true
+			});
+		};
+		
+		if(!this.data.isLoading && !this.data.noMore) {
+			this.setData({
+				isLoading: true,
+				pageNum: this.data.pageNum + 1
+			});
+			requestData.page = this.data.pageNum;
+			this.getData(false, url, requestData);
+		};
+	},
+	
+	
+	//跳转
+	go: function (e) {
+	  var url = e.currentTarget.dataset.url;
+	  getApp().goto(url);
+	},
+	
+	//查看奖励
+	showReward: function(e) {
+		this.setData({
+			currentItemIndex: e.target.dataset.index,
+			currentItemAid: e.target.dataset.aid,
+		});
+		this.getPrizes(this.data.currentItemIndex);
+	},
+	
+	//关闭奖励
+	closeReward: function() {
+		this.setData({
+			showReward: false,
+		});
+	},
+	
+	
+	// 获取优惠券奖励和服务项目奖励
+	getPrizes: function(currentItemIndex) {
+		let currentItem = this.data.list.pageData[currentItemIndex];
+		let type = currentItem.type;
+		
+		// 分割type字符串
+		let typeArr = this.splitStringToArr(type);
+		let prizesArr = [];
+		let promiseArr = [];
+		typeArr.forEach(function(item) {
+			
+			let obj = {};
+			obj.type = item;
+			
+			let promise = new Promise((resolve, reject) => {
+				switch(item) {
+					case 1: { //积分
+						obj.name = '积分';
+						obj.num = 'point'; 
+						prizesArr.push(obj);
+						resolve();
+						break;
+					};
+					case 2: { //成长值
+						obj.name = '成长值';
+						obj.num = 'grow';
+						prizesArr.push(obj);
+						resolve();
+						break;
+					};
+					case 3: { //优惠券
+						app.request.promiseGet('/api/weshop/prom/luckyCoupon/page', {
+							data: {
+								store_id: app.globalData.setting.stoid,
+								aid: self.data.currentItemAid,
+							}
+						}).then(res => {
+							if(res.data.code == 0) {
+								obj.couponList = res.data.data.pageData;
+								prizesArr.push(obj);
+								resolve();
+							};
+						});
+						break;
+					};
+					case 4: { //服务项目
+						app.request.promiseGet('/api/weshop/prom/luckyService/page', {
+							data: {
+								store_id: app.globalData.setting.stoid,
+								aid: self.data.currentItemAid,
+							}
+						}).then(res => {
+							if(res.data.code == 0) {
+								obj.serviceList = res.data.data.pageData;
+								prizesArr.push(obj);
+								resolve();
+							};
+						});
+						break;
+					};
+					case 5: { //预存金额
+						obj.name = 'prestore_name';
+						obj.num = 'prestore_money';
+						prizesArr.push(obj);
+						resolve();
+						break;
+					};
+				};
+			});
+			
+			promiseArr.push(promise);
+			
+			
+			Promise.all(promiseArr).then(()=> {
+				self.setData({
+					prizesArr,
+					showReward: true,
+				});
+			});
+						
+		});
+	},
+	
+	// 将type字符串分割成数组
+	splitStringToArr: function(typeStr) {
+		var index;
+		var newTypeArr = [];
+		var typeStrArr = typeStr.split(',');
+		typeStrArr.forEach(function(item) {
+			index = parseInt(item);
+			newTypeArr.push(index);
+		});
+		return newTypeArr;
+	},
+	
+	
+	
+	
+	
+	viewDetails() {
+		let url = '/packageB/pages/boxes-details/boxes-details';
+		app.goto(url);
+	}
+	
+	
+})
+
diff --git a/packageB/pages/boxes-list/boxes-list.json b/packageB/pages/boxes-list/boxes-list.json
new file mode 100644
index 0000000..365a55c
--- /dev/null
+++ b/packageB/pages/boxes-list/boxes-list.json
@@ -0,0 +1,7 @@
+{
+	"navigationBarTitleText": "套盒商品",
+	"enablePullDownRefresh": false,
+  "usingComponents": {
+		"nodata": "/components/nodata/nodata"
+	}
+}
\ No newline at end of file
diff --git a/packageB/pages/boxes-list/boxes-list.wxml b/packageB/pages/boxes-list/boxes-list.wxml
new file mode 100644
index 0000000..a4d4eb6
--- /dev/null
+++ b/packageB/pages/boxes-list/boxes-list.wxml
@@ -0,0 +1,57 @@
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
+
+<!-- tabbar -->
+<view class="tab-hd" bindtap="clickTab">
+	<view class="tab-hd-item {{currentTabIndex == index ? 'active':''}}"
+				wx:for="{{tabArr}}"
+				data-index="{{index}}">{{item}}</view>
+</view>
+
+<view class="tab-bd">
+	<view class="list">
+
+	
+		<view class="list-item" wx:if="{{currentTabIndex == 0}}" bindtap="viewDetails">
+			<view class="pd20">
+					<view class=""><text class="fs24 c-9">订单编号：</text>191561561565555</view>
+					<view class="ellipsis-2 title">卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称</view>
+					<view class="flex ai-center">
+						<text class="rmb fs40 c-red">2{{filters.price(item.group_price)}}</text>
+						<view class="fs22 del pdl10 c-c7">零售价<text class="rmb">3{{item.market_price}}</text></view>
+					</view>
+					<view class="fs24 c-red">*兑换截止日期：2022-01-01至2022-12-31</view>
+			</view>
+			
+			<view class="pd20 bdt fs24 t-r">
+				<view class="btn bg-gray white">已过期</view>
+				<view class="btn bg-red white">立即兑换</view>
+			</view>
+		</view>
+		
+		
+		<view class="list-item" wx:if="{{currentTabIndex == 1}}">
+			<view class="pd20">
+					<view class=""><text class="fs24 c-9">订单编号：</text>191561561565555</view>
+					<view class="ellipsis-2 title">卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称项名称卡项名称卡项名称</view>
+					<view class="flex ai-center">
+						<text class="rmb fs40 c-red">2{{filters.price(item.group_price)}}</text>
+						<view class="fs22 del pdl10 c-c7">零售价<text class="rmb">3{{item.market_price}}</text></view>
+					</view>
+					<view class="fs24 c-red">*兑换截止日期：2022-01-01至2022-12-31</view>
+			</view>
+			
+			<view class="pd20 bdt fs24 t-r">
+				<view class="btn bg-gray white">已核销</view>
+			</view>
+		</view>
+		
+	</view>
+</view>
+
+
+
+
+<view class="no-more" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">—— 已经到底啦 ——</view>
+<nodata nodataContainer="t-c" wx:if="{{list.pageData.length == 0}}"></nodata>
+
+
diff --git a/packageB/pages/boxes-list/boxes-list.wxss b/packageB/pages/boxes-list/boxes-list.wxss
new file mode 100644
index 0000000..8d5232d
--- /dev/null
+++ b/packageB/pages/boxes-list/boxes-list.wxss
@@ -0,0 +1,166 @@
+.bdt {
+	border-top: 2rpx solid #f5f5f5;
+}
+
+page {
+	background-color: #f2f2f2;
+}
+
+.btn {
+	display: inline-block;
+	min-width: 120rpx;
+	text-align: center;
+	/* border: 2rpx solid #ff6768; */
+	padding: 10rpx 20rpx;
+	border-radius: 40rpx;
+}
+
+.btn.gray {
+	border-color: #ccc;
+}
+
+.tab-hd {
+	display: flex;
+	text-align: center;
+	font-size: 28rpx;
+	background-color: white;
+	position: sticky;
+	top: 0;
+	z-index: 2;
+}
+
+.tab-hd-item {
+	flex-grow: 1;
+	padding: 20rpx;
+	position: relative;
+}
+
+.tab-hd-item.active {
+	color: #ff6768;
+}
+
+.tab-hd-item.active::after {
+	content: '';
+	position: absolute;
+	width: 30%;
+	height: 4rpx;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	margin: 0 auto;
+	background-color: #ff6768;
+}
+
+.title {
+	/* max-height: 88rpx; */
+	box-sizing: border-box;
+	margin-top: 10rpx;
+	margin-bottom: 10rpx;
+	height: 90rpx;
+}
+
+.tab-bd {
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+}
+
+.list {
+	overflow: hidden;
+}
+
+.list-item {
+	background-color: white;
+	margin-top: 20rpx;
+	border-radius: 12rpx;
+	font-size: 28rpx;
+}
+
+.arrow {
+	position: relative;
+}
+
+.arrow::after {
+	font-family: iconfont;
+	content: '\e61f';
+	position: absolute;
+	right: 0;
+	color: #ccc;
+}
+
+.img-container {
+	width: 200rpx;
+	height: 200rpx;
+	flex-shrink: 0;
+	margin-right: 20rpx;
+	border-radius: 14rpx;
+	overflow: hidden;
+}
+
+.rmb::before {
+	content: '￥';
+	font-size: 24rpx;
+}
+
+.del {
+	text-decoration: line-through;
+}
+
+.no-more {
+	font-size: 24rpx;
+	line-height: 3;
+	text-align: center;
+	/* margin-top: 10rpx; */
+	color: #ccc;
+}
+
+
+.popup-container {
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background-color: rgba(0,0,0,.8);
+}
+
+.popup {
+	background-color: #FFFAE7;
+	position: fixed;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	border-radius: 12rpx;
+	min-width: 600rpx;
+	color: #AF481D;
+}
+
+.popup-list {
+	max-height: 700rpx;
+	overflow-y: auto;
+}
+
+.popup-list-item {
+	display: flex;
+	align-items: center;
+	padding: 20rpx;
+}
+
+.popup-list-item .img-container {
+	width: 120rpx;
+	height: 100rpx;
+}
+
+ .popup-title {
+	 font-size: 28rpx;
+	 height: 88rpx;
+ }
+ 
+ .bg-red {
+ 	background-image: -webkit-linear-gradient(315deg,#f2140c,#f2270c 70%,#f24d0c);
+ 	background-image: linear-gradient(135deg,#f2140c,#f2270c 70%,#f24d0c);
+ }
+ 
+ .bg-gray {
+ 	background-image: -webkit-linear-gradient(315deg,#bfbfbf,#c3c3c3 70%,#d4d3d3);
+ 	background-image: linear-gradient(135deg,#bfbfbf,#c3c3c3 70%,#d4d3d3);
+ }
\ No newline at end of file
diff --git a/packageB/pages/user/add_comment/add_comment.js b/packageB/pages/user/add_comment/add_comment.js
index 13d5b01..3c50fb6 100644
--- a/packageB/pages/user/add_comment/add_comment.js
+++ b/packageB/pages/user/add_comment/add_comment.js
@@ -25,14 +25,45 @@ Page({
   },
   onLoad: async function (a) {
     var th = this;
-    await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", { data:{store_id:os.stoid,goods_id:a.goods_id, order_id:a.order_id}}).then(res => {
-
-      if(ut.ajax_ok(res)) {
-          a.img = th.data.iurl + res.data.data.pageData[0].original_img;
-          a.goods_name = res.data.data.pageData[0].goods_name;
-          a.goods_num = res.data.data.pageData[0].goods_num;
-      }
-    })
+		if(a.card == 1) {
+			wx.setNavigationBarTitle({
+				title: '评价卡项',
+			});
+			// console.log('card==1');
+			await getApp().request.promiseGet('/api/weshop/recharge/user/servicelist/list',{ 
+				data:{
+					store_id:os.stoid,
+					card_id:a.goods_id,
+					order_id:a.order_id,
+				},
+			}).then(res => {
+				// console.log('card===1', res.data);
+				if(res.data.code == 0) {
+					a.img = th.data.iurl + res.data.data[0].img_url;
+					a.goods_name = res.data.data[0].service_name;
+					a.goods_num = res.data.data[0].qty;
+				};
+			  // if(ut.ajax_ok(res)) {
+			  //     a.img = th.data.iurl + res.data.data.pageData[0].original_img;
+			  //     a.goods_name = res.data.data.pageData[0].goods_name;
+			  //     a.goods_num = res.data.data.pageData[0].goods_num;
+			  // }
+			});
+		} else {
+			wx.setNavigationBarTitle({
+				title: '评价宝贝',
+			});
+			// console.log('card==0');
+			await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", { data:{store_id:os.stoid,goods_id:a.goods_id, order_id:a.order_id}}).then(res => {
+			
+			  if(ut.ajax_ok(res)) {
+			      a.img = th.data.iurl + res.data.data.pageData[0].original_img;
+			      a.goods_name = res.data.data.pageData[0].goods_name;
+			      a.goods_num = res.data.data.pageData[0].goods_num;
+			  }
+			})
+		};
+    
     this.setData({ options: a });
     t.getUserInfo(function (e) {
       console.log(e);
@@ -64,9 +95,9 @@ Page({
     });
   },
   checkDeliverRank: function (t) {
-    this.setData({
-      deliver_rank: parseInt(t.currentTarget.dataset.i) + 1
-    });
+		this.setData({
+			deliver_rank: parseInt(t.currentTarget.dataset.i) + 1
+		});
   },
   selectPhotos: function (t) {
     if (this.data.isLongPress) this.data.isLongPress = !1; else {
@@ -88,8 +119,20 @@ Page({
   },
   submitComment: function (i) {
     var a = this;
-    if (!a.data.service_rank || !a.data.goods_rank || !a.data.deliver_rank)
-        return getApp().my_warnning("请先打分",0,a);
+		let url = '';
+		if(this.options.card == 1) {
+			this.setData({
+				deliver_rank: 5
+			});
+			if (!a.data.service_rank || !a.data.goods_rank)
+			    return getApp().my_warnning("请先打分",0,a);
+		} else {
+			if (!a.data.service_rank || !a.data.goods_rank || !a.data.deliver_rank)
+			    return getApp().my_warnning("请先打分",0,a);
+		};
+		
+		
+    
     // if(a.data.content=="")
     //   return getApp().my_warnning("请填写评价内容",0,a);
 
@@ -114,18 +157,26 @@ Page({
       if(a.data.is_anonymous){
         p_data['is_anonymous']=1;
       }
+			if(this.data.options.card == 1) {
+				// delete p_data.goods_id;
+				p_data['service_id'] = this.data.options.goods_id;
+				url = '/api/weshop/serviceComment/savecomment';
+			} else {
+				url = '/api/weshop/comment/savecomment';
+			};
+			
 
-      e.post("/api/weshop/comment/savecomment", {
+      e.post(url, {
         data:p_data,
-        success: function (a) {
-          if(a.data.code==0){
+        success: function (res) {
+          if(res.data.code==0){
           wx.setStorageSync("user:comment:update", !0), t.showSuccess("评论成功", function () {
             // wx.navigateBack();
             var url = i.currentTarget.dataset.url;
             getApp().goto(url);
           });
           }else{
-            getApp().my_warnning(a.data.msg,0,a);
+            getApp().my_warnning(res.data.msg,0,a);
           }
         }
       });
diff --git a/packageB/pages/user/add_comment/add_comment.json b/packageB/pages/user/add_comment/add_comment.json
index 401e4e6..034b0bf 100644
--- a/packageB/pages/user/add_comment/add_comment.json
+++ b/packageB/pages/user/add_comment/add_comment.json
@@ -1,5 +1,4 @@
 {
-    "navigationBarTitleText": "评价宝贝",
     "enablePullDownRefresh": false,
     "usingComponents": {
         "warn": "/components/long_warn/long_warn"
diff --git a/packageB/pages/user/add_comment/add_comment.wxml b/packageB/pages/user/add_comment/add_comment.wxml
index aecfbcd..910c2c3 100644
--- a/packageB/pages/user/add_comment/add_comment.wxml
+++ b/packageB/pages/user/add_comment/add_comment.wxml
@@ -30,7 +30,7 @@
 
     <!-- 商品评价信息 -->
     <view class="addComment">
-      <textarea class="fs24" placeholder="已经收到商品,快跟大家分享一下宝贝吧!" bindinput="txtInpt" placeholder-class="fs24" maxlength="500" value="{{content}}"></textarea>
+      <textarea class="fs24" placeholder="已经收到商品,快跟大家分享一下宝贝吧!" bindinput="txtInpt" placeholder-class="fs24" maxlength="500" value="{{content}}" />
       <view class="flex addimages">
         <!-- 评论图片集合 -->
         <view class="images">
@@ -74,8 +74,9 @@
           </view>
         </view>
       </view>
-
-      <view class="score-item flex-vertical">
+			<!-- 卡项订单不用给予物流服务评价 -->
+			<view class="score-item flex-vertical" wx:if="{{!options.card}}">
+      <!-- <view class="score-item flex-vertical"> -->
         <view class="fs24">物流服务</view>
         <view class="stars flex-vertical">
           <view class="flex-vertical" bindtap="checkDeliverRank" data-i="{{index}}" wx:for="{{5}}" wx:key="{{index}}">
@@ -106,7 +107,12 @@
   </view>
 
   <view class="Submission flex-level ">
-    <view class="fs30 flex-level white " bindtap="submitComment" data-url="/packageB/pages/user/view_comment/view_comment?goods_id={{goods_id}}&order_id={{order_id}}">提交评价</view>
+		<block>
+			<!-- 卡项订单 -->
+			<view class="fs30 flex-level white " bindtap="submitComment" data-url="/packageB/pages/user/view_comment/view_comment?card=1&goods_id={{options.goods_id}}&order_id={{order_id}}" wx:if="{{options.card == 1}}">提交评价</view>
+			<!-- 其他订单 -->
+			<view class="fs30 flex-level white " bindtap="submitComment" data-url="/packageB/pages/user/view_comment/view_comment?goods_id={{goods_id}}&order_id={{order_id}}" wx:else>提交评价</view>
+		</block>
   </view>
 </view>
 
diff --git a/packageB/pages/user/collect_list/collect_list.js b/packageB/pages/user/collect_list/collect_list.js
index ea786ae..b1fbd36 100644
--- a/packageB/pages/user/collect_list/collect_list.js
+++ b/packageB/pages/user/collect_list/collect_list.js
@@ -88,10 +88,14 @@ Page({
     for (var e = 0; e < this.data.collects.length; e++)
       if (this.data.collects[e].collect_id == t) {
         this.data.collects.splice(e, 1), this.setData({
-          collects: this.data.collects
+          collects: this.data.collects,
         });
         break;
       }
+	
+	this.setData({
+		total_collects: this.data.collects.length,
+	});
   },
   //图片失败，默认图片
   bind_bnerr: function(e) {
diff --git a/packageB/pages/user/collect_list/collect_list.wxml b/packageB/pages/user/collect_list/collect_list.wxml
index c3ba730..5f756a5 100644
--- a/packageB/pages/user/collect_list/collect_list.wxml
+++ b/packageB/pages/user/collect_list/collect_list.wxml
@@ -22,7 +22,7 @@
     <!-- 商品集合 -->
     <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}}"
-                 data-url="{{editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id:''}}">
+                 data-url="{{item.type == 1 ? '/packageA/pages/goodsInfo/goodsInfo?goods_id=' + item.goods_id : (editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id:'')}}">
 
         <view class="radioCheck iconClick" wx:if="{{editEd}}">
           <radio color="rgb(214,1,33)" class="scale" checked="{{item.checked==true?true:false}}"></radio>
@@ -56,7 +56,12 @@
               </view>
 
               <view class="money_right flex line" wx:if="{{!editEd}}">
-                <view class="similar flex-level fs22" catchtap="go_to" data-url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}">
+				<!-- 卡项订单 -->
+				<view wx:if="{{item.type == 1}}" class="similar flex-level fs22" catchtap="go_to" data-url="/packageA/pages/cardList/cardList?cat_id={{item.cat_id}}">
+				  <view>找相似</view>
+				</view>
+				<!-- 其他 -->
+                <view wx:elif="{{item.type == 0}}" class="similar flex-level fs22" catchtap="go_to" data-url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}">
                   <view>找相似</view>
                 </view>
                 <image src="{{url}}miniapp/images/trash.png" catchtap="cancelCollect" data-id="{{item.collect_id}}"></image>
diff --git a/packageB/pages/user/comment/comment.js b/packageB/pages/user/comment/comment.js
index 06b7766..a7438ba 100644
--- a/packageB/pages/user/comment/comment.js
+++ b/packageB/pages/user/comment/comment.js
@@ -12,6 +12,8 @@ var t = function(t) {
   os = e.globalData.setting;
 var regeneratorRuntime = require('../../../../utils/runtime.js');
 
+
+
 Page({
   data: {
     url: e.globalData.setting.url,
@@ -28,24 +30,29 @@ Page({
       status: 1
     }],
     activeStatus: 0,
-    comments: null,
+    comments: [],
     currentPage: 1,
     isloaded: 0,
     order_id:0,
     is_no_more:0,
   },
+	
   onLoad: function(t) {
     var e = void 0 === t.status ? this.data.activeStatus : t.status;
     this.data.order_id=t.order_id;
-
+		this.setData({
+			options: t,
+		});
     //a.init(this, "", "comments"),
     //this.requestComments(e);
     this.requestComments_new(e);
   },
+	
   onShow: function() {
     wx.getStorageSync("user:comment:update") && (wx.setStorageSync("user:comment:update", !1),
       this.resetData(), this.requestComments_new(this.data.activeStatus));
   },
+	
   changeTab: function(t) {
     var e = this;
     if (this.data.activeStatus == t.currentTarget.dataset.status)
@@ -54,23 +61,34 @@ Page({
   },
 
   requestComments_new:async function(t){
-        var e = this, th = e, n = os.url + "/api/weshop/comment/list?page=" + e.data.currentPage;
+        var e = this, th = e;
+				let n = '';
+				if(this.data.options.card == 1) { // 卡项订单
+					n = os.url + '/api/weshop/serviceComment/list?page=' + this.data.currentPage;
+				} else {
+					n = os.url + '/api/weshop/comment/list?page=' + this.data.currentPage;
+				};
+				
         this.setData({
-            activeStatus: t
+            activeStatus: t, // t为tabIndex
         });
 
-        if(e.data.order_id) n+="&order_id="+e.data.order_id;
+        if(this.data.order_id) n+="&order_id="+e.data.order_id;
         var rq_data={store_id: os.stoid, user_id: oo.user_id};
         if (t!= 2) {rq_data['is_comment']=t;}
 
         var rs_data=null,com_data=this.data.comments;
         await getApp().request.promiseGet(n,{data:rq_data}).then(res=>{
-            e.data.currentPage++
+            e.data.currentPage++;
             if(res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
                 rs_data=res.data.data.pageData;
             }else{
-                th.setData({ is_no_more: 1, })
-            }
+                th.setData({is_no_more: 1, comments: null});
+            };
+						if(res.data.data && res.data.data.total <= res.data.data.pageSize) {
+							// console.log('res======>>>', res.data.data);
+							th.setData({ is_no_more: 1, });
+						};
         })
 
         if(rs_data){
@@ -94,7 +112,7 @@ Page({
             th.setData({ comments: com_data })		
         }
 		
-		th.setData({isloaded: 1,})
+		th.setData({isloaded: 1,});
     },
 
   onReachBottom: function() {
@@ -130,6 +148,7 @@ Page({
     _errObj[_errImg] = os.imghost + "/public/images/default_goods_image_240.gif";
     th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;  
   },
+	
   //预览图片
   previewImg: function(e) {
     var index = e.currentTarget.dataset.index;
diff --git a/packageB/pages/user/comment/comment.wxml b/packageB/pages/user/comment/comment.wxml
index b3d3e2f..ec7dda5 100644
--- a/packageB/pages/user/comment/comment.wxml
+++ b/packageB/pages/user/comment/comment.wxml
@@ -1,14 +1,15 @@
 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
 <view class="container">
+	<!-- tabbar -->
   <view class="type-navbar padding">
     <view class="type-box fs28 type-navbar-item {{activeStatus==item.status?'type-item-on':''}}" data-status="{{item.status}}" wx:for="{{categories}}" wx:key="{{index}}">
       <view class="title_width" bindtap="changeTab" data-status="{{item.status}}">{{item.name}}</view>
     </view>
-
   </view>
 
   <!-- 无评价 -->
-  <view class="noCollection" wx:if="{{(!comments||comments.length==0) && isloaded}}">
+	<!-- <view class="noCollection" wx:if="{{(!comments||comments.length==0) && isloaded}}"> -->
+  <view class="noCollection" wx:if="{{!comments}}" data-c="{{comments}}">
     <view class="flex-level">
       <image src="{{iurl}}/miniapp/images/comment.png"></image>
     </view>
@@ -21,41 +22,44 @@
   </view>
 
   <!-- 待评价栏 -->
-  <view class="stay_evaluate" wx:if="{{comments.length>0}}" wx:for="{{comments}}">
-
+  <view class="stay_evaluate" wx:if="{{comments && comments.length>0}}" wx:for="{{comments}}">
     <!-- 商品编号和状态 -->
     <view class="Commodity_number flex-vertical-between fs26 padding border_bottom">
       <!--商品编号 -->
-      <view>订单编号：{{item.order_sn}}</view>
+			<block>
+				<!-- 卡项订单 -->
+				<view wx:if="{{options.card == 1}}">订单编号：{{item.service_sn}}</view>
+				<view wx:else>订单编号：{{item.order_sn}}</view>
+			</block>
       <!-- 商品评价状态 -->
       <view class="xc-wc">{{item.comment_id>0?'已评价':'待评价'}}</view>
     </view>
 
-    <!-- 商品详情集合 -->
-    <view class="detail_commoditys">
+    <!-- 商品详情集合 - 卡项订单 -->
+    <view class="detail_commoditys" wx:if="{{options.card == 1}}">
       <!-- 单个商品 -->
       <view>
-        <navigator class="detail_commodity flex-vertical padding border_bottom" url="{{'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id}}">
+        <navigator class="detail_commodity flex-vertical padding border_bottom" url="{{'/packageA/pages/goodsInfo/goodsInfo?goods_id='+item.goods_id}}">
           <!-- 商品图片 -->
-          <image src="{{item.original_img}}" binderror="bind_bnerr2" data-errorimg="comments[{{index}}].original_img"></image>
+          <image src="{{iurl + item.img_url}}" binderror="bind_bnerr2" data-errorimg="comments[{{index}}].original_img"></image>
           <!-- 商品内容 -->
           <view class="Commodity_content">
             <view class="Commodity_goods">
               <!-- 商品名称 -->
-              <view class="goods_name ellipsis-2 fs26">{{item.goods_name}}</view>
+              <view class="goods_name ellipsis-2 fs26">{{item.service_name}}</view>
               <!-- 商品规格 -->
-              <view class="Commodity_spec fs20">
+              <!-- <view class="Commodity_spec fs20">
                 <view class="flex-center">{{item.goods_color+item.goods_spec.length>-1?item.goods_color+item.goods_spec:'规格1'}}</view>
-              </view>
+              </view> -->
             </view>
             <!-- 商品价格数量 -->
             <view class="Commodity_money flex-vertical-between baseline">
               <!-- 商品价格 -->
               <view class="flex-vertical xc-wc baseline">
                 <view class="fs20">￥</view>
-                <view class="fs30">{{filter.toFix(item.goods_price,2)}}</view>
+                <view class="fs30">{{filter.toFix(item.price,2)}}</view>
               </view>
-              <view class="fs26">x{{item.goods_num}}</view>
+              <view class="fs26">x{{item.qty}}</view>
 
             </view>
           </view>
@@ -72,9 +76,7 @@
           <!-- 评价内容 -->
           <view class="Comment_content ellipsis-2 fs24">{{item.content.length>0?item.content:'此用户没有填写评论'}}</view>
           <view class="Comment_images flex">
-            <image wx:if="{{item.source_type==0  && aitem.length>10}}" data-index="{{index}}" src="{{iurl+aitem}}" wx:for="{{item.img}}" wx:for-item="aitem" wx:for-index="i" data-sindex="{{i}}" data-name="img"></image>
-            <image wx:if="{{item.source_type==1 && aitem.length>10}}" src="{{iurl+aitem}}" wx:for-index="i" data-index="{{index}}" wx:for="{{item.weapp_img}}" wx:for-item="aitem" data-sindex="{{i}}" data-name="weapp_img"></image>
-
+            <image src="{{aitem}}" wx:for-index="i" data-index="{{index}}" wx:for="{{item.weapp_img}}" wx:for-item="aitem" data-sindex="{{i}}" data-name="weapp_img"></image>
           </view>
 
           <!-- 商家回复 -->
@@ -95,31 +97,122 @@
       <view class="commodity_evaluate flex jc_sb padding baseline fs26">
         <!-- 商品数量 -->
         <view class="commodity_smy flex">
-          <view>共{{item.goods_num}}件商品</view>
+          <view>共{{item.qty}}件商品</view>
           <!-- 商品总价格 -->
           <view class="flex commodity_money">
             <view>合计:</view>
             <view class="flex baseline xc-wc">
               <view class="fs24">￥</view>
-              <view>{{filter.toFix(item.goods_price,2)}}</view>
+              <view>{{filter.toFix(item.price,2)}}</view>
             </view>
           </view>
         </view>
         <view class="flex">
-          <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level View_evaluation fs24" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">
+          <!-- <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level View_evaluation fs24" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">
             <view>查看订单</view>
-          </navigator>
+          </navigator> -->
 
-          <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level comment_go" url="/packageB/pages/user/view_comment/view_comment?goods_id={{item.goods_id}}&order_id={{item.order_id}}">
+          <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level comment_go" url="/packageB/pages/user/view_comment/view_comment?card=1&goods_id={{item.card_id}}&order_id={{item.order_id}}">
             <view>查看评价</view>
           </navigator>
 
-          <navigator wx:if="{{!item.comment_id}}" bindtap="comment" data-recid="{{item.rec_id}}" class="commodity_To_evaluate flex-level comment_go" url="{{item.comment_id>0?'/packageB/pages/user/add_comment/add_comment?goods_id={{item.goods_id}}&order_id={{item.order_id}}':''}}">
+          <navigator wx:if="{{!item.comment_id}}" bindtap="comment" data-recid="{{item.rec_id}}" class="commodity_To_evaluate flex-level comment_go" url="/packageB/pages/user/add_comment/add_comment?card=1&goods_id={{item.card_id}}&order_id={{item.order_id}}&price={{item.price}}">
             <view class="fs24">去评价</view>
           </navigator>
         </view>
       </view>
     </view>
+		
+		<!-- 商品详情集合 -->
+		<view class="detail_commoditys" wx:else>
+		  <!-- 单个商品 -->
+		  <view>
+		    <navigator class="detail_commodity flex-vertical padding border_bottom" url="{{'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id}}">
+		      <!-- 商品图片 -->
+		      <image src="{{item.original_img}}" binderror="bind_bnerr2" data-errorimg="comments[{{index}}].original_img"></image>
+		      <!-- 商品内容 -->
+		      <view class="Commodity_content">
+		        <view class="Commodity_goods">
+		          <!-- 商品名称 -->
+		          <view class="goods_name ellipsis-2 fs26">{{item.goods_name}}</view>
+		          <!-- 商品规格 -->
+		          <view class="Commodity_spec fs20">
+		            <view class="flex-center">{{item.goods_color+item.goods_spec.length>-1?item.goods_color+item.goods_spec:'规格1'}}</view>
+		          </view>
+		        </view>
+		        <!-- 商品价格数量 -->
+		        <view class="Commodity_money flex-vertical-between baseline">
+		          <!-- 商品价格 -->
+		          <view class="flex-vertical xc-wc baseline">
+		            <view class="fs20">￥</view>
+		            <view class="fs30">{{filter.toFix(item.goods_price,2)}}</view>
+		          </view>
+		          <view class="fs26">x{{item.goods_num}}</view>
+		
+		        </view>
+		      </view>
+		    </navigator>
+		    <!-- 评论信息 -->
+		    <view class="Commodity_evaluation padding border_bottom" wx:if="{{item.comment_id>0}}">
+		      <!-- 评价星级 -->
+		      <view class="starss flex fs26">
+		        <view class="commen">评价：</view>
+		        <view class="stars">
+		          <image src="{{imaitem>=item.deliver_rank?iurl+'/miniapp/images/StarswhiteUnCk.png':iurl+'/miniapp/images/StarsredCk.png'}}" data-ind="{{imaitem}}" data-oo="{{item.deliver_rank}}" wx:for="{{5}}" wx:for-index="imaitem" wx:for-item="{{item_start}}"></image>
+		        </view>
+		      </view>
+		      <!-- 评价内容 -->
+		      <view class="Comment_content ellipsis-2 fs24">{{item.content.length>0?item.content:'此用户没有填写评论'}}</view>
+		      <view class="Comment_images flex">
+							<image wx:if="{{item.source_type==0  && aitem.length>10}}" data-index="{{index}}" src="{{iurl+aitem}}" wx:for="{{item.img}}" wx:for-item="aitem" wx:for-index="i" data-sindex="{{i}}" data-name="img"></image>
+							<image wx:if="{{item.source_type==1 && aitem.length>10}}" src="{{iurl+aitem}}" wx:for-index="i" data-index="{{index}}" wx:for="{{item.weapp_img}}" wx:for-item="aitem" data-sindex="{{i}}" data-name="weapp_img"></image>
+
+		      </view>
+		
+		      <!-- 商家回复 -->
+		      <view class="reply rel" wx:if="{{item.replay_list}}">
+		        <view class="line_bulge"></view>
+		        <view class="shop-reply fs26">店家回复: </view>
+		        <view class="shop-font fs24" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="{{index}}">
+		          {{r_item.content}}
+		        </view>
+		      </view>
+		
+		
+		      <!-- 评价时间 -->
+		      <view class="fs24 xc-ash comment_addtime flex-vertical">{{item.comment_addtime}}</view>
+		    </view>
+		  </view>
+		  <!-- 去评价 -->
+		  <view class="commodity_evaluate flex jc_sb padding baseline fs26">
+		    <!-- 商品数量 -->
+		    <view class="commodity_smy flex">
+		      <view>共{{item.goods_num}}件商品</view>
+		      <!-- 商品总价格 -->
+		      <view class="flex commodity_money">
+		        <view>合计:</view>
+		        <view class="flex baseline xc-wc">
+		          <view class="fs24">￥</view>
+		          <view>{{filter.toFix(item.goods_price,2)}}</view>
+		        </view>
+		      </view>
+		    </view>
+		    <view class="flex">
+		      <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level View_evaluation fs24" url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">
+		        <view>查看订单</view>
+		      </navigator>
+		
+		      <navigator wx:if="{{item.comment_id}}" class="commodity_To_evaluate flex-level comment_go" url="/packageB/pages/user/view_comment/view_comment?goods_id={{item.goods_id}}&order_id={{item.order_id}}">
+		        <view>查看评价</view>
+		      </navigator>
+		
+		      <navigator wx:if="{{!item.comment_id}}" bindtap="comment" data-recid="{{item.rec_id}}" class="commodity_To_evaluate flex-level comment_go" url="{{item.comment_id>0?'/packageB/pages/user/add_comment/add_comment?goods_id={{item.goods_id}}&order_id={{item.order_id}}':''}}">
+		        <view class="fs24">去评价</view>
+		      </navigator>
+		    </view>
+		  </view>
+		</view>
+		
   </view>
 
   <view class="get_bottom fs26" wx:if="{{comments.length>0 && is_no_more}}">已经加载到底部</view>
diff --git a/packageB/pages/user/view_comment/view_comment.js b/packageB/pages/user/view_comment/view_comment.js
index 0764c07..f826ea7 100644
--- a/packageB/pages/user/view_comment/view_comment.js
+++ b/packageB/pages/user/view_comment/view_comment.js
@@ -28,7 +28,8 @@ Page({
     var th = this;
     th.setData({
       goods_id: options.goods_id,
-      order_id: options.order_id
+      order_id: options.order_id,
+			options: options,
     })
     th.query_comment();
   },
@@ -41,10 +42,17 @@ Page({
   },
   query_comment: function() {
     var th = this;
+		let url = '';
     wx.showLoading({
       title: '加载中'
     })
-    var url = "/api/weshop/comment/list";
+		
+		if(this.data.options.card == 1) { // 卡项订单
+			url = `/api/weshop/serviceComment/list?card_id=${this.data.goods_id}`;
+		} else {
+			url = '/api/weshop/comment/list';
+		}
+
     getApp().request.promiseGet(url, {
       data: {
         store_id: a.stoid,
@@ -105,7 +113,7 @@ Page({
     if (image != "") {
       image = imgArr[0].weapp_img[index];
       wx.previewImage({
-        current: iurl + image,
+        current: image,
         //当前图片地址
         urls: imgArr[0].weapp_img, //所有要预览的图片的地址集合 数组形式
       })
@@ -117,6 +125,8 @@ Page({
         urls: imgArr[0].img, //所有要预览的图片的地址集合 数组形式
       })
     }
+		
+		
   },
   goto: function(e) {
     var th = this;
diff --git a/packageB/pages/user/view_comment/view_comment.wxml b/packageB/pages/user/view_comment/view_comment.wxml
index c74b53f..82bf871 100644
--- a/packageB/pages/user/view_comment/view_comment.wxml
+++ b/packageB/pages/user/view_comment/view_comment.wxml
@@ -1,12 +1,40 @@
 <view class="commoditymax" wx:for="{{comment}}" wx:if="{{index==0}}" wx:for-item="item">
   <!-- 商品评价 -->
   <view class='commodity'>
-    <!-- 商品信息 -->
-    <navigator class='information flex-vertical' url="{{'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id}}">
+		<!-- 卡项 -->
+		<navigator class='information flex-vertical' url="{{'/packageA/pages/goodsInfo/goodsInfo?goods_id='+options.goods_id}}" wx:if="{{options.card == 1}}">
+		  <image src="{{iurl+item.img_url}}" binderror="bind_bnerr2" data-errorimg="item.img_url"></image>
+		  <view class="goods_name xc-black">
+		    <!-- 商品名称 -->
+				<view class='ellipsis-2 fs32'>{{item.service_name}}</view>
+		    
+		    <!-- 商品价格，数量 -->
+		    <view class='flex jc_sb balin'>
+		      <!-- 价格 -->
+		      <view class='flex-vertical balin'>
+		        <view class="fs24">￥</view>
+						<view class="fs35">{{item.price}}</view>
+		      </view>
+		
+		      <!-- 商品数量 -->
+		      <view class='sum flex-vertical balin xc-black'>
+		        <view class="fs24">x</view>
+						<view class="fs28">{{item.qty}}</view>
+		      </view>
+		
+		    </view>
+		
+		  </view>
+		
+		</navigator>
+		
+    <!-- 其他商品 -->
+    <navigator class='information flex-vertical' url="{{'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id}}" wx:else>
       <image src="{{iurl+item.original_img}}" binderror="bind_bnerr2" data-errorimg="item.original_img"></image>
       <view class="goods_name xc-black">
         <!-- 商品名称 -->
-        <view class='ellipsis-2 fs32'>{{item.goods_name}}</view>
+				<view class='ellipsis-2 fs32'>{{item.goods_name}}</view>
+        
         <!-- 商品价格，数量 -->
         <view class='flex jc_sb balin'>
           <!-- 价格 -->
@@ -35,8 +63,16 @@
         <!-- 评论图片集合 -->
         <view class="images">
           <block wx:if="{{item.weapp_img!=''}}">
-            <image class="rel" catchtap="previewImg" data-index="{{index}}" src="{{iurl+item}}" wx:for="{{item.weapp_img}}" lazy-load="true">
-            </image>
+						<!-- 卡项 -->
+						<block wx:if="{{options.card == 1}}" >
+							<image class="rel" catchtap="previewImg" data-index="{{index}}" src="{{item}}" wx:for="{{item.weapp_img}}" lazy-load="true"></image>
+						</block>
+						
+						<!-- 其他商品 -->
+						<block wx:else>
+							<image class="rel" catchtap="previewImg" data-index="{{index}}" src="{{iurl+item}}" wx:for="{{item.weapp_img}}" lazy-load="true"></image>
+						</block>
+						
           </block>
           <block wx:else>
             <image wx:if="{{item.img!=''}}" class="rel" catchtap="previewImg" data-index="{{index}}" src="{{iurl+item}}" wx:for="{{item.img}}" lazy-load="true">
@@ -68,7 +104,7 @@
         </view>
       </view>
 
-      <view class="score-item flex-vertical">
+      <view class="score-item flex-vertical" wx:if="{{!options.card}}">
         <view class="fs24">物流服务</view>
         <view class="stars flex-vertical">
           <view class="flex-vertical" wx:for="{{5}}" wx:for-item="deliver" wx:for-index="deliver">
@@ -91,14 +127,17 @@
   </view>
 </view>
 <!-- 是否匿名评价 -->
-<view class="Whether" wx:if="{{comment.length>0}}">
-  <view class="Submission flex-level ">
-    <view class="fs30 flex-level white " bindtap="goto" data-url="/packageB/pages/user/comment/comment">评价其他</view>
-  </view>
-  <view class="flex-level" wx:if="{{is_act}}">
-    <view class="fs30 flex-level white receive" data-url="/pages/giftpack/evaluategift/evaluategift?actId={{actId}}&orderNumber={{order_id}}&orderGoodsId={{goods_id}}&giftBagId={{giftBagId}}" bindtap="goto">点击领取礼品</view>
-  </view>
-</view>
+<block wx:if="{{!options.card}}">
+	<view class="Whether" wx:if="{{comment.length>0}}">
+	  <view class="Submission flex-level ">
+	    <view class="fs30 flex-level white " bindtap="goto" data-url="/packageB/pages/user/comment/comment">评价其他</view>
+	  </view>
+	  <view class="flex-level" wx:if="{{is_act}}">
+	    <view class="fs30 flex-level white receive" data-url="/pages/giftpack/evaluategift/evaluategift?actId={{actId}}&orderNumber={{order_id}}&orderGoodsId={{goods_id}}&giftBagId={{giftBagId}}" bindtap="goto">点击领取礼品</view>
+	  </view>
+	</view>
+</block>
+
 
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
diff --git a/packageB/pages/user/view_comment/view_comment.wxss b/packageB/pages/user/view_comment/view_comment.wxss
index ed974d5..478fca3 100644
--- a/packageB/pages/user/view_comment/view_comment.wxss
+++ b/packageB/pages/user/view_comment/view_comment.wxss
@@ -69,11 +69,12 @@ page{
   margin-bottom: 15rpx;
 }
 .comment{
-   overflow: hidden;
+	word-break: break-all;
+  /* overflow: hidden;
   text-overflow: ellipsis;
   display: -webkit-box;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
+  -webkit-line-clamp: 3; */
 }
 .addComment .addimages .images {
   height: 140rpx;
diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
index ccc853c..3a1f24b 100644
--- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
+++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
@@ -121,22 +121,22 @@ Page({
         tabs: ['门店自提', '快递邮寄'],
         currentTabIndex: 1,
 
-        in_zhact_gdmap:{}, //不同门店参与同一活动的限购
-        hid_inp:1,
-        user_note:{},
-        zuhe_map_good:{},
+        in_zhact_gdmap: {}, //不同门店参与同一活动的限购
+        hid_inp: 1,
+        user_note: {},
+        zuhe_map_good: {},
     },
-		
+
     onLoad: function (t) {
-        wx.setNavigationBarTitle({title: "填写订单",})
+        wx.setNavigationBarTitle({ title: "填写订单", })
         var th = this;
-        this.setData({is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow,});
+        this.setData({ is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow, });
         th.data.param = t;
         //清理一下，确保最新的系统配置
         getApp().globalData.config2 = null;
         //清空is_pick_up
         getApp().request.put("/api/weshop/useraddress/updatePickUp", {
-            data: {user_id: getApp().globalData.user_id, is_pickup: 0},
+            data: { user_id: getApp().globalData.user_id, is_pickup: 0 },
             success: function (s) {
             }
         });
@@ -144,7 +144,7 @@ Page({
 
     },
     onUnload: function () {
-        this.setData({isclose: 1})
+        this.setData({ isclose: 1 })
     },
     onHide: function () {
         this.setData({
@@ -157,7 +157,7 @@ Page({
     //----------子页返回父页触发----------
     onShow: function () {
         var th = this;
-        th.setData({show_submit: 0}); //让提交先掩藏
+        th.setData({ show_submit: 0 }); //让提交先掩藏
         th.data.g_cart_q_time = null;
 
         if (th.data.isclose == 0) {
@@ -190,20 +190,20 @@ Page({
                 th.data.is_summit_ing = 0;
                 //更换地址回来要重新调用计算价钱的接口
                 if (!th.data.user_addr || th.data.user_addr.address_id != ie.address_id) {
-                    th.setData({user_addr: ie});
+                    th.setData({ user_addr: ie });
                     if (th.data.is_b_now == 1) {
                         if (th.data.bn_goods) {
-                            th.setData({add_back: 1});
+                            th.setData({ add_back: 1 });
                             //th.calculatePrice2();
                         }
                     } else {
                         if (th.data.cartlist) {
-                            th.setData({add_back: 1});
+                            th.setData({ add_back: 1 });
                             //th.calculatePrice();
                         }
                     }
                 } else {
-                    th.setData({user_addr: ie});
+                    th.setData({ user_addr: ie });
                 }
                 var going = 0;
 
@@ -257,34 +257,34 @@ Page({
                 //-- 获取所有的等级卡, --
                 getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?storeId=" + os.stoid,
                     {}).then(res => {
-                    if (res.data.code == 0) {
-                        var plusCard = res.data.data;
-                        //-- 循环判断，拿到最贵的那张卡 --
-                        for (var ih in plusCard) {
-                            if (plusCard[ih].IsStopBuy == true) {
-                                continue;
-                            }
-                            if (max_price < 0) {
-                                max_price = plusCard[ih].CardFee;
-                                name = 'card' + plusCard[ih]['CorrPrice'];
-                                show_card = plusCard[ih];
-                            } else {
-                                if (max_price < plusCard[ih].CardFee) {
+                        if (res.data.code == 0) {
+                            var plusCard = res.data.data;
+                            //-- 循环判断，拿到最贵的那张卡 --
+                            for (var ih in plusCard) {
+                                if (plusCard[ih].IsStopBuy == true) {
+                                    continue;
+                                }
+                                if (max_price < 0) {
                                     max_price = plusCard[ih].CardFee;
                                     name = 'card' + plusCard[ih]['CorrPrice'];
                                     show_card = plusCard[ih];
+                                } else {
+                                    if (max_price < plusCard[ih].CardFee) {
+                                        max_price = plusCard[ih].CardFee;
+                                        name = 'card' + plusCard[ih]['CorrPrice'];
+                                        show_card = plusCard[ih];
+                                    }
                                 }
                             }
-                        }
 
-                        if (show_card) {
-                            name = name.toLowerCase();
-                            th.setData({card_name: name, show_card: show_card})
+                            if (show_card) {
+                                name = name.toLowerCase();
+                                th.setData({ card_name: name, show_card: show_card })
+                            }
                         }
-                    }
-                    //-----先获取物流，再获取用户信息，再展示页面-----
-                    th.get_wuliu(th.get_info(th.show_page));
-                })
+                        //-----先获取物流，再获取用户信息，再展示页面-----
+                        th.get_wuliu(th.get_info(th.show_page));
+                    })
             } else {
                 //-----先获取物流，再获取用户信息，再展示页面-----
                 th.get_wuliu(th.get_info(th.show_page));
@@ -303,10 +303,10 @@ Page({
             if (th.data.is_default_logistics) {
                 //如果第一个不是开启默认，说明要让用户自己选
                 if (!e[0].is_default) {
-                    th.setData({is_default_logistics: 0});
+                    th.setData({ is_default_logistics: 0 });
                 }
             }
-            th.setData({wu_arr: e})
+            th.setData({ wu_arr: e })
             typeof func == "function" && func();
         })
     },
@@ -320,7 +320,7 @@ Page({
     getuser_addr: function (func) {
         var th = this;
         a.get("/api/weshop/useraddress/page", {
-            data: {user_id: to.globalData.user_id, store_id: oo.stoid, pageSize: 600, t: Math.random()},
+            data: { user_id: to.globalData.user_id, store_id: oo.stoid, pageSize: 600, t: Math.random() },
             success: function (su) {
                 /*---
                  var user_addr=[
@@ -345,7 +345,7 @@ Page({
                 }
 
                 if (item == undefined) item = null;
-                if (!item) th.setData({user_addr: null});  //地址为空的时候，要清空，因为返回的时候，有缓存
+                if (!item) th.setData({ user_addr: null });  //地址为空的时候，要清空，因为返回的时候，有缓存
 
                 func(item);
             }
@@ -360,19 +360,19 @@ Page({
         //会员的信息，要获取最新
         var user = getApp().globalData.userInfo;
         getApp().request.get("/api/weshop/users/get/" + oo.stoid + "/" + user.user_id, {
-            data: {r: Math.random()},
+            data: { r: Math.random() },
             success: function (e) {
                 getApp().globalData.userInfo = e.data.data;
-                th.setData({userinfo: e.data.data});
+                th.setData({ userinfo: e.data.data });
 
                 //选获取地址
                 th.getuser_addr(function (addr) {
-                    th.setData({user_addr: addr});
+                    th.setData({ user_addr: addr });
                     //--------------------------立即购买------------------
                     if (ta.is_bnow == 1) {
                         //读取门店
                         to.get_allsto(function (e) {
-                            th.setData({allsto: e});
+                            th.setData({ allsto: e });
                             //获取立即购买的商品信息
                             th.get_buy_goods(ta.goods_id);
                         });
@@ -380,7 +380,7 @@ Page({
                         //------------------------购物车结算----------------------
                         //读取门店
                         to.get_allsto(function (e) {
-                            th.setData({allsto: e});
+                            th.setData({ allsto: e });
                             //-------获取购物车已经选择的商品--------
                             th.get_cart();
                         })
@@ -389,12 +389,12 @@ Page({
 
                 //获取提现金额
                 getApp().request.get("/api/weshop/withdrawals/summoney", {
-                    data: {user_id: to.globalData.user_id, store_id: oo.stoid, status: 0},
+                    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});
+                            th.setData({ txmon: su.data.data.summoney, yuer: yuer });
                         }
                     }
                 });
@@ -418,7 +418,7 @@ Page({
                 var arr = new Array();
                 var carr = su.data.data.pageData;
                 th.data.cartlist_y = carr;  //存储原始购物车列表
-                th.data.in_zhact_gdmap={};
+                th.data.in_zhact_gdmap = {};
 
                 //---是不是购买等级卡成功的返回---等级卡显示的判断---
                 var is_card_back = getApp().globalData.is_card_back;
@@ -427,7 +427,7 @@ Page({
                     var item1 = carr[i];
                     //把已经购买了多少见的内容填入
 
-                    var goodsbuynum=0,promgoodsbuynum=0;
+                    var goodsbuynum = 0, promgoodsbuynum = 0;
                     //--要获得商品，该用户买了多少件,同步应用--
                     await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
                         data: {
@@ -445,7 +445,7 @@ Page({
                         goodsbuynum = buy_num_data.goodsbuynum;
                     })
                     //如果有购买活动
-                    item1.promgoodsbuynum=promgoodsbuynum;
+                    item1.promgoodsbuynum = promgoodsbuynum;
 
                     //要把优惠活动加入,prom_goods_map中,赠品不要运算
                     if (item1.prom_type == 3 && item1.is_gift != 1) {
@@ -455,9 +455,9 @@ Page({
                     //要把组合购的东西拿出来算一下
                     if (item1.prom_type == 7) {
                         var isok = 1;
-                        var is_flag=1;
+                        var is_flag = 1;
                         //如果有组合购
-                        var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id+'/'+getApp().globalData.userInfo.user_id;
+                        var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + item1.prom_id + '/' + getApp().globalData.userInfo.user_id;
                         await getApp().request.promiseGet(url, {}).then(res => {
                             if (res.data.code == 0 && res.data.data) {
                                 //如果活动已经结束
@@ -488,16 +488,16 @@ Page({
                             data: req_data
                         }).then(res => {
                             if (ut.ajax_ok(res)) {
-                               var gdlist = res.data.data.pageData;
-                                gdlist.forEach(i=>{
-                                    if(item1.goods_id==i.goods_id&&!is_flag){
-                                        item1.prom_type=0;
-                                        item1.prom_type1=0;
-                                        item1.prom_id=0;
-                                        item1.prom_id1=0
+                                var gdlist = res.data.data.pageData;
+                                gdlist.forEach(i => {
+                                    if (item1.goods_id == i.goods_id && !is_flag) {
+                                        item1.prom_type = 0;
+                                        item1.prom_type1 = 0;
+                                        item1.prom_id = 0;
+                                        item1.prom_id1 = 0
                                     }
                                 })
-                                th.data.zuhe_map_good[item1.prom_id]=gdlist; 
+                                th.data.zuhe_map_good[item1.prom_id] = gdlist;
                             }
                         })
                     }
@@ -532,7 +532,7 @@ Page({
 
                     item.original_img = oo.imghost + item.original_img;
 
-                    var car_item=item;
+                    var car_item = item;
                     /*----接口要弄出来的，先顶着-----*/
                     var pcid = car_item.pick_id;
                     var find = 0;
@@ -560,7 +560,7 @@ Page({
                                         break;
                                 }
                                 arr[j].exp_type = e_t;
-                                if (e_t == 0) th.setData({is_all_zt: 0});
+                                if (e_t == 0) th.setData({ is_all_zt: 0 });
                                 //}
 
                                 //-- 把等级卡会优惠多少钱装进去 --
@@ -603,7 +603,7 @@ Page({
                                 break;
                         }
                         //如果是物流的话，全部自提的控制要弄成0
-                        if (e_t == 0) th.setData({is_all_zt: 0});
+                        if (e_t == 0) th.setData({ is_all_zt: 0 });
 
                         var narr = new Array();
                         narr.push(car_item);
@@ -662,11 +662,11 @@ Page({
                     var offline_price = 0;
                     var offline_num = 0;
                     for (var c = 0; c < item.length; c++) {
-                        if(th.data.sales_rules!=2){
-                            item[c].offline_price=0;
+                        if (th.data.sales_rules != 2) {
+                            item[c].offline_price = 0;
                         }
                         //-- 如果这个商品是线下取价的时候 --
-                        if (item[c].offline_price > 0 && item[c].prom_type != 7 ) {
+                        if (item[c].offline_price > 0 && item[c].prom_type != 7) {
                             offline_price += (item[c].goods_price - item[c].offline_price) * item[c].goods_num;
                             offline_num += item[c].goods_num;
                         }
@@ -689,10 +689,10 @@ Page({
                     //存储不同活动的商品列表
                     u_item.zh_prom_goods = {};
                     for (let var1 in obj) {
-                        var h_item=obj[var1];
-				   	    var gdlist= th.data.zuhe_map_good[h_item.prom_id];
-						//获取活动需要的商品列表
-						// u_item.zh_prom_goods[h_item.prom_id]=gdlist;
+                        var h_item = obj[var1];
+                        var gdlist = th.data.zuhe_map_good[h_item.prom_id];
+                        //获取活动需要的商品列表
+                        // u_item.zh_prom_goods[h_item.prom_id]=gdlist;
                         // var h_item = obj[var1];
                         // var gdlist = null;
                         // var url1 = "/api/weshop/prom/zhbuyGoods/page";
@@ -710,7 +710,7 @@ Page({
                         //     }
                         // })
                         //获取活动需要的商品列表
-                        u_item.zh_prom_goods[h_item.prom_id] = {gdlist: gdlist, act: h_item.act};
+                        u_item.zh_prom_goods[h_item.prom_id] = { gdlist: gdlist, act: h_item.act };
                     }
                     zh_calc.fir_set_arr(u_item, th);
                 }
@@ -723,7 +723,7 @@ Page({
                 setTimeout(function () {
                     var frozenQuan = null;
                     var url0 = "/api/weshop/users/frozenQuan/listFrozenQuan/" + app.globalData.user_id;
-                    app.request.promiseGet(url0, {1: 1}).then(res => {
+                    app.request.promiseGet(url0, { 1: 1 }).then(res => {
                         if (res.data.code == 0) {
                             frozenQuan = res.data.data;
                             th.data.frozenQuan = frozenQuan;
@@ -794,7 +794,7 @@ Page({
                         th.data.card_name = th.data.userinfo.card_field;
                         gg.goods_price = gd[th.data.card_name];
                         getApp().globalData.is_card_back = 0;
-                        th.setData({card_cut_price: 0});
+                        th.setData({ card_cut_price: 0 });
                         //如果是秒杀的返回
                         if (gd.prom_type == 1) gd.prom_type = 0;
                     } else {
@@ -802,13 +802,13 @@ Page({
                         //-- 搭配购的商品也可以单独购买，所以此时搭配购的商品要进行计算优惠 --
                         if (!gg.collocation_goods && gd['prom_type'] != 6 && th.data.card_name && gd[th.data.card_name] > 0 && gg.goods_price > gd[th.data.card_name] && !th.data.userinfo.card_field) {
                             var cut_p = (gg.goods_price - gd[th.data.card_name]) * gg.goods_num;
-                            th.setData({card_cut_price: cut_p});
+                            th.setData({ card_cut_price: cut_p });
                         }
                     }
 
 
-                        gd.prom_type=gg.prom_type;
-                        gd.prom_id=gg.prom_id;
+                    gd.prom_type = gg.prom_type;
+                    gd.prom_id = gg.prom_id;
 
                     switch (gd.prom_type) {
                         case 0:
@@ -872,7 +872,7 @@ Page({
                                             ob.exp_sum_type = data.gift_exp_sum_type;  //商品的物流计算方式
                                             ob.uniform_exp_sum = data.gift_uniform_exp_sum  //统一运费的金额
 
-                                            th.setData({buy_now_gift_goods: ob});
+                                            th.setData({ buy_now_gift_goods: ob });
                                         }
                                     }
 
@@ -900,7 +900,7 @@ Page({
                                         t.data.data.guide_id = gg.guide_id;
                                         t.data.data.guide_type = gg.guide_type;
                                     }
-                                    th.setData({collocation_goods: gg.collocation_goods});
+                                    th.setData({ collocation_goods: gg.collocation_goods });
 
                                     var cart_arr = new Array();
                                     //var narr=gg.collocation_goods;
@@ -915,7 +915,7 @@ Page({
                                     for (var hi in narr) {
                                         var dis_t = narr[hi].distr_type;
                                         if (dis_t == 2) {
-                                            th.setData({is_all_zt: 0});
+                                            th.setData({ is_all_zt: 0 });
                                             et = 0;
                                         }
                                         if (dis_t > 0) {
@@ -957,7 +957,7 @@ Page({
                                 if (gg.prom_type == 5) {
                                     var frozenQuan = null;
                                     var url0 = "/api/weshop/users/frozenQuan/listFrozenQuan/" + app.globalData.user_id;
-                                    app.request.promiseGet(url0, {1: 1}).then(res => {
+                                    app.request.promiseGet(url0, { 1: 1 }).then(res => {
                                         if (res.data.code == 0) {
                                             frozenQuan = res.data.data;
                                             th.data.frozenQuan = frozenQuan;
@@ -978,13 +978,13 @@ Page({
                         case 1: //---秒杀-----
                             var quanlist = null;
                             getApp().request.get("/api/weshop/activitylist/getSJGoodsPriceNew/" + gd.store_id
-                                + "/" + gd.goods_id + "/1/" + gd.prom_id+"/"+app.globalData.user_id, {
+                                + "/" + gd.goods_id + "/1/" + gd.prom_id + "/" + app.globalData.user_id, {
                                 success: async function (tt) {
                                     if (tt.data.code == 0) {
                                         //t.data.data.shop_price = tt.data.data.prom_price;
                                         t.data.data.shop_price = tt.data.data.prom_user_price;
-                                        th.data.ckeck_quan_price=0;
-                                        gd.is_xz_yh=1;
+                                        th.data.ckeck_quan_price = 0;
+                                        gd.is_xz_yh = 1;
                                     } else {
                                         t.data.data.prom_id = 0;
                                         t.data.data.prom_type = 0;
@@ -1006,7 +1006,7 @@ Page({
                                     //计算价格
                                     th.calculatePrice2();
                                     //获取优惠券,如果有券的钱，就调用
-                                    if(th.data.ckeck_quan_price>0)  th.get_buy_now_quan();
+                                    if (th.data.ckeck_quan_price > 0) th.get_buy_now_quan();
                                 }
                             });
 
@@ -1014,7 +1014,7 @@ Page({
 
                         case 2: //--- 团购 ---
                             var quanlist = null;
-                            getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +gd.goods_id+"/"+ gd.prom_id, {
+                            getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gd.goods_id + "/" + gd.prom_id, {
                                 success: async function (tt) {
                                     if (tt.data.code == 0) {
                                         //t.data.data.shop_price = tt.data.data.prom_price;
@@ -1024,12 +1024,12 @@ Page({
                                         t.data.data.prom_type = 0;
                                     }
 
-                                    if(tt.data.data.isQuan){
+                                    if (tt.data.data.isQuan) {
                                         th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num;
                                         th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + "";
                                         th.data.check_quan_ware_list = t.data.data.erpwareid + "";
-                                    }else{
-                                        gd.is_xz_yh=1;
+                                    } else {
+                                        gd.is_xz_yh = 1;
                                     }
 
                                     th.setData({
@@ -1045,7 +1045,7 @@ Page({
                                     //-- 计算价格 --
                                     th.calculatePrice2();
                                     //获取优惠券,如果有券的钱，就调用
-                                    if(th.data.ckeck_quan_price>0)  th.get_buy_now_quan();
+                                    if (th.data.ckeck_quan_price > 0) th.get_buy_now_quan();
                                 }
                             });
 
@@ -1060,14 +1060,14 @@ Page({
     checkAddressList: function () {
         var t = this;
         return !(!this.data.order || null == this.data.order.userAddress) || (wx.showModal({
-                title: "请先填写或选择收货地址~",
-                success: function (a) {
-                    a.confirm ? t.enterAddressPage() : wx.navigateBack();
-                },
-                fail: function () {
-                    wx.navigateBack();
-                }
-            }), !1);
+            title: "请先填写或选择收货地址~",
+            success: function (a) {
+                a.confirm ? t.enterAddressPage() : wx.navigateBack();
+            },
+            fail: function () {
+                wx.navigateBack();
+            }
+        }), !1);
     },
     showInvoice: function () {
         this.setData({
@@ -1086,7 +1086,7 @@ Page({
     },
     keyUpChangeNum: function (t) {
         var index = t.currentTarget.dataset.index;
-        var txt="user_note."+index;
+        var txt = "user_note." + index;
         this.setData({
             maxWord: t.detail.value.length,
             [txt]: t.detail.value
@@ -1176,7 +1176,7 @@ Page({
                         }
 
                         var pt_res = null;
-                        await  getApp().request.promisePost("/api/weshop/order/getGoodsSplit", {
+                        await getApp().request.promisePost("/api/weshop/order/getGoodsSplit", {
                             is_json: 1,
                             data: pt_data
                         }).then(res => {
@@ -1231,11 +1231,11 @@ Page({
                     if (item_map.s_coupon_id) {
                         if (!cart_item.s_coupon_id) {
                             cart_item.s_coupon_id = item_map.s_coupon_id + "";
-                            cart_item.g_coupon_num = [{'c_id': item_map.s_coupon_id, "num": item_map.s_coupon_num}];
+                            cart_item.g_coupon_num = [{ 'c_id': item_map.s_coupon_id, "num": item_map.s_coupon_num }];
                         }
                         else {
                             cart_item.s_coupon_id += "," + item_map.s_coupon_id;
-                            cart_item.g_coupon_num.push({'c_id': item_map.s_coupon_id, "num": item_map.s_coupon_num})
+                            cart_item.g_coupon_num.push({ 'c_id': item_map.s_coupon_id, "num": item_map.s_coupon_num })
                         }
                     }
 
@@ -1243,11 +1243,11 @@ Page({
                     if (item_map.s_libao) {
                         if (!cart_item.s_libao) {
                             cart_item.s_libao = item_map.s_libao + "";
-                            cart_item.g_lb_num = [{'l_id': item_map.s_libao, "num": item_map.s_lb_num}];
+                            cart_item.g_lb_num = [{ 'l_id': item_map.s_libao, "num": item_map.s_lb_num }];
                         }
                         else {
                             cart_item.s_libao += "," + item_map.s_libao;
-                            cart_item.g_lb_num.push({'l_id': item_map.s_libao, "num": item_map.s_lb_num})
+                            cart_item.g_lb_num.push({ 'l_id': item_map.s_libao, "num": item_map.s_lb_num })
                         }
                     }
                 }
@@ -1272,7 +1272,7 @@ Page({
                 var all_cutprice = 0;        //所有的优惠减
                 var all_zh_cutprice = 0;     //所有的组合优惠减
                 var all_order_prom = 0;      //所有的订单优惠
-                var out_of_weight=0; //超出多少重量
+                var out_of_weight = 0; //超出多少重量
                 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 weight_free = ee.weight_free;   //多少kg内包邮
@@ -1283,7 +1283,7 @@ Page({
                 if (no_ex_id && freight_free > 0) {
                     //-----------获取不包邮区域，不包邮商品-------
                     await getApp().request.promiseGet("/api/weshop/areaFeemail/getAreaGoods", {
-                        data: {store_id: os.stoid, id: no_ex_id}
+                        data: { store_id: os.stoid, id: no_ex_id }
                     }).then(res => {
                         if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
                             by_qc = res.data.data[0];
@@ -1303,7 +1303,7 @@ Page({
                 //调用函数计算每件商品的单价
                 await th.calc_per(c_arr);
                 //调用函数计算每件组合购商品的单价,
-                await zh_calc.calc_zh_split_price(c_arr,th);
+                await zh_calc.calc_zh_split_price(c_arr, th);
                 //调用函数计算，优惠券优惠什么商品价格，优惠券优惠什么商品
                 await th.get_cart_quan(c_arr);
                 //---循环购物车---
@@ -1326,7 +1326,7 @@ Page({
                     var cart_item = c_arr[i];      //就是每一单的意思
                     var pickid = cart_item.pickup_id;
                     var o_price = 0;
-                    var o_price_no_zh=0;  //参与订单优惠叠加--组合购的金额汇总
+                    var o_price_no_zh = 0;  //参与订单优惠叠加--组合购的金额汇总
                     var o_shipping_price = 0, goods_weight = -1, goods_piece = -1;
                     var item = c_arr[i].goods;   //就是每一单的从表的意思
 
@@ -1334,8 +1334,8 @@ Page({
                     var quan_price = 0;
                     var coupon_price = 0;
                     var quan_no = null;
-                    var is_has_zh=c_arr[i].is_has_zh;
-                    var zh_prom_goods=c_arr[i].zh_prom_goods;  //组合购计算的原始数据存储空间
+                    var is_has_zh = c_arr[i].is_has_zh;
+                    var zh_prom_goods = c_arr[i].zh_prom_goods;  //组合购计算的原始数据存储空间
 
                     if (th.data.using_quan[pickid] != null && th.data.using_quan[pickid] != undefined)
                         quan_no = th.data.using_quan[pickid].coupon_no;
@@ -1363,43 +1363,42 @@ Page({
 
                     //--------循环计算总价-----------
                     for (var j = 0; j < item.length; j++) {
-                        if(item[j].prom_type!=7){
+                        if (item[j].prom_type != 7) {
                             o_price_no_zh += item[j].goods_price * item[j].goods_num;
                         }
                         //组合购的商品，且有订单优惠的叠加,is_orderyh就是优惠叠加
-                        else if(zh_prom_goods && zh_prom_goods[item[j].prom_id] && zh_prom_goods[item[j].prom_id].act.is_orderyh )
-                        {
+                        else if (zh_prom_goods && zh_prom_goods[item[j].prom_id] && zh_prom_goods[item[j].prom_id].act.is_orderyh) {
                             o_price_no_zh += item[j].goods_price * item[j].goods_num;
                         }
                         o_price += item[j].goods_price * item[j].goods_num;
 
                         //判断是否有设置限制重量包邮
-                        if(item[j]['is_past']!==1 && item[j]['exp_sum_type']==2){
+                        if (item[j]['is_past'] !== 1 && item[j]['exp_sum_type'] == 2) {
                             if (goods_weight < 0) goods_weight = 0;
-                                //累积商品重量 每种商品的重量 * 数量
+                            //累积商品重量 每种商品的重量 * 数量
                             goods_weight += item[j]['weight'] * item[j]['goods_num'];
-                            if(weight_free > 0){
-                                out_of_weight = (weight_free*1000) - goods_weight;
+                            if (weight_free > 0) {
+                                out_of_weight = (weight_free * 1000) - goods_weight;
                             }
                         }
                     }
                     //判断是不是有组合购的金额
                     var f_o_price = o_price;
                     //如果又优惠的钱，就要减价
-                    if (c_arr[i].cut_price > 0){
+                    if (c_arr[i].cut_price > 0) {
                         o_price -= c_arr[i].cut_price;
-                        o_price_no_zh-=c_arr[i].cut_price;
+                        o_price_no_zh -= c_arr[i].cut_price;
                     }
                     //如果有组合购优惠的钱，就要减价
-                    if (c_arr[i].zh_cut_price>0 || c_arr[i].zh_cut_price<0){
+                    if (c_arr[i].zh_cut_price > 0 || c_arr[i].zh_cut_price < 0) {
                         o_price -= c_arr[i].zh_cut_price;
-                        if(o_price_no_zh>0){
+                        if (o_price_no_zh > 0) {
                             //找到那些可以订单优惠叠加的
-                            for(let ij in zh_prom_goods){
-                            	let kitem=zh_prom_goods[ij];
-                            	var is_has_zh=kitem.is_has_zh;
-                                if(kitem.act.is_orderyh)
-                                     o_price_no_zh-=kitem.cut_price;
+                            for (let ij in zh_prom_goods) {
+                                let kitem = zh_prom_goods[ij];
+                                var is_has_zh = kitem.is_has_zh;
+                                if (kitem.act.is_orderyh)
+                                    o_price_no_zh -= kitem.cut_price;
                             }
                         }
                     }
@@ -1407,12 +1406,12 @@ Page({
                     //-- 计算线下取价的功能 --
                     if (cart_item.is_offline == 1) {
                         o_price = o_price - cart_item.offline_price;
-                        o_price_no_zh-=c_arr[i].offline_price;
+                        o_price_no_zh -= c_arr[i].offline_price;
                     }
                     //判断包邮券的钱,组合购的商品不使用优惠券
                     var q_conditin = 0;
                     q_conditin = o_price - quan_price;
-                    if(is_has_zh){
+                    if (is_has_zh) {
                         q_conditin = o_price_no_zh - quan_price;
                     }
                     cart_item.goods_price = f_o_price.toFixed(2);      //商品总费用,用f_o_price来计算
@@ -1426,12 +1425,17 @@ Page({
                         if (by_qc.region_list != "" && by_qc.region_list != null && by_qc.region_list != undefined) {
                             if (th.check_by_area(by_qc.region_list)) {
                                 freight_free = 0;
+                                goods_weight = -1;
+                                out_of_weight = 0;
                                 th.data.is_no_by[pickid] = 1;
                             }
                         }
                         //如果有设置不包邮区商品
                         if (by_qc.goods_list != "" && by_qc.goods_list != undefined && by_qc != null && freight_free > 0) {
                             freight_free = 0;
+                            goods_weight = -1;
+                            out_of_weight = 0;
+                            th.data.is_no_by[pickid] = 1;
                             no_ex_good = by_qc.goods_list;
                         }
                     }
@@ -1446,7 +1450,7 @@ Page({
                                     store_id: os.stoid,
                                     isuse: 0,
                                     //condition: q_conditin,
-                                    condition:cart_item.ckeck_quan_price,
+                                    condition: cart_item.ckeck_quan_price,
                                     user_id: getApp().globalData.user_id,
                                     pageSize: 2000
                                 }
@@ -1471,7 +1475,7 @@ Page({
                                     }
                                     if (arr) {
                                         th.data.get_by_quan_list_cart[pickid] = arr;
-                                        th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart});
+                                        th.setData({ get_by_quan_list_cart: th.data.get_by_quan_list_cart });
                                         //if (th.data.is_b_now) {
                                         //    th.setData({get_by_quan_list: arr});
                                         //}
@@ -1496,7 +1500,7 @@ Page({
                                 if (ut.isContained(arr, arr2)) {
                                     getApp().my_warnning("全场不包邮商品和包邮券的重复", 0, th);
                                     th.data.using_quan[pickid] = {};
-                                    th.setData({using_quan: th.data.using_quan})
+                                    th.setData({ using_quan: th.data.using_quan })
                                     return false;
                                 }
                                 var n_arr = ut.mergeArray(arr, arr2);
@@ -1522,7 +1526,7 @@ Page({
                         }
 
                         //如果达到全场包邮的条件，同时，没有地区不包邮，或者商品不包邮
-                        if (o_price - quan_price >= freight_free && freight_free > 0 && !is_good_no_by && th.data.is_no_by[pickid] != 1) {
+                        if (o_price - quan_price >= freight_free && freight_free > 0 && !is_good_no_by && th.data.is_no_by[pickid] != 1 && out_of_weight >= 0) {
                             continue;
                         }
 
@@ -1535,7 +1539,7 @@ Page({
                         if (no_ex_good) no_ex_good_arr = no_ex_good.split(',');
 
                         //----------------如果是选择了物流---------------------
-                        if (cart_item.exp_type == 0 && item[j].is_free_shipping == 0 && (!no_ex_good_arr || no_ex_good_arr.indexOf(item[j].goods_id + '') > -1 )) {
+                        if (cart_item.exp_type == 0 && item[j].is_free_shipping == 0 && (!no_ex_good_arr || no_ex_good_arr.indexOf(item[j].goods_id + '') > -1)) {
 
                             //如果地址不为空
                             if (th.data.user_addr != null) {
@@ -1545,7 +1549,7 @@ Page({
                                         o_shipping_price += item[j]['uniform_exp_sum'];
                                         break;
                                     // case 2:  //1464行已计算 不必重复计算 注释为：判断是否有设置限制重量包邮
-                                     //     +''
+                                    //     +''
                                     //     if (goods_weight < 0) goods_weight = 0;
                                     //     //累积商品重量 每种商品的重量 * 数量
                                     //     goods_weight += item[j]['weight'] * item[j]['goods_num'];
@@ -1559,12 +1563,10 @@ Page({
                                 }
                             }
 
-                        }else{
-                            if(item[j]['exp_sum_type']==2){
-                                if(out_of_weight !==0){
-                                    goods_weight=-1;
-                                    out_of_weight=0;
-                                }
+                        } else {
+                            if (item[j]['exp_sum_type'] == 2 && out_of_weight !== 0) {
+                                goods_weight = -1;
+                                out_of_weight = 0;
                             }
                         }
                     }
@@ -1576,8 +1578,8 @@ Page({
                         if (th.data.wu_arr && th.data.wu_arr[cart_item.wind])
                             code = th.data.wu_arr[cart_item.wind].code;
                         cart_item.shipping_price =
-                            th.calculatewuliu(code, o_shipping_price, goods_weight,out_of_weight,
-                                goods_piece, th.data.user_addr, freight_free, o_price - quan_price, rs);
+                            th.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight,
+                                goods_piece, th.data.user_addr, freight_free, o_price - quan_price, rs, pickid);
 
                         if (!th.data.using_quan[pickid] || th.data.using_quan[pickid].isby != 1) {
                             if (cart_item.shipping_price == 0) th.data.is_by[pickid] = 1; //已经全场包邮，就不要选择券了
@@ -1596,19 +1598,19 @@ Page({
                     var order_prom_id = 0;
                     var o_condition = cart_item.order_amount;
                     //看一下是不是不用组合购的订单优惠的叠加
-                    if(is_has_zh){
-                        o_condition=o_price_no_zh-quan_price;
+                    if (is_has_zh) {
+                        o_condition = o_price_no_zh - quan_price;
                     }
 
                     var order_m = 0;
                     //---判断是不是有订单优惠---
-                    await  getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
-                        data: {store_id: os.stoid, orderAmount: o_condition}
+                    await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
+                        data: { store_id: os.stoid, orderAmount: o_condition }
                     }).then(res => {
                         if (res.data.code == 0) {
                             var ord_prom = res.data.data;
                             //么有使用券，或者活动没有限制使用优惠券
-                            if(quan_price<=0 || !ord_prom.is_xz_yh) {
+                            if (quan_price <= 0 || !ord_prom.is_xz_yh) {
                                 order_prom_id = ord_prom['id'];
                                 switch (ord_prom['type']) {
                                     case 0:
@@ -1749,7 +1751,7 @@ Page({
                 }
             }
             var set_txt = "cartlist[" + iter + "].can_num";
-            th.setData({[set_txt]: num});
+            th.setData({ [set_txt]: num });
         }
     },
 
@@ -1781,10 +1783,10 @@ Page({
 
         allpice = parseFloat(allpice).toFixed(2);
         var txt = "formData.all_price";
-        th.setData({[txt]: allpice,});
+        th.setData({ [txt]: allpice, });
         if (cut_price) {
             var c_txt = "formData.cut_price";
-            th.setData({[c_txt]: cut_price,});
+            th.setData({ [c_txt]: cut_price, });
 
         }
 
@@ -1798,7 +1800,7 @@ Page({
             to.getwuliuprice(async function (rs) {
 
                 var o_shipping_price = 0, goods_weight = -1, goods_piece = -1;
-                var out_of_weight=null; //超出多少重量
+                var out_of_weight = null; //超出多少重量
                 var freight_free = ee.freight_free;   //全场满多少包邮
                 var weight_free = ee.weight_free;   //多少kg内包邮
                 var no_ex_id = ee.no_ex_id;
@@ -1852,7 +1854,7 @@ Page({
                                     arr.push(item);
                                 }
                                 if (arr) {
-                                    th.setData({get_by_quan_list: arr});
+                                    th.setData({ get_by_quan_list: arr });
                                 }
                                 th.data.isget_by_quan[th.data.bn_pick] = 1;
                             }
@@ -1868,8 +1870,8 @@ Page({
                             if (goods_weight < 0) goods_weight = 0;
                             //累积商品重量 每种商品的重量 * 数量
                             goods_weight += good['weight'] * good['buynum'];
-                            if(weight_free > 0){
-                                out_of_weight = (weight_free * 1000 ) - goods_weight;
+                            if (weight_free > 0) {
+                                out_of_weight = (weight_free * 1000) - goods_weight;
                             }
                             break;
                         case 3:
@@ -1881,7 +1883,7 @@ Page({
 
                     var code = "";
                     if (th.data.wu_arr && th.data.wu_arr[th.data.index]) code = th.data.wu_arr[th.data.index].code;
-                    
+
                     th.data.is_no_by[th.data.bn_pick] = 0;
 
                     var no_by_data = null;
@@ -1892,7 +1894,7 @@ Page({
                     if (no_ex_id && freight_free > 0 && freight_free <= parseFloat(allpice) - cut_price - quan_price) {
                         //-----------获取不包邮区域，不包邮商品-------
                         await getApp().request.promiseGet("/api/weshop/areaFeemail/getAreaGoods", {
-                            data: {store_id: os.stoid, id: no_ex_id}
+                            data: { store_id: os.stoid, id: no_ex_id }
                         }).then(res => {
                             if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
                                 no_by_data = res.data.data[0];
@@ -1900,7 +1902,7 @@ Page({
                                 if (res.data.data[0].region_list) {
                                     if (th.check_by_area(res.data.data[0].region_list)) {
                                         freight_free = 0;
-                                        out_of_weight=0;
+                                        out_of_weight = 0;
                                         th.data.is_no_by[th.data.bn_pick] = 1;
                                     }
                                 }
@@ -1908,7 +1910,7 @@ Page({
                                 if (res.data.data[0].goods_list && freight_free) {
                                     if (th.check_by_goods(res.data.data[0].goods_list)) {
                                         freight_free = 0;
-                                        out_of_weight=0;
+                                        out_of_weight = 0;
                                         th.data.is_no_by[th.data.bn_pick] = 1;
                                     }
                                 }
@@ -1919,12 +1921,12 @@ Page({
                     th.data.is_by[th.data.bn_pick] = 0;
                     //--------------开始计算物流------------------
                     var shipping_price =
-                        th.calculatewuliu(code, o_shipping_price, goods_weight,out_of_weight,
-                            goods_piece, th.data.user_addr, freight_free, parseFloat(allpice) - cut_price - quan_price, rs);
+                        th.calculatewuliu(code, o_shipping_price, goods_weight, out_of_weight,
+                            goods_piece, th.data.user_addr, freight_free, parseFloat(allpice) - cut_price - quan_price, rs,th.data.bn_pick);
 
                     //如果有赠品的时候，也要计算赠品的物流费用
                     if (th.data.buy_now_gift_goods) {
-                        shipping_price = th.get_now_gift_goods_wuliu(code, o_shipping_price, th.data.user_addr, gift_freight_free,out_of_weight,
+                        shipping_price = th.get_now_gift_goods_wuliu(code, o_shipping_price, th.data.user_addr, gift_freight_free, out_of_weight,
                             parseFloat(allpice) - cut_price - quan_price, rs, shipping_price, no_by_data, goods_weight, goods_piece);
                     }
 
@@ -1934,18 +1936,18 @@ Page({
 
                     shipping_price = parseFloat(shipping_price).toFixed(2);
                     var wl_txt = "formData.shipping_price";
-                    th.setData({[wl_txt]: shipping_price,})
+                    th.setData({ [wl_txt]: shipping_price, })
 
                 } else {
                     var wl_txt = "formData.shipping_price";
-                    th.setData({[wl_txt]: 0,})
+                    th.setData({ [wl_txt]: 0, })
                 }
 
                 if (quan_no) {
                     if (th.data.using_quan[bn_pick].isby == 1) {
                         shipping_price = 0;
                         var wl_txt = "formData.shipping_price";
-                        th.setData({[wl_txt]: 0,})
+                        th.setData({ [wl_txt]: 0, })
                     }
                 }
                 //-----------------支付价,优惠券不减物流-----------------
@@ -1966,7 +1968,7 @@ Page({
                             var ord_prom = th.data.order_prom[th.data.bn_pick];
 
                             //么有使用券，或者活动没有限制使用优惠券
-                            if(coupon_price<=0 || !ord_prom.is_xz_yh) {
+                            if (coupon_price <= 0 || !ord_prom.is_xz_yh) {
                                 order_prom_id = ord_prom['id'];
                                 switch (ord_prom['type']) {
                                     case 0:
@@ -1984,7 +1986,7 @@ Page({
                         if (order_prom_id > 0) {
                             var order_prom_txt1 = "formData.order_prom_id";
                             var order_prom_txt2 = "formData.order_prom_amount";
-                            th.setData({[order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount})
+                            th.setData({ [order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount })
                         }
 
                         total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
@@ -1994,7 +1996,7 @@ Page({
                         order_m = order_m.toFixed(2);
 
                         var atxt = "formData.total_amount";
-                        th.setData({[atxt]: total_m,})
+                        th.setData({ [atxt]: total_m, })
 
                         var txt = "formData.user_money";
                         var txt2 = "formData.order_amount";
@@ -2004,44 +2006,44 @@ Page({
                         if (th.data.bn_use_money == 1) {
                             if (amoney > order_m) {
                                 order_m = parseFloat(order_m).toFixed(2);
-                                th.setData({[txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1})
+                                th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1 })
                             } else {
                                 order_m = parseFloat(order_m) - parseFloat(amoney);
                                 order_m = order_m.toFixed(2);
-                                th.setData({[txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1})
+                                th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1 })
                             }
                         } else {
-                            th.setData({[txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1})
+                            th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1 })
                         }
                         //优惠活动送积分
                         if (good.s_intValue) {
                             txt = "formData.give_integral";
-                            th.setData({[txt]: good.s_intValue});
+                            th.setData({ [txt]: good.s_intValue });
                         }
                         //优惠送券
                         if (good.s_coupon_id) {
                             var i_txt = "formData.give_coupon_id";
                             //这个是json格式的
                             var i_txt1 = "formData.g_coupon_num";
-                            var ob = [{"num": good.s_coupon_num, "c_id": good.s_coupon_id}];
+                            var ob = [{ "num": good.s_coupon_num, "c_id": good.s_coupon_id }];
                             ob = JSON.stringify(ob);
-                            th.setData({[i_txt]: good.s_coupon_id, [i_txt1]: ob});
+                            th.setData({ [i_txt]: good.s_coupon_id, [i_txt1]: ob });
                         }
                         //优惠礼包
                         if (good.s_libao) {
                             var l_txt = "formData.give_lb_id";
                             //这个是json格式的
                             var l_txt1 = "formData.g_lb_num";
-                            var ob = [{"num": good.s_lb_num, "l_id": good.s_libao}];
+                            var ob = [{ "num": good.s_lb_num, "l_id": good.s_libao }];
                             ob = JSON.stringify(ob);
-                            th.setData({[l_txt]: good.s_libao, [l_txt1]: ob});
+                            th.setData({ [l_txt]: good.s_libao, [l_txt1]: ob });
                         }
                     })
                 } else {
 
                     var order_prom_txt1 = "formData.order_prom_id";
                     var order_prom_txt2 = "formData.order_prom_amount";
-                    th.setData({[order_prom_txt1]: 0, [order_prom_txt2]: 0})
+                    th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 })
 
 
                     total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
@@ -2051,7 +2053,7 @@ Page({
                     total_m = total_m.toFixed(2);
                     order_m = order_m.toFixed(2);
 
-                    th.setData({[atxt]: total_m,})
+                    th.setData({ [atxt]: total_m, })
 
                     var txt = "formData.user_money";
                     var txt2 = "formData.order_amount";
@@ -2061,37 +2063,37 @@ Page({
                     if (th.data.bn_use_money == 1) {
                         if (amoney > order_m) {
                             order_m = parseFloat(order_m).toFixed(2);
-                            th.setData({[txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1})
+                            th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1 })
                         } else {
                             order_m = parseFloat(order_m) - parseFloat(amoney);
                             order_m = order_m.toFixed(2);
-                            th.setData({[txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1})
+                            th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1 })
                         }
                     } else {
-                        th.setData({[txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1})
+                        th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1 })
                     }
                     //优惠活动送积分
                     if (good.s_intValue) {
                         txt = "formData.give_integral";
-                        th.setData({[txt]: good.s_intValue});
+                        th.setData({ [txt]: good.s_intValue });
                     }
                     //优惠送券
                     if (good.s_coupon_id) {
                         var i_txt = "formData.give_coupon_id";
                         //这个是json格式的
                         var i_txt1 = "formData.g_coupon_num";
-                        var ob = [{"num": good.s_coupon_num, "c_id": good.s_coupon_id}];
+                        var ob = [{ "num": good.s_coupon_num, "c_id": good.s_coupon_id }];
                         ob = JSON.stringify(ob);
-                        th.setData({[i_txt]: good.s_coupon_id, [i_txt1]: ob});
+                        th.setData({ [i_txt]: good.s_coupon_id, [i_txt1]: ob });
                     }
                     //优惠礼包
                     if (good.s_libao) {
                         var l_txt = "formData.give_lb_id";
                         //这个是json格式的
                         var l_txt1 = "formData.g_lb_num";
-                        var ob = [{"num": good.s_lb_num, "l_id": good.s_libao}];
+                        var ob = [{ "num": good.s_lb_num, "l_id": good.s_libao }];
                         ob = JSON.stringify(ob);
-                        th.setData({[l_txt]: good.s_coupon_id, [l_txt1]: ob});
+                        th.setData({ [l_txt]: good.s_coupon_id, [l_txt1]: ob });
                     }
                 }
 
@@ -2102,7 +2104,7 @@ Page({
     },
 
     //--------------------提交订单-----------------------
-    async submitForm(t){
+    async submitForm(t) {
         var sub_value = t;
 
         if (this.data.is_summit_ing == 1) return false; //--提交中退出--
@@ -2174,7 +2176,7 @@ Page({
             }
 
             //--判断优惠活动的提交--
-            if (th.data.formData.cut_price > 0 ) {
+            if (th.data.formData.cut_price > 0) {
                 order_prom_list.discount_amount = th.data.formData.cut_price.toFixed(2);
                 var ob = [{
                     "prom_id": th.data.bn_goods.prom_id,
@@ -2237,7 +2239,7 @@ Page({
                 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 => {
+                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;
@@ -2289,7 +2291,7 @@ Page({
                 }
 
                 var pt_res = null;
-                await  getApp().request.promisePost("/api/weshop/order/getGoodsSplit", {
+                await getApp().request.promisePost("/api/weshop/order/getGoodsSplit", {
                     is_json: 1,
                     data: pt_data
                 }).then(res => {
@@ -2409,14 +2411,14 @@ Page({
                     order_prom_list.order_prom_amount = t_item.order_prom_amount;
                 }
 
-                order_prom_list.discount_amount =0;
+                order_prom_list.discount_amount = 0;
                 //--判断优惠活动的提交--
                 if (t_item.cut_price > 0) {
                     order_prom_list.discount_amount += t_item.cut_price;
                     order_prom_list.prom_pt_json = JSON.stringify(t_item.prom_pt_json);
                 }
                 //--判断组合优惠活动的提交--
-                if (t_item.zh_cut_price > 0 || t_item.zh_cut_price<0) {
+                if (t_item.zh_cut_price > 0 || t_item.zh_cut_price < 0) {
                     order_prom_list.discount_amount += t_item.zh_cut_price;
                     order_prom_list.zh_pt_json = JSON.stringify(t_item.zh_pt_json);
                 }
@@ -2431,11 +2433,11 @@ Page({
                     order_prom_list.give_lb_id = t_item.s_libao;
                     order_prom_list.g_lb_num = JSON.stringify(t_item.g_lb_num);
                 }
-                if (Object.keys(order_prom_list).length > 0){
-                    if(order_prom_list.discount_amount)
-                        order_prom_list.discount_amount= parseFloat(order_prom_list.discount_amount).toFixed(2);
-                    if(order_prom_list.order_prom_amount)
-                        order_prom_list.order_prom_amount= parseFloat(order_prom_list.order_prom_amount).toFixed(2);
+                if (Object.keys(order_prom_list).length > 0) {
+                    if (order_prom_list.discount_amount)
+                        order_prom_list.discount_amount = parseFloat(order_prom_list.discount_amount).toFixed(2);
+                    if (order_prom_list.order_prom_amount)
+                        order_prom_list.order_prom_amount = parseFloat(order_prom_list.order_prom_amount).toFixed(2);
                     item.order_prom_list = order_prom_list;
                 }
 
@@ -2459,7 +2461,7 @@ Page({
                 //-------------让商品添加到商品列表--------------------
                 for (var k = 0; k < t_item.goods.length; k++) {
                     var g_item = t_item.goods[k];
-                    if(g_item.goods_num<=0) continue;
+                    if (g_item.goods_num <= 0) continue;
                     var goods = {
                         'goods_id': g_item.goods_id,
                         'goods_name': g_item.goods_name,
@@ -2472,7 +2474,7 @@ Page({
                     };
 
                     //-- 线下取价也要写入,组合购的商品不能去线下价格 --
-                    if (g_item.offline_price && t_item.is_offline == 1 && g_item.prom_type!=7) {
+                    if (g_item.offline_price && t_item.is_offline == 1 && g_item.prom_type != 7) {
                         goods.goods_price = g_item.offline_price;
                         goods.member_goods_price = g_item.offline_price;
                         goods.offline_cut = (g_item.goods_price - g_item.offline_price).toFixed(2);
@@ -2483,7 +2485,7 @@ Page({
                     if (t_item.quan_youhui_list && t_item.coupon_price) {
                         for (var kk in t_item.quan_youhui_list) {
                             var you_item = t_item.quan_youhui_list[kk];
-                            if (g_item.prom_type!=7 && g_item.erpwareid == you_item.WareId) {
+                            if (g_item.prom_type != 7 && g_item.erpwareid == you_item.WareId) {
                                 goods.quan_num = you_item.WareCashSum;
                                 goods.quan_no = you_item.CashRepNo;
                             }
@@ -2493,7 +2495,7 @@ Page({
                     //--判断活动的类型--
                     switch (g_item.prom_type) {
                         case 1:
-						case 2:
+                        case 2:
                             goods.prom_type = g_item.prom_type;
                             goods.prom_id = g_item.prom_id;
                             break;
@@ -2535,7 +2537,7 @@ Page({
                     }
 
                     //把优惠的平摊结果写进去
-                    if (g_item.account >= 0 || (g_item.account_yu != 0 && g_item.account!=undefined)) {
+                    if (g_item.account >= 0 || (g_item.account_yu != 0 && g_item.account != undefined)) {
                         if (g_item.account >= 0) goods.account = g_item.account;
                         if (g_item.account_yu != 0) goods.account_yu = g_item.account_yu;
                         item.is_discount_amount = 1;
@@ -2546,7 +2548,7 @@ Page({
                         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 => {
+                        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;
@@ -2572,7 +2574,7 @@ Page({
         if (pdata.length == 0) return;
         var str = JSON.stringify(pdata);
 
-        wx.showLoading({title: "加载中"});
+        wx.showLoading({ title: "加载中" });
         wx.request({
             url: oo.url + '/api/weshop/order/createWxdOrder',
             data: str,
@@ -2603,7 +2605,7 @@ Page({
                         })
                         //要进行判断，如果是用微信支付，就要跳转到支付界面
                         if (order_amount > 0) {
-                            th.setData({isclose: 0});
+                            th.setData({ isclose: 0 });
                             //void e.jumpToCart4({
                             //  order_sn: data.data,
                             //}, 1);
@@ -2618,12 +2620,12 @@ Page({
                             }, function () {
                                 //支付失败
                                 setTimeout(function () {
-                                        var cps=getCurrentPages();
-                                        if(cps.length>1){
-                                            wx.navigateBack({delta: 1})
-                                        }else{
-                                            getApp().goto("/pages/index/index/index");
-                                        }
+                                    var cps = getCurrentPages();
+                                    if (cps.length > 1) {
+                                        wx.navigateBack({ delta: 1 })
+                                    } else {
+                                        getApp().goto("/pages/index/index/index");
+                                    }
 
                                 }, 1000)
                             }, oo.stoid);
@@ -2641,7 +2643,7 @@ Page({
                                     if (t.data.code == 0) {
                                         //app.my_warnning("支付成功",1,th);
                                         //setTimeout(function () {
-                                        th.setData({isclose: 0});
+                                        th.setData({ isclose: 0 });
                                         wx.redirectTo({
                                             url: "/pages/payment/pay_success/pay_success?type=2&order_sn=" + data.data,
                                         })
@@ -2666,7 +2668,7 @@ Page({
                                 cancelText: '取消',
                                 confirmText: '确定',
                                 showCancel: true,
-                                success(res){
+                                success(res) {
                                     if (res.cancel) {
                                         return;
                                     } else if (res.confirm) {
@@ -2700,11 +2702,11 @@ Page({
 
     },
     //---确认线下门店的数量足不足---
-    async check_store_num(goods_id, pick, goods_num, func){
+    async check_store_num(goods_id, pick, goods_num, func) {
         var lock = 0, pick_no, plist, erpwareid;
         //先读取门店的lock
         await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
-            data: {store_id: os.stoid, wareId: goods_id, storageId: pick, pageSize: 1000}
+            data: { store_id: os.stoid, wareId: goods_id, storageId: pick, pageSize: 1000 }
         }).then(res => {
             if (res.data.code == 0 && res.data.data.total > 0) {
                 for (var i in res.data.data.pageData)
@@ -2713,7 +2715,7 @@ Page({
         })
         //先获取门店的编号
         await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + pick, {
-            data: {storeId: os.stoid, goodsId: t.goods_id, pickupId: pick}
+            data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
         }).then(res => {
             if (res.data.code == 0) {
                 pick_no = res.data.data.pickup_no;
@@ -2721,7 +2723,7 @@ Page({
         })
         //先获取商品的线下库存
         await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, {
-            data: {storeId: os.stoid, goodsId: t.goods_id, pickupId: pick}
+            data: { storeId: os.stoid, goodsId: t.goods_id, pickupId: pick }
         }).then(res => {
             if (res.data.code == 0) {
                 erpwareid = res.data.data.erpwareid;
@@ -2729,7 +2731,7 @@ Page({
         })
         //读取线下的门店库存
         await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
-            data: {storageNos: pick_no, wareIds: encodeURIComponent(erpwareid), storeId: os.stoid, pageSize: 2000}
+            data: { storageNos: pick_no, wareIds: encodeURIComponent(erpwareid), storeId: os.stoid, pageSize: 2000 }
         }).then(res => {
             if (res.data.code == 0) {
                 plist = res.data.data.pageData[0];
@@ -2771,11 +2773,11 @@ Page({
             wl_txt = t.currentTarget.dataset.wl_txt,
             ont = t.currentTarget.dataset.ont;
 
-        th.setData({[txt]: ty});
+        th.setData({ [txt]: ty });
         var iszt = 1;
 
         if (ty == 0) {
-            th.setData({is_all_zt: 0});
+            th.setData({ is_all_zt: 0 });
         } else {
             for (var i = 0; i < th.data.cartlist.length; i++) {
                 var item = th.data.cartlist[i];
@@ -2785,7 +2787,7 @@ Page({
                 }
             }
 
-            th.setData({is_all_zt: iszt});
+            th.setData({ is_all_zt: iszt });
 
             var ind = t.currentTarget.dataset.ind;
             var c_item = th.data.cartlist[ind];
@@ -2793,7 +2795,7 @@ Page({
 
             if (th.data.using_quan[pickid] && th.data.using_quan[pickid].isby == 1) {
                 th.data.using_quan[pickid] = {};
-                th.setData({using_quan: th.data.using_quan});
+                th.setData({ using_quan: th.data.using_quan });
             }
 
 
@@ -2805,7 +2807,7 @@ Page({
                 for (var i = 0; i < wu_arr.length; i++) {
                     if (wu_arr[i].shipping_code == def_exp_code) {
                         var set_txt = "cartlist"
-                        th.setData({wl_txt: i});
+                        th.setData({ wl_txt: i });
                     }
                 }
             }
@@ -2818,9 +2820,9 @@ Page({
     setexptype: function (t) {
         var th = this;
         var ty = t.currentTarget.dataset.t, def_exp_code = getApp().globalData.userInfo.def_exp_code;
-        th.setData({bn_exp_type: ty});
+        th.setData({ bn_exp_type: ty });
         if (ty == 0) {
-            th.setData({is_all_zt: 0});
+            th.setData({ is_all_zt: 0 });
         }
 
         //当物流为空的时候。
@@ -2833,7 +2835,7 @@ Page({
         if (ty == 1) {
             th.data.isget_by_quan = {};
             if (th.data.using_quan[th.data.bn_pick] && th.data.using_quan[th.data.bn_pick].isby == 1) {
-                th.setData({using_quan: {}});
+                th.setData({ using_quan: {} });
             }
         }
 
@@ -2843,7 +2845,7 @@ Page({
             if (wu_arr != null && wu_arr != "") {
                 for (var i = 0; i < wu_arr.length; i++) {
                     if (wu_arr[i].shipping_code == def_exp_code) {
-                        th.setData({index: i});
+                        th.setData({ index: i });
                     }
                 }
             }
@@ -2855,17 +2857,17 @@ Page({
     //--------立即购买时，使用余额--------
     set_bn_useyuer: function () {
         var th = this;
-        th.setData({bn_use_money: !th.data.bn_use_money});
+        th.setData({ bn_use_money: !th.data.bn_use_money });
         th.calculatePrice2();
     },
     set_js_useyuer: function () {
         var th = this;
-        th.setData({js_use_money: !th.data.js_use_money});
+        th.setData({ js_use_money: !th.data.js_use_money });
         th.calculatePrice();
     },
     //-------------------计算物流---------------
-    calculatewuliu: function (code, o_shipping_price, goods_weight,out_of_weight,
-                              goods_piece, user_addr, freight_free, o_price, rs) {
+    calculatewuliu: function (code, o_shipping_price, goods_weight, out_of_weight,
+        goods_piece, user_addr, freight_free, o_price, rs, pickid) {
         var price = 0, th = this;
         price += parseFloat(o_shipping_price);
         //如果是包邮
@@ -2896,7 +2898,7 @@ Page({
             }
         }
         //------超出重量----------
-        if(out_of_weight < 0  && o_price >= freight_free){
+        if (out_of_weight < 0 && o_price >= freight_free && !th.data.is_no_by[pickid]) {
             fw_price = parseFloat(item['money']);
             var out_of_weight = Math.abs(out_of_weight);
             if (out_of_weight > item['first_weight']) {
@@ -2942,13 +2944,13 @@ Page({
     //----------立即购买，选择物流-------------
     bindPickerChange: function (e) {
         var ind = e.detail.value
-        this.setData({index: ind});
+        this.setData({ index: ind });
         this.calculatePrice2();
     },
     //----------购物车结算，选择物流-------------
     bindPickerChange_w: function (e) {
         var ind = e.detail.value, txt = e.currentTarget.dataset.txt;
-        this.setData({[txt]: ind});
+        this.setData({ [txt]: ind });
         this.calculatePrice();
     },
 
@@ -2962,7 +2964,7 @@ Page({
 
 
         if (bn == 1) {
-            th.setData({open_quan: 1, selected_quan_pick: pickid, disabled: 1});
+            th.setData({ open_quan: 1, selected_quan_pick: pickid, disabled: 1 });
         } else {
             //---多单打开券的时候，就要判断券在其他门店是否有使用---
             var quanlist = th.data.cartlist[cindx].quan_list;
@@ -2988,9 +2990,9 @@ Page({
                     else
                         get_by_quan_list_cart[i].show_red = 0;
                 }
-                th.setData({by_quan_list_cart: get_by_quan_list_cart});
+                th.setData({ by_quan_list_cart: get_by_quan_list_cart });
             } else {
-                th.setData({by_quan_list_cart: null});
+                th.setData({ by_quan_list_cart: null });
             }
 
             console.log("2222222券的列表", quanlist);
@@ -3006,7 +3008,7 @@ Page({
     },
     close_coupon: function (e) {
         var th = this;
-        th.setData({open_quan: 0, disabled: 0});
+        th.setData({ open_quan: 0, disabled: 0 });
     },
 
     //---判断券时候在已经选择的列表中---
@@ -3077,14 +3079,14 @@ Page({
         for (var i in quanlist) {
             quanlist[i].show_red = 0;
         }
-        this.setData({selected_quan_list: quanlist});
+        this.setData({ selected_quan_list: quanlist });
         var by_quanlist = this.data.get_by_quan_list;
         if (by_quanlist) {
             //---所有的券的显示红色选择都清理一遍---
             for (var inb in by_quanlist) {
                 by_quanlist[inb].show_red = 0;
             }
-            this.setData({get_by_quan_list: by_quanlist});
+            this.setData({ get_by_quan_list: by_quanlist });
         }
 
         var by_cart_list = this.data.by_quan_list_cart;
@@ -3093,7 +3095,7 @@ Page({
             for (var inc in by_cart_list) {
                 by_cart_list[inc].show_red = 0;
             }
-            this.setData({by_quan_list_cart: by_cart_list});
+            this.setData({ by_quan_list_cart: by_cart_list });
         }
 
         var using_quan = this.data.using_quan;
@@ -3105,9 +3107,9 @@ Page({
                 using_quan[th.data.selected_quan_pick].is_nouse_red = 1;
             }
             else {
-                using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1};
+                using_quan[th.data.selected_quan_pick] = { is_nouse_red: 1 };
             }
-            this.setData({using_quan: using_quan, is_coupon: 2222});
+            this.setData({ using_quan: using_quan, is_coupon: 2222 });
             return;
         }
 
@@ -3124,9 +3126,9 @@ Page({
             using_quan[th.data.selected_quan_pick].is_nouse_red = 0;
         }
         else {
-            using_quan[th.data.selected_quan_pick] = {is_nouse_red: 0};
+            using_quan[th.data.selected_quan_pick] = { is_nouse_red: 0 };
         }
-        this.setData({using_quan: using_quan});
+        this.setData({ using_quan: using_quan });
 
     },
 
@@ -3141,7 +3143,7 @@ Page({
             for (var ind in by_quanlist) {
                 by_quanlist[ind].show_red = 0;
             }
-            this.setData({get_by_quan_list: by_quanlist});
+            this.setData({ get_by_quan_list: by_quanlist });
         }
 
         //--购物车过来的包邮券--
@@ -3151,7 +3153,7 @@ Page({
             for (var ind in by_cart_list) {
                 by_cart_list[ind].show_red = 0;
             }
-            this.setData({by_quan_list_cart: by_cart_list});
+            this.setData({ by_quan_list_cart: by_cart_list });
         }
         //普通券
         var quanlist = this.data.selected_quan_list;
@@ -3160,7 +3162,7 @@ Page({
             for (var ind in quanlist) {
                 quanlist[ind].show_red = 0;
             }
-            this.setData({selected_quan_list: quanlist});
+            this.setData({ selected_quan_list: quanlist });
         }
 
         var th = this;
@@ -3171,9 +3173,9 @@ Page({
                 using_quan[th.data.selected_quan_pick].is_nouse_red = 1;
             }
             else {
-                using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1};
+                using_quan[th.data.selected_quan_pick] = { is_nouse_red: 1 };
             }
-            this.setData({using_quan: using_quan, is_coupon: 2222});
+            this.setData({ using_quan: using_quan, is_coupon: 2222 });
             return;
         }
 
@@ -3202,9 +3204,9 @@ Page({
             using_quan[th.data.selected_quan_pick].is_nouse_red = 0;
         }
         else {
-            using_quan[th.data.selected_quan_pick] = {is_nouse_red: 0};
+            using_quan[th.data.selected_quan_pick] = { is_nouse_red: 0 };
         }
-        this.setData({using_quan: using_quan});
+        this.setData({ using_quan: using_quan });
     },
 
     //--确认使用券---
@@ -3264,14 +3266,14 @@ Page({
         //选择了的券，看是不是点击了不使用券,点击了不使用优惠券
         if (using_quan[pickid]) {
             if (using_quan[pickid].is_nouse_red == 1) {
-                using_quan[pickid] = {is_nouse_red: 1};
-                th.setData({using_quan: using_quan});
+                using_quan[pickid] = { is_nouse_red: 1 };
+                th.setData({ using_quan: using_quan });
                 if (th.data.is_b_now == 1) {
                     th.calculatePrice2();
                 } else {
                     th.calculatePrice();
                 }
-                th.setData({open_quan: 0});
+                th.setData({ open_quan: 0 });
                 return;
             }
         }
@@ -3290,16 +3292,16 @@ Page({
             };
             using_quan[pickid].isby = 1;
         } else {
-            using_quan[pickid] = {coupon_no: item.CashRepNo, money: item.Sum, is_nouse_red: 0};
+            using_quan[pickid] = { coupon_no: item.CashRepNo, money: item.Sum, is_nouse_red: 0 };
             using_quan[pickid].isby = 0;
         }
-        this.setData({using_quan: using_quan});
+        this.setData({ using_quan: using_quan });
         if (th.data.is_b_now == 1) {
             th.calculatePrice2();
         } else {
             th.calculatePrice();
         }
-        th.setData({open_quan: 0});
+        th.setData({ open_quan: 0 });
     },
 
     cart_set_err: function (e) {
@@ -3336,7 +3338,7 @@ Page({
         var wu_arr_txt = e.currentTarget.dataset.txt;
         var w_sele_index = e.currentTarget.dataset.w_sele_index;
         var is_express = null;
-        var ob = {open_express: 1, wu_arr_txt: wu_arr_txt, disabled: 1};
+        var ob = { open_express: 1, wu_arr_txt: wu_arr_txt, disabled: 1 };
 
         //--如果是多个门店的时候--
         if (w_sele_index != undefined) {
@@ -3347,20 +3349,20 @@ Page({
     },
     // 关闭物流的弹窗
     close_express: function () {
-        this.setData({open_express: 0, disabled: 0});
+        this.setData({ open_express: 0, disabled: 0 });
     },
     // 选择物流
     click_express_name: function (e) {
         var express_name = e.currentTarget.dataset.name, shippingcode = e.currentTarget.dataset.shippingcode;
         var index = e.currentTarget.dataset.idxe;
-        var ob = {is_express: index, is_shipping_code: shippingcode, disabled: 0};
+        var ob = { is_express: index, is_shipping_code: shippingcode, disabled: 0 };
         ob[this.data.wu_arr_txt] = index;
         this.setData(ob);
     },
 
     //点击确定物流
     determine_expres: function (e) {
-        this.setData({open_express: 0});
+        this.setData({ open_express: 0 });
         if (this.data.is_b_now == 1)
             this.calculatePrice2();
         else
@@ -3380,7 +3382,7 @@ Page({
         obj[txt] = is_open;
 
         this.setData(obj);
-        this.setData({disabled: 1})
+        this.setData({ disabled: 1 })
     },
 
     clik_coupons2: function (e) {
@@ -3395,7 +3397,7 @@ Page({
         obj[txt] = is_open;
 
         this.setData(obj);
-        this.setData({disabled: 1})
+        this.setData({ disabled: 1 })
     },
 
 
@@ -3404,11 +3406,11 @@ Page({
         var th = this;
         var is_shipping_code = this.data.is_shipping_code
         getApp().request.put("/api/weshop/users/update", {
-            data: {user_id: getApp().globalData.user_id, store_id: oo.stoid, def_exp_code: is_shipping_code},
+            data: { user_id: getApp().globalData.user_id, store_id: oo.stoid, def_exp_code: is_shipping_code },
             success: function (rse) {
                 if (rse.data.code == 0) {
                     getApp().globalData.userInfo.def_exp_code = is_shipping_code;
-                    th.setData({open_express: 0});
+                    th.setData({ open_express: 0 });
                     //----计算此时购物车的价格----
                     if (th.data.is_b_now == 1) th.calculatePrice2();
                     else th.calculatePrice();
@@ -3418,7 +3420,7 @@ Page({
     },
 
     //更新下默认，在onshow里面
-    update_code(){
+    update_code() {
         var th = this, m_wind = 0, def_exp_code = getApp().globalData.userInfo.def_exp_code;
         //--定时器，判断wu_arr不未空--
         var uii = setInterval(function () {
@@ -3432,7 +3434,7 @@ Page({
                 }
                 //--如果是立即购买--
                 if (th.data.is_b_now == 1) {
-                    th.setData({index: m_wind, is_express: m_wind});
+                    th.setData({ index: m_wind, is_express: m_wind });
                 } else {
                     var ui = setInterval(function () {
                         if (th.data.cartlist) {
@@ -3440,7 +3442,7 @@ Page({
                             for (var i in c_arr) {
                                 c_arr[i].wind = m_wind;
                             }
-                            th.setData({cartlist: c_arr, is_express: m_wind})
+                            th.setData({ cartlist: c_arr, is_express: m_wind })
                             clearInterval(ui);
                         }
                     }, 500)
@@ -3479,13 +3481,13 @@ Page({
                 }
 
                 //--如果是团购，要判断有没有限制使用优惠券
-                if(gd.prom_type == 2){
-                    var prom1=null;
+                if (gd.prom_type == 2) {
+                    var prom1 = null;
                     await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gd.goods_id + "/" + gd.prom_id, {
                     }).then(res => {
                         if (res.data.code == 0) prom1 = res.data.data;
                     })
-                    if(!prom1.isQuan){
+                    if (!prom1.isQuan) {
                         continue;
                     }
                 }
@@ -3555,10 +3557,10 @@ Page({
         if (th.data.is_b_now) {
             if (arr && arr.length > 0) {
                 var quanlist = arr[0].quan_list;
-                th.setData({selected_quan_list: quanlist, cartlist: arr})
+                th.setData({ selected_quan_list: quanlist, cartlist: arr })
             }
         } else {
-            th.setData({cartlist: arr})
+            th.setData({ cartlist: arr })
             th.set_can_num();
         }
 
@@ -3578,7 +3580,7 @@ Page({
         if (th.data.is_close_quan != 1 && th.data.bn_goods.is_xz_yh != 1) {
             var url0 = "/api/weshop/users/frozenQuan/listFrozenQuan/" + app.globalData.user_id;
             var url = "/api/weshop/couponList/getUseCouponList";
-            app.request.promiseGet(url0, {1: 1}).then(res => {
+            app.request.promiseGet(url0, { 1: 1 }).then(res => {
                 if (res.data.code == 0) {
                     frozenQuan = res.data.data;
                     th.data.frozenQuan = frozenQuan;
@@ -3596,7 +3598,7 @@ Page({
                             quanlist = res.data.data.pageData;
                             if (quanlist) {
                                 quanlist = th.check_is_frozenQuan(quanlist, frozenQuan);
-                                th.setData({selected_quan_list: quanlist})
+                                th.setData({ selected_quan_list: quanlist })
                             }
                         }
                     }
@@ -3624,7 +3626,7 @@ Page({
         if (!goods_id) goods_id = this.data.bn_goods.goods_id;
         for (var i in arr) {
             var item = arr[i];
-            if (goods_id == item)  return 0;
+            if (goods_id == item) return 0;
         }
         return 1;
     },
@@ -3695,7 +3697,7 @@ Page({
         if (this.data.is_b_now == 1) pick = this.data.bn_pick;
         //---获取订单优惠---
         getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
-            data: {store_id: os.stoid, orderAmount: condition}
+            data: { store_id: os.stoid, orderAmount: condition }
         }).then(res => {
             if (res.data.code == 0) {
                 var data = res.data.data;
@@ -3717,7 +3719,7 @@ Page({
                 var ob = map[pickid][item.prom_id];
                 ob.price += item.goods_price * item.goods_num;
                 ob.goods_num += item.goods_num;
-                ob.goods.push({goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num});
+                ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num });
 
             } else {
                 var prom = null;
@@ -3733,7 +3735,7 @@ Page({
                 ob.is_bz = prom.is_bz;
                 ob.is_xz_yh = prom.is_xz_yh;
                 ob.goods = new Array();
-                ob.goods.push({goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num});
+                ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num });
                 map[pickid][item.prom_id] = ob;
             }
         } else {
@@ -3750,7 +3752,7 @@ Page({
             ob.is_bz = prom.is_bz;
             ob.is_xz_yh = prom.is_xz_yh;
             ob.goods = new Array();
-            ob.goods.push({goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num});
+            ob.goods.push({ goods_id: item.goods_id, goods_price: item.goods_price, goods_num: item.goods_num });
 
             var obj = {};
             obj[item.prom_id] = ob;
@@ -3760,7 +3762,7 @@ Page({
     },
 
     //计算立即购买赠品的物流费用
-    get_now_gift_goods_wuliu: function (code, o_shipping_price, user_addr, gift_freight_free,gift_weight_free, allpice, rs, shipping_price, no_by_data, goods_weight1, goods_piece1) {
+    get_now_gift_goods_wuliu: function (code, o_shipping_price, user_addr, gift_freight_free, gift_weight_free, allpice, rs, shipping_price, no_by_data, goods_weight1, goods_piece1) {
         var good = this.data.buy_now_gift_goods;
         var goods_weight = -1, goods_piece = -1;
         var gift_shipping_price = 0;
@@ -3776,8 +3778,9 @@ Page({
                 //累积商品重量 每种商品的重量 * 数量
                 goods_weight += good['weight'] * good['buynum'];
                 if (goods_weight1 > 0) {
+                    out_of_weight = gift_weight_free - goods_weight;
+                    //不能调换位置 下面goods_weight会变大
                     goods_weight += goods_weight1;
-                    out_of_weight = (gift_weight_free*1000) - goods_weight;
                 }
                 break;
             case 3:
@@ -3795,7 +3798,7 @@ Page({
         if (no_by_data && no_by_data.region_list) {
             if (th.check_by_area(no_by_data.region_list)) {
                 gift_freight_free = 0;
-                out_of_weight=0;
+                out_of_weight = 0;
                 th.data.is_no_by[th.data.bn_pick] = 1;
             }
         }
@@ -3803,14 +3806,15 @@ Page({
         if (no_by_data && no_by_data.goods_list && gift_freight_free) {
             if (th.check_by_goods(no_by_data.goods_list, good.goods_id)) {
                 gift_freight_free = 0;
-                out_of_weight=0;
+                out_of_weight = 0;
+                th.data.is_no_by[th.data.bn_pick] = 1;
                 //th.data.is_no_by[th.data.bn_pick]=1;
             }
         }
 
         var t_shipping_price =
-            this.calculatewuliu(code, gift_shipping_price, goods_weight,out_of_weight,
-                goods_piece, user_addr, gift_freight_free, allpice, rs);
+            this.calculatewuliu(code, gift_shipping_price, goods_weight, out_of_weight,
+                goods_piece, user_addr, gift_freight_free, allpice, rs, th.data.bn_pick);
         return t_shipping_price;
 
     },
@@ -3867,7 +3871,7 @@ Page({
 
     //跳转关闭弹出框的显示
     close_offline: function () {
-        this.setData({is_offline_show: 0});
+        this.setData({ is_offline_show: 0 });
     },
 
     //立即购买显示弹出框
@@ -3875,7 +3879,7 @@ Page({
         var off_price = this.data.bn_goods.shop_price - this.data.bn_goods.offline_price;
         //是不是线下
         var is_get_offline = this.data.bn_goods.is_offline;
-        this.setData({is_offline_show: 1, show_off_price: off_price.toFixed(2), is_get_offline: is_get_offline});
+        this.setData({ is_offline_show: 1, show_off_price: off_price.toFixed(2), is_get_offline: is_get_offline });
     },
 
     //确定使用线下取价
@@ -3883,14 +3887,14 @@ Page({
         var bn_goods = this.data.bn_goods;
         if (bn_goods && bn_goods.prom_type == 0) {
             bn_goods.is_offline = 1;
-            this.setData({is_offline_show: 0, bn_goods: bn_goods});
+            this.setData({ is_offline_show: 0, bn_goods: bn_goods });
             this.calculatePrice2();
         }
         //就是购物车结算时的
         else {
             var index = this.data.pop_offline_index;
             var txt = "cartlist[" + index + "].is_offline";
-            this.setData({[txt]: 1, is_offline_show: 0,});
+            this.setData({ [txt]: 1, is_offline_show: 0, });
             this.data.old_cartlist[index].is_offline = 1;
             this.calculatePrice();
         }
@@ -3902,14 +3906,14 @@ Page({
         var bn_goods = this.data.bn_goods;
         if (bn_goods && bn_goods.prom_type == 0) {
             bn_goods.is_offline = 0;
-            this.setData({is_offline_show: 0, bn_goods: bn_goods});
+            this.setData({ is_offline_show: 0, bn_goods: bn_goods });
             this.calculatePrice2();
         }
         //就是购物车结算时的
         else {
             var index = this.data.pop_offline_index;
             var txt = "cartlist[" + index + "].is_offline";
-            this.setData({[txt]: 0, is_offline_show: 0,})
+            this.setData({ [txt]: 0, is_offline_show: 0, })
             this.data.old_cartlist[index].is_offline = 0;
             this.calculatePrice();
         }
@@ -3930,19 +3934,19 @@ Page({
         });
     },
 
-    set_hid_inp:function (e) {
+    set_hid_inp: function (e) {
         var index = e.currentTarget.dataset.index;
         var txt = "cartlist[" + index + "].focus";
-        this.setData({[txt]:1})
+        this.setData({ [txt]: 1 })
     },
 
-    clear_hid_inp:function (e) {
+    clear_hid_inp: function (e) {
         var index = e.currentTarget.dataset.index;
         var txt = "cartlist[" + index + "].focus";
-        this.setData({[txt]:0})
+        this.setData({ [txt]: 0 })
     },
 
-    go_url:function (e) {
+    go_url: function (e) {
         var url = e.currentTarget.dataset.url;
         getApp().goto(url);
     }
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 53c46f6..596285d 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -1097,7 +1097,7 @@ Page({
             goods_id: a.goods_id,
             store_id: oo.stoid
         };
-        // this.postCardList_ser(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems);
+        this.postCardList_ser(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems);
 
     },
     //-------------减数量---------------------
@@ -1111,7 +1111,7 @@ Page({
         a = this.data.service_data[b].goods[a];
         this.data.btn_click = 1;
 
-        if (a.goods_num - 1 < 0) {
+        if (a.goods_num - 1 <= 0) {
             this.data.up_dating = 0;
             return false;
         }
diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml
index 309db35..87ba168 100644
--- a/pages/cart/cart/cart.wxml
+++ b/pages/cart/cart/cart.wxml
@@ -128,8 +128,7 @@
               <view class="count">
                 <view bindtap="{{items.goods_num <= 1 ? '':'subNum'}}" class="sub fs28 {{items.goods_num <= 1 ? 'active':''}}" data-pitems="{{pidx}}" data-item="{{idx}}">一</view>
                 <input class="goodadd" bindblur="valueToNum" data-pitems="{{pidx}}" data-item="{{idx}}"
-				   bindinput="refresh_input"
-				   type="number" value="{{items.goods_num}}"></input>
+				   bindinput="refresh_input" type="number" value="{{items.goods_num}}"></input>
                 <view class="add" bindtap="addNum" data-pitems="{{pidx}}" data-item="{{idx}}">+</view>
               </view>
             </view>
diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss
index 32bcca1..2e1efe0 100644
--- a/pages/cart/cart/cart.wxss
+++ b/pages/cart/cart/cart.wxss
@@ -109,7 +109,7 @@ radio {
 }
 
 .count>view, .count>input {
-  width: 45rpx;
+  width: 50rpx;
   height: 40rpx;
   line-height: 40rpx;
   text-align: center;
@@ -139,7 +139,7 @@ radio {
 	color: #ccc;
 }
 .count>input {
-	margin: 0 10rpx;
+	margin: 0 14rpx;
 	line-height: normal;
 }
 
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 66080e8..dbb19f4 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -6,6 +6,9 @@ var util_pay = require("../../../utils/pay.js");
 var zh_calc = require("zh_calculate.js");
 var ladder_calc = require("ladder_calculate.js");
 
+// 防抖函数用定时器
+let timer;
+
 Page({
     data: {
         url: t.globalData.setting.url,
@@ -1014,7 +1017,7 @@ Page({
                                     }
                                     //自选的时候，系统配置了默认的配送方式是物流的时候
                                     if (distr_t == 0 && th.data.json_d.pickupway && th.data.json_d.pickupway == 1) {
-                                        et = 2;
+                                        et = 0;
                                     }
 
 
@@ -1647,8 +1650,8 @@ Page({
                             is_good_no_by = th.check_by_goods(no_ex_good, item[j].goods_id);
                         }
 
-                        //如果达到全场包邮的条件，同时，没有地区不包邮，或者商品不包邮
-                        if (o_price - quan_price >= freight_free && freight_free > 0 && !is_good_no_by && th.data.is_no_by[pickid] != 1) {
+                        //如果达到全场包邮的条件，同时，没有地区不包邮，或者商品不包邮 并且没有超出重量
+                        if (o_price - quan_price >= freight_free && freight_free > 0 && !is_good_no_by && th.data.is_no_by[pickid] != 1 && out_of_weight >=0 ) {
                             continue;
                         }
 
@@ -1670,15 +1673,14 @@ Page({
                                         //统一运费
                                         o_shipping_price += item[j]['uniform_exp_sum'];
                                         break;
-                                    case 2:
-                                        +''
-                                        if (goods_weight < 0) goods_weight = 0;
-                                        //累积商品重量 每种商品的重量 * 数量
-                                        goods_weight += item[j]['weight'] * item[j]['goods_num'];
-                                        if (weight_free > 0) {
-                                            out_of_weight = (weight_free * 1000) - goods_weight;
-                                        }
-                                        break;
+                                    // case 2:
+                                    //     if (goods_weight < 0) goods_weight = 0;
+                                    //     //累积商品重量 每种商品的重量 * 数量
+                                    //     goods_weight += item[j]['weight'] * item[j]['goods_num'];
+                                    //     if (weight_free > 0) {
+                                    //         out_of_weight = (weight_free * 1000) - goods_weight;
+                                    //     }
+                                    //     break;
                                     case 3:
                                         if (goods_piece < 0) goods_piece = 0;
                                         //累积商品数量
@@ -1686,6 +1688,11 @@ Page({
                                         break;
                                 }
                             }
+                        }else{
+                            if(item[j]['exp_sum_type']==2 && out_of_weight!==0){
+                                goods_weight = -1;
+                                out_of_weight = 0;
+                            }
                         }
                     }
 
@@ -2094,7 +2101,7 @@ Page({
                     th.check_is_order_prom(o_condition, function () {
                         var order_prom_amount = 0;
                         var order_prom_id = 0;
-                        if (th.data.order_prom[th.data.bn_pick]) {
+                        if (th.data.order_prom[th.data.bn_pick] && th.data.order_prom[th.data.bn_pick]['money'] <= o_condition) {
                             var ord_prom = th.data.order_prom[th.data.bn_pick];
                             //么有使用券，或者活动没有限制使用优惠券
                             if (coupon_price <= 0 || !ord_prom.is_xz_yh) {
@@ -4260,6 +4267,24 @@ Page({
         })
 
     },
+		
+	
+		
+		setexptype2: function(e) {
+			this.debounce(this.setexptype.bind(this, e),400)();
+		},
+		
+		setexptype_w2: function(e) {
+			this.debounce(this.setexptype_w.bind(this, e),400)();
+		},
+		
+		// 函数防抖
+		debounce: function (func, wait) { 
+			return () => {
+				clearTimeout(timer);
+				timer = setTimeout(func, wait);
+			};
+		},
 
 
 });
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index ff1b79e..0fdda33 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -9,10 +9,10 @@
 		<block wx:if="{{is_b_now==1}}">
 			<view class="tab-container">
 				<view class="tab-wrapper">
-						<view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}"
+						<view hidden="{{bn_t_exp_t==2}}" bindtap='setexptype2' data-t='1' class="tab {{bn_exp_type == 1? 'active':''}}"
 						data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >门店自提</view>
 
-						<view hidden="{{bn_t_exp_t==1}}" bindtap='setexptype' data-t='0' class="tab {{bn_exp_type== 0 ? 'active':''}}"
+						<view hidden="{{bn_t_exp_t==1}}" bindtap='setexptype2' data-t='0' class="tab {{bn_exp_type== 0 ? 'active':''}}"
 						data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >快递邮寄</view>
 
 				</view>
@@ -22,10 +22,10 @@
 		<block wx:if="{{is_b_now==0 && cartlist.length==1}}">
 			<view class="tab-container">
 				<view class="tab-wrapper">
-						<view hidden="{{cartlist[0].distr_t==2}}" bindtap='setexptype_w' data-ind="0" data-t='1' class="tab {{cartlist[0].exp_type == 1? 'active':''}}"
+						<view hidden="{{cartlist[0].distr_t==2}}" bindtap='setexptype_w2' data-ind="0" data-t='1' class="tab {{cartlist[0].exp_type == 1? 'active':''}}"
 						data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >门店自提</view>
 
-						<view hidden="{{cartlist[0].distr_t==1}}" bindtap='setexptype_w' data-ind="0"  data-t='0' class="tab {{cartlist[0].exp_type== 0 ? 'active':''}}"
+						<view hidden="{{cartlist[0].distr_t==1}}" bindtap='setexptype_w2' data-ind="0"  data-t='0' class="tab {{cartlist[0].exp_type== 0 ? 'active':''}}"
 						data-txt='cartlist[0].exp_type' data-wl_txt='cartlist[0].wind' data-index="{{index}}" >快递邮寄</view>
 
 				</view>
@@ -145,7 +145,7 @@
 					<!-- 当是物流很多单的时候 -->
 					<view class="use-item flex-space-between" wx:if="{{cartlist.length>1}}">
 						<view class="flex-vertical" >
-							<view bindtap='setexptype_w' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type'
+							<view bindtap='setexptype_w2' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type'
 							    style="padding-right:26rpx;display:{{item.distr_t==2?'none':'flex;align-items: center'}};">
 								<!-- <icon  bindtap='setexptype_w' data-t='1' data-txt='cartlist[{{pidx}}].exp_type'  color="{{item.exp_type==1?'red':'gray'}}" size="16" type="success"></icon> -->
 
@@ -156,10 +156,10 @@
 								<block wx:else>
 									<view class="circle  xc-hookts on"></view>
 								</block>
-								<view bindtap='setexptype_w' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type' class="yu_er">门店自提</view>
+								<view bindtap='setexptype_w2' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type' class="yu_er">门店自提</view>
 							</view>
 
-							<view data-t='0' data-txt='cartlist[{{pidx}}].exp_type' data-ind="{{pidx}}" bindtap="setexptype_w" style="display:{{item.distr_t==1?'none':'flex;align-items: center'}};">
+							<view data-t='0' data-txt='cartlist[{{pidx}}].exp_type' data-ind="{{pidx}}" bindtap="setexptype_w2" style="display:{{item.distr_t==1?'none':'flex;align-items: center'}};">
 								<!-- <icon bindtap='setexptype_w' data-t='0' data-txt='cartlist[{{pidx}}].exp_type'  color="{{item.exp_type==0?'red':'gray'}}" size="16" type="success"></icon> -->
 								<block wx:if="{{item.exp_type==0}}">
 									<!-- <view class="circle white xc-hookt fs20 red-b  sn"><text>Γ</text></view> -->
@@ -169,7 +169,7 @@
 									<view class="circle  xc-hookts on"></view>
 								</block>
 
-								<view bindtap='setexptype_w' data-t='0' data-ind="{{pidx}}" data-txt='cartlist[{{pidx}}].exp_type' data-wl_txt='cartlist[{{pidx}}].wind'
+								<view bindtap='setexptype_w2' data-t='0' data-ind="{{pidx}}" data-txt='cartlist[{{pidx}}].exp_type' data-wl_txt='cartlist[{{pidx}}].wind'
 								 class="yu_er">快递邮寄</view>
 							</view>
 						</view>
diff --git a/pages/distribution/distribution.js b/pages/distribution/distribution.js
index 708d871..125b7a6 100644
--- a/pages/distribution/distribution.js
+++ b/pages/distribution/distribution.js
@@ -3,6 +3,19 @@ const app =  getApp();
 let self = null, os = app.globalData.setting;
 var regeneratorRuntime = require('../../utils/runtime.js');
 
+// Component({
+//   pageLifetimes: {
+//     show() {
+//       if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+//         this.getTabBar().setData({
+//           active: 2
+//         })
+//       }
+//     }
+//   }
+// })
+
+
 Page({
 
   /**
@@ -57,7 +70,13 @@ Page({
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {	  
+  onShow: function () {	 
+		if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+			this.getTabBar().setData({
+				active: 2
+			})
+		};
+		
 	    var self=this,userinfo=app.globalData.userInfo;
 		if(!app.globalData.userInfo){
 			 return false;
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index 291b636..e3d1305 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -60,14 +60,17 @@ Page({
     is_hot: 0,
     msgStatus:false,  //页面显示暂无数据状态
     countDownNum: 3,
-    timer: '', //定时器
+    timer: null, //定时器
     lastMsg:false,
     toView:"",
     is_show_class:false,//是否添加新样式
     status_show:0,
     currentTab: 0, //预设当前项的值
 	
-	load:0,
+    load:0,
+    xmlist: null,
+  
+
   },
 
 
@@ -134,6 +137,7 @@ Page({
    
       if (this.data.is_used_share==0){  
         this.get_nation();
+        this.getServiceCategory();
       }
       
       //风格三
@@ -202,7 +206,7 @@ Page({
 		if(this.data.load) return false;
 
         getApp().getConfig2(function (e) {
-
+				console.log('card------------>>>>', e);
         var data=e;
         var switch_list_data = data.switch_list;
         var switch_list = JSON.parse(switch_list_data);
@@ -215,13 +219,14 @@ Page({
         if (e.categoryset.indexOf("," + 1 + ",") != -1) { that.setData({ is_show_pl: 1 }); }
         if (e.categoryset.indexOf("," + 3 + ",") != -1) { that.setData({ is_show_pp: 1 }); }
         if (e.categoryset.indexOf("," + 2 + ",") != -1) { that.setData({ is_show_gb: 1 }); }
+        if (e.categoryset.indexOf("," + 4 + ",") != -1) { that.setData({ is_show_xm: 1 }); }
         that.setData({ store_config: e,is_do:1 });
 
         //---有勾品类---
         if (that.data.is_show_pl){
            that.requestFirstCategoris();
         }
-        if (that.data.is_show_gb != 1 && that.data.is_show_pp != 1 && that.data.is_show_pl){     
+        if (that.data.is_show_xm != 1 && that.data.is_show_gb != 1 && that.data.is_show_pp != 1 && that.data.is_show_pl){     
             that.data.pl_timer = setInterval(function () {
                  if (that.data.one_level_classify.length>0){
                      var item=that.data.one_level_classify[0],arr=item.array;
@@ -259,6 +264,7 @@ Page({
         if (that.data.is_show_pl) that.setData({ currentTab: 0 });
         else if (that.data.is_show_gb){ that.setData({ currentTab: 1 });that.get_nation();  }
         else if (that.data.is_show_pp) {that.setData({ currentTab: 2 });that.get_brand(); }
+        else if (that.data.is_show_xm) {that.setData({ currentTab: 3 });that.getServiceCategory(); }
 
         //----求传参过来的控制-----
         if (getApp().globalData.cat_type == 1 && that.data.is_show_gb ) {
@@ -267,6 +273,9 @@ Page({
         } else if (getApp().globalData.cat_type == 2 && that.data.is_show_pp ) {
           that.setData({ currentTab: 2 });
           that.get_brand();
+        } else if (getApp().globalData.cat_type == 3 && that.data.is_show_xm ) {
+          that.setData({ currentTab: 3 });
+          that.getServiceCategory();
         } else if (that.data.is_show_pl) {
           that.setData({ currentTab: 0 });
         }
@@ -277,7 +286,7 @@ Page({
           that.setData({ status_show: 2 });
         }
 		
-		that.data.load=1;
+      that.data.load=1;
       })
     
     },
@@ -402,6 +411,13 @@ Page({
       if (e.detail.current == 2 && that.data.groups == null) {
         that.get_brand();
       }
+
+      //获取服务卡项
+      if (e.detail.current == 3 && that.data.xmlist == null) {
+        that.getServiceCategory();
+      }
+
+
     },
     //-----------点击切换-----------
     clickTab: function (e) {
@@ -422,9 +438,15 @@ Page({
         if (e.detail.current == 2 && that.data.groups == null) {
            that.get_brand();
         }
+
+        //获取服务卡项
+        if (e.detail.current == 3 && that.data.xmlist == null) {
+          that.getServiceCategory();
+       }
+
     },
 
-    tabLetter(e) {
+  tabLetter(e) {
       const index = e.currentTarget.dataset.index;
       this.setData({
         selected: index,
@@ -488,8 +510,9 @@ Page({
     var lurl = "/pages/goods/goodsList/goodsList?nation_id=" + cid;
     wx.navigateTo({ url: lurl });
   },
+  
   //获取国别
-  get_nation:function(){
+  get_nation:function() {
     var s = this;
     e.get("/api/weshop/nation/page", {
       data: {
@@ -575,6 +598,33 @@ Page({
       }
     });
   },
+
+
+  // 获取服务卡项分类
+  getServiceCategory: function() {
+    var s = this;
+    e.get("/api/weshop/serviceCategory/page", {
+      data: {
+        is_show: 1,
+        store_id:oo.stoid,
+				pageSize: 1000,
+      },
+      success: function (e) {
+        var dda = e.data.data.pageData;
+        s.setData({ 
+					xmlist:dda,
+				});
+      }
+    });
+  },
+
+  
+  goServiceCategoryList: function(t) {
+    var cid = t.currentTarget.dataset.cid;
+    var lurl = "/packageA/pages/cardList/cardList?cat_id=" + cid;
+    wx.navigateTo({ url: lurl });
+  },
+
   //---------分享配置--------
   onShareAppMessage: function (e) {
 	  
@@ -656,10 +706,12 @@ Page({
   // 新的版本分类点击一级分类
  click_classify:function(e){
   // 在风格三的时候，才会有current
+	clearInterval(this.data.timer);
+	
   let cur = e.currentTarget.dataset.current;
   if(cur) {
       if (this.data.currentTab == cur) {
-          if (this.data.select_classify_on != 220 && this.data.select_classify_on != 223) {
+          if (this.data.select_classify_on != 220 && this.data.select_classify_on != 221 && this.data.select_classify_on != 223) {
               return false;
           } else if (cur != 0) {
               return false;
@@ -675,6 +727,9 @@ Page({
           this.checkCor();
       }
   }
+	this.setData({
+		countDownNum: 3,
+	});
   // if(e.currentTarget.dataset.index == 223){
   //   this.setData({ status_show: 1});
   //  }else if(e.currentTarget.dataset.index == 220){
@@ -692,7 +747,7 @@ Page({
    }
    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)
+  // console.log(e.currentTarget.dataset.index)
    clearInterval(this.data.timer);
    this.setData({ countDownNum: 3, stylePage: 1, scrollTop: 0});
    this.data.ishaf_three = 0;
@@ -746,6 +801,8 @@ Page({
     _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
   },
+	
+	
   //选择更多
   select_more:function(e){ 
     var cid = e.currentTarget.dataset.cid;
@@ -754,6 +811,8 @@ Page({
     wx.navigateTo({ url: lurl });
    
   },
+	
+	
 //扫一扫
   getScancode:function(){
       var _this = this;
@@ -767,6 +826,8 @@ Page({
       }
     })
   },
+	
+	
   onUnload: function () {
     //this.destroyActivityTimer();
   },
diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index e7c7e1e..6be3964 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -12,6 +12,8 @@
               data-current="1" bindtap="clickTab">国家</view>
         <view  wx:if="{{is_show_pp}}" class="swiper-tab-item {{currentTab==2?'active':''}}" 
               data-current="2" bindtap="clickTab">品牌</view>
+				<view  wx:if="{{is_show_xm}}" class="swiper-tab-item {{currentTab==3?'active':''}}" 
+				      data-current="3" bindtap="clickTab">项目</view>
     </view> 
   </view>
   <view class="search-box "  bindtap="goseach">
@@ -22,7 +24,7 @@
             <input bindfocus="goseach" class="search-cont" placeholder="寻找好口碑" type="text"></input>
         </view>
   </view>
-  <block wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
+  <block wx:if="{{is_show_pl || is_show_gb || is_show_pp || is_show_xm}}">
    <swiper current="{{currentTab}}" duration="300"  bindanimationfinish="swiperTab" style="height:{{abc}}rpx;margin-bottom:120rpx">
       <!--------分类---------->
       <swiper-item >
@@ -86,6 +88,31 @@
               </view>
             </view>
       </swiper-item>
+			<!-------项目---------->
+			<swiper-item wx:if="{{is_show_xm}}">
+				<scroll-view scroll-y="true" class="fenlei-list" 
+				scroll-with-animation="true" lower-threshold="1" bindscrolltolower="scrolltolower"  style="height: {{abc}}rpx;" >
+					<block wx:if="{{xmlist && xmlist.length != 0}}">
+						<block wx:for="{{xmlist}}" wx:for-item="fitem" >
+							<view class='f_item'>
+									<view  class="pic_view" bindtap="goServiceCategoryList" data-cid="{{fitem.id}}" data-pid="0">
+						
+										<image wx:if="{{fitem.showImgType==1}}" binderror="bind_bnerr2" class='fl_img' data-errorimg="xmlist[{{index}}].showImg" src='{{fitem.showImg}}'></image>
+										<image wx:else class='fl_img' binderror="bind_bnerr2" data-errorimg="xmlist[{{index}}].showImg" src='{{iurl}}{{fitem.showImg}}'></image>
+										
+							<view class='over_view'></view> 
+								<text class='f_item_over_t'>{{fitem.name}}</text></view>
+								<view class='fenlei_text_v'>
+									<view class='f_text'  wx:for="{{fitem.array}}" wx:for-item="item" bindtap="goServiceCategoryList" data-cid="{{item.id}}" data-pid="{{item.parent_id}}">{{item.name}}</view>
+								</view>
+							</view> 
+							</block>
+					</block>
+					
+						
+						<view wx:else class="t-c fs28 c-9 pdt50">暂无项目</view>
+				</scroll-view>
+			</swiper-item>
    </swiper>
    <view class="no-data" wx:if="{{!is_date}}">
       <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
@@ -103,7 +130,7 @@
 </block>
 <!-- 风格2 -->
 <block wx:elif="{{is_used_share == 1}}">
-    <block wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
+    <block wx:if="{{is_show_pl || is_show_gb || is_show_pp || is_show_xm}}">
 			<!-- 新版分类头部 -->
 			<view class="xc-search-box flex jc_sb ai-center" style="position:fixed;top:0;z-index:99">
 				<!-- <view class="xc-search-inner ">
@@ -129,38 +156,47 @@
                <!-- 分类项目的类型 -->
            <view class="project_type" style="background-color:#f4f4f4;overflow-y:auto;position:fixed;left:0;z-index:99;top:108rpx;">
            <view class="project_type-frame" style="margin-bottom:120rpx;">
-           <view wx:if="{{is_show_gb}}" class="{{status_show == 1?'':''}}">
+							<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  {{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  class="tab-bar-item sort-name ellipsis-1" style="">国家</view>
+								<view  bindtap="click_classify"  style="{{status_show == 1?'margin-top:0':'margin-top:40rpx'}}" class="fs30  {{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 class="tab-bar-item sort-name ellipsis-1" style="">国家</view>
 
+								</view>
               </view>
-              </view>
-              <view wx:if="{{is_show_pp}}" class="{{status_show == 2?'':''}}">
+							
+              <view wx:if="{{is_show_pp}}">
               <!-- <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" wx:if="{{is_brand}}"data-index="220"data-name="品牌">
+                <view bindtap="click_classify" class="{{select_classify_on==220?'select_classify':''}} fs30" wx:if="{{is_brand}}" data-index="220" data-name="品牌">
               
-							<!-- <view  class="tab-bar-item sort-name ellipsis-1" style="letter-spacing:50rpx;">品牌</view> -->
-              <view  class="tab-bar-item sort-name ellipsis-1" style="">品牌</view>
-              </view>
+								<!-- <view  class="tab-bar-item sort-name ellipsis-1" style="letter-spacing:50rpx;">品牌</view> -->
+									<view  class="tab-bar-item sort-name ellipsis-1" style="">品牌</view>
+								</view>
               </view>
+							
+							<!-- 项目 -->
+							<view wx:if="{{is_show_xm}}">
+							  <view  bindtap="click_classify" class="fs30 {{select_classify_on==221?'select_classify':''}}" data-index="221" data-name="项目">
+									<view  class="tab-bar-item sort-name ellipsis-1">项目</view>
+								</view>
+							</view>
+							
+							
+							<!-- 品类 -->
               <view wx:if="{{is_show_pl}}">
-
-                <view wx:for="{{one_level_classify}}" wx:for-item="ittms" >
-                <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?'':''}} {{select_classify_on==index&&ittms.items.name.length==3?'':''}}"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 wx:for="{{one_level_classify}}" wx:for-item="ittms">
+									<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?'':''}} {{select_classify_on==index&&ittms.items.name.length==3?'':''}}" 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>
 
         </view>
                <!-- 分类项目的内容 -->
@@ -204,18 +240,44 @@
             <view class="t-c">
               <image class="brand_img" src="{{user.logo}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
               <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
-           </view>
+            </view>
          </view>
 
 
         </block>
         </view>
         </block>
+				
+				<!-- 卡项 -->
+				<!-- <block wx:if="{{select_classify_on==220&&is_show_xm}}"> -->
+				<block wx:if="{{select_classify_on==221&&is_show_xm}}">
+					<block wx:if="{{xmlist && xmlist.length != 0}}">
+						<view class="classify_name fs28 flex-space-between">
+							 <view>{{classify_name}}</view>
+						</view>
+						
+						<view class="classify_content-frame flex flex-wrap" style="padding-bottom: 130rpx;">
+						 <block wx:for="{{xmlist}}">
+							 <view class="brand_img_frame" bindtap="goServiceCategoryList" data-cid="{{item.id}}" >
+									<view class="t-c">
+										<image wx:if="{{item.ico}}" class="brand_img" src="{{item.ico}}" mode="heightFix"></image>
+										<image wx:else class="brand_img" src="{{iurl + '/miniapp/images/no_cate_def.png'}}" mode="heightFix"></image>
+										<view class="brand_img_name ellipsis-1 fs24">{{item.name}}</view>
+								  </view>
+							 </view>
+						</block>
+						</view>
+					</block>
+
+					<view wx:else class="t-c fs28 c-9 pdt50">暂无项目</view>
+				</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="{{is_show_pl&&select_classify_on!=221&&select_classify_on!=220&&select_classify_on!=223}}">
+				<block wx:if="{{select_classify_on!=221&&select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
+        <!-- <block wx:if="{{select_classify_on == 0&&is_level_three!=1}}"> -->
              <view class="my-container">
-                 <view class="classify_name fs28 flex-space-between ai-center"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
+                 <view class="classify_name fs28 flex-space-between ai-center" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more'>
             <view class="classify_title ellipsis-1">{{classify_name}}</view>
               <view class="flex select_more ai-center" >
                 <view class="red-co fs24" >更多</view>
@@ -227,7 +289,7 @@
                  <block wx:if="{{goodslist && goodslist.length>0}}">
                      <block  wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="indx">
                         <view  class="type_img_frame t-c ib" data-cid="{{goods.items.id}}" data-pid="{{goods.items.parent_id}}" bindtap="go_cate">
-                          <image class=" type_img" src="{{goods.items.icoimg==null||goods.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':goods.items.icoimg}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
+                          <image class=" type_img" src="{{goods.items.icoimg==null||goods.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':goods.items.icoimg}}" binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
                             <view class="brand_img_name fs24 ellipsis-1 pdh10">{{goods.items.name}}</view>
                         </view>
                      </block>
@@ -241,8 +303,8 @@
         </block>
 
         <!-- 商品 含有3级的-->
-        <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three==1}}">
-        <block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="inds">
+        <block wx:if="{{select_classify_on!=220&&select_classify_on!=221&&select_classify_on!=223&&is_level_three==1}}">
+        <block wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="inds">
         <view>
 
         <view class="classify_name fs28 flex-space-between ai-center"data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'>
@@ -282,7 +344,7 @@
 </block>
 <!-- 风格3 -->
 <block wx:elif="{{is_used_share == 2}}">
-    <block wx:if="{{is_show_pl || is_show_gb || is_show_pp }}">
+    <block wx:if="{{is_show_pl || is_show_gb || is_show_pp || is_show_xm}}">
       <!-- 头部 -->
       <view class="xc-search-box flex-center white_b" id="navbar" style="position:fixed;top:0;z-index:99">
             <!-- <view class="share-height t-c" bindtap="getScancode" >
@@ -314,16 +376,27 @@
             <view class="project_type" style="background-color:#f4f4f4;overflow-y:auto;position:fixed;left:0;z-index:99;top:108rpx;" id="thress_type3">
               <view class="project_type-frame" style="margin-bottom:120rpx;">
                 <view wx:if="{{is_show_gb}}">
-                  <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}}">
+                  <view  bindtap="click_classify"  class="tab-bar-item {{select_classify_on==223 ? 'active' : ''}}" data-index="223" data-name="国家" wx:if="{{is_country}}" data-current="223">
                     <text style="">国家</text>
                   </view>
                 </view>
+								
                 <view wx:if="{{is_show_pp}}">
-                
-                  <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="品牌">
+                  <view bindtap="click_classify"  class="tab-bar-item {{select_classify_on==220 ? 'active' : ''}}" wx:if="{{is_brand}}"  data-index="220" data-name="品牌" data-current="220">
                     <text style="">品牌</text>
                    </view>
                 </view>
+								
+								
+								<!-- 卡项 -->
+								<view wx:if="{{is_show_xm}}">
+								  <view bindtap="click_classify" class="tab-bar-item {{select_classify_on == 221 ? 'active' : ''}}" data-index="221" data-name="项目" data-current="221">
+								    <text>项目</text>
+								  </view>
+								</view>
+								
+								
+								
                 <view wx:if="{{is_show_pl}}">
                   <!-- <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':''}}"> -->
@@ -356,6 +429,9 @@
                   
                 <!-- </view> -->
               </view>
+							
+							
+							
             </view>
              </view>
             <!-- 分类项目的内容 -->
@@ -383,6 +459,8 @@
                </view>
         </view>
         </block>
+				
+				
         <!-- 品牌 -->
         <block wx:if="{{select_classify_on==220&&is_show_pp}}">
 
@@ -396,7 +474,7 @@
          <view class="brand_img_frame "wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
 
             <view class="t-c">
-               <image class=" brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
+               <image class="brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
                 <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
            </view>
          </view>
@@ -405,9 +483,38 @@
         </block>
         </view>
         </block>
+				
+				
+				<!-- 卡项 -->
+				<block wx:if="{{select_classify_on==221&&is_show_xm}}">
+					<block wx:if="{{xmlist && xmlist.length != 0}}">
+						<view class="classify_name fs28 flex-space-between">
+							 <view>{{classify_name}}</view>
+						</view>
+						
+						<view class="classify_content-frame flex flex-wrap" style="padding-bottom: 130rpx;">
+						 <block wx:for="{{xmlist}}">
+							 <view class="brand_img_frame" bindtap="goServiceCategoryList" data-cid="{{item.id}}">
+									<view class="t-c">
+										<image wx:if="{{item.ico}}" class="brand_img" src="{{item.ico}}" mode="heightFix"></image>
+										<image wx:else class="brand_img" src="{{iurl + '/miniapp/images/no_cate_def.png'}}" mode="heightFix"></image>
+										<view class="brand_img_name ellipsis-1 fs24">{{item.name}}</view>
+								 </view>
+							 </view>
+							</block>
+						</view>
+					</block>
+					
+					<view wx:else class="t-c fs28 c-9 pdt50">暂无项目</view>
+					
+				</block>
+				
+				
         <!-- 品类-->
-        <block  wx:if="{{is_show_pl}}">
-          <block wx:if="{{select_classify_on!=220&&select_classify_on!=223}}">
+				<!-- <block  wx:if="{{select_classify_on==0&&is_show_pl}}"> -->
+        <block  wx:if="{{is_show_pl&&select_classify_on!=220&&select_classify_on!=223&&select_classify_on!=221}}">
+					<!-- <block wx:if="{{select_classify_on!=220&&select_classify_on!=223}}"> -->
+          <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&select_classify_on!=221}}">
               <view style="width:100%;height:100%;position: relative;">
                 <view class="classify_name fs28 flex ai-center flex-space-between" id="header" data-pid="0" data-cid="{{cat_id}}" bindtap='select_more' style="box-sizing:border-box;position:fixed;z-index: 999;width:74%;background-color:#ffffff;padding:0 20rpx;">
                   <view class="classify_title ellipsis-1">{{classify_name}}</view>
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 7d966a3..5e476db 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -33,6 +33,8 @@ Page({
     iurl: o.imghost,
     defaultAvatar: o.resourceUrl + "/static/images/user68.jpg",
 
+    viplimited_timetype: 0,
+
     data: null,
     content: "", //商品详情
     comments: null, //商品评论
@@ -740,7 +742,8 @@ Page({
     i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, {
       failRollback: !0,
       success: function (t) {
-        console.log(t);
+        
+        ee.data.viplimited_timetype = t.data.data.viplimited_timetype;
         if (t.data.code == 0) {
           if (t.data.data.is_on_sale != 1) {
             wx.showModal({
@@ -3719,7 +3722,8 @@ Page({
         data: {
           store_id: os.stoid,
           user_id: user_id,
-          goods_id: gd.goods_id
+          goods_id: gd.goods_id,
+          timetype: th.data.viplimited_timetype
         },
         success: function (t) {
           if (t.data.code == 0) {
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 40fa0f4..1cfab5c 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -1678,6 +1678,7 @@ view.cart-btn-lg {
 	text-align: center;
 	line-height: 38rpx;
 	margin-left: 20rpx;
+	justify-content: center;
 }
 
 .buttem-list .item.red {
diff --git a/pages/index/index/index.json b/pages/index/index/index.json
index c7badaa..d22f482 100644
--- a/pages/index/index/index.json
+++ b/pages/index/index/index.json
@@ -17,10 +17,11 @@
         "picMax": "/components/diy_picMax/diy_picMax",
         "mvideo": "/components/diy_video/diy_video",    
         "service": "/components/diy_service/diy_service",
-		"scan": "/components/diy_scan/diy_scan",
-		"store_select": "/components/diy_store_select/diy_store_select",
+				"scan": "/components/diy_scan/diy_scan",
+				"store_select": "/components/diy_store_select/diy_store_select",
         "presell": "/components/diy_pregoods/diy_pregoods",
-				"luckyGo": "/components/diy_luckyGo/diy_luckyGo"
+				"luckyGo": "/components/diy_luckyGo/diy_luckyGo",
+				"serviceCard": "/components/diy_serviceCard/diy_serviceCard"
     },
 	"enablePullDownRefresh": false
 }
\ No newline at end of file
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index ba0ca97..766039d 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -9,14 +9,15 @@
 <!--普通界面-->
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
 
+
 <view class="container rel nor" wx:if="{{ishow}}">
   <block wx:if="{{banner}}">
     <image class="xc-top-img abs" src="{{url}}/miniapp/images/top-img.png"></image><!-- 红色背景 -->
   </block>
 
   <view class="top-bar">
-        <!-- 顶部关注公众号 -->
-        <view id="off_top" wx:if="{{is_gz_h5}}"><official-account></official-account></view>
+		<!-- 顶部关注公众号 -->
+		<view id="off_top" wx:if="{{is_gz_h5}}"><official-account></official-account></view>
 
 		<!-- 控制要不要显示顶部门店选择 -->
 		<block wx:if="{{is_topstore}}">
@@ -45,9 +46,9 @@
 		</view>
 	</view>
   <!-- 如果有关注，要 -->
-  <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view>
+  <!-- <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view> -->
   <!-- 如果有顶部门店 -->
-  <view wx:if="{{is_topstore}}" style="height: 60rpx"></view>
+  <!-- <view wx:if="{{is_topstore}}" style="height: 60rpx"></view> -->
 
   <!--滚动广告-->
   <view class="rel title-img" wx:if="{{banner}}">
@@ -431,14 +432,14 @@
   <!-- 撑开层 -->	
   <view>
        <!-- 关注层的撑开 -->
-       <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view>
-	   <block wx:for="{{template_arr}}" >
+       <!-- <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view> -->
+	   <!-- <block wx:for="{{template_arr}}" >
            <block wx:if="{{item.content.is_top==1 && item.ename=='searchbox'}}">
 		       <view wx:if="{{item.content.style==1}}" style="height: 115rpx;"></view>
 		       <view wx:if="{{item.content.style==2}}" style="height: 89rpx;"></view>
            </block>
 		   <view wx:if="{{item.content.is_top==1 && item.ename=='store_select'}}" style="height: 100rpx;"></view>
-	   </block>	      
+	   </block>	 -->      
   </view>
   
   <block wx:for="{{template_arr}}" wx:key="{{index}}">
@@ -522,6 +523,10 @@
 			 <luckyGo object="{{item.content}}"></luckyGo>
 		</block>
 		
+		<!-- 服务卡项 -->
+		<block wx:if="{{item.ename=='servicecategory'}}">
+			 <serviceCard object="{{item.content}}"></serviceCard>
+		</block>
 
     </view>
 		
diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss
index 0f96abd..c249c08 100644
--- a/pages/index/index/index.wxss
+++ b/pages/index/index/index.wxss
@@ -1011,7 +1011,8 @@ page {
 }
 
 .container {
-	overflow: hidden;
+	/* overflow: hidden; */
+	overflow: visible;
 	/* padding-top: 140rpx; */
 }
 
@@ -1064,7 +1065,7 @@ page {
 }
 
 .dis_top {
-	position: fixed;
+	position: sticky;
 	top: 0;
 	left: 0;
 	width: 100%;
diff --git a/pages/payment/pay_success/pay_success.js b/pages/payment/pay_success/pay_success.js
index 9b415c8..ae38430 100644
--- a/pages/payment/pay_success/pay_success.js
+++ b/pages/payment/pay_success/pay_success.js
@@ -24,44 +24,84 @@ Page({
       wx.setNavigationBarTitle({
           title: '支付成功',
       });
-
+			this.setData({
+				options,
+			});
       var type=options.type,order_sn=options.order_sn;
       var th=this,order=null;
-      //如果是等1，就是单个订单的订单号
-      if(type==1){
-          await  getApp().request.promiseGet("/api/weshop/order/page",
-               {data:{store_id:e.globalData.setting.stoid,order_sn:order_sn}}).then(res=>{
-                   if(ut.ajax_ok(res)){
-                       order=res.data.data.pageData[0];
-                       th.setData({order:order,order_sn:order_sn})
-                   }
-
-          })
-      }else{
-          await  getApp().request.promiseGet("/api/weshop/order/page",
-              {data:{store_id:e.globalData.setting.stoid,parent_sn:order_sn}}).then(res=>{
-
-                  if(ut.ajax_ok(res)){
-                      var allmoney=0,user_money=0;
-                      for(var i in res.data.data.pageData){
-                          var item=res.data.data.pageData[i];
-                          allmoney+=item.order_amount;
-                          user_money += item.user_money?item.user_money:0;
-                      }
-                      order=res.data.data.pageData[0];
-                      th.setData({ order: order, type: 2, allmoney: allmoney, order_sn: order_sn, user_money: user_money})
-                  }
-
-
-          })
-      }
-      //--获取门店--
-      if(order.exp_type==1) {
-          await getApp().request.promiseGet("/api/weshop/pickup/get/"+ e.globalData.setting.stoid+"/"+order.pickup_id,
-              {1:1}).then(res => {
-              th.setData({pick:res.data.data})
-          });
-      }
+			
+			
+			// 卡项订单
+			if(options.card == 1) {
+				let url = '/api/weshop/recharge/user/page'
+				let data = {
+					store_id: getApp().globalData.setting.stoid,
+					user_id: getApp().globalData.userInfo.user_id,
+					order_id: this.data.options.order_id,
+				};
+				
+				// 请求数据
+				getApp().promiseGet(url, {
+					data: data,
+				}).then(res => {
+					if (res.data.code == 0) {
+						console.log('请求成功', res);
+						this.setData({
+							order: res.data.data.pageData[0],
+							order_sn: res.data.data.pageData[0].order_sn,
+						});
+					} else {
+						throw (res);
+					};
+				}).catch(err => {
+					wx.showToast({
+						title: err.data.data,
+						icon: 'error',
+					});
+				});
+			} else {
+				
+				//如果是等1，就是单个订单的订单号
+				if(type==1){
+				    await  getApp().request.promiseGet("/api/weshop/order/page",
+				         {data:{store_id:e.globalData.setting.stoid,order_sn:order_sn}}).then(res=>{
+				             if(ut.ajax_ok(res)){
+				                 order=res.data.data.pageData[0];
+				                 th.setData({order:order,order_sn:order_sn})
+				             }
+				
+				    })
+				}else{
+				    await  getApp().request.promiseGet("/api/weshop/order/page",
+				        {data:{store_id:e.globalData.setting.stoid,parent_sn:order_sn}}).then(res=>{
+				
+				            if(ut.ajax_ok(res)){
+				                var allmoney=0,user_money=0;
+				                for(var i in res.data.data.pageData){
+				                    var item=res.data.data.pageData[i];
+				                    allmoney+=item.order_amount;
+				                    user_money += item.user_money?item.user_money:0;
+				                }
+				                order=res.data.data.pageData[0];
+				                th.setData({ order: order, type: 2, allmoney: allmoney, order_sn: order_sn, user_money: user_money})
+				            }
+				
+				
+				    })
+				}
+				//--获取门店--
+				if(order.exp_type==1) {
+				    await getApp().request.promiseGet("/api/weshop/pickup/get/"+ e.globalData.setting.stoid+"/"+order.pickup_id,
+				        {1:1}).then(res => {
+				        th.setData({pick:res.data.data})
+				    });
+				};
+				
+				
+			};
+      
+			
+			
   },
 
   goto: function() {
diff --git a/pages/payment/pay_success/pay_success.wxml b/pages/payment/pay_success/pay_success.wxml
index a910a9c..7976a12 100644
--- a/pages/payment/pay_success/pay_success.wxml
+++ b/pages/payment/pay_success/pay_success.wxml
@@ -25,25 +25,38 @@
       <view class="payitem flex">
         <view>实付金额 :</view>
         <!-- {{filters.toFix()}} -->
-        <view class="pay_money" wx:if="{{type==1}}">{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元</view>
-        <view class="pay_money" wx:else>{{filters.toFix(allmoney+user_money,2) }}元</view>
+				<!-- 卡项订单 -->
+				<view class="pay_money" wx:if="{{options.card == 1}}">{{filters.toFix(order.account,2) }}元</view>
+				
+				<block wx:else>
+					<view class="pay_money" wx:if="{{type==1}}">{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元</view>
+					<view class="pay_money" wx:else>{{filters.toFix(allmoney+user_money,2) }}元</view>
+				</block>
       </view>
 
       <!-- 支付方式 -->
-      <view class="payitem flex" wx:if="type==1">
-        <view>支付方式 :</view>
-        <view wx:if="{{order.order_amount>0 && order.user_money>0 }}">微信支付,余额支付</view>
-        <view wx:elif="{{order.order_amount>0}}">微信支付</view>
-        <view wx:elif="{{order.user_money>0}}">余额支付</view>
-        <view wx:else>免单</view>
-      </view>
-      <view class="payitem flex"  wx:else>
-          <view>支付方式 :</view>
-          <view wx:if="{{allmoney>0 && user_money>0 }}">微信支付,余额支付</view>
-          <view wx:elif="{{allmoney>0}}">微信支付</view>
-          <view wx:elif="{{user_money>0}}">余额支付</view>
-          <view wx:else>免单</view>
-      </view>
+			<view class="payitem flex" wx:if="{{options.card == 1}}">
+			  <view>支付方式 :</view>
+			  <view>微信支付</view>
+			</view>
+			
+			<block wx:else>
+				<view class="payitem flex" wx:if="{{type==1}}">
+				  <view>支付方式 :</view>
+				  <view wx:if="{{order.order_amount>0 && order.user_money>0 }}">微信支付,余额支付</view>
+				  <view wx:elif="{{order.order_amount>0}}">微信支付</view>
+				  <view wx:elif="{{order.user_money>0}}">余额支付</view>
+				  <view wx:else>免单</view>
+				</view>
+				<view class="payitem flex"  wx:else>
+				    <view>支付方式 :</view>
+				    <view wx:if="{{allmoney>0 && user_money>0 }}">微信支付,余额支付</view>
+				    <view wx:elif="{{allmoney>0}}">微信支付</view>
+				    <view wx:elif="{{user_money>0}}">余额支付</view>
+				    <view wx:else>免单</view>
+				</view>
+			</block>
+      
 
 
 
@@ -72,23 +85,42 @@
     <view class="pay_User fs28" wx:else>
       <view class="payitem flex">
         <view class="pay_Receiving">门店 :</view>
-        <view class="pay_name ellipsis-1">{{pick.pickup_name}}</view>
+				<view class="pay_name ellipsis-1" wx:if="{{options.card == 1}}">{{order.list[0].pickup_name}}</view>
+        <view class="pay_name ellipsis-1" wx:else>{{pick.pickup_name}}</view>
       </view>
       <view class="payitem flex">
         <view class="pay_Receiving">门店地址 :</view>
-        <view class="address ellipsis-2">{{pick.fulladdress}}</view>
+				<view class="pay_name" wx:if="{{options.card == 1}}">{{order.list[0].fulladdress}}</view>
+        <view class="address ellipsis-2" wx:else>{{pick.fulladdress}}</view>
       </view>
     </view>
 
     <!-- 链接 -->
-    <view class="fs32">
-      <view class="flex-center">
-        <navigator class="pay_order flex-center" url="/pages/user/order_list/order_list">
-          <view>查看订单</view>
-        </navigator>
-      </view>
-      <view class="flex-center">
-        <navigator class="pay_home flex-center" bindtap="goto">
+    <view class="fs28 pd20 mgt40">
+			<view class="flex">
+				
+				<block wx:if="{{options.card == 1}}">
+					<!-- <view class="flex-center"> -->
+					  <navigator class="btn f1 bg-yellow white" url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{order.order_id}}">
+					    <view>订单详情</view>
+					  </navigator>
+					<!-- </view> -->
+					<!-- <view class="flex-center"> -->
+					  <navigator class="btn f1 bg-red white mgl20" url="/pages/user/my_service/i_service">
+					    <view>立即预约</view>
+					  </navigator>
+					<!-- </view> -->
+				</block>
+				
+				<block wx:else>
+					<navigator class="btn f1 bg-yellow white" url="/pages/user/order_list/order_list">
+					  <view>查看订单</view>
+					</navigator>
+				</block>
+				
+			</view>
+      <view class="mgt30">
+        <navigator class="btn border c-6" bindtap="goto">
           <view>回到首页</view>
         </navigator>
       </view>
diff --git a/pages/payment/pay_success/pay_success.wxss b/pages/payment/pay_success/pay_success.wxss
index f69e931..3a996eb 100644
--- a/pages/payment/pay_success/pay_success.wxss
+++ b/pages/payment/pay_success/pay_success.wxss
@@ -59,26 +59,38 @@ page {
 
 .pay_User .payitem .pay_name {
   margin-right: 38rpx;
-  max-width: 250rpx;
+  /* max-width: 250rpx; */
 }
 
-.pay_order {
-  margin-top: 115rpx;
-  color: rgb(104, 104, 104);
-  width: 560rpx;
-  height: 62rpx;
-  border-radius: 30rpx;
-  border: 3rpx solid rgb(209, 209, 209);
+.btn {
+	box-sizing: border-box;
+	height: 80rpx;
+	line-height: 80rpx;
+	/* padding: 10rpx; */
+	text-align: center;
+  border-radius: 40rpx;
 }
 
 .pay_home {
-  margin-top: 35rpx;
+  /* margin-top: 35rpx; */
   color: rgb(255, 255, 255);
-  width: 566rpx;
-  height: 68rpx;
+  /* width: 566rpx;
+  height: 68rpx; */
   border-radius: 30rpx;
   background-color: rgb(219, 27, 52);
 }
 .address{
   width: 470rpx;
-}
\ No newline at end of file
+}
+
+.bg-red {
+	background-color: rgb(219, 27, 52);
+}
+
+.bg-yellow {
+	background-color: #feca53;
+}
+
+.border {
+	border: 2rpx solid #ccc;
+}
diff --git a/pages/store/index.wxss b/pages/store/index.wxss
index 3906111..9a03ec1 100644
--- a/pages/store/index.wxss
+++ b/pages/store/index.wxss
@@ -1,4 +1,4 @@
-.box{
+/* .box{
 	padding: 10px;
 	border-bottom: 10px solid #f5f5f5;
 	color: #000000;
@@ -44,5 +44,278 @@ position: relative;
 .sear_inp{width: 490rpx; background-color:#eaeaea; height: 80rpx; border-radius:5rpx; margin: 25rpx;}
 .sear_inp input{width: 400rpx;}
 .select{height: 80rpx; width: 220rpx;background-color:#eaeaea; margin:25rpx; font-size: 28rpx; line-height: 80rpx;text-align: center }
-.sear_btn{ width: 50rpx; height: 100%; display: flex; align-items: center;}
+.sear_btn{ width: 50rpx; height: 100%; display: flex; align-items: center;} */
+
+.border-bottom {
+	border-bottom: 2rpx solid #e0e0e0;
+}
+
+.fs22 {
+	font-size: 22rpx;
+}
+
+.flexShrink-0 {
+	flex-shrink: 0;
+}
+
+.pt16 {
+	padding-top: 16rpx;
+}
+
+.maxWidth-340 {
+	max-width: 340rpx;
+}
+
+.maxWidth-400 {
+	max-width: 400rpx;
+}
+
+
+/* 图标字体 */
+/* @font-face {
+  font-family: 'iconfont';
+  src: url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.eot');
+  src: url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.eot?#iefix') format('embedded-opentype'),
+  url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.woff') format('woff'),
+  url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.svg#iconfont') format('svg');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 28rpx;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-weizhi:before {
+  content: "\e615";
+	color: #FFBA10;
+}
+
+.icon-arrow_down:before {
+  content: "\e600";
+}
+
+.icon-arrow_right:before {
+  content: "\e61f";
+} */
+/* 图标字体 */
+
+
+
+.icon-weizhi {
+	color: #FFBA10;
+}
+
+page {
+	height: 100%;
+	font-size: 28rpx;
+}
+
+.container {
+	height: 100%;
+}
+#map {
+	/* width: 100%;
+	height: ; */
+	display: block;
+	width: 100%;
+	height: 100%;
+}
+.tab-container.active {
+	height: calc(100% - 86rpx);
+}
+.map-container.active ~ .tab-container .list-container {
+	height: 204rpx;
+	overflow: hidden;
+}
+.map-container.active ~ .tab-container .list {
+	overflow: hidden;
+}
+.tab-container.active .list-container {
+	height: calc(100% - 108rpx - 84rpx);
+	background-color: #F7F7F7;
+}
+
+
+.search-container {
+	display: flex;
+	align-items: center;
+	padding: 0 32rpx;
+	border-bottom: 2rpx solid #F0F0F0;
+}
+
+.city:after {
+	display: inline-block;
+	content: '◣';
+	font-size: 14rpx;
+	padding-left: 8rpx;
+	padding-right: 20rpx;
+	transform: rotateZ(-45deg);
+	position: relative;
+	top: -16rpx;
+}
+
+.input-container {
+	padding: 12rpx 0;
+	flex: 1;
+}
+
+.input {
+	padding: 0 20rpx;
+	height: 60rpx;
+	line-height: 60rpx;
+	border-radius: 30rpx;
+	background-color: #F3F3F3;
+}
+
+.placeholder {
+	color: #676767;
+	font-size: 24rpx;
+}
+
+
+
+
+
+/* 切换卡 */
+.tab-title-container {
+	display: flex;
+	text-align: center;
+	border-bottom: 20rpx solid #F7F7F7;
+}
+.tab-title {
+	width: 50%;
+	line-height: 88rpx;
+	position: relative;
+}
+.tab-title.active {
+	font-weight: bold;
+}
+.tab-title.active::after {
+	position: absolute;
+	content: '';
+	width: 110rpx;
+	height: 4rpx;
+	left: 50%;
+	bottom: 0;
+	transform: translateX(-50%);
+	background-color: #FFBA10;
+}
+
+.map-container {
+	transition: 0.1s all linear;
+	background-color: pink;
+}
+
+.map-container.active {
+	height: calc(100% - 86rpx - 80rpx - 200rpx);
+	transition: 0.1s all linear;
+}
+
+
+
+
+/* 查看地图 */
+.view-map {
+	line-height: 80rpx;
+	text-align: center;
+	font-size: 24rpx;
+	color: #000;
+	border-bottom: 2rpx solid #F0F0F0;
+}
+
+
+/* 列表 */
+.list {
+	height: 100%;
+}
+.list-item {
+	padding: 40rpx 28rpx;
+	border-bottom: 2rpx solid #F0F0F0;
+	justify-content: space-between;
+	background-color: #fff;
+}
+.list-item:last-child {
+	border-bottom: none;
+}
+radio .wx-radio-input {
+  width: 32rpx;
+  height: 32rpx;
+}
+radio .wx-radio-input.wx-radio-input-checked {
+	border-color: #333;
+	/* border-color: #FFBA10; */
+	background-color: white;
+}
+radio .wx-radio-input.wx-radio-input-checked::before {
+	display: inline-block;
+  content: ''; 
+  width: 24rpx;
+  height: 24rpx;
+  border-radius: 50%;
+	background-color: #333;
+  /* background-color: #FFBA10; */
+}
+.name-container {
+	padding-left: 14rpx;
+	padding-right: 30rpx;
+	box-sizing: border-box;
+}
+.name {
+	display: flex;
+	align-items: center;
+	font-size: 30rpx;
+	position: relative;
+}
+.address {
+	color: #6E6E6E;
+	font-size: 26rpx;
+	line-height: 34rpx;
+	padding-top: 16rpx;
+	/* padding-right: 40rpx; */
+	text-align: justify;
+}
+.tag {
+	color: #FF5B5A;
+	border-radius: 6rpx;
+	border: 2rpx solid #FF5B5A;
+	font-size: 22rpx;
+	padding: 0 4rpx;
+	flex-shrink: 0;
+	margin-left: 4rpx;
+}
+
+.distance {
+	color: #6E6E6E;
+	font-size: 22rpx;
+	line-height: 34rpx;
+	padding-top: 16rpx;
+	/* word-break: break-all; */
+}
+
+.icon-arrow_right {
+	padding-left: 20rpx;
+}
+
+.right {
+	min-width: 200rpx;
+	text-align: right;
+}
+
+.icon-arrow_down.active {
+	display: inline-block;
+	transform: rotateZ(180deg);
+}
+
+
+
+
+
+
+
+
 
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index ea0e942..d85e0c2 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -1,4 +1,5 @@
 const app = getApp();
+let self = null;
 var t = function(t) {
     return t && t.__esModule ? t : {
       default: t
@@ -36,6 +37,16 @@ Page({
       name: "待评价",
       id: 4
     }],
+		tab_serviceCard: [{
+      name: "全部",
+      id: 0,
+    },{
+      name: "待付款",
+      id: 1,
+    },{
+      name: "待评价",
+      id: 2,
+    }],
     activeCategoryId: 0,
     orderList: null,
     currentPage: 1,
@@ -50,6 +61,7 @@ Page({
 	
 	back_goods_arr:null,   //返回商品的列表
 		currentIndex: 0,
+		tabIndex: 0,
 		
 		startDate: '',
 		endDate: '',
@@ -60,11 +72,12 @@ Page({
 		is_no_data2: 0,
 		is_no_more2: 0,
 		
-		
+		cardList: [],
 		// 搜索内容
 		searchContent: '',
   },
   onLoad: function(t) {
+		self = this;
 		// 设置日期选择器的结束时间为当前日期
 		var now=new Date();
 		var nowDate = now.getFullYear() + '-' + (now.getMonth() + 1) + '-' + now.getDate(); 
@@ -72,10 +85,12 @@ Page({
 		var startDate=date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate(); 
 			
 		
-		if(t.index) {
+		if(t.index && t.tabindex) {
 			this.setData({
-				currentIndex: t.index
+				currentIndex: t.index,
+				tabIndex: t.tabindex,
 			});
+			this.clickTab();
 		};
 				
 		this.setData({
@@ -131,7 +146,7 @@ Page({
 	},1)
 	    	  
     this.resetData(), this.requestOrderList(this.data.activeCategoryId);
-
+		this.clickTab();
   },
   changeTab: function(t) {
     if (this.data.activeCategoryId == t.currentTarget.id) return false;
@@ -329,6 +344,7 @@ Page({
                 wx.stopPullDownRefresh();
         }, null, {store_id: os.stoid, user_id: oo.user_id});
     },
+		
   //滑倒底部
   onReachBottom: function() {
 		if(this.data.currentIndex == 0) {
@@ -339,13 +355,23 @@ Page({
 			}
 			s.canloadMore() && this.requestOrderList(this.data.activeCategoryId);
 		} else {
-			this.request_list({
-			    store_id: os.stoid,
-			    user_id: oo.user_id,
+			if(this.data.currentIndex == 1) {
+				this.request_list({
+					store_id: os.stoid,
+					user_id: oo.user_id,
 					page: this.data.currentPage2,
-			  });
+				});
+			} else { // 卡项订单
+				this.request_list({
+					store_id: os.stoid,
+					user_id: oo.user_id,
+					page: this.data.currentPage2,
+				});
+			}
+			
 		}
   },
+	
   onPullDownRefresh: function(t) {
 		// sty取消
     // this.resetData(), this.requestOrderList(this.data.activeCategoryId);
@@ -1833,8 +1859,16 @@ Page({
 		// var req_data = {
 		// 	page:th.data.currentPage2
 		// }
-	
-		app.request.promiseGet("/api/weshop/order/pagePosOrder", {
+		let currentIndex = this.data.currentIndex;
+		let url = '';
+		if(currentIndex == 1) {
+			url = '/api/weshop/order/pagePosOrder';
+		};
+		if(currentIndex == 2) {
+			url = '/api/weshop/recharge/user/page';
+		};
+		
+		app.request.promiseGet(url, {
 			  data: data
 			}).then(res=>{
 			// 关闭加载状态
@@ -1846,9 +1880,20 @@ Page({
 					var data = res.data.data.pageData;
 					// 判断有无更多数据可以加载，如果大于则没有更多数据，反之则有
 					if(res.data.data.page*res.data.data.pageSize > res.data.data.total){th.setData({is_no_more2:1});}		  									 
-					var list=th.data.list2;
-					list=list.concat(data);
-					th.setData({list2:list});
+					let list= [];
+
+					if(currentIndex == 1) {
+						list = th.data.list2;
+						list = list.concat(data);
+						th.setData({list2:list});
+					};
+					if(currentIndex == 2) { // 卡项订单
+						list = th.data.cardList;
+						list = list.concat(data);
+						th.setData({cardList:list});
+						console.log('currentCard', list);
+					};
+					
 				} else {
 					if(th.data.currentPage2==1){
 						th.setData({is_no_data2:1});
@@ -1858,11 +1903,11 @@ Page({
 				}	
 				if(callback) callback(res);
 			} else {
-				wx.showToast({
-				  title: res.data.msg,
-				  icon: 'none',
-				  duration: 2000
-				})
+				// wx.showToast({
+				//   title: res.data.msg,
+				//   icon: 'none',
+				//   duration: 2000
+				// })
 			}
 		})	
 	},
@@ -1873,7 +1918,7 @@ Page({
 		this.setData({
 			currentIndex: currentIndex
 		});
-		console.log(this.data.currentIndex);
+		
 		this.setData({
 			is_no_data2: 0,
 			is_no_more2: 0,
@@ -1886,7 +1931,8 @@ Page({
 				startDate: '选择开始时间',
 				endDate: '选择结束时间',
 			});--*/
-		} else if(currentIndex == 1) {
+		};
+		if(currentIndex == 1) {
 			console.log('线下订单');			
 			this.request_list({
 			    store_id: os.stoid,
@@ -1896,6 +1942,43 @@ Page({
 					EndDate: this.data.endDate
 			  });
 		};
+		if(currentIndex == 2) {
+			console.log('卡项订单');
+			// this.setData({
+			// 	orderList: null,
+			// });
+			// 默认请求全部卡项订单
+			this.request_list({
+			    store_id: os.stoid,
+			    user_id: oo.user_id,
+			 });
+			// let url = '/api/weshop/recharge/user/page';
+			// let data = {
+			// 	store_id: os.stoid,
+			// 	user_id: oo.user_id,
+			// };
+			// app.promiseGet(url, {
+			// 	data: data,
+			// }).then(res => {
+			// 	if(res.data.code == 0) {
+			// 		console.log('卡项订单请求成功', res);
+			// 		this.setData({
+			// 			orderList: res.data.data.pageData,
+			// 		});
+			// 	} else {
+			// 		throw(res);
+			// 	};
+			// }).catch(err => {
+			// 	console.log('卡项订单请求失败', err);
+			// 	this.setData({
+			// 		orderList: null,
+			// 	});
+			// 	wx.showToast({
+			// 		title: err.data.data,
+			// 		icon: 'error',
+			// 	});
+			// });
+		};
 	},
 	
 	bindDateChange1: function(e) {
@@ -1917,10 +2000,48 @@ Page({
 	},
 	
 	searchOnline() {
-		console.log('online',this.data.searchContent);
+		let currentIndex = this.data.currentIndex;
+		// console.log('online',this.data.searchContent, currentIndex);
 		if(this.data.searchContent) {
 			console.log(this.data.searchContent);
-			this.resetData(), this.requestOrderList(this.data.activeCategoryId);
+			if(currentIndex == 0) {
+				this.resetData(), this.requestOrderList(this.data.activeCategoryId);
+			};
+			if(currentIndex == 2) { // 卡项订单
+				let url = '/api/weshop/recharge/user/page';
+				let data = {
+					store_id: os.stoid,
+					user_id: oo.user_id,
+					keyWord: this.data.searchContent,
+				};
+				this.setData({
+					tabIndex: 0,
+				});
+				// 请求数据
+				app.promiseGet(url, {
+					data: data,
+				}).then(res => {
+					if(res.data.code == 0) {
+						// console.log('卡项订单请求成功', res);
+						this.setData({
+							cardList: res.data.data.pageData,
+						});
+					} else {
+						throw(res);
+					};
+				}).catch(err => {
+					// console.log('卡项订单请求失败', err);
+					this.setData({
+						cardList: [],
+						is_no_data2: 0,
+						is_no_more2: 0,
+					});
+					// wx.showToast({
+					// 	title: '搜索失败',
+					// 	icon: 'none',
+					// });
+				});
+			};
 		} else {
 			wx.showToast({
 				title: '您还没有输入搜索内容~',
@@ -2014,10 +2135,298 @@ Page({
 		})
 	},
 
-    go_url(e){
-       var url=e.currentTarget.dataset.url;
-       getApp().goto(url);
-    }
+	go_url(e){
+		 var url=e.currentTarget.dataset.url;
+		 getApp().goto(url);
+	},
+	
+	// 点击卡项订单二级tabbar
+	clickTab(e) {
+		// console.log('服务卡项index', e.target.dataset.index);
+		let currentIndex = 0;
+		if(e) {
+			currentIndex = e.target.dataset.index;
+		} else {
+			currentIndex = this.data.tabIndex
+		};
+		
+		// let || this.data.tabIndex;
+		
+		let url = '/api/weshop/recharge/user/page';
+		let data = {
+			store_id: os.stoid,
+			user_id: oo.user_id,
+		};
+		this.setData({
+			tabIndex: currentIndex,
+			is_no_data2: 0,
+			is_no_more2: 0,
+			cardList: [],
+		});
+		
+		
+		switch(currentIndex) {
+			case 0: { // 全部
+				delete data.order_status;
+				break;
+			};
+			case 1: { // 待支付
+				data.order_status = 0;
+				break;
+			};
+			case 2: { // 待评价
+				data.order_status = 1;
+				break;
+			};
+		};
+		// 请求数据
+		this.request_list(data);
+		
+		// app.promiseGet(url, {
+		// 	data: data,
+		// }).then(res => {
+		// 	if(res.data.code == 0) {
+		// 		console.log('卡项订单请求成功', res);
+		// 		this.setData({
+		// 			orderList: res.data.data.pageData,
+		// 		});
+		// 	} else {
+		// 		throw(res);
+		// 	};
+		// }).catch(err => {
+		// 	console.log('卡项订单请求失败', err);
+		// 	this.setData({
+		// 		orderList: null,
+		// 	});
+		// 	wx.showToast({
+		// 		title: err.data.data,
+		// 		icon: 'error',
+		// 	});
+		// });
+	},
+	
+	// 卡项订单 - 查看详情
+	viewDetails() {
+		let url = '/packageA/pages/details_serviceCard/details_serviceCard';
+		app.goto(url);
+	},
+	
+	// 卡项订单 - 立即支付
+	pay(e) {
+		let index = e.currentTarget.dataset.index;
+		let item = this.data.cardList[index];
+		let order_sn = item.order_sn;
+		let order_id = item.order_id;
+		let store_id = app.globalData.setting.stoid;
+		// console.log('go1!!!!!!!!!!!!!!!!!!!!!!!!!',index,item,order_sn,store_id);
+	
+		app.request.post('/api/weshop/order/pay/createRechargeOrder', {
+			data: {
+				parentSn: order_sn,
+				store_id: store_id,
+			},
+	
+			success: function(res) {
+				var n = res.data.data;
+				self.weixinPay(n, function() {
+					app.showWarning('支付成功');
+					setTimeout(function() {
+						wx.reLaunch({
+							url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
+						})
+					}, 1000)
+				}, function() {
+					app.showWarning('支付失败');
+					// setTimeout(function() {
+					// 	wx.reLaunch({
+					// 		url: '/packageA/pages/cardList/cardList',
+					// 	})
+					// }, 1000)
+				});
+			}
+		})
+	},
+	
+	//------调起支付框--------
+	weixinPay: function(n, success, fail) {
+		if (!n) return false;
+		wx.requestPayment({
+			timeStamp: String(n.timeStamp),
+			nonceStr: n.nonceStr,
+			package: n.packageValue,
+			signType: n.signType,
+			paySign: n.paySign,
+			success: function(n) {
+				console.log(n), getApp().showSuccess("支付成功！");
+				"function" == typeof success && success();
+				wx.redirectTo({
+					url: "../deposit/deposit"
+				});
+			},
+			fail: function(n) {
+				console.log(n), "requestPayment:fail" == n.errMsg ? getApp().showWarning("支付失败") :
+					"requestPayment:fail cancel" == n.errMsg ? getApp().showWarning("您已取消支付") : getApp().showWarning("支付失败：" + n
+						.errMsg.substr("requestPayment:fail ".length)),
+					"function" == typeof fail && fail();
+			}
+		});
+	},
+	
+	// 卡项订单 - 取消订单
+	// api/weshop/recharge/update?store_id=&order_id=&order_status=3
+	cancle(e) {
+		wx.showModal({
+		  title: '提示',
+		  content: '确定取消订单吗？',
+		  success (res) {
+		    if (res.confirm) {
+					console.log('取消订单~');
+					let order_id = e.currentTarget.dataset.orderid;
+					let order_sn = e.currentTarget.dataset.ordersn;
+					app.request.put('/api/weshop/recharge/update', {
+					  data: {
+							store_id: os.stoid,
+							order_id: order_id,
+							order_sn: order_sn,
+							order_status: 3,
+						},
+					  success: function(res) {
+							wx.showToast({
+								title: '取消成功',
+								success: function() {
+									
+									// 这里还可以优化不刷新，后面有时间再优化
+									self.setData({
+										is_no_data2: 0,
+										is_no_more2: 0,
+									});
+									
+									// 这里还可以优化不刷新，后面有时间再优化
+									self.clickTab(e);
+								},
+							});
+							
+							// let index = e.currentTarget.dataset.index;
+							// let cardList = self.data.cardList;
+							// cardList.splice(index, 1);
+							// self.setData({
+							// 	cardList,
+							// });
+							
+							//self.request_list(self.data.currentRequestData);
+					  },
+					})
+		    } else if (res.cancel) {
+		      console.log('用户点击取消');
+		    }
+		  }
+		});
+	},
+	
+	
+	// 卡项订单 - 再来一单
+	addCart: function(t) {
+	  var th = this;
+	  var ind = t.currentTarget.dataset.openSpecModal_ind;
+	  var action= t.currentTarget.dataset.action;
+	  if(!ind)  ind = t.currentTarget.dataset.openspecmodal_ind;
+	  
+	th.setData({
+	    open_ind_store: ind
+	  });
+	
+	if(!th.data.sto_sele_name){
+	      getApp().my_warnning('请选择门店', 1, th, 450);
+	      return false;
+	  }
+	
+	
+	if(action=="buy"){
+		//--------------此时操作的数据------------
+		var newd = {
+		  id: th.data.data.id,
+		  goods_num: th.data.goodsInputNum,
+		  pick_id: th.data.sto_sele_id,		
+		  keyid: th.data.sto_sele_keyid,		
+		};	  
+		newd['pick_name'] = th.data.sto_sele_name;		
+		newd['guide_id'] = getApp().globalData.guide_id;
+		newd['guide_type']=0;
+		th.buyNow(newd);
+	}else{
+	
+	      var newd = {
+	          service_id: th.data.data.id,
+	          service_sn:th.data.data.service_sn,
+	          service_name:th.data.data.goods_name,
+	          goods_num: th.data.goodsInputNum,
+	          pick_id: th.data.sto_sele_id,
+	          user_id:oo.user_id,
+	          store_id:os.stoid,
+	          money:th.data.data.shop_price
+	      };
+	      if(getApp().globalData.guide_id){
+	          newd['guide_id'] = getApp().globalData.guide_id;
+	          newd['guide_type']=0;
+	      }
+	
+	      //----先看会员在购物车中是否加入了该商品-----
+	      getApp().request.get("/api/weshop/cartService/page", {
+	          data: {
+	              store_id: os.stoid,
+	              user_id: oo.user_id,
+	              service_id: th.data.data.id,
+	              pick_id: th.data.sto_sele_id,
+	          },
+	          success: function(re) {
+	
+	              //-------如果购物车中有相关的数据---------
+	              if (re.data.data.total > 0) {
+	                  var item = re.data.data.pageData[0];
+	                  var updata = {
+	                      id: item.id,
+	                      goods_num: th.data.goodsInputNum + item.goods_num,
+	                      money: th.data.data.shop_price,
+	                      store_id: os.stoid,
+	                  };
+	
+	                  if (getApp().globalData.guide_id) {
+	                      updata['guide_id'] = getApp().globalData.guide_id;
+	                      updata['guide_type'] = 1;
+	                  }
+	                  getApp().request.put("/api/weshop/cartService/update", {
+	                      data: updata,
+	                      success: function(t) {
+	                          getApp().my_warnning('加入购物车成功', 1, th, 450);
+	                          var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
+	                          th.setData({
+	                              cartGoodsNum: c_num
+	                          });
+	                          th.closeSpecModal();
+	                      }
+	                  });
+	              } else {
+	
+	                  getApp().request.post("/api/weshop/cartService/save", {
+	                      data: newd,
+	                      success: function(t) {
+	                          getApp().my_warnning('加入购物车成功', 1, th, 450);
+	                          var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
+	                          th.setData({
+	                              cartGoodsNum: c_num
+	                          });
+	                          th.closeSpecModal();
+	                      }
+	                  });
+	              }
+	          }
+	      });
+	
+	  }
+	},
+	
+	
+	
   
   
 });
\ No newline at end of file
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 98c314a..3fca809 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -1,13 +1,20 @@
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
+
 <view class="container">
+		<!-- 一级tabbar -->
 		<view class="tab-container" bindtap="onClickTab">
 			<view class="tab {{currentIndex == 0 ? 'active':''}}" data-index="0"><text class="iconfont icon-cloud"></text>线上订单</view>
+			<view class="tab {{currentIndex == 2 ? 'active':''}}" data-index="2"><text class="iconfont icon-bankcard"></text>卡项订单</view>
 			<view class="tab {{currentIndex == 1 ? 'active':''}}" data-index="1"><text class="iconfont icon-shop"></text>线下订单</view>
 		</view>
-		<view class="search-container flex" wx:if="{{currentIndex == 0}}">
+		
+		<!-- 搜索框 -->
+		<view class="search-container flex" wx:if="{{currentIndex != 1 }}">
 			<input class="search-input" type="text" placeholder="请输入您所搜索的商品" bindinput="bindInput" bindconfirm="bindInput" placeholder-style="color:#ccc;"/>
 			<view class="search-btn" bindtap="searchOnline">搜索</view>
 		</view>
+		
+		<!-- 二级tabbar - 线上订单 -->
 		<view class="type-navbar fs28" wx:if="{{currentIndex == 0}}">
 		  <view class="type-box flex-center" wx:for="{{categories}}" wx:key="{{index}}">
 		    <view id="{{item.id}}" bindtap="changeTab" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}">
@@ -15,6 +22,8 @@
 		    </view>
 		  </view>
 		</view>
+		
+		<!-- 二级tabbar - 线下订单 -->
 		<view class="search-container" wx:if="{{currentIndex == 1}}">
 			<view class="flex jc_sb">
 				<view class="picker-container flex f1">
@@ -30,7 +39,17 @@
 			</view>
 			<view class="fs24 c-9 pdt20">注：读取时段内近10笔记录</view>
 		</view>
+		
+		<!-- 二级tabbar - 卡项订单 -->
+		<view class="type-navbar fs28" wx:if="{{currentIndex == 2}}">
+		  <view class="type-box flex-center f1" wx:for="{{tab_serviceCard}}" wx:key="{{index}}">
+		    <view data-index="{{index}}" bindtap="clickTab" class="type-navbar-item {{tabIndex ==index?'type-item-on':''}}">
+		      {{item.name}}
+		    </view>
+		  </view>
+		</view>
 </view>
+
 <!-- 线上订单 -->
 <view class="list-container" wx:if="{{currentIndex == 0}}">
 	<view class="stay_evaluate" data-id="{{item.order_id}}" wx:for="{{orderList}}" wx:key="{{index}}">
@@ -263,8 +282,115 @@
 	  </view>
 	</view>
 </view>
+
+<!-- 服务卡项 -->
+<!-- 订单状态:0=未付款 1=已付款、待评价  2已评价、完成 3已取消   5作废 -->
+<view class="list-container" wx:elif="{{currentIndex == 2}}">
+	<view class="stay_evaluate" data-id="{{item.order_id}}" wx:for="{{cardList}}" wx:key="{{item}}">
+	  <!-- 商品编号和状态 -->
+	  <view class="Commodity_number flex-vertical-between fs24 padding border_bottom">
+	    <!--商品编号 -->
+	    <text selectable='true'>订单编号：{{item.order_sn}}</text>
+	    <!-- 订单状态 -->
+	    <view class="flex-center c-r">
+				<view wx:if="{{item.order_status == 0}}">待支付</view>
+				<view wx:if="{{item.order_status == 1}}">待评价</view>
+				<view wx:if="{{item.order_status == 2}}">已评价</view>
+				<view wx:if="{{item.order_status == 3}}" class="c-a9">已取消</view>
+				<view wx:if="{{item.order_status == 5}}">已作废</view>
+	    </view>
+	  </view>
+	
+	  <!-- 商品详情集合 -->
+	  <view class="detail_commoditys">
+	    <!-- 单个商品 -->
+	    <view>
+	      <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.list}}" wx:for-item="goods"  wx:for-index="pinx" url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{item.order_id}}">
+	        <!-- 商品图片 -->
+	        <navigator class="rel">
+	          <image src="{{resourceUrl+goods.img_url}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].list[{{pinx}}].img_url"></image>
+	          <!-- <view class="abs flex-center fs26">服务卡</view> -->
+	        </navigator>
+	        <!-- 商品内容 -->
+	        <view class="Commodity_content">
+	          <view class="Commodity_goods">
+	            <!-- 商品名称 -->
+	            <view class="goods_name ellipsis-2 fs26">{{goods.service_name}}</view>
+	            <view class="flex-space-between">
+	              <!-- 商品规格 -->
+	              <!-- <view class="Commodity_spec fs28 flex-center"> -->
+	                <!--<text class="ellipsis-1" wx:if="{{goods.goods_color.length>1 && goods.goods_spec.length>1}}">{{goods.goods_color+"/"+goods.goods_spec}}</text>-->
+	                <!--<text class="ellipsis-1" wx:elif="{{goods.goods_color.length>1 || goods.goods_spec.length>1}}">{{goods.goods_color==undefined?"":goods.goods_color}}{{goods.goods_spec==undefined?"":goods.goods_spec}}</text>-->
+	                <!--<text class="ellipsis-1" wx:else>规格1</text>-->
+	                  <!-- <text class="ellipsis-1">{{filters.show_gui_ge(goods.goods_spec, goods.goods_color)}}</text> -->
+	              <!-- </view> -->
+	            </view>
+	          </view>
+	          <!-- 商品价格数量 -->
+	          <view class="Commodity_money flex-vertical-between baseline">
+	            <!-- 商品价格 -->
+	            <view class="flex-vertical c-tb baseline">
+	              <view class="fs24">￥</view>
+								<!-- 幸运购prom_type等于9 -->
+								<!-- 如果是幸运购就显示幸运购参团价格 -->
+								<view class="fs26">{{filters.toFix(goods.price,2)}}</view>
+	              <!-- <view class="fs26" wx:else>{{filters.toFix(goods.member_goods_price,2)}} <text wx:if="{{goods.prom_type==10}}">({{goods.ladder_discount}}折)</text> </view> -->
+	            </view>
+	            <view class="fs26 c-a9">x{{goods.qty}}</view>
+	          </view>
+	        </view>
+	      </navigator>
+	      <!-- 去评价 -->
+	      <view class="commodity_evaluate jc_sb baseline fs26">
+	        <!-- 商品数量 -->
+	        <view class="commodity_smy fs24">
+	          <view class="order-total">
+	            <view>
+	              共{{filters.count(item.list)}}件商品
+	            </view>
+	            <view class="goods-total flex">
+	              <block>
+	                <view class="commodity_money flex baseline">
+	                  <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
+	                  <view class="fs24 c-r">￥</view>
+	                  <view class="c-r">{{filters.toFix(item.account,2)}}
+	                  </view>
+	
+	                </view>
+	              </block>
+								
+	            </view>
+	          </view>
+	        </view>
+					
+	        <view class="links flex-right-vertical fs24 padding">
+	          <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1 && !(item.order_goods[0].prom_type==9))}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
+	          <view bindtap="cancle" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{tabIndex}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" wx:if="{{(item.order_status==0)}}" data-index="{{tabIndex}}">取消订单</view>
+
+	      
+				<navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{item.order_id}}">订单详情</navigator>	
+
+
+				<block wx:if="{{item.order_status==1}}">
+					<navigator wx:if="{{item.list.length > 1}}"  class="order-btn white bg-orange"
+										 url="/packageB/pages/user/comment/comment?card=1&status=0&order_id={{item.list[index].order_id}}">评价</navigator>
+					<navigator wx:else  class="order-btn white bg-orange"
+										 url="/packageB/pages/user/add_comment/add_comment?card=1&goods_id={{item.list[0].card_id}}&order_id={{item.list[0].order_id}}&price={{item.list[0].price}}">评价</navigator>
+				</block>
+
+	          <navigator class="commodity_To_evaluate flex-level comment_go" bindtap="pay" data-index="{{index}}" wx:if="{{item.order_status==0}}">立即支付</navigator>
+			  
+
+
+	        </view>
+	      </view>
+	    </view>
+	  </view>
+	</view>
+</view>
+
 <!-- 线下订单 -->
-<view class="offline-container" wx:else>
+<view class="offline-container" wx:elif="{{currentIndex == 1}}">
 		<view class="offline-list">
 			<view class="item" wx:for="{{list2}}">
 				<view class="title">
@@ -298,14 +424,14 @@
 
 
 <!-- 没有数据 -->
-<view class="After_all flex-center" wx:if="{{(iscodeall==1 && orderList.length>1 && currentIndex ==0) || (is_no_more2 && currentIndex == 1)}}">
-  <view class="Line"></view>
+<view class="After_all flex-center" wx:if="{{(iscodeall==1 && orderList.length>1 && currentIndex ==0) || (is_no_more2 && currentIndex == 1) || (is_no_more2 && currentIndex == 2)}}">
+  <!-- <view class="Line"></view> -->
   <view class="end fs26 xc-black">——— 到底了 ———</view>
-  <view class="Line"></view>
+  <!-- <view class="Line"></view> -->
 </view>
 
 <!-- 无订单 -->
-<view class="empty_order" wx:if="{{((!orderList||orderList.length==0) && is_get && currentIndex == 0) || (list2.length==0 && currentIndex == 1)}}">
+<view class="empty_order" wx:if="{{((!orderList||orderList.length==0) && is_get && currentIndex == 0) || (list2.length==0 && currentIndex == 1) || (cardList.length == 0 && currentIndex == 2)}}">
   <view class="flex-level">
     <image src="{{iurl}}miniapp/images/order/empty_order.png"></image>
   </view>
@@ -316,5 +442,6 @@
     </navigator>
   </view>
 </view>
+
 <!-- 弹出框扫描 -->
 <qr_code id="qc_com"></qr_code>
diff --git a/pages/user/order_list/order_list.wxss b/pages/user/order_list/order_list.wxss
index 0fabe65..8ba96b0 100644
--- a/pages/user/order_list/order_list.wxss
+++ b/pages/user/order_list/order_list.wxss
@@ -617,5 +617,8 @@ page {
 	border-bottom-left-radius: 8rpx;
 }
 
+.bg-orange {
+	background-color: #ff9000;
+}
 
 
diff --git a/utils/filter.wxs b/utils/filter.wxs
index 0717a64..c193211 100644
--- a/utils/filter.wxs
+++ b/utils/filter.wxs
@@ -171,7 +171,18 @@ var filters = {
 	
 	JSONStringify: function(val) {
 		return JSON.stringify(val);
-	}
+	},
+	
+	// 循环列表计算数量
+	count: function(list) {
+		var sum = 0;
+		if(list && list.length != 0) {
+			list.forEach(function(item) {
+				sum += item.qty;
+			});
+			return sum;
+		};
+	},
 	
 	
 	
@@ -194,4 +205,5 @@ module.exports = {
 	price: filters.price,
 	div100: filters.div100,
 	JSONStringify: filters.JSONStringify,
+	count: filters.count,
 }
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index cb197ae..2ed01bb 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -2,6 +2,10 @@ var t = require("util.js");
 
 module.exports = {
     uniqueId: "",
+		// i: url
+		// e: method
+		// s: data
+		// a: header
     request: function(e, i, o) {
         var n = this, a = o.header ? o.header : {
           "content-type": "application/x-www-form-urlencoded"
@@ -39,7 +43,9 @@ module.exports = {
 
     uploadFile: function(t, e) {
         var i = this;
-        t = this.modifyUrl(t, e), console.log("app.request", t, e), e.isShowLoading = void 0 === e.isShowLoading || e.isShowLoading, 
+        t = this.modifyUrl(t, e), 
+				// console.log("app.request", t, e), 
+				e.isShowLoading = void 0 === e.isShowLoading || e.isShowLoading, 
         e.isShowLoading && this.showLoading(), wx.uploadFile(Object.assign({}, e, {
             url: t,
             filePath: e.filePath,