diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 9f3eb01..3092772 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 () { },
@@ -106,7 +107,7 @@ Component({
 			}
 			if (this.data.object.bg_color) {
 				this.setData({
-					bg_color:this.data.object.bg_color,
+					bg_color: this.data.object.bg_color,
 				})
 			}
 			this.setData({
@@ -332,6 +333,21 @@ 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 })
+							}
+						}
+					}
+				}
+			})
 
 		},
 
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index f73d30d..4b4ad3c 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -102,7 +102,7 @@
                                     </block>
                                     <block wx:else>
                                         <!-- 如果商品有设置等级价大于0的 -->
-                                        <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+                                        <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
                                             <view class="money flex">
                                                 <!-- 办卡价 -->
                                                 <view class="flex xc-wc">
@@ -253,7 +253,7 @@
                                             </block>
                                             <block wx:else>
                                                 <!-- 如果商品有设置等级价大于0的 -->
-                                                <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+                                                <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
                                                     <view class="money flex">
                                                         <!-- 办卡价 -->
                                                         <view class="flex xc-wc">
@@ -403,7 +403,7 @@
                                                 </block>
                                                 <block wx:else>
                                                     <!-- 如果商品有设置等级价大于0的 -->
-                                                    <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+                                                    <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
                                                         <view class="money flex">
                                                             <!-- 办卡价 -->
                                                             <view class="flex xc-wc">
@@ -577,7 +577,7 @@
                                                 <!-- 等级价 -->
                                                 <view class="price flex ai_and">
                                                     <view class="fs22">￥</view>
-                                                    <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+                                                    <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2) && is_no_plus}}</view>
                                                     <view class="card_bg">
                                                         <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}
                                                     </view>
@@ -734,7 +734,7 @@
                                             </block>
                                             <block wx:else>
                                                 <!-- 如果商品有设置等级价大于0的 -->
-                                                <block wx:if="{{g_filter.get_card_price(aitem,card_list,0)}}">
+                                                <block wx:if="{{g_filter.get_card_price(aitem,card_list,0) && is_no_plus}}">
                                                     <view class="money flex">
                                                         <!-- 办卡价 -->
                                                         <view class="flex xc-wc">
diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js
index 068ff44..6caf01a 100644
--- a/components/goods_list/goods_list.js
+++ b/components/goods_list/goods_list.js
@@ -16,21 +16,22 @@ Component({
     card_field: "",
     card_name: "",
     max_card_field: "",
-    card_list: null
+    card_list: null,
+    is_no_plus: 1,
   },
   properties: {
     // 这⾥定义了innerText属性，属性值可以在组件使⽤时指定
   },
-  ready: function () {},
+  ready: function () { },
   pageLifetimes: {
     //要处理一下，游客登录后的界面的变化,主要还该是改变会员
     show: function () {
       this.init();
-      if(getApp().globalData.login_back==1){
-          getApp().globalData.login_back==0;
-          this.data.curPage=1;
-          this.setData({ recommend: [] });
-          this.get_list();
+      if (getApp().globalData.login_back == 1) {
+        getApp().globalData.login_back == 0;
+        this.data.curPage = 1;
+        this.setData({ recommend: [] });
+        this.get_list();
       }
     }
   },
@@ -83,9 +84,21 @@ 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 })
+              }
+            }
+          }
         }
       })
     },
@@ -93,8 +106,8 @@ Component({
     get_list: function () {
       var that = this;
       if (that.data.is_no_more == 0) return false;
-      var user_id=getApp().globalData.user_id;
-      if(!user_id) user_id=0;
+      var user_id = getApp().globalData.user_id;
+      if (!user_id) user_id = 0;
 
       var curPage = that.data.curPage;
       getApp().request.get('/api/weshop/goods/page?page', {
@@ -124,10 +137,10 @@ Component({
           //加载完成
           if (data.data.pageData) {
 
-            for(let i in data.data.pageData){
-            	let item=data.data.pageData[i];
-            	if(item.user_price)
-            	   item.prom_price=item.user_price;
+            for (let i in data.data.pageData) {
+              let item = data.data.pageData[i];
+              if (item.user_price)
+                item.prom_price = item.user_price;
             }
 
             that.setData({
@@ -197,10 +210,10 @@ Component({
       })
     },
 
-      go_url:function (e) {
-          var url=e.currentTarget.dataset.url;
-          getApp().goto(url);
-      }
+    go_url: function (e) {
+      var url = e.currentTarget.dataset.url;
+      getApp().goto(url);
+    }
 
   },
 })
\ No newline at end of file
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 7675f86..a04bef6 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -6,9 +6,9 @@
     <!-- 商品详情 -->
 
     <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)}}">-->
+      <!--<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">
+      <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">
@@ -16,25 +16,25 @@
           <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>
-            
+            <view class="pdt10">
+              <view class="money flex xc-wc">
+                <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>
+                <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
+                <!-- 活动价 -->
+                <view class="flex xc-wc" wx:if="{{item.prom_price}}">
+                  <view class="fs24">￥</view>
+                  <view class="fs35">{{item.prom_price}}</view>
+                </view>
+              </view>
+              <view class="flex">
+                <!-- 原价 -->
+                <view class="price flex xc-ash line_th">
+                  <view class="fs22">￥</view>
+                  <view class="fs22">{{item.market_price}}</view>
+                </view>
+              </view>
+            </view>
+
           </block>
           <block wx:else>
             <!-- 商品价格,先判断下是后⼜等级价-->
@@ -81,7 +81,7 @@
               </block>
               <block wx:else>
                 <!-- 如果商品有设置等级价⼤于0的 -->
-                <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+                <block wx:if="{{g_filter.get_card_price(item,card_list,0)  && is_no_plus}}">
                   <view class="money flex">
                     <!-- 办卡价 -->
                     <view class="flex xc-wc">
@@ -94,16 +94,16 @@
                       <view class="fs22">{{item.market_price}}</view>
                     </view>
                   </view>
-                  <view class="flexr" style="">
+                  <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>
-										</view>
+                    <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"/>
+                          <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+                      </view>
+                    </view>
                   </view>
                 </block>
                 <block wx:else>
diff --git a/packageA/pages/distribution/goods/goods.js b/packageA/pages/distribution/goods/goods.js
index 919d255..f6d3451 100644
--- a/packageA/pages/distribution/goods/goods.js
+++ b/packageA/pages/distribution/goods/goods.js
@@ -14,18 +14,14 @@ Page({
 		inputVal: '',//记录搜索输入框的内容
 		isSort: false,//控制排序开关状态，true开启排序
 		isDescending: false, //isDescending降序，ascending升序
-		
-		
 		tabArr: [],
 		currentTabIndex: 0,
 		isShowRow: false,//控制视图切换状态
 		isHiddenDropdown: true,//控制筛选下拉菜单显隐
-		
 		list: null,
 		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
 		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
 		pageNum: 1, // 当前页数
-		
 		isCheckAll: false, //记录是否全选
 		currentQuery: {
 			store_id: app.globalData.setting.stoid,
diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml
index c957d8c..61c2412 100644
--- a/packageA/pages/distribution/goods/goods.wxml
+++ b/packageA/pages/distribution/goods/goods.wxml
@@ -5,12 +5,12 @@
 		<!-- 搜索 -->
 		<view class="flex ai-center fs26 bg-white pd20">
 			<view class="input-container f1">
-				<input class="input" type="text" value="{{inputVal}}" placeholder="请输入商品关键字" bindfocus="inputFocus" bindblur="inputBlur" bindinput="input" confirm-type="search" bindconfirm="search"/>
+				<input class="input" type="text" value="{{inputVal}}" placeholder="请输入商品关键字" bindfocus="inputFocus" bindblur="inputBlur" bindinput="input" confirm-type="search" bindconfirm="search" />
 				<text class="iconfont icon-guanbi" hidden="{{!isInputFocus}}" catchtap="inputClear"></text>
 				<!-- 搜索输入框聚焦时显示关闭按钮，否则隐藏关闭按钮 -->
 			</view>
 			<view class="pd20 filter {{isHiddenDropdown ? '':'c-red'}}" bindtap="clickFilter">筛选</view>
-			
+
 			<view class="dropdown {{isHiddenDropdown ? '':'show'}}" hidden="{{isHiddenDropdown}}">
 				<view class="dropdown-wrapper">
 					<view class="pd20 bsbb" wx:if="{{nationList.length != 0}}">
@@ -28,9 +28,9 @@
 					<view class="pd20 bsbb">
 						<view class="pdb20">价格区间</view>
 						<view class="flex t-c ai-center jc-center">
-							<view class="w30 pdh20"><input type="number" value="{{price}}" placeholder="最低价" class="input-price" bindinput="getPrice" data-ismax="0"/></view>
+							<view class="w30 pdh20"><input type="number" value="{{price}}" placeholder="最低价" class="input-price" bindinput="getPrice" data-ismax="0" /></view>
 							<view class="mgh20">-</view>
-							<view class="w30 pdh20"><input type="number" value="{{price}}" placeholder="最高价" class="input-price" bindinput="getPrice" data-ismax="1"/></view>
+							<view class="w30 pdh20"><input type="number" value="{{price}}" placeholder="最高价" class="input-price" bindinput="getPrice" data-ismax="1" /></view>
 							<!-- <view class="w25 pdt20"><text class="label">品牌一</text></view> -->
 						</view>
 					</view>
@@ -50,12 +50,12 @@
 			</view>
 			<view class="mask" bindtap="clickMask"></view>
 		</view>
-		
-		
+
+
 		<view class="flex t-c fs26 bg-white bdb" bindtap="clickTab">
 			<block wx:for="{{tabArr}}">
 				<view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:if="{{index != 3}}">{{item}}</view>
-				<view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:else  bindtap="clickSort">
+				<view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:else bindtap="clickSort">
 					{{item}}<text class="iconfont icon-sort2 c-db" wx:if="{{!isSort}}" data-index="{{index}}"></text>
 					<text class="t-icon t-icon-sort-up {{isDescending ? 'reverse':''}}" data-index="{{index}}" wx:else></text>
 				</view>
@@ -64,287 +64,291 @@
 				<text class="iconfont {{isShowRow ? 'icon-fenxiang':'icon-fenlie'}}"></text>
 			</view>
 		</view>
-		
+
 	</view>
-	
-	
+
+
 	<view class="content {{(options.index == 1 && currentTabIndex ==1) ? 'pdb0':''}}">
 		<checkbox-group class="fs26" wx:if="{{isShowRow}}" bindchange="checkboxChange">
 			<view class="item bg-white flex ai-center pd16" wx:for="{{list.pageData}}">
 				<!-- <label>
 					
 				</label> -->
-				<checkbox value="{{item.goods_id}}" checked="{{item.checked}}" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}"/>
+				<checkbox value="{{item.goods_id}}" checked="{{item.checked}}" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}" />
 				<view class="flex pdl10" bindtap="goto" data-url="{{g_filter.get_goods_url(item)}}">
-					<view class="pdr20"><image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load/></view>
+					<view class="pdr20">
+						<image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load />
+					</view>
 					<view class="flex fdc jc_sb">
 						<view class="ellipsis-2">{{item.goods_name}}</view>
 						<view>
 							<!-- 判断是否有活动价 -->
 							<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
-							  <view class="flex xc-wc ai-center" >
-										  <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>	
-										  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
-							    <!-- 活动价 -->
-							    <view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}">
-							      <!-- <view class="fs24">￥</view> -->
-							      <view class="fs30 money">{{item.prom_price}}</view>
-							    </view>
-							  </view>
-							  <view class="flex" style="line-height: 28rpx;">
-							    <!-- 原价 -->
-							    <view class="price flex xc-ash line_th">
-							      <!-- <view class="fs22">￥</view> -->
-							      <view class="fs22 money">{{item.market_price}}</view>
-							    </view>
-							  </view>
+								<view class="flex xc-wc ai-center">
+									<text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>
+									<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
+									<!-- 活动价 -->
+									<view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}">
+										<!-- <view class="fs24">￥</view> -->
+										<view class="fs30 money">{{item.prom_price}}</view>
+									</view>
+								</view>
+								<view class="flex" style="line-height: 28rpx;">
+									<!-- 原价 -->
+									<view class="price flex xc-ash line_th">
+										<!-- <view class="fs22">￥</view> -->
+										<view class="fs22 money">{{item.market_price}}</view>
+									</view>
+								</view>
 							</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="flex">
-							          <!-- 办卡价 -->
-							          <view class="flex xc-wc ai-center">
-							            <!-- <view class="fs24">￥</view> -->
-							            <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
-							            <view class="card_bg">
-							              <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}"></image>
-							              <text class="card_name ellipsis-1">{{card_name}}</text>
-							            </view>
-							          </view>
-							        </view>
-							        <view class="flex" style="line-height: 28rpx;">
-							          <!-- 原价 -->
-							          <view class="price flex xc-ash line_th">
-							            <!-- <view class="fs22">￥</view> -->
-							            <view class="fs22 money">{{item.market_price}}</view>
-							          </view>
-							        </view>
-							      </block>
-							      <blocK wx:else>
-							        <view class="flex">
-							          <!-- 办卡价 -->
-							          <view class="flex xc-wc ai-center">
-							            <!-- <view class="fs24">￥</view> -->
-							            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-							          </view>
-							        </view>
-							        <view class="flex" style="line-height: 28rpx;">
-							          <!-- 原价 -->
-							          <view class="price flex xc-ash line_th">
-							            <!-- <view class="fs22">￥</view> -->
-							            <view class="fs22 money">{{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="flex">
-							          <!-- 办卡价 -->
-							          <view class="flex xc-wc ai-center">
-							            <!-- <view class="fs24">￥</view> -->
-							            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-							          </view>
-							          <!-- 原价 -->
-							          <view class="price flex xc-ash line_th">
-							            <!-- <view class="fs22">￥</view> -->
-							            <view class="fs22 money">{{item.market_price}}</view>
-							          </view>
-							        </view>
-							        <view class="flexr">
-							          <!-- 等级价 -->
-																	<view class="price flex ai-center">
-																	  <!-- <view class="fs22">￥</view> -->
-																	  <view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-																	  <view class="card_bg">
-																	    <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}" class="badge"></ image>
-																			<text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
-																		</view>
-																	</view>
-							        </view>
-							      </block>
-							      <block wx:else>
-							        <view class="flex">
-							          <!-- 办卡价 -->
-							          <view class="flex xc-wc ai-center">
-							            <!-- <view class="fs24">￥</view> -->
-							            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-							          </view>
-							        </view>
-							        <view class="flex" style="line-height: 28rpx;">
-							          <!-- 原价 -->
-							          <view class="price flex xc-ash line_th">
-							            <!-- <view class="fs22">￥</view> -->
-							            <view class="fs22 money">{{item.market_price}}</view>
-							          </view>
-							        </view>
-							      </block>
-							    </block>
-							  </block>
-							  <!-- 商品压根就没有等级价 -->
-							  <block wx:else>
-							    <view class="flex">
-							      <!-- 办卡价 -->
-							      <view class="flex xc-wc ai-center">
-							        <!-- <view class="fs24">￥</view> -->
-							        <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-							      </view>
-							    </view>
-							    <view class="flex" style="line-height: 28rpx;">
-							      <!-- 原价 -->
-							      <view class="price flex xc-ash line_th">
-							        <!-- <view class="fs22">￥</view> -->
-							        <view class="fs22 money">{{item.market_price}}</view>
-							      </view>
-							    </view>
-							  </block>
+								<!-- 商品价格,先判断下是后⼜等级价-->
+								<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="flex">
+												<!-- 办卡价 -->
+												<view class="flex xc-wc ai-center">
+													<!-- <view class="fs24">￥</view> -->
+													<view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
+													<view class="card_bg">
+														<image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}"></image>
+														<text class="card_name ellipsis-1">{{card_name}}</text>
+													</view>
+												</view>
+											</view>
+											<view class="flex" style="line-height: 28rpx;">
+												<!-- 原价 -->
+												<view class="price flex xc-ash line_th">
+													<!-- <view class="fs22">￥</view> -->
+													<view class="fs22 money">{{item.market_price}}</view>
+												</view>
+											</view>
+										</block>
+										<blocK wx:else>
+											<view class="flex">
+												<!-- 办卡价 -->
+												<view class="flex xc-wc ai-center">
+													<!-- <view class="fs24">￥</view> -->
+													<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+												</view>
+											</view>
+											<view class="flex" style="line-height: 28rpx;">
+												<!-- 原价 -->
+												<view class="price flex xc-ash line_th">
+													<!-- <view class="fs22">￥</view> -->
+													<view class="fs22 money">{{item.market_price}}</view>
+												</view>
+											</view>
+										</blocK>
+									</block>
+									<block wx:else>
+										<!-- 如果商品有设置等级价⼤于0的 -->
+										<block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
+											<view class="flex">
+												<!-- 办卡价 -->
+												<view class="flex xc-wc ai-center">
+													<!-- <view class="fs24">￥</view> -->
+													<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+												</view>
+												<!-- 原价 -->
+												<view class="price flex xc-ash line_th">
+													<!-- <view class="fs22">￥</view> -->
+													<view class="fs22 money">{{item.market_price}}</view>
+												</view>
+											</view>
+											<view class="flexr">
+												<!-- 等级价 -->
+												<view class="price flex ai-center">
+													<!-- <view class="fs22">￥</view> -->
+													<view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+													<view class="card_bg">
+														<image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}" class="badge">
+															</ image>
+															<text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
+													</view>
+												</view>
+											</view>
+										</block>
+										<block wx:else>
+											<view class="flex">
+												<!-- 办卡价 -->
+												<view class="flex xc-wc ai-center">
+													<!-- <view class="fs24">￥</view> -->
+													<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+												</view>
+											</view>
+											<view class="flex" style="line-height: 28rpx;">
+												<!-- 原价 -->
+												<view class="price flex xc-ash line_th">
+													<!-- <view class="fs22">￥</view> -->
+													<view class="fs22 money">{{item.market_price}}</view>
+												</view>
+											</view>
+										</block>
+									</block>
+								</block>
+								<!-- 商品压根就没有等级价 -->
+								<block wx:else>
+									<view class="flex">
+										<!-- 办卡价 -->
+										<view class="flex xc-wc ai-center">
+											<!-- <view class="fs24">￥</view> -->
+											<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+										</view>
+									</view>
+									<view class="flex" style="line-height: 28rpx;">
+										<!-- 原价 -->
+										<view class="price flex xc-ash line_th">
+											<!-- <view class="fs22">￥</view> -->
+											<view class="fs22 money">{{item.market_price}}</view>
+										</view>
+									</view>
+								</block>
 							</block>
 							<!-- <view class="money fs32 c-red">{{item.market_price}}</view> -->
 							<view class="fs24 c-a">分成金额：<text class="money c-red">{{filter.toFix(item.commission, 2)}}</text></view>
 						</view>
 					</view>
 				</view>
-			</view>			
+			</view>
 		</checkbox-group>
-		
-		<checkbox-group class="fs26 flex pd16 wrap"  catchchange="checkboxChange" wx:else>
+
+		<checkbox-group class="fs26 flex pd16 wrap" catchchange="checkboxChange" wx:else>
 			<view class="item2 bg-white" wx:for="{{list.pageData}}" bindtap="goto" data-url="{{g_filter.get_goods_url(item)}}">
-				<image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" mode="aspectFit" lazy-load/>
+				<image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" mode="aspectFit" lazy-load />
 				<view class="pd20 fs26 flex jc_sb fdc f1">
 					<view class="ellipsis-2">{{item.goods_name}}</view>
 					<view class="flex ai-center pdt20">
-						<checkbox value="{{item.goods_id}}" checked="{{item.checked}}" data-name="checkbox" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}"/>
+						<checkbox value="{{item.goods_id}}" checked="{{item.checked}}" data-name="checkbox" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}" />
 						<view>
 							<!-- 判断是否有活动价 -->
 							<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0 }}">
-							  <view class="flex xc-wc ai-center" >
-										  <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>	
-										  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
-							    <!-- 活动价 -->
-							    <view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}">
-							      <!-- <view class="fs24">￥</view> -->
-							      <view class="fs30 money">{{item.prom_price}}</view>
-							    </view>
-							  </view>
-							  <view class="flex" style="line-height: 28rpx;">
-							    <!-- 原价 -->
-							    <view class="price flex xc-ash line_th">
-							      <!-- <view class="fs22">￥</view> -->
-							      <view class="fs22 money">{{item.market_price}}</view>
-							    </view>
-							  </view>
+								<view class="flex xc-wc ai-center">
+									<text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>
+									<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
+									<!-- 活动价 -->
+									<view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}">
+										<!-- <view class="fs24">￥</view> -->
+										<view class="fs30 money">{{item.prom_price}}</view>
+									</view>
+								</view>
+								<view class="flex" style="line-height: 28rpx;">
+									<!-- 原价 -->
+									<view class="price flex xc-ash line_th">
+										<!-- <view class="fs22">￥</view> -->
+										<view class="fs22 money">{{item.market_price}}</view>
+									</view>
+								</view>
 							</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="flex">
-							          <!-- 办卡价 -->
-							          <view class="flex xc-wc ai-center">
-							            <!-- <view class="fs24">￥</view> -->
-							            <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
-							            <view class="card_bg">
-							              <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}" class="badge"></image>
-							              <text class="card_name ellipsis-1">{{card_name}}</text>
-							            </view>
-							          </view>
-							        </view>
-							        <view class="flex" style="line-height: 28rpx;">
-							          <!-- 原价 -->
-							          <view class="price flex xc-ash line_th">
-							            <!-- <view class="fs22">￥</view> -->
-							            <view class="fs22 money">{{item.market_price}}</view>
-							          </view>
-							        </view>
-							      </block>
-							      <blocK wx:else>
-							        <view class="flex">
-							          <!-- 办卡价 -->
-							          <view class="flex xc-wc ai-center">
-							            <!-- <view class="fs24">￥</view> -->
-							            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-							          </view>
-							        </view>
-							        <view class="flex" style="line-height: 28rpx;">
-							          <!-- 原价 -->
-							          <view class="price flex xc-ash line_th">
-							            <!-- <view class="fs22">￥</view> -->
-							            <view class="fs22 money">{{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="flex">
-							          <!-- 办卡价 -->
-							          <view class="flex xc-wc ai-center">
-							            <!-- <view class="fs24">￥</view> -->
-							            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-							          </view>
-							          <!-- 原价 -->
-							          <view class="price flex xc-ash line_th">
-							            <!-- <view class="fs22">￥</view> -->
-							            <view class="fs22 money">{{item.market_price}}</view>
-							          </view>
-							        </view>
-							        <view class="flexr" style="">
-							          <!-- 等级价 -->
-													<view class="price flex ai-center">
-														<!-- <view class="fs22">￥</view> -->
-														<view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-														<view class="card_bg">
-															<image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}"></ image>
+								<!-- 商品价格,先判断下是后⼜等级价-->
+								<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="flex">
+												<!-- 办卡价 -->
+												<view class="flex xc-wc ai-center">
+													<!-- <view class="fs24">￥</view> -->
+													<view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
+													<view class="card_bg">
+														<image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}" class="badge"></image>
+														<text class="card_name ellipsis-1">{{card_name}}</text>
+													</view>
+												</view>
+											</view>
+											<view class="flex" style="line-height: 28rpx;">
+												<!-- 原价 -->
+												<view class="price flex xc-ash line_th">
+													<!-- <view class="fs22">￥</view> -->
+													<view class="fs22 money">{{item.market_price}}</view>
+												</view>
+											</view>
+										</block>
+										<blocK wx:else>
+											<view class="flex">
+												<!-- 办卡价 -->
+												<view class="flex xc-wc ai-center">
+													<!-- <view class="fs24">￥</view> -->
+													<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+												</view>
+											</view>
+											<view class="flex" style="line-height: 28rpx;">
+												<!-- 原价 -->
+												<view class="price flex xc-ash line_th">
+													<!-- <view class="fs22">￥</view> -->
+													<view class="fs22 money">{{item.market_price}}</view>
+												</view>
+											</view>
+										</blocK>
+									</block>
+									<block wx:else>
+										<!-- 如果商品有设置等级价⼤于0的 -->
+										<block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
+											<view class="flex">
+												<!-- 办卡价 -->
+												<view class="flex xc-wc ai-center">
+													<!-- <view class="fs24">￥</view> -->
+													<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+												</view>
+												<!-- 原价 -->
+												<view class="price flex xc-ash line_th">
+													<!-- <view class="fs22">￥</view> -->
+													<view class="fs22 money">{{item.market_price}}</view>
+												</view>
+											</view>
+											<view class="flexr">
+												<!-- 等级价 -->
+												<view class="price flex ai-center">
+													<!-- <view class="fs22">￥</view> -->
+													<view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+													<view class="card_bg">
+														<image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}">
+															</ image>
 															<text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
-														</view>
 													</view>
-							        </view>
-							      </block>
-							      <block wx:else>
-							        <view class="flex">
-							          <!-- 办卡价 -->
-							          <view class="flex xc-wc ai-center">
-							            <!-- <view class="fs24">￥</view> -->
-							            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-							          </view>
-							        </view>
-							        <view class="flex" style="line-height: 28rpx;">
-							          <!-- 原价 -->
-							          <view class="price flex xc-ash line_th">
-							            <!-- <view class="fs22">￥</view> -->
-							            <view class="fs22 money">{{item.market_price}}</view>
-							          </view>
-							        </view>
-							      </block>
-							    </block>
-							  </block>
-							  <!-- 商品压根就没有等级价 -->
-							  <block wx:else>
-							    <view class="flex">
-							      <!-- 办卡价 -->
-							      <view class="flex xc-wc ai-center">
-							        <!-- <view class="fs24">￥</view> -->
-							        <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-							      </view>
-							    </view>
-							    <view class="flex" style="line-height: 28rpx;">
-							      <!-- 原价 -->
-							      <view class="price flex xc-ash line_th">
-							        <!-- <view class="fs22">￥</view> -->
-							        <view class="fs22 money">{{item.market_price}}</view>
-							      </view>
-							    </view>
-							  </block>
+												</view>
+											</view>
+										</block>
+										<block wx:else>
+											<view class="flex">
+												<!-- 办卡价 -->
+												<view class="flex xc-wc ai-center">
+													<!-- <view class="fs24">￥</view> -->
+													<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+												</view>
+											</view>
+											<view class="flex" style="line-height: 28rpx;">
+												<!-- 原价 -->
+												<view class="price flex xc-ash line_th">
+													<!-- <view class="fs22">￥</view> -->
+													<view class="fs22 money">{{item.market_price}}</view>
+												</view>
+											</view>
+										</block>
+									</block>
+								</block>
+								<!-- 商品压根就没有等级价 -->
+								<block wx:else>
+									<view class="flex">
+										<!-- 办卡价 -->
+										<view class="flex xc-wc ai-center">
+											<!-- <view class="fs24">￥</view> -->
+											<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+										</view>
+									</view>
+									<view class="flex" style="line-height: 28rpx;">
+										<!-- 原价 -->
+										<view class="price flex xc-ash line_th">
+											<!-- <view class="fs22">￥</view> -->
+											<view class="fs22 money">{{item.market_price}}</view>
+										</view>
+									</view>
+								</block>
 							</block>
 							<!-- <view class="money c-red fs32">{{item.market_price}}</view> -->
 							<view class="c-a fs24">分成金额：<text class="money c-red">{{filter.toFix(item.commission, 2)}}</text></view>
@@ -353,25 +357,17 @@
 				</view>
 			</view>
 		</checkbox-group>
-		
+
 		<nodata class="t-c" wx:if="{{list.pageData.length == 0 || list == null}}"></nodata>
 		<view class="noMore" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">- 已经到底了 -</view>
 	</view>
-	
-
-	
-	
-	
 	<view class="bottomBar flex pd20 jc_sb fs26 ai-center" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}">
 		<!-- <view> -->
-			<label class="flex ai-center" bindtap="clickCheckAll" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}">
-				<checkbox checked="{{isCheckAll}}"/>全选
-			</label>
+		<label class="flex ai-center" bindtap="clickCheckAll" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}">
+			<checkbox checked="{{isCheckAll}}" />全选
+		</label>
 		<!-- </view> -->
 		<view class="pd20 btn" wx:if="{{options.index == 0}}" bindtap="putOn">一键上架</view>
 		<view class="pd20 btn" wx:else bindtap="pullOff">一键下架</view>
 	</view>
-	
-	
-
-</view>
+</view>
\ No newline at end of file
diff --git a/packageA/pages/distribution/shop/shop.js b/packageA/pages/distribution/shop/shop.js
index 951e5b5..20860ff 100644
--- a/packageA/pages/distribution/shop/shop.js
+++ b/packageA/pages/distribution/shop/shop.js
@@ -17,26 +17,21 @@ Page({
     isDescending: false, //isDescending降序，ascending升序
     imghost: '',
     url: os.imghost,
-
     tabArr: ['最新', '销量', '评论', '价格'],
     currentTabIndex: 0,
     isShowRow: false,//控制视图切换状态
     isHiddenDropdown: true,//控制筛选下拉菜单显隐
-
     list: [],
     isLoading: false, // 检测是否已经发送请求,防止重复发送请求
     noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
     pageNum: 1, // 当前页数
-
-
     rank_switch: false,
     card_field: "",
     card_name: "",
     max_card_field: "",
     card_list: null,
-
     isAll: true,
-
+    is_no_plus:1,
     default_img: '/miniapp/images/default_g_img.gif',
   },
 
@@ -213,6 +208,21 @@ Page({
           })
         }
       })
+      //调用接口判断商家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 })
+              }
+            }
+          }
+        }
+      })
     }
 
     if (app.globalData.key_word) {
diff --git a/packageA/pages/distribution/shop/shop.wxml b/packageA/pages/distribution/shop/shop.wxml
index 419c52f..e790000 100644
--- a/packageA/pages/distribution/shop/shop.wxml
+++ b/packageA/pages/distribution/shop/shop.wxml
@@ -1,365 +1,365 @@
 <wxs src="../../../../utils/filter.wxs" module="filter"></wxs>
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view>
-  <view class="head pr">
-    <view class="bdb">
-      <!-- <view><image src="../../../images/jfbuy.jpg" mode="widthFix" class="banner"/></view> -->
-      <view>
-        <image src="{{imghost + (ad_img ? ad_img:'/miniapp/images/user_index_powder.jpg')}}" mode="widthFix" class="banner" />
-      </view>
-      <view class="flex bg-white pdh20 jc_sb pr">
-        <!-- 分享人的头像 -->
-        <view class="avatar-container" wx:if="{{userInfo2}}">
-          <image class="avatar" src="{{userInfo2.head_pic}}" />
-          <view class="pdt20">
-            <text class="nickname">{{userInfo2.nickname}}</text>
-          </view>
-        </view>
-        <!-- 自己的头像 -->
-        <view class="avatar-container" wx:else>
-          <image class="avatar" src="{{userInfo.head_pic}}" />
-          <view class="pdt20">
-            <text class="nickname">{{userInfo.nickname}}</text>
-          </view>
-        </view>
-        <view class="flex t-c fs24 f1 jc_fe">
-          <view class="pdv20 pdh40 {{isAll ? 'selected':''}}" bindtap="clickAll">
-            <view class="fs30">{{filter.show_default(total)}}</view>
-            <view>全部商品</view>
-          </view>
-          <view class="pdv20 pdh40 {{!isAll ? 'selected':''}}" bindtap="clickNew">
-            <view class="fs30">{{filter.show_default(newListTotal)}}</view>
-            <view>新品</view>
-          </view>
-          <view class="pdv20 pdh40" bindtap="goto" data-url="/pages/user/index/index">
-            <view class="fs26">
-              <text class="iconfont icon-ren1 bold"></text>
-            </view>
-            <view>会员中心</view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <!-- 搜索 -->
-    <view class="flex ai-center fs26 bg-white pd20">
-      <text class="pdr20 c-a iconfont icon-fenlei" catch:tap="goto" data-url="/packageC/pages/goods/distributionCategoryList/index"></text>
-      <view class="input-container f1">
-        <input class="input" type="text" value="{{inputVal}}" placeholder="请输入商品关键字" placeholder-style="color:#aaa;" confirm-type="search" bindfocus="inputFocus" bindblur="inputBlur" bindinput="input" bindconfirm="search" />
-        <text class="iconfont icon-guanbi" hidden="{{!isInputFocus}}" catchtap="inputClear"></text>
-        <!-- 搜索输入框聚焦时显示关闭按钮，否则隐藏关闭按钮 -->
-      </view>
-      <view class="pdl20 c-a" bindtap="search">搜索</view>
-    </view>
-  </view>
-  <view class="flex t-c fs26 bg-white bdb sticky c-a" catchtap="clickTab">
-    <block wx:for="{{tabArr}}">
-      <view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:if="{{index != 3}}">
-        {{item}}
-      </view>
-      <view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:else bindtap="clickSort">
-        {{item}}
-        <text class="iconfont icon-sort2 c-db" wx:if="{{!isSort}}"></text>
-        <text class="t-icon t-icon-sort-up {{isDescending ? 'reverse':''}}" wx:else></text>
-      </view>
-    </block>
-    <view class="f1 pd20" catchtap="change">
-      <text class="iconfont {{isShowRow ? 'icon-fenxiang':'icon-fenlie'}}"></text>
-    </view>
-  </view>
-  <view class="content">
-    <view class="fs26" wx:if="{{isShowRow}}">
-      <view class="item bg-white flex ai-center pd20" wx:for="{{list}}">
-        <view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
-          <view class="img-container pdr20" data-txt="已售:{{item.sales_sum}}">
-            <image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load mode="aspectFit" />
-          </view>
-          <view class="flex fdc jc_sb">
-            <view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
-            <!-- 判断是否有活动价 -->
-            <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
-              <view class="flex xc-wc pdt20">
-                <text wx:if="{{item.prom_integral}}">
-                  <text class="fs30">{{item.prom_integral}}</text>
-                  积分
-                </text>
-                <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
-                <!-- 活动价 -->
-                <view class="flex xc-wc ai_and" wx:if="{{item.prom_price}}">
-                  <!-- <view class="fs24">￥</view> -->
-                  <view class="fs30 money">{{item.prom_price}}</view>
-                </view>
-              </view>
-              <view class="flex" style="line-height: 28rpx;">
-                <!-- 原价 -->
-                <view class="price flex xc-ash line_th">
-                  <!-- <view class="fs22">￥</view> -->
-                  <view class="fs22 money">{{item.market_price}}</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="flex">
-                      <!-- 办卡价 -->
-                      <view class="flex xc-wc ai_and">
-                        <!-- <view class="fs24">￥</view> -->
-                        <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
-                        <view class="card_bg">
-                          <image src="{{url + 'miniapp/images/plus/dj_icon.png'}}" />
-                          <text class="card_name ellipsis-1">{{card_name}}</text>
-                        </view>
-                      </view>
-                    </view>
-                    <view class="flex" style="line-height: 28rpx;">
-                      <!-- 原价 -->
-                      <view class="price flex xc-ash line_th">
-                        <!-- <view class="fs22">￥</view> -->
-                        <view class="fs22 money">{{item.market_price}}</view>
-                      </view>
-                    </view>
-                  </block>
-                  <blocK wx:else>
-                    <view class="flex">
-                      <!-- 办卡价 -->
-                      <view class="flex xc-wc">
-                        <!-- <view class="fs24">￥</view> -->
-                        <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-                      </view>
-                    </view>
-                    <view class="flex" style="line-height: 28rpx;">
-                      <!-- 原价 -->
-                      <view class="price flex xc-ash line_th">
-                        <!-- <view class="fs22">￥</view> -->
-                        <view class="fs22 money">{{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="flex">
-                      <!-- 办卡价 -->
-                      <view class="flex xc-wc">
-                        <!-- <view class="fs24">￥</view> -->
-                        <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-                      </view>
-                      <!-- 原价 -->
-                      <view class="price flex xc-ash line_th">
-                        <!-- <view class="fs22">￥</view> -->
-                        <view class="fs22 money">{{item.market_price}}</view>
-                      </view>
-                    </view>
-                    <view class="flexr" style="">
-                      <!-- 等级价 -->
-                      <view class="price flex ai-center">
-                        <!-- <view class="fs22">￥</view> -->
-                        <view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>    
-                        <view class="card_bg">
-                          <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                          <text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}} </text>                                                 
-                        </view>
-                      </view>
-                    </view>
-                  </block>
-                  <block wx:else>
-                    <view class="flex">
-                      <!-- 办卡价 -->
-                      <view class="flex xc-wc">
-                        <!-- <view class="fs24">￥</view> -->
-                        <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-                      </view>
-                    </view>
-                    <view class="flex" style="line-height: 28rpx;">
-                      <!-- 原价 -->
-                      <view class="price flex xc-ash line_th">
-                        <!-- <view class="fs22">￥</view> -->
-                        <view class="fs22 money">{{item.market_price}}</view>
-                      </view>
-                    </view>
-                  </block>
-                </block>
-              </block>
-              <!-- 商品压根就没有等级价 -->
-              <block wx:else>
-                <view class="flex">
-                  <!-- 办卡价 -->
-                  <view class="flex xc-wc">
-                    <!-- <view class="fs24">￥</view> -->
-                    <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-                  </view>
-                </view>
-                <view class="flex" style="line-height: 28rpx;">
-                  <!-- 原价 -->
-                  <view class="price flex xc-ash line_th">
-                    <!-- <view class="fs22">￥</view> -->
-                    <view class="fs22 money">{{item.market_price}}</view>
-                  </view>
-                </view>
-              </block>
-            </block>
-            <!-- 分层金额 -->
-            <view hidden="{{ishidden_comise}}" class="fs24 c-a">
-              分成金额：
-              <text class="money c-red">{{filter.toFix(item.commission,2)}}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="fs26 flex pd20 wrap" wx:else>
-      <view class="item2 bg-white" wx:for="{{list}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
-        <view class="img-container" data-txt="已售:{{item.sales_sum}}">
-          <image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load="true" />
-        </view>
-        <view class="pd20 fs26">
-          <view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
-          <!-- 判断是否有活动价 -->
-          <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
-            <view class="flex xc-wc">
-              <text wx:if="{{item.prom_integral}}">
-                <text class="fs30" 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="fs30 money">{{item.prom_price}}</view>
-              </view>
-            </view>
-            <view class="flex" style="line-height: 28rpx;">
-              <!-- 原价 -->
-              <view class="price flex xc-ash line_th">
-                <!-- <view class="fs22">￥</view> -->
-                <view class="fs22 money">{{item.market_price}}</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="flex">
-                    <!-- 办卡价 -->
-                    <view class="flex xc-wc ai_and">
-                      <!-- <view class="fs24">￥</view> -->
-                      <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
-                      <view class="card_bg">
-                        <image src="{{url}}/miniapp/images/plus/dj_icon.png" />
-                        <text class="card_name ellipsis-1">{{card_name}}</text>
-                      </view>
-                    </view>
-                  </view>
-                  <view class="flex" style="line-height: 28rpx;">
-                    <!-- 原价 -->
-                    <view class="price flex xc-ash line_th">
-                      <!-- <view class="fs22">￥</view> -->
-                      <view class="fs22 money">{{item.market_price}}</view>
-                    </view>
-                  </view>
-                </block>
-                <blocK wx:else>
-                  <view class="flex">
-                    <!-- 办卡价 -->
-                    <view class="flex xc-wc ai_and">
-                      <!-- <view class="fs24">￥</view> -->
-                      <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-                    </view>
-                  </view>
-                  <view class="flex" style="line-height: 28rpx;">
-                    <!-- 原价 -->
-                    <view class="price flex xc-ash line_th">
-                      <!-- <view class="fs22">￥</view> -->
-                      <view class="fs22 money">{{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="flex">
-                    <!-- 办卡价 -->
-                    <view class="flex xc-wc ai_and">
-                      <!-- <view class="fs24">￥</view> -->
-                      <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-                    </view>
-                    <!-- 原价 -->
-                    <view class="price flex xc-ash line_th">
-                      <!-- <view class="fs22">￥</view> -->
-                      <view class="fs22 money">{{item.market_price}}</view>
-                    </view>
-                  </view>
-                  <view class="flexr" style="">
-                    <!-- 等级价 -->
-                    <view class="price flex ai-center">
-                      <!-- <view class="fs22">￥</view> -->
-                      <view class="fs28 money">
-                        {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
-                      </view>
-                      <view class="card_bg">
-                        <image src="{{url}}/miniapp/images/plus/dj_icon.png" />
-                        <text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>                                 
-                      </view>
-                    </view>
-                  </view>
-                </block>
-                <block wx:else>
-                  <view class="flex">
-                    <!-- 办卡价 -->
-                    <view class="flex xc-wc ai_and">
-                      <!-- <view class="fs24">￥</view> -->
-                      <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-                    </view>
-                  </view>
-                  <view class="flex" style="line-height: 28rpx;">
-                    <!-- 原价 -->
-                    <view class="price flex xc-ash line_th">
-                      <!-- <view class="fs22">￥</view> -->
-                      <view class="fs22 money">{{item.market_price}}</view>
-                    </view>
-                  </view>
-                </block>
-              </block>
-            </block>
-            <!-- 商品压根就没有等级价 -->
-            <block wx:else>
-              <view class="flex">
-                <!-- 办卡价 -->
-                <view class="flex xc-wc ai_and">
-                  <!-- <view class="fs24">￥</view> -->
-                  <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
-                </view>
-              </view>
-              <view class="flex" style="line-height: 28rpx;">
-                <!-- 原价 -->
-                <view class="price flex xc-ash line_th">
-                  <!-- <view class="fs22">￥</view> -->
-                  <view class="fs22 money">{{item.market_price}}</view>
-                </view>
-              </view>
-            </block>
-          </block>
-          <!-- 分层金额 -->
-          <view class="fs24 c-a">
-            分成金额：
-            <text class="money c-red">{{filter.toFix(item.commission,2)}}</text>
-          </view>
-        </view>
-      </view>
-    </view>
-    <nodata class="t-c" wx:if="{{list.length == 0 && list}}"></nodata>
-    <view class="noMore" hidden="{{!noMore}}" wx:if="{{list.length !== 0}}">
-      - 已经到底了 -
-    </view>
-  </view>
+	<view class="head pr">
+		<view class="bdb">
+			<!-- <view><image src="../../../images/jfbuy.jpg" mode="widthFix" class="banner"/></view> -->
+			<view>
+				<image src="{{imghost + (ad_img ? ad_img:'/miniapp/images/user_index_powder.jpg')}}" mode="widthFix" class="banner" />
+			</view>
+			<view class="flex bg-white pdh20 jc_sb pr">
+				<!-- 分享人的头像 -->
+				<view class="avatar-container" wx:if="{{userInfo2}}">
+					<image class="avatar" src="{{userInfo2.head_pic}}" />
+					<view class="pdt20">
+						<text class="nickname">{{userInfo2.nickname}}</text>
+					</view>
+				</view>
+				<!-- 自己的头像 -->
+				<view class="avatar-container" wx:else>
+					<image class="avatar" src="{{userInfo.head_pic}}" />
+					<view class="pdt20">
+						<text class="nickname">{{userInfo.nickname}}</text>
+					</view>
+				</view>
+				<view class="flex t-c fs24 f1 jc_fe">
+					<view class="pdv20 pdh40 {{isAll ? 'selected':''}}" bindtap="clickAll">
+						<view class="fs30">{{filter.show_default(total)}}</view>
+						<view>全部商品</view>
+					</view>
+					<view class="pdv20 pdh40 {{!isAll ? 'selected':''}}" bindtap="clickNew">
+						<view class="fs30">{{filter.show_default(newListTotal)}}</view>
+						<view>新品</view>
+					</view>
+					<view class="pdv20 pdh40" bindtap="goto" data-url="/pages/user/index/index">
+						<view class="fs26">
+							<text class="iconfont icon-ren1 bold"></text>
+						</view>
+						<view>会员中心</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 搜索 -->
+		<view class="flex ai-center fs26 bg-white pd20">
+			<text class="pdr20 c-a iconfont icon-fenlei" catch:tap="goto" data-url="/packageC/pages/goods/distributionCategoryList/index"></text>
+			<view class="input-container f1">
+				<input class="input" type="text" value="{{inputVal}}" placeholder="请输入商品关键字" placeholder-style="color:#aaa;" confirm-type="search" bindfocus="inputFocus" bindblur="inputBlur" bindinput="input" bindconfirm="search" />
+				<text class="iconfont icon-guanbi" hidden="{{!isInputFocus}}" catchtap="inputClear"></text>
+				<!-- 搜索输入框聚焦时显示关闭按钮，否则隐藏关闭按钮 -->
+			</view>
+			<view class="pdl20 c-a" bindtap="search">搜索</view>
+		</view>
+	</view>
+	<view class="flex t-c fs26 bg-white bdb sticky c-a" catchtap="clickTab">
+		<block wx:for="{{tabArr}}">
+			<view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:if="{{index != 3}}">
+				{{item}}
+			</view>
+			<view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:else bindtap="clickSort">
+				{{item}}
+				<text class="iconfont icon-sort2 c-db" wx:if="{{!isSort}}"></text>
+				<text class="t-icon t-icon-sort-up {{isDescending ? 'reverse':''}}" wx:else></text>
+			</view>
+		</block>
+		<view class="f1 pd20" catchtap="change">
+			<text class="iconfont {{isShowRow ? 'icon-fenxiang':'icon-fenlie'}}"></text>
+		</view>
+	</view>
+	<view class="content">
+		<view class="fs26" wx:if="{{isShowRow}}">
+			<view class="item bg-white flex ai-center pd20" wx:for="{{list}}">
+				<view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
+					<view class="img-container pdr20" data-txt="已售:{{item.sales_sum}}">
+						<image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load mode="aspectFit" />
+					</view>
+					<view class="flex fdc jc_sb">
+						<view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
+						<!-- 判断是否有活动价 -->
+						<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
+							<view class="flex xc-wc pdt20">
+								<text wx:if="{{item.prom_integral}}">
+									<text class="fs30">{{item.prom_integral}}</text>
+									积分
+								</text>
+								<text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
+								<!-- 活动价 -->
+								<view class="flex xc-wc ai_and" wx:if="{{item.prom_price}}">
+									<!-- <view class="fs24">￥</view> -->
+									<view class="fs30 money">{{item.prom_price}}</view>
+								</view>
+							</view>
+							<view class="flex" style="line-height: 28rpx;">
+								<!-- 原价 -->
+								<view class="price flex xc-ash line_th">
+									<!-- <view class="fs22">￥</view> -->
+									<view class="fs22 money">{{item.market_price}}</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="flex">
+											<!-- 办卡价 -->
+											<view class="flex xc-wc ai_and">
+												<!-- <view class="fs24">￥</view> -->
+												<view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
+												<view class="card_bg">
+													<image src="{{url + 'miniapp/images/plus/dj_icon.png'}}" />
+													<text class="card_name ellipsis-1">{{card_name}}</text>
+												</view>
+											</view>
+										</view>
+										<view class="flex" style="line-height: 28rpx;">
+											<!-- 原价 -->
+											<view class="price flex xc-ash line_th">
+												<!-- <view class="fs22">￥</view> -->
+												<view class="fs22 money">{{item.market_price}}</view>
+											</view>
+										</view>
+									</block>
+									<blocK wx:else>
+										<view class="flex">
+											<!-- 办卡价 -->
+											<view class="flex xc-wc">
+												<!-- <view class="fs24">￥</view> -->
+												<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+											</view>
+										</view>
+										<view class="flex" style="line-height: 28rpx;">
+											<!-- 原价 -->
+											<view class="price flex xc-ash line_th">
+												<!-- <view class="fs22">￥</view> -->
+												<view class="fs22 money">{{item.market_price}}</view>
+											</view>
+										</view>
+									</blocK>
+								</block>
+								<block wx:else>
+									<!-- 如果商品有设置等级价⼤于0的 -->
+									<block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
+										<view class="flex">
+											<!-- 办卡价 -->
+											<view class="flex xc-wc">
+												<!-- <view class="fs24">￥</view> -->
+												<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+											</view>
+											<!-- 原价 -->
+											<view class="price flex xc-ash line_th">
+												<!-- <view class="fs22">￥</view> -->
+												<view class="fs22 money">{{item.market_price}}</view>
+											</view>
+										</view>
+										<view class="flexr">
+											<!-- 等级价 -->
+											<view class="price flex ai-center">
+												<!-- <view class="fs22">￥</view> -->
+												<view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+												<view class="card_bg">
+													<image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+													<text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}} </text>
+												</view>
+											</view>
+										</view>
+									</block>
+									<block wx:else>
+										<view class="flex">
+											<!-- 办卡价 -->
+											<view class="flex xc-wc">
+												<!-- <view class="fs24">￥</view> -->
+												<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+											</view>
+										</view>
+										<view class="flex" style="line-height: 28rpx;">
+											<!-- 原价 -->
+											<view class="price flex xc-ash line_th">
+												<!-- <view class="fs22">￥</view> -->
+												<view class="fs22 money">{{item.market_price}}</view>
+											</view>
+										</view>
+									</block>
+								</block>
+							</block>
+							<!-- 商品压根就没有等级价 -->
+							<block wx:else>
+								<view class="flex">
+									<!-- 办卡价 -->
+									<view class="flex xc-wc">
+										<!-- <view class="fs24">￥</view> -->
+										<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+									</view>
+								</view>
+								<view class="flex" style="line-height: 28rpx;">
+									<!-- 原价 -->
+									<view class="price flex xc-ash line_th">
+										<!-- <view class="fs22">￥</view> -->
+										<view class="fs22 money">{{item.market_price}}</view>
+									</view>
+								</view>
+							</block>
+						</block>
+						<!-- 分层金额 -->
+						<view hidden="{{ishidden_comise}}" class="fs24 c-a">
+							分成金额：
+							<text class="money c-red">{{filter.toFix(item.commission,2)}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="fs26 flex pd20 wrap" wx:else>
+			<view class="item2 bg-white" wx:for="{{list}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
+				<view class="img-container" data-txt="已售:{{item.sales_sum}}">
+					<image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load="true" />
+				</view>
+				<view class="pd20 fs26">
+					<view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
+					<!-- 判断是否有活动价 -->
+					<block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
+						<view class="flex xc-wc">
+							<text wx:if="{{item.prom_integral}}">
+								<text class="fs30" 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="fs30 money">{{item.prom_price}}</view>
+							</view>
+						</view>
+						<view class="flex" style="line-height: 28rpx;">
+							<!-- 原价 -->
+							<view class="price flex xc-ash line_th">
+								<!-- <view class="fs22">￥</view> -->
+								<view class="fs22 money">{{item.market_price}}</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="flex">
+										<!-- 办卡价 -->
+										<view class="flex xc-wc ai_and">
+											<!-- <view class="fs24">￥</view> -->
+											<view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
+											<view class="card_bg">
+												<image src="{{url}}/miniapp/images/plus/dj_icon.png" />
+												<text class="card_name ellipsis-1">{{card_name}}</text>
+											</view>
+										</view>
+									</view>
+									<view class="flex" style="line-height: 28rpx;">
+										<!-- 原价 -->
+										<view class="price flex xc-ash line_th">
+											<!-- <view class="fs22">￥</view> -->
+											<view class="fs22 money">{{item.market_price}}</view>
+										</view>
+									</view>
+								</block>
+								<blocK wx:else>
+									<view class="flex">
+										<!-- 办卡价 -->
+										<view class="flex xc-wc ai_and">
+											<!-- <view class="fs24">￥</view> -->
+											<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+										</view>
+									</view>
+									<view class="flex" style="line-height: 28rpx;">
+										<!-- 原价 -->
+										<view class="price flex xc-ash line_th">
+											<!-- <view class="fs22">￥</view> -->
+											<view class="fs22 money">{{item.market_price}}</view>
+										</view>
+									</view>
+								</blocK>
+							</block>
+							<block wx:else>
+								<!-- 如果商品有设置等级价⼤于0的 -->
+								<block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
+									<view class="flex">
+										<!-- 办卡价 -->
+										<view class="flex xc-wc ai_and">
+											<!-- <view class="fs24">￥</view> -->
+											<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+										</view>
+										<!-- 原价 -->
+										<view class="price flex xc-ash line_th">
+											<!-- <view class="fs22">￥</view> -->
+											<view class="fs22 money">{{item.market_price}}</view>
+										</view>
+									</view>
+									<view class="flexr">
+										<!-- 等级价 -->
+										<view class="price flex ai-center">
+											<!-- <view class="fs22">￥</view> -->
+											<view class="fs28 money">
+												{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
+											</view>
+											<view class="card_bg">
+												<image src="{{url}}/miniapp/images/plus/dj_icon.png" />
+												<text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
+											</view>
+										</view>
+									</view>
+								</block>
+								<block wx:else>
+									<view class="flex">
+										<!-- 办卡价 -->
+										<view class="flex xc-wc ai_and">
+											<!-- <view class="fs24">￥</view> -->
+											<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+										</view>
+									</view>
+									<view class="flex" style="line-height: 28rpx;">
+										<!-- 原价 -->
+										<view class="price flex xc-ash line_th">
+											<!-- <view class="fs22">￥</view> -->
+											<view class="fs22 money">{{item.market_price}}</view>
+										</view>
+									</view>
+								</block>
+							</block>
+						</block>
+						<!-- 商品压根就没有等级价 -->
+						<block wx:else>
+							<view class="flex">
+								<!-- 办卡价 -->
+								<view class="flex xc-wc ai_and">
+									<!-- <view class="fs24">￥</view> -->
+									<view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
+								</view>
+							</view>
+							<view class="flex" style="line-height: 28rpx;">
+								<!-- 原价 -->
+								<view class="price flex xc-ash line_th">
+									<!-- <view class="fs22">￥</view> -->
+									<view class="fs22 money">{{item.market_price}}</view>
+								</view>
+							</view>
+						</block>
+					</block>
+					<!-- 分层金额 -->
+					<view class="fs24 c-a">
+						分成金额：
+						<text class="money c-red">{{filter.toFix(item.commission,2)}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<nodata class="t-c" wx:if="{{list.length == 0 && list}}"></nodata>
+		<view class="noMore" hidden="{{!noMore}}" wx:if="{{list.length !== 0}}">
+			- 已经到底了 -
+		</view>
+	</view>
 </view>
\ No newline at end of file
diff --git a/packageD/pages/AI-test-skin/analyse/analyse.js b/packageD/pages/AI-test-skin/analyse/analyse.js
index efb5be2..c6f5873 100644
--- a/packageD/pages/AI-test-skin/analyse/analyse.js
+++ b/packageD/pages/AI-test-skin/analyse/analyse.js
@@ -236,7 +236,7 @@ Page({
                 //检查睁眼闭眼
                 var eye_status = check_data.eye_status;
                 console.log('eye_status',eye_status);
-                if (eye_status.left_eye > 0.1 || eye_status.right_eye > 0.1) {
+                if (eye_status.left_eye > 0.5 || eye_status.right_eye > 0.5) {
                     // var msg = "未闭眼拍照";
                     // th.go_error(msg);
                     // return false;
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index d7accad..fcf119b 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -227,23 +227,6 @@ Page({
                 } else {
                     th.setData({ user_addr: ie });
                 }
-                var going = 0;
-
-
-                //使用计时器，避免空现象
-                /*---
-                 var jishi= setInterval(function () {
-                 if (th.data.is_b_now == 1 && going==0) {
-                 if(th.data.bn_goods) {
-                 th.calculatePrice2();going=1;clearInterval(jishi);
-                 }
-                 }else if(going==0) {
-                 if (th.data.cartlist){
-                 th.calculatePrice();going = 1; clearInterval(jishi);
-                 }
-                 }
-                 },500)--*/
-
             });
             var is_card_back = getApp().globalData.is_card_back;
             //--更新默认地址--,看一下是不是跳到地址页面,同时也不是购买等级卡返回的，这里很重要，否则会重新更新收货物流公司
@@ -392,6 +375,7 @@ Page({
                     th.setData({ user_addr: addr });
                     //--------------------------立即购买------------------
                     if (ta.is_bnow == 1) {
+                        console.log('is_bnow');
                         //读取门店
                         to.get_allsto(function (e) {
                             th.setData({ allsto: e });
@@ -404,6 +388,8 @@ Page({
                         to.get_allsto(function (e) {
                             th.setData({ allsto: e });
                             //-------获取购物车已经选择的商品--------
+                        console.log('购物车结算');
+
                             th.get_cart();
                         })
                     }
@@ -533,7 +519,7 @@ Page({
                     }
                     if (item1.prom_type == 10) {
                         if (!th.data.ladder_map[item1.prom_id]) {
-                            //如果有组合购
+                            //如果有预售
                             var isok = 1;
                             var is_flag = 1;
                             var act = null;
@@ -984,7 +970,6 @@ Page({
                                 if (gg.prom_type == 5) {
                                     t.data.data.prom_id = gg.prom_id;
                                     t.data.data.prom_type = 5;
-
                                     // console.log('xxxxxxxxxxxxxxxxxx', gg.is_coupon)
                                     th.is_coupon = gg.is_coupon;
                                     th.setData({
@@ -3786,7 +3771,7 @@ Page({
             for (var i in goodlist) {
                 var gd = goodlist[i];
                 //--如果是秒杀就跳出,如果是赠品，如果是组合购，如果是限制使用优惠券--
-                if (gd.prom_type == 1 || gd.is_gift || gd.prom_type == 7) {
+                if (gd.prom_type == 1 || gd.is_gift || (gd.prom_type == 7 && gd.act.is_xz_yh)) {
                     continue;
                 }
 
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index c755b15..5fcc7ad 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -294,7 +294,7 @@
               <view class="co-red" wx:if="{{prom_type==0 || prom_type==3}}">
 
                 <view class="market-price flex" style="align-items: baseline;">
-                  <block wx:if="{{card_field && data[card_field]>0 && is_no_plus}}">
+                  <block wx:if="{{card_field && data[card_field]>0}}">
                     <view class="flex ai-center  grade-card-frame">
                       <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
                       <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index caee622..4fe7bfe 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -19,7 +19,8 @@ Page({
         tabname:"sort",   //排序的字段
         adname:"asc",        //升降的字段
 		is_new:0,
-		is_hot:0,
+        is_hot:0,
+        is_no_plus:1,
         prom_goods_list:null,
         rq_data:null,
 		isToggle: false, //切换商品视图控制符
@@ -43,9 +44,6 @@ Page({
         }
 
 	  var th=this;
-
-      //a.init(this, "", "requestData");
-
       var url = this.data.baseUrl;
 	  this.data.is_new=t.is_new;
 	  this.data.is_hot=t.is_hot;
@@ -152,9 +150,6 @@ Page({
               }
           })
       }
-
-
-
       this.requestGoodsList(url);
 	  getApp().getConfig2(function(rs){  	  
 			  //计算等级价相关
@@ -186,7 +181,23 @@ 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 13dea3a..82e562a 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -120,7 +120,7 @@
               </block>
             </block>
             <block wx:else>
-              <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+              <view wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
                 <view class="flex ai-center">
                   <view class="price rmb">{{item.shop_price}}</view>
                   <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
@@ -203,7 +203,7 @@
 		      </block>
 		      <block wx:else>
 		        <!-- 商品价格,先判断下是后又等级价-->
-		        <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
+		        <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
 		          <!-- 当会员是等级卡的时候 -->
 		          <block wx:if="{{card_field}}">
 		            <!-- 等级价>0 -->
@@ -235,7 +235,7 @@
 		            </block>
 		          </block>
 		          <block wx:else>
-		            <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+		            <view wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
 		              <view class="flex ai-center">
 		                <view class="price rmb">{{item.shop_price}}</view>
 		                <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index 3e5c1d6..c645425 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -97,7 +97,7 @@
         </block>
         <block wx:else>
           <!-- 商品价格,先判断下是后又等级价-->
-          <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
+          <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
             <!-- 当会员是等级卡的时候 -->
             <block wx:if="{{card_field}}">
               <!-- 等级价>0 -->
@@ -124,7 +124,7 @@
               </block>
             </block>
             <block wx:else>
-              <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+              <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
                 <view class="flex ai-center">
                   <view class="price">￥{{item.shop_price}}</view>
                   <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
@@ -161,11 +161,9 @@
         </block>
       </view>
     </navigator>
-
     <!-- 有商品列表的时候，要有分享攻击 -->
     <share_box id="share"></share_box>
   </view>
-	
 		<!-- 无数据提示 -->
 		<view class="no-data" wx:if="{{!requestData||requestData.length==0}}">
 		  <image class="cart-image" src="{{url}}/miniapp/images/cart-null.png"></image>
@@ -174,13 +172,7 @@
 		</view>
 	
 	</block>
-	
-	
-	
 </view>
-
-
-
 <view hidden="{{!openFilterModal}}">
   <view bindtap="closeFilterModal" class="cover-layer"></view>
   <view class="filter-modal">
@@ -215,39 +207,4 @@
       </view>
     </view>
   </view>
-</view>
-
-
-
-<!-- <view wx:if="{{openSearchModal}}">
-  <view class="search-modal">
-    <view class="search-bar">
-      <form bindsubmit="submitSearch">
-        <input autoFocus class="search-input" name="word" placeholder="搜索商品" bindconfirm="submitSearch" bindinput="getInput"></input>
-        <button class="search-btn" formType="submit">
-          <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image>
-        </button>
-      </form>
-    </view>
-    <view class="search-hot">
-      <view class="hot-title">热门搜索</view>
-      <block wx:if="{{hotWords.length>0}}">
-        <view class="hot-row" wx:for="{{hotWords}}" wx:key="{{index}}">
-          <view bindtap="searchHotWord" class="hot-item" data-word="{{item}}" wx:for="{{item}}" wx:key="{{index}}">{{item}}</view>
-        </view>
-      </block>
-    </view>
-		<view class="search-hot">
-		  <view class="hot-title flex jc_sb ai_c">
-				<text>历史搜索</text>
-				<text class="iconfont icon-shanchu xc-ash" bindtap="clearSearchRecord" wx:if="{{searchRecord.length != 0}}"></text>
-			</view>
-		  <block wx:if="{{searchRecord.length>0}}">
-		    <view class="hot-row flex flex-wrap" wx:key="{{index}}">
-		      <view class="hot-item history ellipsis-1" bindtap="searchHotWord" data-word="{{item}}" wx:for="{{searchRecord}}" wx:key="{{index}}">{{item}}</view>
-		    </view>
-		  </block>
-			<view wx:else class="fs24">暂无历史搜索记录</view>
-		</view>
-  </view>
-</view> -->
\ No newline at end of file
+</view>
\ No newline at end of file
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index d553601..2fa7e06 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -74,32 +74,6 @@ Page({
           }
       })
       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});
-
-
-
-				})						 
-			}
-		}	
-	})
-	 --*/
      this.init_user_tool()
 
   },
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index fc4fe8a..09ce4f3 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -10,9 +10,10 @@
             <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>
+                <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'>
@@ -69,29 +70,31 @@
       </image>
 
     </view>
-    <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==2 && show_buy_plus && is_no_plus}}">
+   <block wx:if="{{is_no_plus}}">
+    <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==2 && 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="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-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="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>
+   </block>
 
   </view>
   <view class="xc-after-sale rel">
@@ -102,8 +105,8 @@
           <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 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>
@@ -152,7 +155,7 @@
       <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 class="three-level-word">我的权益</view>
         </view>
       </view>
       <view wx:if="{{is_grad_get}}" class="three-level-word  xc-more-frame flex-vertical">
@@ -168,32 +171,32 @@
       <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>
+          <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 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">
+            <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 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>
-            </view>
-          </swiper-item>
+            </swiper-item>
 
-        </swiper>
+          </swiper>
 
-        <view bindtap="click_next">
-          <view class="bg_right xc-right bcolor mt"></view>
+          <view bindtap="click_next">
+            <view class="bg_right xc-right bcolor mt"></view>
+          </view>
         </view>
-      </view>
       </block>
       <view wx:else style="text-align: center">
-            未找到数据
+        未找到数据
       </view>
     </block>
 
@@ -202,87 +205,87 @@
 
   </view>
   <!-- 生日营销 is_banner-->
- <block wx:if="{{is_banner}}">
-    <view class="t-c banner-frame"bindtap="clike_banne">
+  <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>
+  </block>
 
   <!-- 工具与服务 -->
-  <view class="xc-tool-service" >
+  <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>
+      <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}}">
-									<image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
-									<view class="four-level-word">收入卡包</view>
-								</view>																						 
-						   </block> 							    
-					   </block>									  
-			   </block>					  								  
-		   </block>
+        <!-- 循环使用自定义菜单，显示和掩藏 -->
+        <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}}">
+                  <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
+                  <view class="four-level-word">收入卡包</view>
+                </view>
+              </block>
+            </block>
+          </block>
+        </block>
       </view>
 
     </view>
@@ -306,15 +309,17 @@
       </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>
+
+  <!-- 显示商品 -->
+  <!-- 好物推荐 -->
+  <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>
 </view>
 
 <!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"-->
@@ -327,7 +332,7 @@
         <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>
+            <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>
@@ -341,4 +346,4 @@
   </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 d2f17f3..2e82d7b 100644
--- a/pages/user/userinfo/userinfo.wxml
+++ b/pages/user/userinfo/userinfo.wxml
@@ -27,7 +27,7 @@
                 </view>
               </navigator>
             </block>
-            <block wx:if="{{pulscardname && rank_switch > 0 && is_no_plus}}">
+            <block wx:if="{{pulscardname && rank_switch > 0 }}">
               <navigator url="/pages/user/plus/plus">
                 <view class="flex-center plusMax">
                   <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>