From de3f76889d0f5da4ea31d10ac8c140f721a7bcd6 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Mon, 26 Oct 2020 15:56:01 +0800
Subject: [PATCH] 1.  会员中心首页的  我的权益的显示问题

---
 app.json                    |  3 +--
 pages/user/index/filter.wxs | 19 ++++++++++++++-----
 pages/user/index/index.wxml | 18 +++++++++---------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/app.json b/app.json
index bac00e3..a17acea 100644
--- a/app.json
+++ b/app.json
@@ -106,8 +106,7 @@
 				
 				 "pages/goods_share/goods_share",
 				 "pages/activity_share/activity_share",
-				 "pages/live_share/live_share",
-				 "pages/addCustomer/addCustomer",
+				 "pages/live_share/live_share",				
 				  "pages/quan/quan"
       ]
       
diff --git a/pages/user/index/filter.wxs b/pages/user/index/filter.wxs
index 8d0f324..3997e16 100644
--- a/pages/user/index/filter.wxs
+++ b/pages/user/index/filter.wxs
@@ -5,21 +5,30 @@ var is_close = function (name,c_list) {
   map['我的拼单']="2";
   map['秒杀活动']="3";
   map['PLUS会员']="4"; 
+  map['我的权益']="5";
   map['联系客服']="6";
   map['收藏夹']="7";
   map['我的地址']="8";
   map['收入卡包']="9";
   map['专享礼包']="10";
-  map['我的权益']="11";
   map['我的服务']="12";
   map['我的评价']="13";
   map['我的礼包']="14";
   map['助力活动']="15";
   var index=map[name];
-  //不包含，不关闭
-  if(c_list.indexOf(index)==-1) return 0;
-  //包含，就是关闭的
-  return 1 
+ 
+  //我的权益要判断5，和11
+  if(name=="我的权益"){
+	  if(c_list.indexOf("11")!=-1) return 1;
+	  else if(c_list.indexOf("5")!=-1) return 1;
+	  return 0;
+  }else{
+	  //不包含，不关闭
+	  if(c_list.indexOf(index)==-1) return 0;
+	  //包含，就是关闭的
+	  return 1 
+  }
+ 
 }
 
 module.exports = {
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 374537d..4a3e699 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -216,7 +216,13 @@
 							  	 	<image class="xc-center-img " src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image>
 							  	 	<view class="four-level-word">助力活动</view>
 							  	 </view>							 							  															 
-							 </block> 							  										 
+							 </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:else>							  
 								  <view  class="item t-c" data-url="{{item.weappurl}}" bindtap="goto_nav">
 									<image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
@@ -225,14 +231,8 @@
 							 </block> 
 					   </block>
 					   <!-- 没有链接地址的时候 --> 
-					   <block wx:else>						   
-						   <block wx:if="{{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=='联系客服'}}">
+					   <block wx:else>			   
+						   <block wx:if="{{item.name=='联系客服'}}">
 							   <button class="item t-c"  wx:if="{{sys_switch.weapp_customertype}}" 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>
--
libgit2 0.21.4