diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 6064565..bae83d3 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -46,6 +46,7 @@ Component({
 		title_index: 0,
 		swiper_hei: 0,
 		title_class: "",
+		is_no_plus:1,
 	},
 
 	ready: function () { },
@@ -62,8 +63,7 @@ Component({
 				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];
@@ -142,8 +142,10 @@ Component({
 	pageLifetimes: {
 		//游客登录后，只要更新卡的情况
 		show: function () {
+			let th = this;
 			//--初始化卡类--
 			this.card_init();
+			
 		},
 	},
 
@@ -190,38 +192,8 @@ Component({
 							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] });
@@ -293,6 +265,24 @@ Component({
 					})
 					break;
 			}
+			//调用接口判断商家plus有没有过期
+			getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
+				console.log(res);
+				if (res.data.code == 0) {
+					
+					var arr = res.data.data.pageData;
+					if (arr.length > 0) {
+						var item = arr[0];
+						if (item.is_sy == 0) {
+							var now = Date.parse(new Date()); now = now / 1000;
+							if (item.end_time < now) {
+								th.setData({ is_no_plus: 0 })
+							}
+						}
+					}
+				}
+			})
+
 		},
 
 		setLoading: function () {
@@ -455,7 +445,6 @@ Component({
 				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 = {
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index f73d30d..29a2c8a 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -59,7 +59,7 @@
                             </block>
                             <block wx:else>
 
-                                <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+                                <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
                                     <!-- 当会员是等级卡的时候 -->
                                     <block wx:if="{{card_field}}">
                                         <!-- 等级价>0 -->
@@ -210,7 +210,7 @@
                                         <view class='del'>￥{{item.market_price}}</view>
                                     </block>
                                     <block wx:else>
-                                        <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+                                        <block wx:if="{{g_filter.is_has_rank(rank_switch,item)  && is_no_plus}}">
                                             <!-- 当会员是等级卡的时候 -->
                                             <block wx:if="{{card_field}}">
                                                 <!-- 等级价>0 -->
@@ -360,7 +360,7 @@
                                             <view class='del'>￥{{item.market_price}}</view>
                                         </block>
                                         <block wx:else>
-                                            <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+                                            <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
                                                 <!-- 当会员是等级卡的时候 -->
                                                 <block wx:if="{{card_field}}">
                                                     <!-- 等级价>0 -->
@@ -516,7 +516,7 @@
                             <!-- 不是活动的情况 -->
                             <block wx:else>
 
-                                <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+                                <block wx:if="{{g_filter.is_has_rank(rank_switch,item)  && is_no_plus}}">
                                     <!-- 当会员是等级卡的时候 -->
                                     <block wx:if="{{card_field}}">
                                         <!-- 等级价>0 -->
@@ -691,7 +691,7 @@
                                         <view class='del'>￥{{aitem.market_price}}</view>
                                     </block>
                                     <block wx:else>
-                                        <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}">
+                                        <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem) && is_no_plus}}">
                                             <!-- 当会员是等级卡的时候 -->
                                             <block wx:if="{{card_field}}">
                                                 <!-- 等级价>0 -->
diff --git a/components/diy_luckyGo/diy_luckyGo.js b/components/diy_luckyGo/diy_luckyGo.js
index 245e973..c5a47ba 100644
--- a/components/diy_luckyGo/diy_luckyGo.js
+++ b/components/diy_luckyGo/diy_luckyGo.js
@@ -1,9 +1,3 @@
-// var e = function(e) {
-//       return e && e.__esModule ? e : {
-//         default: e
-//       };
-//     }(require("../../utils/LoadMore3.js")),
-//     n = new e.default(),
 var t = getApp(),
   a = t.request,
   o = t.globalData.setting,
diff --git a/components/diy_pingd_buy/diy_pingd_buy.js b/components/diy_pingd_buy/diy_pingd_buy.js
index 26d126f..a33ca6c 100644
--- a/components/diy_pingd_buy/diy_pingd_buy.js
+++ b/components/diy_pingd_buy/diy_pingd_buy.js
@@ -1,9 +1,4 @@
-// var e = function(e) {
-//       return e && e.__esModule ? e : {
-//         default: e
-//       };
-//     }(require("../../utils/LoadMore3.js")),
-//     n = new e.default(),
+
 var t = getApp(),
     a = t.request,
     o = t.globalData.setting,
diff --git a/components/diy_richtext/diy_richtext.js b/components/diy_richtext/diy_richtext.js
index 67c2ba9..b58c5df 100644
--- a/components/diy_richtext/diy_richtext.js
+++ b/components/diy_richtext/diy_richtext.js
@@ -4,7 +4,7 @@ Component({
 
     nodes: {
       type: String,
-      value: '<div><h3>javascript - <em>js同步编程</em>与异步编程的区别,异步有哪些优点,为什么...</h3><div><span>2016年5月20日 - </span>从编程方式来讲当然是<em>同步编程</em>的方式更为简单,但是同步有其局限性一是假如是单线程那么一旦遇到阻塞调用,会造成整个线程阻塞,导致cpu无法得到有效利用...</div><div><div></div><span ><span ></span></span> - 百度快照</div><div ><span>为您推荐：</span>js同步和异步ajax异步和同步的区别</div></div>',
+      value: '',
     },
     my:{
       type: String,
diff --git a/components/diy_richtext/diy_richtext.wxml b/components/diy_richtext/diy_richtext.wxml
index ec52b63..affb040 100644
--- a/components/diy_richtext/diy_richtext.wxml
+++ b/components/diy_richtext/diy_richtext.wxml
@@ -1,11 +1,2 @@
-<!--pages/diy_fwb/diy_fwb.wxml-->
 <rich-text nodes="{{nodes}}"></rich-text>
 
-
-
-<!-- <view>
-
-<w-test inner-text="sssszwpwpwpww"></w-test>
- <component-tag-name inner-text="Some text"></component-tag-name>
-</view> -->
-
diff --git a/components/diy_serviceCard/diy_serviceCard.js b/components/diy_serviceCard/diy_serviceCard.js
index 5d74dd5..58cd02e 100644
--- a/components/diy_serviceCard/diy_serviceCard.js
+++ b/components/diy_serviceCard/diy_serviceCard.js
@@ -226,33 +226,6 @@ Component({
 							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);
 
@@ -353,91 +326,13 @@ Component({
 
 		//---卡的初始化----
 		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);
-			// })
+
 		},
 
 
@@ -505,26 +400,7 @@ Component({
 				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;
@@ -532,12 +408,6 @@ Component({
 				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;
 
@@ -547,44 +417,6 @@ Component({
 
 				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;
@@ -627,9 +459,7 @@ Component({
 					page: th.data.currentPage - 1,
 				});
 			}
-			
-			
-			// console.log('goods_array0000000000====>>>', th.data.goods_array);
+
 
 		},
 
diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js
index 5c9ce87..f1dbfec 100644
--- a/components/goods_list/goods_list.js
+++ b/components/goods_list/goods_list.js
@@ -16,7 +16,8 @@ Component({
     card_field: "",
     card_name: "",
     max_card_field: "",
-    card_list: null
+    card_list: null,
+    is_no_plus:1,
   },
   properties: {
     // 这⾥定义了innerText属性，属性值可以在组件使⽤时指定
@@ -87,20 +88,25 @@ Component({
 
 
         }
-      })
+      }),
+
+       //调用接口判断商家plus有没有过期
+       getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
+        if (res.data.code == 0) {
+            var arr = res.data.data.pageData;
+            if (arr.length > 0) {
+                var item = arr[0];
+                if (item.is_sy == 0) {
+                    var now = Date.parse(new Date()); now = now / 1000;
+                    if (item.end_time < now) {
+                        th.setData({ is_no_plus: 0 })
+                    }
+                }
+            }
+        }
+    })
     },
-    // 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;
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 7675f86..dfd190a 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -2,153 +2,153 @@
 <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="hang ">
+		<!-- 商品详情 -->
 
-    <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{g_filter.get_url_by_type(item)}}">
-    <!--<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.original_img}}" mode="aspectFill" binderror="bind_bnerr_xc" data-url="{{url+item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image>
-        <view class="bottom">
-          <!-- 商品名称 -->
-          <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</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="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{g_filter.get_url_by_type(item)}}">
+			<!--<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.original_img}}" mode="aspectFill" binderror="bind_bnerr_xc" data-url="{{url+item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image>
+				<view class="bottom">
+					<!-- 商品名称 -->
+					<view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</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 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="">
-                    <!-- 等级价 -->
+					</block>
+					<block wx:else>
+						<!-- 商品价格,先判断下是后⼜等级价-->
+						<block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
+							<!-- 当会员是等级卡的时候 -->
+							<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">
+										<!-- 等级价 -->
 										<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 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.shop_price,2)}}</view>
-                </view>
-              </view>
-              <view class="flex" style="">
-                <!-- 原价 -->
-                <view class="price flex xc-ash line_th">
-                  <view class="fs22">￥</view>
-                  <view class="fs22">{{item.market_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>
+								</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.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>
+						</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.js b/components/serviceCard_list/serviceCard_list.js
index d642be6..210b188 100644
--- a/components/serviceCard_list/serviceCard_list.js
+++ b/components/serviceCard_list/serviceCard_list.js
@@ -90,18 +90,6 @@ Component({
         }
       })
     },
-    // 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;
@@ -109,18 +97,8 @@ Component({
       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: {
diff --git a/components/timePicker/timePicker.js b/components/timePicker/timePicker.js
index 0096d7d..ed02ede 100644
--- a/components/timePicker/timePicker.js
+++ b/components/timePicker/timePicker.js
@@ -83,14 +83,10 @@ Component({
    * 组件的初始数据
    */
   data: {
-    // pickerShow:true
-    // limitStartTime: new Date().getTime()-1000*60*60*24*30,
-    // limitEndTime: new Date().getTime(),
-    // yearStart:2000,
-    // yearEnd:2100
+
   },
   detached: function() {
-    console.log("dele");
+
   },
   attached: function() {},
   ready: function() {
@@ -384,11 +380,7 @@ Component({
       this.setStartDate(startYear, startMonth, startDay, startHour, startMinute, startSecond);
       this.setEndDate(endYear, endMonth, endDay, endHour, endMinute, endSecond);
 
-      //!!!
-      // setTimeout(() => {
-      //   this.setStartDate(nowYear, nowMonth, nowDay, nowHour, nowMinute)
-      //   this.setEndDate(nowYear, nowMonth, nowDay, nowHour, nowMinute)
-      // }, 0);
+
     },
     setPickerDateArr(type, year, month, day, hour, minute, second) {
       let yearIdx = 0;
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index ad7d3e8..532967a 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -107,15 +107,11 @@ 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;
@@ -123,18 +119,7 @@ Component({
 			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 0c417bb..23f8d7f 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -4,9 +4,6 @@
 				 <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>
@@ -23,8 +20,7 @@
 		    <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="{{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>
diff --git a/packageA/pages/distribution/shop/shop.js b/packageA/pages/distribution/shop/shop.js
index 951e5b5..d6f6f83 100644
--- a/packageA/pages/distribution/shop/shop.js
+++ b/packageA/pages/distribution/shop/shop.js
@@ -36,6 +36,7 @@ Page({
     card_list: null,
 
     isAll: true,
+    is_no_plus:1,
 
     default_img: '/miniapp/images/default_g_img.gif',
   },
@@ -214,6 +215,23 @@ Page({
         }
       })
     }
+    //调用接口判断商家plus有没有过期
+			getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
+				console.log(res);
+				if (res.data.code == 0) {
+					var arr = res.data.data.pageData;
+					if (arr.length > 0) {
+						var item = arr[0];
+						if (item.is_sy == 0) {
+							var now = Date.parse(new Date()); now = now / 1000;
+							if (item.end_time < now) {
+								th.setData({ is_no_plus: 0 })
+							}
+						}
+					}
+				}
+			})
+
 
     if (app.globalData.key_word) {
       this.setData({
diff --git a/packageA/pages/distribution/shop/shop.wxml b/packageA/pages/distribution/shop/shop.wxml
index 419c52f..e7e0abf 100644
--- a/packageA/pages/distribution/shop/shop.wxml
+++ b/packageA/pages/distribution/shop/shop.wxml
@@ -99,7 +99,7 @@
             </block>
             <block wx:else>
               <!-- 商品价格,先判断下是后⼜等级价 -->
-              <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+              <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
                 <!-- 当会员是等级卡的时候 -->
                 <block wx:if="{{card_field}}">
                   <!-- 等级价>0 -->
@@ -155,7 +155,7 @@
                         <view class="fs22 money">{{item.market_price}}</view>
                       </view>
                     </view>
-                    <view class="flexr" style="">
+                    <view class="flexr">
                       <!-- 等级价 -->
                       <view class="price flex ai-center">
                         <!-- <view class="fs22">￥</view> -->
@@ -243,7 +243,7 @@
           </block>
           <block wx:else>
             <!-- 商品价格,先判断下是后⼜等级价 -->
-            <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+            <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
               <!-- 当会员是等级卡的时候 -->
               <block wx:if="{{card_field}}">
                 <!-- 等级价>0 -->
diff --git a/pages/activity/pind_list/pind_list.js b/pages/activity/pind_list/pind_list.js
index e6c1775..05e480a 100644
--- a/pages/activity/pind_list/pind_list.js
+++ b/pages/activity/pind_list/pind_list.js
@@ -61,11 +61,6 @@ Page({
         });
       }
     })
-    // var user_id=getApp().globalData.user_id;
-    // if(!user_id) user_id=0;
-    // this.setData({
-    //   user_id,
-    // })
     this.requestSalelist();
   },
 
@@ -74,15 +69,7 @@ Page({
     this.data.currentPage = 1;
     this.data.ismore = 1;
     var th = this;
-    // var userInfo = wx.getStorageSync('userinfo');
-    // if (userInfo) {
-    //   //调用列表
-    //   this.requestSalelist(userInfo.user_id);
-    // } else {
-    //   getApp().goto("/pages/togoin/togoin");
-    // }
 
-    
     //设置全局定时器
     th.data.timer = setInterval(function () {
       th.countDown();
diff --git a/pages/cart/cart2/c_filter.wxs b/pages/cart/cart2/c_filter.wxs
index e8eda3e..01114fe 100644
--- a/pages/cart/cart2/c_filter.wxs
+++ b/pages/cart/cart2/c_filter.wxs
@@ -15,6 +15,7 @@ var filters = {
           if(ind==1 ) return "green";
           if(ind==2) return "blue";
           if(ind==11) return "green";
+          if(ind==13) return "red";
           if(ind==12) return "blue";
           if(ind==20) return "green";
           return "";
@@ -44,6 +45,7 @@ var filters = {
                   if (ind == 2) return "指定品类";
                   if (ind == 11) return "指定用途";
                   if (ind == 12) return "指定分类1";
+                  if (ind == 13) return "全场通用";
                   if (ind == 20) return "指定单品";
                   return "";
                 },
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 4e12a82..d7accad 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1609,11 +1609,15 @@ Page({
                                     //累积商品重量 每种商品的重量 * 数量
                                     goods_weight += item[jo]['weight'] * item[jo]['goods_num'];
                                     by_g_weight+=item[jo]['weight'] * item[jo]['goods_num'];
-                                    if (weight_free > 0) {
-                                        out_of_weight = (weight_free * 1000) - by_g_weight;
-                                    }else{
-                                        out_of_weight= -by_g_weight;
+
+                                    if(free1>0){
+                                        if (weight_free > 0) {
+                                            out_of_weight = (weight_free * 1000) - by_g_weight;
+                                        }else{
+                                            out_of_weight= -by_g_weight;
+                                        }
                                     }
+
                                 }
                             }
                             //这个是在不包邮列表礼包
@@ -1629,11 +1633,13 @@ Page({
                         }
                     }
 
-                    //当商品没有超出的时候
-                    if(out_of_weight>=0){
-                        out_of_weight= -by_g_weight;
-                    }else{
-                        out_of_weight= -weight_free * 1000;
+                    if(free1>0) {
+                        //当商品没有超出的时候
+                        if (out_of_weight >= 0) {
+                            out_of_weight = -by_g_weight;
+                        } else {
+                            if (weight_free > 0) out_of_weight = -weight_free * 1000;
+                        }
                     }
 
                     //所有的商品都不在不包邮商品列表，freight_free为0的时候，以及不是区域包邮
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index caee622..029a2a3 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -24,6 +24,7 @@ Page({
         rq_data:null,
 		isToggle: false, //切换商品视图控制符
         show_all:1,      //判断显示
+        is_no_plus:1
     },
 
     onLoad: function(t) {
@@ -186,7 +187,22 @@ Page({
 						  })	
 					},500)				
 			  }
-	  });
+      });
+      //调用接口判断商家plus有没有过期
+      getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + oo.stoid + "&type=3", {}).then(res => {
+        if (res.data.code == 0) {
+            var arr = res.data.data.pageData;
+            if (arr.length > 0) {
+                var item = arr[0];
+                if (item.is_sy == 0) {
+                    var now = Date.parse(new Date()); now = now / 1000;
+                    if (item.end_time < now) {
+                        th.setData({ is_no_plus: 0 })
+                    }
+                }
+            }
+        }
+    })
     },
 
     //设置优惠券的
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 96377db..3371d20 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -88,7 +88,7 @@
         </block>
         <block wx:else>
           <!-- 商品价格,先判断下是后又等级价-->
-          <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+          <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
             <!-- 当会员是等级卡的时候 -->
             <block wx:if="{{card_field}}">
               <!-- 等级价>0 -->
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 2d0812a..9a21925 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -461,7 +461,6 @@
       <!--商品分组-->
       <block wx:if="{{item.ename=='goodsGroup'}}">
         <goodsGroup object="{{item.content}}"></goodsGroup>
-				
       </block>
       <!--通知-->
       <block wx:if="{{item.ename=='notice'}}">
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index d553601..4455d69 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -25,7 +25,7 @@ Page({
     txmon: 0,
     byquan: 0,
     yuer: 0,
-    is_no_plus:1,
+    is_no_plus: 1,
     currentPage: 1,
     recommend_list: [],
     tc_hide: true,
@@ -41,12 +41,12 @@ Page({
     actId: "", //生日活动的id
     actImg: "",
     is_assistance: 0, //助力活动
-    ad_img:"",
-    add_card_data:'',  //等级卡的内容
+    ad_img: "",
+    add_card_data: '',  //等级卡的内容
+
 
-    
   },
-  goto_nav: function(e) {
+  goto_nav: function (e) {
     var th = this;
     var url = e.currentTarget.dataset.url;
     if (th.data.userInfo != null) {
@@ -60,124 +60,124 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {	  
-      var th=this;
-      getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, {
-          data: {
-              enabled: 1
-          },
-          success:function(res){
-              if(res.data.code==0 && res.data.data  && res.data.data.pageData && res.data.data.pageData.length){
-                  var item=res.data.data.pageData[0];
-                  if (item && item.ad_code)  th.setData({ad_img:item.ad_code})
-              }
-          }
-      })
-      app.getUserFir();
+  onLoad: function (options) {
+    var th = this;
+    getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, {
+      data: {
+        enabled: 1
+      },
+      success: function (res) {
+        if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) {
+          var item = res.data.data.pageData[0];
+          if (item && item.ad_code) th.setData({ ad_img: item.ad_code })
+        }
+      }
+    })
+    app.getUserFir();
 
 
-      
 
-      //-- 读取会员中心按钮列表 --
-      /*--
-	  getApp().request.get("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, {
-		success:function(res){
-			if(ut.ajax_ok(res)) {
-			     var d_list=res.data.data.pageData;		 
-				 getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{
-						  var dis=rs.data.data;
-						  for(var i in d_list){
-								 if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){
-									 d_list.splice(i,1);
-								 }
-						  }  
-						  th.setData({user_tool:d_list});
+
+    //-- 读取会员中心按钮列表 --
+    /*--
+  getApp().request.get("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, {
+  success:function(res){
+    if(ut.ajax_ok(res)) {
+         var d_list=res.data.data.pageData;		 
+       getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{
+            var dis=rs.data.data;
+            for(var i in d_list){
+               if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){
+                 d_list.splice(i,1);
+               }
+            }  
+            th.setData({user_tool:d_list});
 
 
 
-				})						 
-			}
-		}	
-	})
-	 --*/
-     this.init_user_tool()
+      })						 
+    }
+  }	
+})
+ --*/
+    this.init_user_tool()
 
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function() {
-      //看一下小程序是不是过期了
-      getApp().getConfig2(function(config2){
-          if(config2 && config2.is_overdue==1){
-              getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=5",{}).then(res=>{
-                  var o=res;
-                  if (o.data.code == 0) {
-                      var ob = { isout: 0, isbuy: 1 };
-                      var arr = o.data.data.pageData;
-                      var isbuy = 0;
-                      //----如果数组不为空----
-                      if (arr.length > 0) {
-                          arr.forEach(function (val, ind) {
-                              if (val.is_sy == 0 && val.type == 5) {
-                                  isbuy = 1;
-                                  var now = ut.gettimestamp();
-                                  if (now > val.end_time) ob.isout = 1;
-                                  return false;
-                              }
-                          })
-                      }
-                      ob.isbuy = isbuy;
-                      th.setappdata(ob);
-                  }
+  onShow: function () {
+    //看一下小程序是不是过期了
+    getApp().getConfig2(function (config2) {
+      if (config2 && config2.is_overdue == 1) {
+        getApp().promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=5", {}).then(res => {
+          var o = res;
+          if (o.data.code == 0) {
+            var ob = { isout: 0, isbuy: 1 };
+            var arr = o.data.data.pageData;
+            var isbuy = 0;
+            //----如果数组不为空----
+            if (arr.length > 0) {
+              arr.forEach(function (val, ind) {
+                if (val.is_sy == 0 && val.type == 5) {
+                  isbuy = 1;
+                  var now = ut.gettimestamp();
+                  if (now > val.end_time) ob.isout = 1;
+                  return false;
+                }
               })
+            }
+            ob.isbuy = isbuy;
+            th.setappdata(ob);
           }
-      })
+        })
+      }
+    })
 
-       //调用接口判断商家plus有没有过期
-       rq.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
-        if (res.data.code == 0) {
-            var arr = res.data.data.pageData;
-            if (arr.length > 0) {
-                var item = arr[0];
-                if (item.is_sy == 0) {
-                    var now = Date.parse(new Date()); now = now / 1000;
-                    if (item.end_time < now) {
-                        th.setData({ is_no_plus: 0 })
-                    }
-                }
+    //调用接口判断商家plus有没有过期
+    rq.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
+      if (res.data.code == 0) {
+        var arr = res.data.data.pageData;
+        if (arr.length > 0) {
+          var item = arr[0];
+          if (item.is_sy == 0) {
+            var now = Date.parse(new Date()); now = now / 1000;
+            if (item.end_time < now) {
+              th.setData({ is_no_plus: 0 })
             }
+          }
         }
+      }
     })
-    var th=this;
-		
-		// 判断是否开启美业
-		getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => {
-			if(res.data.code == 0) {
-				th.setData({
-					enableMeiye: res.data.data.EnableMeiye,
-				});
-			};
-		});
-		
-		
+    var th = this;
+
+    // 判断是否开启美业
+    getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => {
+      if (res.data.code == 0) {
+        th.setData({
+          enableMeiye: res.data.data.EnableMeiye,
+        });
+      };
+    });
+
+
     getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => {
-      if(res.data.code==0){
+      if (res.data.code == 0) {
         var plusCard = res.data.data;
         for (var i = 0; i < plusCard.length; i++) {
-          if(!plusCard[i].IsStopBuy) { th.setData({show_buy_plus:1}); break;  }
+          if (!plusCard[i].IsStopBuy) { th.setData({ show_buy_plus: 1 }); break; }
         }
       }
     })
-	    
-	if (typeof this.getTabBar === 'function' && this.getTabBar()) {
-				  var index=getApp().getPageIndex(this);			 
-	     this.getTabBar().setData({
-	       active: index //数字是当前页面在tabbar的索引
-	     });
-		 //getApp().requestCardNum(this);
-	}
+
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      var index = getApp().getPageIndex(this);
+      this.getTabBar().setData({
+        active: index //数字是当前页面在tabbar的索引
+      });
+      //getApp().requestCardNum(this);
+    }
 
 
     var stoid = app_d.setting.stoid;
@@ -186,295 +186,293 @@ Page({
       cur_g_num = 0;
 
     /*------会员登录------*/
-    var e=getApp().globalData.userInfo;
+    var e = getApp().globalData.userInfo;
     if (e != undefined && e != null && e.mobile) {
 
-        this.birthday();
-        this.is_assistance();
+      this.birthday();
+      this.is_assistance();
 
-        s.setData({
-          userInfo: e
-        });
-		
-		//-- 要调用接口，获取卡的钱 --
-		var url="/api/weshop/wxuser/getWxCardInfo?storeId="+os.stoid+"&userId="+e.user_id;
-		rq.get(url,{
-            isShowLoading:0,
-			success: function(su) {
-			  if(su.data.code==0){
-				  s.setData({
-				    add_card_data: su.data.data,
-				  });
-			  }			  
-			}
-		});
-				
-        /*-----统计-----*/
-        rq.get("/api/weshop/order/waitlist", {
-          isShowLoading:0,
-          data: {
-            user_id: app_d.user_id
-          },
-          success: function(su) {
+      s.setData({
+        userInfo: e
+      });
+
+      //-- 要调用接口，获取卡的钱 --
+      var url = "/api/weshop/wxuser/getWxCardInfo?storeId=" + os.stoid + "&userId=" + e.user_id;
+      rq.get(url, {
+        isShowLoading: 0,
+        success: function (su) {
+          if (su.data.code == 0) {
             s.setData({
-              toji: su.data.data,
+              add_card_data: su.data.data,
             });
           }
-        })
-        /*-----获取线下会员的预存款和优惠券的数量-----*/
-        rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, {
-          isShowLoading:0,
-          success: function(su) {
-			 if(su.data.code==0 && su.data.data ) {
-				 var data = su.data.data;
-				 if(!data) data={};
-				 data.cashcount = parseInt(data.cashcount);
-				 s.setData({
-				   udata: data,
-				 });
-			 }
-           
+        }
+      });
+
+      /*-----统计-----*/
+      rq.get("/api/weshop/order/waitlist", {
+        isShowLoading: 0,
+        data: {
+          user_id: app_d.user_id
+        },
+        success: function (su) {
+          s.setData({
+            toji: su.data.data,
+          });
+        }
+      })
+      /*-----获取线下会员的预存款和优惠券的数量-----*/
+      rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, {
+        isShowLoading: 0,
+        success: function (su) {
+          if (su.data.code == 0 && su.data.data) {
+            var data = su.data.data;
+            if (!data) data = {};
+            data.cashcount = parseInt(data.cashcount);
+            s.setData({
+              udata: data,
+            });
           }
-        })
-        /*-----获取会员提现金额-----*/
-        rq.get("/api/weshop/withdrawals/summoney", {
-          isShowLoading:0,
-          data: {
-            user_id: e.user_id,
-            store_id: os.stoid,
-            status: 0
-          },
-          success: function(su) {
-            if (su.data.code == 0) {
-              var yuer = parseFloat(th.data.userInfo.user_money -
-                th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2);
-              th.setData({
-                txmon: su.data.data.summoney,
-                yuer: yuer
-              });
-            }
+
+        }
+      })
+      /*-----获取会员提现金额-----*/
+      rq.get("/api/weshop/withdrawals/summoney", {
+        isShowLoading: 0,
+        data: {
+          user_id: e.user_id,
+          store_id: os.stoid,
+          status: 0
+        },
+        success: function (su) {
+          if (su.data.code == 0) {
+            var yuer = parseFloat(th.data.userInfo.user_money -
+              th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2);
+            th.setData({
+              txmon: su.data.data.summoney,
+              yuer: yuer
+            });
           }
-        })
+        }
+      })
 
-        /*-----获取会员包邮券的数量-----*/
-        rq.get("/api/weshop/userfeemail/page", {
-          isShowLoading:0,
-          data: {
-            user_id: e.user_id,
-            store_id: os.stoid,
-            pageSize: 1,
-            isuse: 0
-          },
-          success: function(su) {
-            if (su.data.code == 0) {
-              th.setData({
-                byquan: parseInt(su.data.data.total)
-              });
-            }
+      /*-----获取会员包邮券的数量-----*/
+      rq.get("/api/weshop/userfeemail/page", {
+        isShowLoading: 0,
+        data: {
+          user_id: e.user_id,
+          store_id: os.stoid,
+          pageSize: 1,
+          isuse: 0
+        },
+        success: function (su) {
+          if (su.data.code == 0) {
+            th.setData({
+              byquan: parseInt(su.data.data.total)
+            });
           }
-        });
-				
-				/*-----物流信息提醒-----*/
-				rq.get('/api/weshop/order/countDadaOrder', {
-				  isShowLoading:0,
-				  data: {
-				    user_id: e.user_id,
-				    store_id: os.stoid,
-				  },
-				  success: function(su) {
-				    if (su.data.code == 0) {
-				      th.setData({
-				        countDadaOrder: su.data.data
-				      });
-				    }
-				  }
-				});
-				
-				
-				
-
-        //--初始化是否有打勾--
-        getApp().request.get("/api/weshop/users/grade/vip/init/get", {
-            data: {
-                storeId: os.stoid
-            },
-            success:function (rs) {
-                 if(rs.data.code==0 && rs.data.data.isBool){
-                     th.setData({is_init:1});
-                     /*-----获取会员权益列表-----*/
-                     rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", {
-                         isShowLoading:0,
-                         data: {
-                             storeId: os.stoid,
-                             pageSize: 100
-                         },
-                         success: async function(res) {
-
-                             //判断有没有值，没有值返回
-                             if(!ut.ajax_ok(res)) return false;
-
-                             var arr_data = res.data.data.pageData;
-                             var gid = null,
-                                 g_qy_list = null,
-                                 cz_vals = 0,
-                                 need_money = 0,
-                                 backClass = null,
-
-                                 GradeName = '';
-
-                             //获取成长值
-                             await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", {
-                                 data: {
-                                     storeId: os.stoid,
-                                     userId: app_d.user_id
-                                 }
-                             }).then(res => {
-                                 if (res.data.code == 0 && res.data.data) {
-                                     gid = res.data.data.GradeId;
-                                     var cz_val = res.data.data.GradeSum;
-                                     cz_vals = parseInt(cz_val);
-                                     GradeName = res.data.data.GradeName;
-                                 }
-                                 //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid});
-                             })
-                             var obj = {
-                                 cz_val: cz_vals,
-                                 GradeName: GradeName,
-                                 gradeId: gid,
-                                 is_grad_get:1
-                             };
-
-                             //  获取最大值
-                             await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", {
-                                 data: {
-                                     storeId: os.stoid
-                                 }
-                             }).then(res => {
-                                 if (res.data.data)
-                                     backClass = res.data.data.pageData;
-                                 if (backClass) {
-                                     var full_cz_val = backClass[backClass.length - 1].BuyGradeSum;
-                                     //th.setData({ full_cz_val: full_cz_val});
-                                     obj.full_cz_val = full_cz_val
-                                 }
-                             })
-
-                             //--会员权益中心页的修改--
-                             for (var i in backClass) {
-                                 var im = backClass[i];
-                                 if (cz_vals < im.BuyGradeSum && need_money == 0) {
-                                     need_money = im.BuyGradeSum;
-                                     obj.need_money = need_money;
-                                 }
-                             }
-
-                             //获取当前等级的特权
-                             await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", {
-                                 data: {
-                                     storeId: os.stoid,
-                                     GradeId: gid,
-                                     userId: app_d.user_id,
-                                     pageSize: 100
-                                 }
-                             }).then(res => {
-                                 if (res.data.data)
-                                     g_qy_list = res.data.data.pageData;
-                             });
-
-                             for (var i in arr_data) {
-                                 var item = arr_data[i];
-                                 var FromId = th.check_is_has_qy(item, g_qy_list);
-                                 arr_data[i].ishas = 0;
-                                 if (FromId) {
-                                     arr_data[i].ishas = 1;
-                                     arr_data[i].FromId = FromId;
-                                 }
-                             }
-                             arr_data.sort(function(a, b) {
-                                 return b.ishas - a.ishas
-                             })
-
-                             //4个4个一组
-                             var arr = new Array();
-                             for (var i = 0; i < arr_data.length; i += 4) {
-                                 arr.push(arr_data.slice(i, i + 4));
-                             }
-                             //th.setData({ qy_list: arr, need_money: need_money});
-                             obj.qy_list = arr;
-                             th.setData(obj);
-                         }
-                     })
-                 }
-            }
-        })
-      
-
-
-        /*-- 获取 --*/
-        th.requestRecommend();
-
-        /*-------系统是否开通等级卡，会员是等级卡-----*/
-        getApp().getConfig2(function(e) {
-          var t_swi = e.switch_list;
-          if (t_swi) t_swi = JSON.parse(t_swi)
-          if(t_swi){			  	   
-             th.setData({sys_switch:t_swi});
-			 
-			 var user_tool=[];
-			 if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool);			  
-			 th.setData({c_list:user_tool})		
-			 
+        }
+      });
+
+      /*-----物流信息提醒-----*/
+      rq.get('/api/weshop/order/countDadaOrder', {
+        isShowLoading: 0,
+        data: {
+          user_id: e.user_id,
+          store_id: os.stoid,
+        },
+        success: function (su) {
+          if (su.data.code == 0) {
+            th.setData({
+              countDadaOrder: su.data.data
+            });
           }
+        }
+      });
+
+
+
+
+      //--初始化是否有打勾--
+      getApp().request.get("/api/weshop/users/grade/vip/init/get", {
+        data: {
+          storeId: os.stoid
+        },
+        success: function (rs) {
+          if (rs.data.code == 0 && rs.data.data.isBool) {
+            th.setData({ is_init: 1 });
+            /*-----获取会员权益列表-----*/
+            rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", {
+              isShowLoading: 0,
+              data: {
+                storeId: os.stoid,
+                pageSize: 100
+              },
+              success: async function (res) {
+
+                //判断有没有值，没有值返回
+                if (!ut.ajax_ok(res)) return false;
 
+                var arr_data = res.data.data.pageData;
+                var gid = null,
+                  g_qy_list = null,
+                  cz_vals = 0,
+                  need_money = 0,
+                  backClass = null,
 
-          if (parseInt(t_swi.rank_switch) == 2) {
-            var userInfo = th.data.userInfo;
-            if (userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") {
-              var now = ut.gettimestamp();
-              var str = userInfo.card_expiredate;
-              var end = new Date(str);
-              end = Date.parse(end) / 1000;
-              //---判断是不是有过期---
-              if (now < end) {
-                th.setData({
-                  is_dengji: 1
+                  GradeName = '';
+
+                //获取成长值
+                await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", {
+                  data: {
+                    storeId: os.stoid,
+                    userId: app_d.user_id
+                  }
+                }).then(res => {
+                  if (res.data.code == 0 && res.data.data) {
+                    gid = res.data.data.GradeId;
+                    var cz_val = res.data.data.GradeSum;
+                    cz_vals = parseInt(cz_val);
+                    GradeName = res.data.data.GradeName;
+                  }
+                  //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid});
                 })
-              } else {
-                th.setData({
-                  is_dengji: 3
+                var obj = {
+                  cz_val: cz_vals,
+                  GradeName: GradeName,
+                  gradeId: gid,
+                  is_grad_get: 1
+                };
+
+                //  获取最大值
+                await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", {
+                  data: {
+                    storeId: os.stoid
+                  }
+                }).then(res => {
+                  if (res.data.data)
+                    backClass = res.data.data.pageData;
+                  if (backClass) {
+                    var full_cz_val = backClass[backClass.length - 1].BuyGradeSum;
+                    //th.setData({ full_cz_val: full_cz_val});
+                    obj.full_cz_val = full_cz_val
+                  }
                 })
+
+                //--会员权益中心页的修改--
+                for (var i in backClass) {
+                  var im = backClass[i];
+                  if (cz_vals < im.BuyGradeSum && need_money == 0) {
+                    need_money = im.BuyGradeSum;
+                    obj.need_money = need_money;
+                  }
+                }
+
+                //获取当前等级的特权
+                await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", {
+                  data: {
+                    storeId: os.stoid,
+                    GradeId: gid,
+                    userId: app_d.user_id,
+                    pageSize: 100
+                  }
+                }).then(res => {
+                  if (res.data.data)
+                    g_qy_list = res.data.data.pageData;
+                });
+
+                for (var i in arr_data) {
+                  var item = arr_data[i];
+                  var FromId = th.check_is_has_qy(item, g_qy_list);
+                  arr_data[i].ishas = 0;
+                  if (FromId) {
+                    arr_data[i].ishas = 1;
+                    arr_data[i].FromId = FromId;
+                  }
+                }
+                arr_data.sort(function (a, b) {
+                  return b.ishas - a.ishas
+                })
+
+                //4个4个一组
+                var arr = new Array();
+                for (var i = 0; i < arr_data.length; i += 4) {
+                  arr.push(arr_data.slice(i, i + 4));
+                }
+                //th.setData({ qy_list: arr, need_money: need_money});
+                obj.qy_list = arr;
+                th.setData(obj);
               }
+            })
+          }
+        }
+      })
+
+      /*-- 获取 --*/
+      th.requestRecommend();
+
+      /*-------系统是否开通等级卡，会员是等级卡-----*/
+      getApp().getConfig2(function (e) {
+        var t_swi = e.switch_list;
+        if (t_swi) t_swi = JSON.parse(t_swi)
+        if (t_swi) {
+          th.setData({ sys_switch: t_swi });
+
+          var user_tool = [];
+          if (t_swi.usertool) user_tool = JSON.parse(t_swi.usertool);
+          th.setData({ c_list: user_tool })
+
+        }
+
+
+        if (parseInt(t_swi.rank_switch) == 2) {
+          var userInfo = th.data.userInfo;
+          if (userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") {
+            var now = ut.gettimestamp();
+            var str = userInfo.card_expiredate;
+            var end = new Date(str);
+            end = Date.parse(end) / 1000;
+            //---判断是不是有过期---
+            if (now < end) {
+              th.setData({
+                is_dengji: 1
+              })
             } else {
               th.setData({
-                is_dengji: 2
+                is_dengji: 3
               })
             }
+          } else {
+            th.setData({
+              is_dengji: 2
+            })
           }
-        })
-        //th.requestRecommend();
-				
-				
-				
-				
-				
-     }
-	   
-	 /*-- 
-	 var t_swi= getApp().globalData.config2.switch_list
-	 if (t_swi){
-		 t_swi = JSON.parse(t_swi);
-		 var user_tool=[];
-		 if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool);			  
-	     th.setData({c_list:user_tool})		  
-	 } --*/
+        }
+      })
+      //th.requestRecommend();
+
+
+
 
-      //自定义组件一定要等到页面加载完了，才来调用selectComponnent
-      setTimeout(function () {
-          if (getApp().globalData.user_id) getApp().requestCardNum(th);
-          var goods_list = th.selectComponent("#goods_recommend"); //组件的id
-          goods_list.init();
-          goods_list.get_list();
-      },800)
+
+    }
+
+    /*-- 
+    var t_swi= getApp().globalData.config2.switch_list
+    if (t_swi){
+      t_swi = JSON.parse(t_swi);
+      var user_tool=[];
+      if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool);			  
+        th.setData({c_list:user_tool})		  
+    } --*/
+
+    //自定义组件一定要等到页面加载完了，才来调用selectComponnent
+    setTimeout(function () {
+      if (getApp().globalData.user_id) getApp().requestCardNum(th);
+      var goods_list = th.selectComponent("#goods_recommend"); //组件的id
+      goods_list.init();
+      goods_list.get_list();
+    }, 800)
 
 
 
@@ -483,7 +481,7 @@ Page({
 
 
   //判断会员是后有改服务项目
-  check_is_has_qy: function(item, g_qy_list) {
+  check_is_has_qy: function (item, g_qy_list) {
     if (!g_qy_list) return false;
 
     for (var i in g_qy_list) {
@@ -496,13 +494,13 @@ Page({
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function() {
-    for(var i = 1; i < 100; i++) {
+  onHide: function () {
+    for (var i = 1; i < 100; i++) {
       clearInterval(i);
     }
   },
-  setappdata: function(t) {
-    var t=getApp().globalData.wxapp_buy_obj;
+  setappdata: function (t) {
+    var t = getApp().globalData.wxapp_buy_obj;
     if (t && t.isout == 1)
       wx.navigateTo({
         url: "/pages/error/error?msg=小程序已经过期",
@@ -516,11 +514,11 @@ Page({
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function() {
+  onReachBottom: function () {
     //!this.nomore && this.requestRecommend();
     var goods_list = this.selectComponent("#goods_recommend"); //组件的id
     goods_list.init();
-    setTimeout(function() {
+    setTimeout(function () {
       goods_list.get_list();
     }, 300)
   },
@@ -528,42 +526,42 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function() {},
+  onShareAppMessage: function () { },
 
   //------卡片的显示和关闭--------
-  show_tc: function() {
+  show_tc: function () {
     if (!this.data.userInfo) return false;
     //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
-    var val=this.data.userInfo.mobile+"|"+ut.formatTime();
-    val="^"+ut.base64_encode(val);
+    var val = this.data.userInfo.mobile + "|" + ut.formatTime();
+    val = "^" + ut.base64_encode(val);
 
     qrcode('qrcode', val, 480, 480, this);
     this.setData({
       tc_hide: false,
     });
   },
-  hide_tc: function() {
+  hide_tc: function () {
     this.setData({
       tc_hide: true,
     });
   },
 
   //--跳转到预存款页面--
-  deposit: function() {
+  deposit: function () {
     if (!this.data.userInfo) return false;
     wx.navigateTo({
       url: '../deposit/deposit',
     })
   },
   //--跳转到余额页面--
-  balance: function() {
+  balance: function () {
     if (!this.data.userInfo) return false;
     wx.navigateTo({
       url: '../member/menber',
     })
   },
   //--跳转到优惠券--
-  coupon: function() {
+  coupon: function () {
     var th = this;
     if (!this.data.userInfo) return false;
     //  th.sendsm();
@@ -572,20 +570,20 @@ Page({
     })
   },
   //--跳转到积分--
-  integral: function() {
+  integral: function () {
     if (!this.data.userInfo) return false;
     wx.navigateTo({
       url: '../integral/integral',
     })
   },
   //--跳到绑定页面--
-  gobindtel: function() {
+  gobindtel: function () {
     wx.navigateTo({
       url: '/pages/togoin/togoin',
     })
   },
 
-  go_order: function(e) {
+  go_order: function (e) {
     if (!this.data.userInfo) return false;
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({
@@ -595,7 +593,7 @@ Page({
   },
 
   //--加载更多商品--
-  requestRecommend: function() {
+  requestRecommend: function () {
     var e = this,
       t = '/api/weshop/goods/page?page=' + e.data.currentPage;
     var th_recommend_list = e.data.recommend_list;
@@ -608,7 +606,7 @@ Page({
         store_id: os.stoid,
         pageSize: 10
       },
-      success: function(ee) {
+      success: function (ee) {
         var recommend_list = ee.data.data.pageData;
         if (recommend_list && recommend_list.length > 0) {
           var dd = [...th_recommend_list, ...recommend_list];
@@ -627,20 +625,20 @@ Page({
   },
 
   //--跳转到权益页面--
-  go_qy: function() {
+  go_qy: function () {
     if (!this.data.userInfo) return false;
     var url = "/pages/user/userqy/userqy";
     getApp().goto(url);
   },
 
   //--跳转到商品详情页面--
-  go_goods: function(e) {
+  go_goods: function (e) {
     var gid = e.currentTarget.dataset.gid;
     var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid;
     getApp().goto(url);
   },
 
-  click_next: function() {
+  click_next: function () {
     var index = this.data.sw_index;
     index++;
     if (index >= this.data.qy_list.length) return;
@@ -649,7 +647,7 @@ Page({
     })
   },
 
-  click_pre: function() {
+  click_pre: function () {
     var index = this.data.sw_index;
     index--;
     if (index < 0) return;
@@ -658,7 +656,7 @@ Page({
     })
   },
 
-  onSli: function(e) {
+  onSli: function (e) {
     var that = this;
     that.setData({
       sw_index: e.detail.current
@@ -666,7 +664,7 @@ Page({
   },
 
   //--权益使用--
-  go_qy_url: function(e) {
+  go_qy_url: function (e) {
     var th = this;
     var no = e.currentTarget.dataset.no;
     var ind = e.currentTarget.dataset.ind;
@@ -683,8 +681,8 @@ Page({
     }
 
     var url = e.currentTarget.dataset.img;
-    if(!url || url==""){
-      url=`/public/upload/userqy/quanbg.jpg`
+    if (!url || url == "") {
+      url = `/public/upload/userqy/quanbg.jpg`
     }
     switch (no) {
       case "01":
@@ -696,7 +694,7 @@ Page({
         break;
       case "03":
         getApp().goto("/pages/user/user_spsy/user_spsy?img=" +
-        url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
+          url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
         break;
       case "10":
         getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get", {
@@ -706,7 +704,7 @@ Page({
             userId: getApp().globalData.user_id,
             gradeId: th.data.gradeId
           },
-          success: function(res) {
+          success: function (res) {
             var val = res.data.data.Remark;
             var title = res.data.data.PrivilegeName;
             var qt_txt = th.selectComponent("#pop_txt"); //组件的id
@@ -722,20 +720,20 @@ Page({
   },
 
   //跳转到链接
-  goto: function(e) {
+  goto: function (e) {
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
   },
 
   //---------联系客服------------
-  contactService: function() {
+  contactService: function () {
     var s = getApp();
-    s.getConfig(function(t) {
+    s.getConfig(function (t) {
       if (t.store_tel == undefined) {
         getApp().request.get("/api/weshop/store/get/" + os.stoid, {
           isShowLoading: 1,
           data: {},
-          success: function(rs) {
+          success: function (rs) {
             getApp().globalData.config = rs.data.data;
             if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
               getApp().showWarning("商家未设置电话");
@@ -750,15 +748,15 @@ Page({
     });
   },
 
-  go_info: function() {
+  go_info: function () {
     getApp().goto("/pages/user/userinfo/userinfo");
   },
 
-  jump: function() {
+  jump: function () {
     getApp().goto("/pages/user/grow_value/grow_value")
   },
   // 判断生日营销的页面是不是存在
-  birthday: function() {
+  birthday: function () {
 
     var th = this;
     rq.get("/api/weshop/marketing/birthday/act/judge", {
@@ -771,13 +769,13 @@ Page({
           var actId = res.data.data.id;
           var actImg = res.data.data.actImg;
           th.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg });
-          th.setData({is_banner:1});
+          th.setData({ is_banner: 1 });
         }
 
       }
     })
   },
-  clike_banne: function() {
+  clike_banne: function () {
     var th = this;
     var actId = th.data.actId;
     var giftbagid = th.data.giftbagid;
@@ -792,143 +790,141 @@ Page({
   },
 
   // 判断助力活动是不是存在
-  is_assistance: function() {
-    var th = this,r=Math.random()*100;
+  is_assistance: function () {
+    var th = this, r = Math.random() * 100;
     rq.get("/api/weshop/marketing/help/act/judge", {
       data: {
         storeId: os.stoid,
         userId: app_d.user_id,
-				r:r,
+        r: r,
       },
-      success: function(res) {
+      success: function (res) {
         var code = res.data.code;
         if (code == 0) {
           th.setData({
             is_assistance: 1
           });
-        }else{
-					th.setData({
-						is_assistance: 0
-					});
-				}
+        } else {
+          th.setData({
+            is_assistance: 0
+          });
+        }
 
       }
     })
   },
 
   //导航跳转
-  nav_goto:function(e){
-  		  var url=e.currentTarget.dataset.url;
-  		  if(!url || url=='') return; 
-  		  if(url[0]!='/') url='/'+url;
-  		  getApp().goto(url);
-   },
-   
-   //添加卡包
-   addcard:function(){	   
-	   var res=this.data.add_card_data;	
-	   if(!res) return false;	
-		
-	   var arr = new Array(6)
-	   arr[0] = res.code;
-	   arr[1] = res.timestamp;
-	   arr[2] = res.jsapiTicket;
-	   arr[3] = res.openid;
-	   arr[4] = res.cardid;
-	   arr[5] = res.nonceStr;
-	   var c=arr.sort();
-	   var newstr="";
-	   for  (var i=0;i<c.length;i++)
-	   {
-	       newstr+=c[i];
-	   }
-   
-	   var sh1=	 ut.sha1(newstr);	 	 
-	   wx.addCard({
-	       cardList: [
-	       {
-	        cardId: res.cardid,
-	        cardExt: '{"code": "'+res.code+'", "openid": "'+res.openid+'","timestamp": "' + res.timestamp + '","nonce_str":"' + res.nonceStr + '","outer_str":"web", "signature":"' + sh1 + '"}'
-	       }
-	   
-	       ],
-	       success: function (res) {},
-	       cancel: function (res) {}
-	   });
-   },
-
-   //订阅消息提醒
-  sendsm:function()
-    {  
-      var template_id = "";
-      rq.get("/api/wx/weappSendlist/page", {
-        data: {
-          store_id: os.stoid,
-          typeid: "1020"
-        },
-        success: function(res) {
-          if (res.data.code == 0 && res.data.data.pageData.length > 0) {
-            template_id = res.data.data.pageData[0].template_id;
-              // //授权订阅
-            wx.requestSubscribeMessage({
-              tmplIds: [template_id],
-              success(res) {
-                
-              },
-              fail(res) {
-              
-              }
-            })
-          }
+  nav_goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    if (!url || url == '') return;
+    if (url[0] != '/') url = '/' + url;
+    getApp().goto(url);
+  },
+
+  //添加卡包
+  addcard: function () {
+    var res = this.data.add_card_data;
+    if (!res) return false;
+
+    var arr = new Array(6)
+    arr[0] = res.code;
+    arr[1] = res.timestamp;
+    arr[2] = res.jsapiTicket;
+    arr[3] = res.openid;
+    arr[4] = res.cardid;
+    arr[5] = res.nonceStr;
+    var c = arr.sort();
+    var newstr = "";
+    for (var i = 0; i < c.length; i++) {
+      newstr += c[i];
+    }
+
+    var sh1 = ut.sha1(newstr);
+    wx.addCard({
+      cardList: [
+        {
+          cardId: res.cardid,
+          cardExt: '{"code": "' + res.code + '", "openid": "' + res.openid + '","timestamp": "' + res.timestamp + '","nonce_str":"' + res.nonceStr + '","outer_str":"web", "signature":"' + sh1 + '"}'
         }
-      })   
-    },
-
-    con_weixin:function () {
-        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) {}
-        })
-    },
-
-    //初始话按钮图标
-    init_user_tool:async function () {
-        var d_list=null;
-        //读取user_tool按钮图标
-        await  getApp().promiseGet("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, {
-        }).then(res=>{
-            if(ut.ajax_ok(res)) {
-                d_list=res.data.data.pageData;
-            }
-        })
-        if(!d_list) return false;
-        //过滤掉分销关闭的
-        await getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{
-           if(rs.data.code==0){
-               var dis=rs.data.data;
-               for(var i in d_list){
-                   if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){
-                       d_list.splice(i,1);
-                   }
-               }
-           }
-        })
 
-        //判断右没有开AI测肤
-        await getApp().promiseGet("/api/weshop/wx/weappSkin/get/"+os.stoid,{}).then(rs=>{
-            if(rs.data.code!=0 || !rs.data.data){
-                for(var i in d_list){
-                    if(d_list[i].name=='AI测肤'){
-                        d_list.splice(i,1);
-                    }
-                }
+      ],
+      success: function (res) { },
+      cancel: function (res) { }
+    });
+  },
+
+  //订阅消息提醒
+  sendsm: function () {
+    var template_id = "";
+    rq.get("/api/wx/weappSendlist/page", {
+      data: {
+        store_id: os.stoid,
+        typeid: "1020"
+      },
+      success: function (res) {
+        if (res.data.code == 0 && res.data.data.pageData.length > 0) {
+          template_id = res.data.data.pageData[0].template_id;
+          // //授权订阅
+          wx.requestSubscribeMessage({
+            tmplIds: [template_id],
+            success(res) {
+
+            },
+            fail(res) {
+
             }
-        })
-        this.setData({user_tool:d_list});
-    }
+          })
+        }
+      }
+    })
+  },
+
+  con_weixin: function () {
+    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) { }
+    })
+  },
+
+  //初始话按钮图标
+  init_user_tool: async function () {
+    var d_list = null;
+    //读取user_tool按钮图标
+    await getApp().promiseGet("/api/weshop/userTool/page?pageSize=100&store_id=" + os.stoid, {
+    }).then(res => {
+      if (ut.ajax_ok(res)) {
+        d_list = res.data.data.pageData;
+      }
+    })
+    if (!d_list) return false;
+    //过滤掉分销关闭的
+    await getApp().promiseGet("/api/weshop/storeDistribut/get/" + os.stoid, {}).then(rs => {
+      if (rs.data.code == 0) {
+        var dis = rs.data.data;
+        for (var i in d_list) {
+          if (d_list[i].name == '我的分销' && (!dis || dis.switch == 0)) {
+            d_list.splice(i, 1);
+          }
+        }
+      }
+    })
+
+    //判断右没有开AI测肤
+    await getApp().promiseGet("/api/weshop/wx/weappSkin/get/" + os.stoid, {}).then(rs => {
+      if (rs.data.code != 0 || !rs.data.data) {
+        for (var i in d_list) {
+          if (d_list[i].name == 'AI测肤') {
+            d_list.splice(i, 1);
+          }
+        }
+      }
+    })
+    this.setData({ user_tool: d_list });
+  }
 
 
 
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index fc4fe8a..59eb0a5 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -2,343 +2,349 @@
 <template is="tabBar" data="{{tabBar}}" /> -->
 <wxs src="filter.wxs" module="util"></wxs>
 <view class="xc-page" style="margin-bottom:{{isIpx ? '168rpx' : '100rpx'}}">
-  <view class="xc-user">
-    <view class="xc-head rel">
-      <image class="xc-background" src="{{iurl}}{{ad_img?ad_img:'/miniapp/images/user_index_powder.jpg'}}">
-        <view class="flex-space-between  abs xc-user-frame">
-          <view class="xc-user-left  flex" wx:if="{{userInfo}}">
-            <image class="xc-user-img  circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
-            <view class="xc-uesr-name">
-              <view class="flex ai-center">
-              <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text>
-              <view class="hvip" wx:if='{{GradeName && is_init}}'>
-                <image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{GradeName}}</view>
-              </view>
-
-              <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
-                <block wx:if="{{cz_val<full_cz_val}}">
-                  {{" "}}
-                  <text class="grow-up-val">成长值</text>
-                  <view style='margin-left:5rpx; '>{{cz_val}} / {{need_money}}</view>
-                </block>
-                <block wx:else>
-                  {{" "}}
-                  <text class="grow-up-val">成长值</text> {{cz_val}}
-                </block>
-              </view>
-            </view>
-
-          </view>
-
-          <view class="xc-user-left  flex" wx:else bindtap="gobindtel">
-            <image class="xc-user-img  circle" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
-            <view class="xc-uesr-name">请点击注册</view>
-          </view>
-
-
-        </view>
-        <view wx:if="{{userInfo}}" class="xc-qrcode-frame abs flex-center ">
-          <!-- {{iurl}}/miniapp -->
-          <image bindtap='show_tc' class=" xc-qrcode " src="{{iurl}}/miniapp/images/qrcode1.png"></image>
-        </view>
-        <view class="flex-vertical abs xc-grow-frame rel" style="display: none">
-          <view class="xc-grow-up">成长值</view>
-
-          <view class="xc-line-not rel">
-            <image class="xc-bj-img abs" src="{{iurl}}/miniapp/images/baijing.png"></image>
-            <image class="xc-zs-img abs" src="{{iurl}}/miniapp/images/zhuangshi.png"></image>
-            <view class="xc-line-Yes abs" style="width:{{length}}rpx;"></view>
-          </view>
-
-          <view class="xc-grow-val">5000/10000</view>
-        </view>
-        <view class="flex-equality  abs xc-assets">
-          <view class="t-c typefont" bindtap='balance'>{{yuer?yuer:0}}
-            <view class='numfont'>余额</view>
-          </view>
-          <view class="t-c typefont" bindtap='deposit'>{{udata.Balance?udata.Balance:0}}
-            <view class='numfont'>预存款</view>
-          </view>
-          <view class="t-c typefont" bindtap='integral'>{{udata.Integral?udata.Integral:0}}
-            <view class='numfont'>积分</view>
-          </view>
-          <view class="t-c typefont" bindtap='coupon'>{{udata.CashCount+byquan?udata.CashCount+byquan:0}}
-            <view class='numfont'>优惠券</view>
-          </view>
-        </view>
-      </image>
-
-    </view>
-    <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==2 && show_buy_plus && is_no_plus}}">
-      <view class="xc-add-member flex-center-around ">
-      <view class="flex jc-center ai-center">
-        <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
-        <view class="member fs28 "> 加入plus会员预计可省3031元</view>
-      </view>
-        <view class="xc-opening-button t-c" data-url="/pages/user/plus/plus" bindtap="goto">
-          <view class="xc-opening fs28">立即开通</view>
-        </view>
-      </view>
-    </view>
-
-	<view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==3 && show_buy_plus}}">
-      <view class="xc-add-member flex-center-around ">
-      <view class="flex jc-center ai-center">
-        <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
-        <view class="member fs28 "> 加入plus会员预计可省3031元</view>
-      </view>
-        <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto">
-          <view class="xc-opening fs28">立即续费</view>
-        </view>
-      </view>
-	</view>
+	<view class="xc-user">
+		<view class="xc-head rel">
+			<image class="xc-background" src="{{iurl}}{{ad_img?ad_img:'/miniapp/images/user_index_powder.jpg'}}">
+				<view class="flex-space-between  abs xc-user-frame">
+					<view class="xc-user-left  flex" wx:if="{{userInfo}}">
+						<image class="xc-user-img  circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
+						<view class="xc-uesr-name">
+							<view class="flex ai-center">
+								<text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text>
+								<view class="hvip" wx:if='{{GradeName && is_init}}'>
+									<image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{GradeName}}
+								</view>
+							</view>
+
+							<view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
+								<block wx:if="{{cz_val<full_cz_val}}">
+									{{" "}}
+									<text class="grow-up-val">成长值</text>
+									<view style='margin-left:5rpx; '>{{cz_val}} / {{need_money}}</view>
+								</block>
+								<block wx:else>
+									{{" "}}
+									<text class="grow-up-val">成长值</text> {{cz_val}}
+								</block>
+							</view>
+						</view>
+
+					</view>
+
+					<view class="xc-user-left  flex" wx:else bindtap="gobindtel">
+						<image class="xc-user-img  circle" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
+						<view class="xc-uesr-name">请点击注册</view>
+					</view>
+
+
+				</view>
+				<view wx:if="{{userInfo}}" class="xc-qrcode-frame abs flex-center ">
+					<!-- {{iurl}}/miniapp -->
+					<image bindtap='show_tc' class=" xc-qrcode " src="{{iurl}}/miniapp/images/qrcode1.png"></image>
+				</view>
+				<view class="flex-vertical abs xc-grow-frame rel" style="display: none">
+					<view class="xc-grow-up">成长值</view>
+
+					<view class="xc-line-not rel">
+						<image class="xc-bj-img abs" src="{{iurl}}/miniapp/images/baijing.png"></image>
+						<image class="xc-zs-img abs" src="{{iurl}}/miniapp/images/zhuangshi.png"></image>
+						<view class="xc-line-Yes abs" style="width:{{length}}rpx;"></view>
+					</view>
+
+					<view class="xc-grow-val">5000/10000</view>
+				</view>
+				<view class="flex-equality  abs xc-assets">
+					<view class="t-c typefont" bindtap='balance'>{{yuer?yuer:0}}
+						<view class='numfont'>余额</view>
+					</view>
+					<view class="t-c typefont" bindtap='deposit'>{{udata.Balance?udata.Balance:0}}
+						<view class='numfont'>预存款</view>
+					</view>
+					<view class="t-c typefont" bindtap='integral'>{{udata.Integral?udata.Integral:0}}
+						<view class='numfont'>积分</view>
+					</view>
+					<view class="t-c typefont" bindtap='coupon'>{{udata.CashCount+byquan?udata.CashCount+byquan:0}}
+						<view class='numfont'>优惠券</view>
+					</view>
+				</view>
+			</image>
+
+		</view>
+		<block wx:if="{{is_no_plus}}">
+			<view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==2 && show_buy_plus && is_no_plus}}">
+			<view class="xc-add-member flex-center-around ">
+				<view class="flex jc-center ai-center">
+					<image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
+					<view class="member fs28 "> 加入plus会员预计可省3031元</view>
+				</view>
+				<view class="xc-opening-button t-c" data-url="/pages/user/plus/plus" bindtap="goto">
+					<view class="xc-opening fs28">立即开通</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==3 && show_buy_plus}}">
+			<view class="xc-add-member flex-center-around ">
+				<view class="flex jc-center ai-center">
+					<image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
+					<view class="member fs28 "> 加入plus会员预计可省3031元</view>
+				</view>
+				<view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto">
+					<view class="xc-opening fs28">立即续费</view>
+				</view>
+			</view>
+		</view>
+		
+		</block>
 
-  </view>
-  <view class="xc-after-sale rel">
-    <!-- 顶上的一栏 -->
-    <view class="xc-equity-title flex-level">
-      <view class="xc-title-frame flex ai-center">
-        <view class="flex-vertical xc-title-content" bindtap="go_order" data-url="/pages/user/order_list/order_list">
-          <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image>
-          <view class="three-level-word">我的订单</view>
-        </view>
+	</view>
+	<view class="xc-after-sale rel">
+		<!-- 顶上的一栏 -->
+		<view class="xc-equity-title flex-level">
+			<view class="xc-title-frame flex ai-center">
+				<view class="flex-vertical xc-title-content" bindtap="go_order" data-url="/pages/user/order_list/order_list">
+					<image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image>
+					<view class="three-level-word">我的订单</view>
+				</view>
 				<!-- 物流信息提醒 -->
 				<view class="fs26 c-5 pdl60" wx:if="{{countDadaOrder && countDadaOrder != 0}}" bindtap="go_order" data-url="/pages/user/order_list/order_list?index=1"><text class="iconfont icon-dingwei"></text>您有<text class="c-red">{{countDadaOrder}}</text>个同城配送订单</view>
-      </view>
-      <view class="three-level-word  xc-more-frame flex-vertical" bindtap="go_order" data-url="/pages/user/order_list/order_list">
-        <view class="three-level-word xc-more">更多</view>
-        <view class="bg_right xc-more-click bcolor"></view>
-      </view>
-    </view>
-    <!-- 内容的一栏 -->
-    <view class="xc-after-sale-left flex-center-around">
-      <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=1">
-        <image class="xc-no-money" src="{{iurl}}/miniapp/images/daifuk.png"></image>
-        <view class=" xc-word-color four-level-word">待付款</view>
-        <text class="order-num" hidden='{{toji.wait_pay>0?"":"true"}}'>{{toji.wait_pay}}</text>
-      </view>
-
-      <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=2">
-        <image class="xc-send" src="{{iurl}}/miniapp/images/dfahuo.png?v=1"></image>
-        <view class="xc-word-color four-level-word">待发货</view>
-        <text class="order-num" hidden='{{toji.wait_send>0?"":"true"}}'>{{toji.wait_send}}</text>
-      </view>
-
-      <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=3">
-        <image class="xc-await" src="{{iurl}}/miniapp/images/shouhuo1.png"></image>
-        <view class="xc-word-color four-level-word">待收货</view>
-        <text class="order-num" hidden='{{toji.wait_receive>0?"":"true"}}'>{{toji.wait_receive}}</text>
-      </view>
-      <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=4">
-        <image class="xc-no-money" src="{{iurl}}/miniapp/images/dpr1.png"></image>
-        <view class="xc-word-color four-level-word">待评论</view>
-        <text class="order-num" hidden='{{toji.wait_pj>0?"":"true"}}'>{{toji.wait_pj}}</text>
-      </view>
-      <view class="t-c margin-auto rel" style='margin-left:30rpx;' bindtap="go_order" data-url="/pages/user/return_goods_list/return_goods_list">
-        <image class="xc-no-money" src="{{iurl}}/miniapp/images/shouh1.png"></image>
-        <view style='height:36rpx;'> </view>
-        <view class="xc-word-color four-level-word abs">售后/退款</view>
-        <!--<text class="order-num" hidden='{{toji.wait_return>0>0?"":"true"}}' style="right: -20rpx">{{toji.wait_return}}</text>-->
-      </view>
-
-    </view>
-    <view style="clear: both"></view>
-
-  </view>
-
-  <!-- 我的权益 -->
-  <view class="xc-my-equity-frame" wx:if="{{is_init }}">
-    <view class="xc-equity-title flex-level" bindtap="go_qy">
-      <view class="xc-title-frame flex-space-between">
-        <view class="flex-vertical xc-title-content">
-          <image class="xc-title-img" src="{{iurl}}/miniapp/images/medal.png"></image>
-            <view class="three-level-word">我的权益</view>
-        </view>
-      </view>
-      <view wx:if="{{is_grad_get}}" class="three-level-word  xc-more-frame flex-vertical">
-        <view class="three-level-word xc-more">更多</view>
-        <view class="bg_right xc-more-click bcolor"></view>
-      </view>
-      <view wx:else class="three-level-word  xc-more-frame flex-vertical" style="justify-content: flex-end">
-        <image style="width: 40rpx; height: 40rpx; margin-right: 20rpx" src="{{iurl}}/miniapp/images/loader.gif"></image>
-      </view>
-    </view>
-
-    <block wx:if="{{is_grad_get}}">
-      <block wx:if="{{qy_list && gradeId}}">
-        <view class="xc-specific-more-frame flex-vertical" wx:if="{{qy_list}}">
-
-        <view bindtap="click_pre">
-          <view class="bg_left xc-left bcolor"></view>
-        </view>
-
-        <swiper current="{{sw_index}}" style='width:82.7%; height:108rpx' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
-
-          <swiper-item wx:for="{{qy_list}}" wx:for-item="aitem" wx:for-index="pidx">
-            <view class="flex xc-middle">
-
-              <view class="xc-center-frame t-c" wx:for="{{aitem}}" data-img="{{item.PrivilegeImageUrl}}" data-no="{{item.PrivilegeType}}" data-ind="{{index}}" data-find="{{pidx}}" bindtap="go_qy_url">
-                <!-- <text>qy_list.privilegeICOUrl</text> -->
-                <image class="xc-center-img  {{item.ishas==1?'':'img_gray'}}" src="{{item.PrivilegeICOUrl}}"></image>
-                <view class="four-level-word">{{item.PrivilegeName}}</view>
-              </view>
-            </view>
-          </swiper-item>
-
-        </swiper>
-
-        <view bindtap="click_next">
-          <view class="bg_right xc-right bcolor mt"></view>
-        </view>
-      </view>
-      </block>
-      <view wx:else style="text-align: center">
-            未找到数据
-      </view>
-    </block>
-
-
-
-
-  </view>
-  <!-- 生日营销 is_banner-->
- <block wx:if="{{is_banner}}">
-    <view class="t-c banner-frame"bindtap="clike_banne">
-      <image class="banner-img" src="{{actImg==''?iurl+'/miniapp/images/user/banner-img.jpg':iurl+actImg}}">
-      </image>
-  </view>
- </block>
-
-  <!-- 工具与服务 -->
-  <view class="xc-tool-service" >
-    <view class="xc-tool-service-title flex-vertical">
-      <image  class="xc-tool-service-img" src="{{iurl}}/miniapp/images/gj.png"></image>
-      <view class="three-level-word xc-tool-service-word">工具与服务</view>
-    </view>
-    <view class="xc-project-frame">
-      <!-- 跳转页面 -->
-      <view class="center_v" style="display: flex;flex-wrap: wrap;align-items: center;">
-		   <!-- 循环使用自定义菜单，显示和掩藏 -->
-           <block wx:for="{{user_tool}}">
-			   <!-- 判断系统配置中有没有把菜单关闭 --> 
-			   <block wx:if="{{!util.is_close(item.name,c_list)}}">	
-						<!-- 有链接地址的时候 -->  
-					   <block wx:if="{{item.weappurl}}">		
-							 <block wx:if="{{item.name=='PLUS会员'}}">
-								 <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto" wx:if="{{is_dengji==1}}">
-								 	<image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
-								 	<view class="fs26">PLUS会员</view>
-								 </view>							 
-							 </block>							  
-							 <block wx:elif="{{item.name=='助力活动'}}">
-							  	 <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav" wx:if="{{is_assistance==1}}">
-							  	 	<image class="xc-center-img" src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image>
-							  	 	<view class="four-level-word">助力活动</view>
-							  	 </view>							 							  															 
-							 </block> 																								  
-						     <block wx:elif="{{item.name=='我的权益'}}">
-						     	<view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}">
-						     	    <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
-						     	    <view class="fs26">我的权益</view>
-						     	</view>							 							  								 
-						     </block>
-									<block wx:elif="{{item.name=='套盒商品'}}">
-										<view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto" wx:if="{{enableMeiye}}">
-										    <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
-										    <view class="fs26">套盒商品</view>
-										</view>							 							  								 
-									</block>																														 
-							 <block wx:else>							  
-								  <view  class="item t-c" data-url="{{item.weappurl}}" bindtap="goto_nav">
+			</view>
+			<view class="three-level-word  xc-more-frame flex-vertical" bindtap="go_order" data-url="/pages/user/order_list/order_list">
+				<view class="three-level-word xc-more">更多</view>
+				<view class="bg_right xc-more-click bcolor"></view>
+			</view>
+		</view>
+		<!-- 内容的一栏 -->
+		<view class="xc-after-sale-left flex-center-around">
+			<view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=1">
+				<image class="xc-no-money" src="{{iurl}}/miniapp/images/daifuk.png"></image>
+				<view class=" xc-word-color four-level-word">待付款</view>
+				<text class="order-num" hidden='{{toji.wait_pay>0?"":"true"}}'>{{toji.wait_pay}}</text>
+			</view>
+
+			<view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=2">
+				<image class="xc-send" src="{{iurl}}/miniapp/images/dfahuo.png?v=1"></image>
+				<view class="xc-word-color four-level-word">待发货</view>
+				<text class="order-num" hidden='{{toji.wait_send>0?"":"true"}}'>{{toji.wait_send}}</text>
+			</view>
+
+			<view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=3">
+				<image class="xc-await" src="{{iurl}}/miniapp/images/shouhuo1.png"></image>
+				<view class="xc-word-color four-level-word">待收货</view>
+				<text class="order-num" hidden='{{toji.wait_receive>0?"":"true"}}'>{{toji.wait_receive}}</text>
+			</view>
+			<view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=4">
+				<image class="xc-no-money" src="{{iurl}}/miniapp/images/dpr1.png"></image>
+				<view class="xc-word-color four-level-word">待评论</view>
+				<text class="order-num" hidden='{{toji.wait_pj>0?"":"true"}}'>{{toji.wait_pj}}</text>
+			</view>
+			<view class="t-c margin-auto rel" style='margin-left:30rpx;' bindtap="go_order" data-url="/pages/user/return_goods_list/return_goods_list">
+				<image class="xc-no-money" src="{{iurl}}/miniapp/images/shouh1.png"></image>
+				<view style='height:36rpx;'> </view>
+				<view class="xc-word-color four-level-word abs">售后/退款</view>
+				<!--<text class="order-num" hidden='{{toji.wait_return>0>0?"":"true"}}' style="right: -20rpx">{{toji.wait_return}}</text>-->
+			</view>
+
+		</view>
+		<view style="clear: both"></view>
+
+	</view>
+
+	<!-- 我的权益 -->
+	<view class="xc-my-equity-frame" wx:if="{{is_init }}">
+		<view class="xc-equity-title flex-level" bindtap="go_qy">
+			<view class="xc-title-frame flex-space-between">
+				<view class="flex-vertical xc-title-content">
+					<image class="xc-title-img" src="{{iurl}}/miniapp/images/medal.png"></image>
+					<view class="three-level-word">我的权益</view>
+				</view>
+			</view>
+			<view wx:if="{{is_grad_get}}" class="three-level-word  xc-more-frame flex-vertical">
+				<view class="three-level-word xc-more">更多</view>
+				<view class="bg_right xc-more-click bcolor"></view>
+			</view>
+			<view wx:else class="three-level-word  xc-more-frame flex-vertical" style="justify-content: flex-end">
+				<image style="width: 40rpx; height: 40rpx; margin-right: 20rpx" src="{{iurl}}/miniapp/images/loader.gif"></image>
+			</view>
+		</view>
+
+		<block wx:if="{{is_grad_get}}">
+			<block wx:if="{{qy_list && gradeId}}">
+				<view class="xc-specific-more-frame flex-vertical" wx:if="{{qy_list}}">
+
+					<view bindtap="click_pre">
+						<view class="bg_left xc-left bcolor"></view>
+					</view>
+
+					<swiper current="{{sw_index}}" style='width:82.7%; height:108rpx' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
+
+						<swiper-item wx:for="{{qy_list}}" wx:for-item="aitem" wx:for-index="pidx">
+							<view class="flex xc-middle">
+
+								<view class="xc-center-frame t-c" wx:for="{{aitem}}" data-img="{{item.PrivilegeImageUrl}}" data-no="{{item.PrivilegeType}}" data-ind="{{index}}" data-find="{{pidx}}" bindtap="go_qy_url">
+									<!-- <text>qy_list.privilegeICOUrl</text> -->
+									<image class="xc-center-img  {{item.ishas==1?'':'img_gray'}}" src="{{item.PrivilegeICOUrl}}"></image>
+									<view class="four-level-word">{{item.PrivilegeName}}</view>
+								</view>
+							</view>
+						</swiper-item>
+
+					</swiper>
+
+					<view bindtap="click_next">
+						<view class="bg_right xc-right bcolor mt"></view>
+					</view>
+				</view>
+			</block>
+			<view wx:else style="text-align: center">
+				未找到数据
+			</view>
+		</block>
+
+
+
+
+	</view>
+	<!-- 生日营销 is_banner-->
+	<block wx:if="{{is_banner}}">
+		<view class="t-c banner-frame" bindtap="clike_banne">
+			<image class="banner-img" src="{{actImg==''?iurl+'/miniapp/images/user/banner-img.jpg':iurl+actImg}}">
+			</image>
+		</view>
+	</block>
+
+	<!-- 工具与服务 -->
+	<view class="xc-tool-service">
+		<view class="xc-tool-service-title flex-vertical">
+			<image class="xc-tool-service-img" src="{{iurl}}/miniapp/images/gj.png"></image>
+			<view class="three-level-word xc-tool-service-word">工具与服务</view>
+		</view>
+		<view class="xc-project-frame">
+			<!-- 跳转页面 -->
+			<view class="center_v" style="display: flex;flex-wrap: wrap;align-items: center;">
+				<!-- 循环使用自定义菜单，显示和掩藏 -->
+				<block wx:for="{{user_tool}}">
+					<!-- 判断系统配置中有没有把菜单关闭 -->
+					<block wx:if="{{!util.is_close(item.name,c_list)}}">
+						<!-- 有链接地址的时候 -->
+						<block wx:if="{{item.weappurl}}">
+							<block wx:if="{{item.name=='PLUS会员'}}">
+								<view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto" wx:if="{{is_dengji==1}}">
+									<image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+									<view class="fs26">PLUS会员</view>
+								</view>
+							</block>
+							<block wx:elif="{{item.name=='助力活动'}}">
+								<view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav" wx:if="{{is_assistance==1}}">
+									<image class="xc-center-img" src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image>
+									<view class="four-level-word">助力活动</view>
+								</view>
+							</block>
+							<block wx:elif="{{item.name=='我的权益'}}">
+								<view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}">
+									<image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
+									<view class="fs26">我的权益</view>
+								</view>
+							</block>
+							<block wx:elif="{{item.name=='套盒商品'}}">
+								<view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto" wx:if="{{enableMeiye}}">
+									<image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
+									<view class="fs26">套盒商品</view>
+								</view>
+							</block>
+							<block wx:else>
+								<view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto_nav">
 									<image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
 									<view class="fs26">{{item.name}}</view>
-								  </view>
-							 </block> 
-					   </block>
-					   <!-- 没有链接地址的时候 --> 
-					   <block wx:else>			   
-						   <block wx:if="{{item.name=='联系客服'}}">
-							   <button class="item t-c"  wx:if="{{sys_switch.weapp_customertype==1}}" open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
-							      <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
-							      <view class="fs26">联系客服</view>
-							   </button>
-
-                               <view class="item t-c" bindtap="con_weixin" wx:elif="{{sys_switch.weapp_customertype==2}}">
-                                   <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
-                                   <view class="fs26">联系客服</view>
-                               </view>
-
-							   <view class="item t-c" bindtap="contactService" wx:else>
-							      <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
-							      <view class="fs26">联系客服</view>
-							   </view>
-						    								 							  								 
-						   </block> 
-						   <block wx:elif="{{item.name=='收入卡包'}}">
-								<view class="item t-c"  bindtap="addcard" wx:if="{{add_card_data}}">
+								</view>
+							</block>
+						</block>
+						<!-- 没有链接地址的时候 -->
+						<block wx:else>
+							<block wx:if="{{item.name=='联系客服'}}">
+								<button class="item t-c" wx:if="{{sys_switch.weapp_customertype==1}}" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+									<image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+									<view class="fs26">联系客服</view>
+								</button>
+
+								<view class="item t-c" bindtap="con_weixin" wx:elif="{{sys_switch.weapp_customertype==2}}">
+									<image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+									<view class="fs26">联系客服</view>
+								</view>
+
+								<view class="item t-c" bindtap="contactService" wx:else>
+									<image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+									<view class="fs26">联系客服</view>
+								</view>
+
+							</block>
+							<block wx:elif="{{item.name=='收入卡包'}}">
+								<view class="item t-c" bindtap="addcard" wx:if="{{add_card_data}}">
 									<image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
 									<view class="four-level-word">收入卡包</view>
-								</view>																						 
-						   </block> 							    
-					   </block>									  
-			   </block>					  								  
-		   </block>
-      </view>
-
-    </view>
-  </view>
-  <view style='width:100%;height:73rpx;'>
-    <view class="xc-recommend-goods flex-center">
-
-      <view class="circle xc-small">
-      </view>
-      <view class="circle xc-zhong">
-      </view>
-      <view class="circle xc-big">
-      </view>
-      <view class="three-level-word xc-recommend">为你推荐</view>
-      <view class="circle xc-big">
-      </view>
-      <view class="circle xc-zhong">
-      </view>
-      <view class="circle xc-small" style='margin-left:15rpx;'>
-        <!-- </view> -->
-      </view>
-    </view>
-  </view>
-	
+								</view>
+							</block>
+						</block>
+					</block>
+				</block>
+			</view>
+
+		</view>
+	</view>
+	<view style='width:100%;height:73rpx;'>
+		<view class="xc-recommend-goods flex-center">
+
+			<view class="circle xc-small">
+			</view>
+			<view class="circle xc-zhong">
+			</view>
+			<view class="circle xc-big">
+			</view>
+			<view class="three-level-word xc-recommend">为你推荐</view>
+			<view class="circle xc-big">
+			</view>
+			<view class="circle xc-zhong">
+			</view>
+			<view class="circle xc-small" style='margin-left:15rpx;'>
+				<!-- </view> -->
+			</view>
+		</view>
+	</view>
+
 	<!-- 显示商品 -->
 	<!-- 好物推荐 -->
 	<goods_recommend id="goods_recommend"></goods_recommend>
-	
+
 	<!-- 技术支持 -->
 	<view class="logo-container t-c">
-		<view class="flex ai_c fs24 jc-center pdv30 white"><image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view>
+		<view class="flex ai_c fs24 jc-center pdv30 white">
+			<image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
+		</view>
 	</view>
 </view>
 
 <!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"-->
 <view class="tc_view" hidden='{{tc_hide}}' bindtap='hide_tc'>
-  <view class="modal-box" hidden="{{flag}}" bindtap="hide" catchtouchmove="true"></view>
-  <view class="modal-body" catchtouchmove="true">
-    <view class="modal-content">
-      <view class="flex">
-        <image src="{{userInfo.head_pic}}" class="hd_img"></image>
-        <view class="ctent_txt">
-          <view class='txt1'>{{userInfo.nickname}}
-            <image wx:if="{{userInfo.sex==2}}" class="arrow-right" style="width: 35rpx; height:35rpx; top: 5rpx" src="{{iurl}}/miniapp/images/user/wum.png"></image>
-            <image wx:else class="arrow-right fu" style="width: 35rpx; height:35rpx;top:5rpx"  src="{{iurl}}/miniapp/images/user/man.png"></image>
-          </view>
-          <view wx:if="{{userInfo.address}}" class='txt2'>{{userInfo.address}}</view>
-        </view>
-      </view>
-      <view class="m_ta">
-        <!--<image class='g_img' src='https://mshop.yolipai.net//index.php?m=Home&c=Index&a=qr_code&data={{userInfo.mobile}}'></image>-->
-        <canvas class="g_img" canvas-id="qrcode" />
-      </view>
-      <view class="s_sao">扫一扫上面的二维码图案，即可消费</view>
-    </view>
-  </view>
+	<view class="modal-box" hidden="{{flag}}" bindtap="hide" catchtouchmove="true"></view>
+	<view class="modal-body" catchtouchmove="true">
+		<view class="modal-content">
+			<view class="flex">
+				<image src="{{userInfo.head_pic}}" class="hd_img"></image>
+				<view class="ctent_txt">
+					<view class='txt1'>{{userInfo.nickname}}
+						<image wx:if="{{userInfo.sex==2}}" class="arrow-right" style="width: 35rpx; height:35rpx; top: 5rpx" src="{{iurl}}/miniapp/images/user/wum.png"></image>
+						<image wx:else class="arrow-right fu" style="width: 35rpx; height:35rpx;top:5rpx" src="{{iurl}}/miniapp/images/user/man.png"></image>
+					</view>
+					<view wx:if="{{userInfo.address}}" class='txt2'>{{userInfo.address}}</view>
+				</view>
+			</view>
+			<view class="m_ta">
+				<!--<image class='g_img' src='https://mshop.yolipai.net//index.php?m=Home&c=Index&a=qr_code&data={{userInfo.mobile}}'></image>-->
+				<canvas class="g_img" canvas-id="qrcode" />
+			</view>
+			<view class="s_sao">扫一扫上面的二维码图案，即可消费</view>
+		</view>
+	</view>
 </view>
 
-<pop_txt id="pop_txt"></pop_txt>
+<pop_txt id="pop_txt"></pop_txt>
\ No newline at end of file
diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml
index 68cfc8b..d2f17f3 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -14,7 +14,7 @@
           <view>
             <view class="ellipsis-2 Nickname" style="font-size: 31rpx">
               <view style="float:left;">{{user.nickname}}</view>
-              <button bindtap="getUserProfile" style="margin-left:10rpx;float:left;width: 200rpx;height:50rpx;font-size:20rpx;" class="flex-center fs30 confirmtext"> 点击更新头像昵称 </button>
+              <button bindtap="getUserProfile" style="margin-left:10rpx;float:left;width: 50rpx;height:50rpx;font-size:20rpx;background:rgba(217, 81, 99, 0.9);" class="flex-center fs30 confirmtext"><text class="iconfont icon-tongbu"></text></button>
             </view>
           </view>
 
diff --git a/pages/user/withdrawals/withdrawals.js b/pages/user/withdrawals/withdrawals.js
deleted file mode 100644
index 532d51f..0000000
--- a/pages/user/withdrawals/withdrawals.js
+++ /dev/null
@@ -1,54 +0,0 @@
-var a = getApp(), n = a.request, e = require("../../../utils/common.js");
-
-Page({
-    data: {
-        url: a.globalData.setting.url,
-        userMoney: 0,
-        capacheUrl: ""
-    },
-    onLoad: function(a) {
-        this.setData({
-            userMoney: a.money
-        }), this.getCapache();
-    },
-    submitWithdrawals: function(a) {
-        var e = a.detail.value;
-        if (!0 === this.checkFormData(e)) {
-            var t = this;
-            n.post("/api/user/withdrawals", {
-                data: {
-                    account_bank: e.account_bank,
-                    account_name: e.account_name,
-                    bank_name: e.bank_name,
-                    money: e.money,
-                    verify_code: e.verify_code,
-                    paypwd: e.paypwd
-                },
-                success: function() {
-                    wx.showToast({
-                        title: "已提交申请",
-                        mask: !0,
-                        complete: function() {
-                            setTimeout(function() {
-                                wx.navigateBack();
-                            }, 1e3);
-                        }
-                    });
-                },
-                failStatus: function() {
-                    t.getCapache();
-                }
-            });
-        }
-    },
-    checkFormData: function(n) {
-        console.log(n);
-        var e = parseFloat(n.money);
-        return isNaN(e) ? a.showWarning("请填写合法的提现金额") : e < .01 ? a.showWarning("请填写大于等于1分的提现金额") : e > this.data.userMoney ? a.showWarning("可提现最大金额是 " + this.data.userMoney + " 元") : n.bank_name.length < 2 ? a.showWarning("请填写正确的银行名称") : isNaN(parseInt(n.account_bank)) || "" == n.account_bank ? a.showWarning("请填写正确的收款账号") : "" == n.account_name ? a.showWarning("请填写正确的开户号") : "" == n.paypwd.length ? a.showWarning("支付密码不能为空") : "" != n.verify_code || a.showWarning("请先输入验证码");
-    },
-    getCapache: function() {
-        this.setData({
-            capacheUrl: e.getCapache()
-        });
-    }
-});
\ No newline at end of file
diff --git a/pages/user/withdrawals/withdrawals.json b/pages/user/withdrawals/withdrawals.json
deleted file mode 100644
index 7032d9c..0000000
--- a/pages/user/withdrawals/withdrawals.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "navigationBarTitleText": "申请提现"
-}
\ No newline at end of file
diff --git a/pages/user/withdrawals/withdrawals.wxml b/pages/user/withdrawals/withdrawals.wxml
deleted file mode 100644
index 72776d6..0000000
--- a/pages/user/withdrawals/withdrawals.wxml
+++ /dev/null
@@ -1,32 +0,0 @@
-<view class="panel pd-bg-fff">
-    <form bindsubmit="submitWithdrawals">
-        <view class="apply-item">
-            <view class="title">提现金额 : </view>
-            <input name="money" placeholder="可提现金额 : {{userMoney}}元" type="digit"></input>
-        </view>
-        <view class="apply-item">
-            <view class="title">银行名称 : </view>
-            <input name="bank_name" placeholder="如 : 工商银行,支付宝,微信" type="text"></input>
-        </view>
-        <view class="apply-item">
-            <view class="title">收款账号 : </view>
-            <input name="account_bank" placeholder="收款账号" type="number"></input>
-        </view>
-        <view class="apply-item">
-            <view class="title">开户号 : </view>
-            <input name="account_name" placeholder="持卡人姓名" type="text"></input>
-        </view>
-        <view class="apply-item">
-            <view class="title">支付密码 : </view>
-            <input name="paypwd" placeholder="支付密码" type="password"></input>
-        </view>
-        <view class="apply-item">
-            <view class="title">验证码 : </view>
-            <input class="v-code-text" name="verify_code" placeholder="请输入验证码" type="text"></input>
-            <view bindtap="getCapache" class="v-code">
-                <image class="wh100" src="{{capacheUrl}}"></image>
-            </view>
-        </view>
-        <button class="apply-btn" formType="submit">提交申请</button>
-    </form>
-</view>
diff --git a/pages/user/withdrawals/withdrawals.wxss b/pages/user/withdrawals/withdrawals.wxss
deleted file mode 100644
index b8978e8..0000000
--- a/pages/user/withdrawals/withdrawals.wxss
+++ /dev/null
@@ -1,42 +0,0 @@
-.panel {
-    padding-bottom: 50rpx;
-}
-
-.apply-item {
-    display: flex;
-    align-items: center;
-    font-size: 28rpx;
-    height: 88rpx;
-    border-bottom: 1px solid #ddd;
-}
-
-.title {
-    color: #444;
-    margin-right: 20rpx;
-}
-
-input {
-    color: #777;
-    width: 500rpx;
-}
-
-.v-code-text {
-    width: 220rpx;
-}
-
-.v-code {
-    width: 260rpx;
-    height: 60rpx;
-}
-
-.apply-btn {
-    margin: 60rpx auto 0;
-    width: 580rpx;
-    height: 88rpx;
-    font-size: 28rpx;
-    line-height: 88rpx;
-    text-align: center;
-    color: #fff;
-    background-color: #e30000;
-    border-radius: 8rpx;
-}
\ No newline at end of file
diff --git a/pages/user/withdrawals_list/withdrawals_list.js b/pages/user/withdrawals_list/withdrawals_list.js
deleted file mode 100644
index 940598d..0000000
--- a/pages/user/withdrawals_list/withdrawals_list.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var t = function(t) {
-    return t && t.__esModule ? t : {
-        default: t
-    };
-}(require("../../../utils/LoadMore.js")), a = getApp(), e = new t.default(), r = require("../../../utils/util.js");
-
-Page({
-    data: {
-        url: a.globalData.setting.url,
-        resourceUrl: a.globalData.setting.resourceUrl,
-        withdrawals: null,
-        currentPage: 1
-    },
-    onLoad: function() {
-        e.init(this, "", "withdrawals"), this.requestWithdrawalsList();
-    },
-    requestWithdrawalsList: function() {
-        var t = this, a = "/api/user/withdrawals_list/?p=" + t.data.currentPage;
-        e.request(a, function(a) {
-            t.data.currentPage++, a.data.result.forEach(function(t, a, e) {
-                t.createTimeFommat = r.format(t.create_time, "yyyy-MM-dd");
-            }), wx.stopPullDownRefresh();
-        });
-    },
-    onReachBottom: function() {
-        e.canloadMore() && this.requestWithdrawalsList();
-    },
-    onPullDownRefresh: function() {
-        this.data.withdrawals = null, this.data.currentPage = 1, e.resetConfig(), this.requestWithdrawalsList();
-    }
-});
\ No newline at end of file
diff --git a/pages/user/withdrawals_list/withdrawals_list.json b/pages/user/withdrawals_list/withdrawals_list.json
deleted file mode 100644
index bece1ed..0000000
--- a/pages/user/withdrawals_list/withdrawals_list.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "navigationBarTitleText": "提现申请记录"
-}
\ No newline at end of file
diff --git a/pages/user/withdrawals_list/withdrawals_list.wxml b/pages/user/withdrawals_list/withdrawals_list.wxml
deleted file mode 100644
index 805d0ec..0000000
--- a/pages/user/withdrawals_list/withdrawals_list.wxml
+++ /dev/null
@@ -1,14 +0,0 @@
-<view class="container">
-    <view class="withdrawal-box">
-        <view class="withdrawal-item pay title">编号</view>
-        <view class="withdrawal-item time title">申请日期</view>
-        <view class="withdrawal-item price title">金额</view>
-        <view class="withdrawal-item status title">状态</view>
-    </view>
-    <view class="withdrawal-box" wx:for="{{withdrawals}}" wx:key="{{index}}">
-        <view class="withdrawal-item pay">{{item.id}}</view>
-        <view class="withdrawal-item time">{{item.createTimeFommat}}</view>
-        <view class="withdrawal-item price">{{item.money}}</view>
-        <view class="withdrawal-item status">{{item.status==0?'申请中':''}}{{item.status==1?'申请成功':''}}{{item.status==2?'申请失败':''}}</view>
-    </view>
-</view>
diff --git a/pages/user/withdrawals_list/withdrawals_list.wxss b/pages/user/withdrawals_list/withdrawals_list.wxss
deleted file mode 100644
index 652c284..0000000
--- a/pages/user/withdrawals_list/withdrawals_list.wxss
+++ /dev/null
@@ -1,42 +0,0 @@
-page {
-    background-color: white;
-}
-
-.withdrawal-box {
-    font-size: 28rpx;
-    padding: 25rpx 30rpx;
-    border-bottom: 1rpx solid #f8f8f8;
-}
-
-.withdrawal-item {
-    display: inline-block;
-    word-break: keep-all;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    color: #666666;
-    box-sizing: border-box;
-    text-align: center;
-}
-
-.withdrawal-box .pay {
-    width: 20%;
-}
-
-.withdrawal-box .time {
-    width: 27%;
-}
-
-.withdrawal-box .price {
-    width: 28%;
-}
-
-.withdrawal-box .status {
-    width: 25%;
-    color: #e01222;
-}
-
-.withdrawal-box .title {
-    color: #666666;
-    font-size: 32rpx;
-}
\ No newline at end of file