1

pages/share-order/share-order.vue

@@ -30,9 +30,10 @@
 										<view class="box_ltext">
 											<Text class='l_name'>{{item.UserName}}</Text>
 										</view>
-										<Text v-if='item.Grade==0'>自购返佣</Text>
+										<!-- <Text v-if='item.Grade==0'>自购返佣</Text>
 										<Text v-if='item.Grade==1'>一级分销</Text>
-										<Text v-if='item.Grade==2'>二级分销</Text>
+										<Text v-if='item.Grade==2'>二级分销</Text> -->
+										<text>{{item.GradeDescription}}</text>
 									</view>
 									<view class="center_l">
 										

pages/share-team/share-team.vue

@@ -21,7 +21,7 @@
 							<view v-for="(item, index) in g" :key="index" class="listbox">
 								<view class="box_top">
 									
-									<u-avatar :src="item.Photo"  size="110"></u-avatar>
+									<u-avatar :src="item.Photo"  size="64"></u-avatar>
 									<view class="box_r">
 										<view style="width: 100%;display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
 											<view style="width: 190px;">
@@ -29,12 +29,12 @@
 											</view>
 											<Text style='font-size: 12px;'>推广{{item.GeneralizeNum}}人</Text>
 										</view>
-										<Text style='font-size: 12px;'>注册时间：{{item.CreateDate}}</Text>
+										<Text style='font-size: 10px;color: #999999;'>{{item.CreateDate}}</Text>
 									</view>
 								</view>
 								<view class="box_b">
-									<Text style='color: #BABABA;'>{{item.Income}}元</Text>
-									<Text style='color: #BABABA;'>{{item.OrderNum}}个订单</Text>
+									<Text style='color: #878787;font-size: 13px;'> <text style='color: #FF3F47;'> {{item.Income}}</text> 元</Text>
+									<Text style='color: #878787;font-size: 13px;'>{{item.OrderNum}}个订单</Text>
 								</view>
 								
 							</view>
@@ -84,6 +84,7 @@
 				  loading: "努力加载中",
 				  nomore: "没有更多了",
 				},
+				IsEnableFXGrade:0,
 			
 			}
 		},
@@ -92,7 +93,20 @@
 			 this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
 			 this.mainColor = this.$uiConfig.mainColor;
 			 this.secondary = this.$uiConfig.secondary;
-			 this.init()
+			 
+		},
+		onLoad(option){
+			if(option && option.IsEnableFXGrade){
+				this.IsEnableFXGrade = option.IsEnableFXGrade;
+			}
+			if(this.IsEnableFXGrade==1){
+				this.list=[{name: '普通会员'},]//设置默认值
+				this.getUserMyTeamTitelListForFX()
+				
+			}else{
+				this.init()
+			}
+			
 		},
 		mounted() {
 			let currentPages = getCurrentPages();
@@ -110,6 +124,23 @@
 			 });
 		},
 		methods: {
+			getUserMyTeamTitelListForFX(){
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.request2(
+					{
+						url: '/api/AppletUser/GerUserMyTeamTitelListForFX',
+						data: {}
+					},
+							
+				  (res) => {
+					 uni.hideLoading();
+					
+					
+				  }
+				);
+			},
 			init(){
 				
 				uni.showLoading({
@@ -178,7 +209,7 @@
 		width: 100%;
 		background: #fff;
 		padding: 0 15px;
-		margin-bottom: 15px;
+		margin-top: 15px;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
@@ -191,12 +222,12 @@
 		align-items: center;
 		justify-content: space-between;
 		padding: 10px 0 ;
-		border-bottom: 1px solid #f5f5f5;
+		/* border-bottom: 1px solid #f5f5f5; */
 		
 	}
 	.cteamStyle .box_r{
-		width: calc(100vw - 30px - 55px - 20px);
-		height: 55px;
+		width: calc(100vw - 30px - 32px - 20px);
+		height: 32px;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
@@ -210,10 +241,14 @@
 	}
 	.cteamStyle .box_b{
 		width: 100%;
-		padding: 15px 0;
+		height: 40px;
+		padding: 0 10px;
+		background: #F7F5F5;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
+		border-radius: 4px;
+		margin: 10px 0;
 	}
 </style>

pages/share/index/index.vue

@@ -70,16 +70,23 @@
 								<Text style='font-size: 18px;max-width: 150px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;'>
 									{{sharedata.UserInfo.UserName}}
 								</Text>
-								<view class="sj_style" style="" @click="goUrl('/pages/share/level/level')"	>
+								<view class="sj_style" style="" @click="goUrl('/pages/share/level/level')"	v-if="sharedata.UserInfo.IsEnableFXGrade==1">
 									<image src="../../../static/images/sj.png" style="width: 9px;height: 10px;"></image>
 									<text style="font-size: 10px;color: #fff;">
 										升级规则
 									</text>
 								</view>
+								<!-- 不是粉象模式 -->
+								<view class="sj_style" style="" @click="goUrl('/pages/share/level/level')"	v-if="sharedata.UserInfo.IsEnableFXGrade!=1 && sharedata.UserInfo.DistributorGradeEntrance==1">
+									<image src="../../../static/images/sj.png" style="width: 9px;height: 10px;"></image>
+									<text style="font-size: 10px;color: #fff;">
+										升级条件
+									</text>
+								</view>
 							</view>
 							
 							<Text style='font-size: 12px;'>{{sharedata.CustomModel.ReferrerName}}：{{sharedata.UserInfo.SuperiorName}}</Text>
-							<Text style='font-size: 12px;'>会员日期：{{sharedata.UserInfo.GradeName}}</Text>
+							<Text style='font-size: 12px;' v-if='sharedata.UserInfo.IsEnableFXGrade==1 && sharedata.UserInfo.IsVip==1'>会员日期：{{sharedata.UserInfo.VipExpiryDate}}</Text>
 						</view>
 					</view>
 					
@@ -102,7 +109,7 @@
 						<Text>{{sharedata.UserInfo.WJSCommission!=null ?sharedata.UserInfo.WJSCommission:0}}元</Text>
 					</view>
 				</view>
-				<!-- 会员购买 -->
+				<!-- 会员购买 -->	
 				<view class="buyvip" v-if="words.isshowvipbuypic==0" @click="goUrl(words.vipbuyurl)">
 					<image :src="words.vipbuyico" style="width: 100%;" mode='widthFix'></image>
 				</view>
@@ -166,6 +173,18 @@
 						<u-icon name="arrow" size="24" color="#A5A3AB"></u-icon>
 					</view>
 				</view>
+				
+				<view class="menus_item" @click="goUrl('/pages/share-team/share-team')" v-if="sharedata.UserInfo.IsEnableFXGrade==1">
+					<view style="display: flex;flex-direction: row;align-items: center;">
+						<image src="../../../static/images/icon/GradeAudit.png" style="width: 14px;" mode='widthFix'></image>	
+						<text style="font-size: 13px;color:#07090D;margin-left: 15px;">Vip购买返佣</text>
+					</view>
+					<view style="display: flex;flex-direction: row;align-items: center;">
+						<text :style="{color:mainColor}">{{sharedata.UserInfo.VipBuyCommission!=null ?sharedata.UserInfo.VipBuyCommission:0}}</text>
+						<text style="color: #A5A3AB;margin-right: 5px;">元</text>
+						<u-icon name="arrow" size="24" color="#A5A3AB"></u-icon>
+					</view>
+				</view>
 				<view class="menus_item" @click="goUrl('/pages/share/examine')" v-if='sharedata.UserInfo.HpReferralsGradeAudit==1'>
 					<view style="display: flex;flex-direction: row;align-items: center;">
 						<image  src="../../../static/images/icon/GradeAudit.png" style="width: 14px;" mode='widthFix'></image>	
@@ -177,7 +196,7 @@
 				</view>
 				
 			</view>
-			<view class="sharebox_menus" >
+			<view class="sharebox_menus" style="margin-bottom: 20px;">
 				<view class="menus_item" @click="goUrl('/pages/share-qrcode/share-qrcode')">
 					<view style="display: flex;flex-direction: row;align-items: center;">
 						<image :src="sharedata.CustomModel.PromoteQRCodeImage" style="width: 14px;" mode='widthFix'></image>	
@@ -339,6 +358,11 @@
 		  },
 		  goUrl(url){
 			  console.log(url)
+			  if(url=='/pages/share-team/share-team' && this.sharedata.UserInfo.IsEnableFXGrade==1){//判断我的团队是否粉象模式
+				  uni.navigateTo({
+				    url: url+'?IsEnableFXGrade='+ this.sharedata.UserInfo.IsEnableFXGrade
+				  });
+			  }
 			  uni.navigateTo({
 			    url: url
 			  });

pages/share/level/level.vue

 <template>
 	<view :style="{'height':contentHeight}" class="levelStyle">
-		<image src="../../../static/images/icon/no-level-bg.png" v-if="level=='' " style="width: 100%;height: 100%;"></image>
+		<image src="../../../static/images/icon/no-level-bg.png" v-if="level.Status==2 " style="width: 100%;height: 100%;"></image>
 		
-		<view  class="imgbg">
-			<text style="display: inline-block;width: 94%;margin: 15px 0;" >升级状态:{{level.Status==1?'正常':(level.Status==2?'暂无升级':'')}}</text>
+		<view  class="imgbg" v-if="level.Status== 1">
 			<view class="leve_box">
 				<text style="font-size: 18px;">等级名称：{{level.GradeInfo.GradeName}}</text>
 				<view style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;margin-top: 15px;">