From 29f5a1e755465e679606ce7aafd4c7e22a3a06f3 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Wed, 27 Oct 2021 09:53:29 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8E=BB=E5=8D=87=E7=BA=A7=E6=8D=A2=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=88=A4=E6=96=AD=E7=94=A8is=5Ftop=E5=88=A4=E6=96=AD]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/add.vue  |  4 ++--
 pages/user/index.vue | 16 ++++++++++------
 pages/vip/vip.vue    |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pages/goods/add.vue b/pages/goods/add.vue
index 43896ee..492fa11 100644
--- a/pages/goods/add.vue
+++ b/pages/goods/add.vue
@@ -703,11 +703,11 @@
 				<input type="digit" v-model="skus_price" placeholder="0.00"/>
 				<text class="units">元{{skus_unit != '' ? '/' + skus_unit : ''}}</text>
 			</view>
-			<view class="form-box inputs-flex input-unit">
+			<!-- <view class="form-box inputs-flex input-unit">
 				<label class="form-label">分销佣金</label>
 				<input type="digit" v-model="skus_charge" placeholder="0.00"/>
 				<text class="units">元{{skus_unit != '' ? '/' + skus_unit : ''}}</text>
-			</view>
+			</view> -->
 		</view>
 		<!-- 商品详情介绍 -->
 		<view class="form-block">
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 4eb5df8..6b2344b 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -58,14 +58,14 @@
 					<view class="userVip-top-name" v-if="userIdentity.right">
 						{{ userData.identity.id == 1 ? '开通' + userIdentity.right.name : '到期时间：' + userIdentity.times.ended_at}}
 					</view>
-					<view class="userVip-top-btn" v-if="userData.identity.id != 5"
-						@click="openVip(userIdentity.right.identity_id)">
-						{{ userData.identity.id == 1 ? '去开通' : '去升级'}}
+					<!-- v-if="userData.identity.id != 5" -->
+					<view class="userVip-top-btn" @click="openVip(userIdentity.right.identity_id)" >
+						{{ userData.identity.id == 1 ? '去开通' : userIdentity.is_top ?'已达成满级':'去升级'}}
 						<image class="userVip-top-arrow" src="/static/user/userVip_arrow.png"></image>
 					</view>
-					<view class="userVip-top-btn" v-else>
+					<!-- <view class="userVip-top-btn" v-else>
 						已达成满级
-					</view>
+					</view> -->
 				</view>
 				<!-- 已认证后显示 -->
 				<view class="userVip-rights">
@@ -75,10 +75,14 @@
 							全部更多 <image class="userVip-rightst-more-img" src="/static/user/userVip_more_arrow.png">
 							</image>
 						</view> -->
-						<view class="userVip-rightst-more"	@click="openVip(userIdentity.right.identity_id)">
+						<view class="userVip-rightst-more" @click="openVip(userIdentity.right.identity_id)">
 							全部更多 <image class="userVip-rightst-more-img" src="/static/user/userVip_more_arrow.png">
 							</image>
 						</view>
+						<!-- <view class="userVip-rightst-more"	v-else>
+							全部更多 <image class="userVip-rightst-more-img" src="/static/user/userVip_more_arrow.png">
+							</image>
+						</view> -->
 					</view>
 					<view class="userVip-rightst-list" v-if="userIdentity.right">
 						<view v-for="(item, index) in userIdentity.right.rights" :key="index"
diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue
index bbc7815..878c386 100644
--- a/pages/vip/vip.vue
+++ b/pages/vip/vip.vue
@@ -178,7 +178,7 @@
 					this.identitie = res.identities
 					if (type === 'cre') {
 						let Index = res.identities.findIndex(val => val.identity_id == this.$Route.query.identity_id)
-						if(Index+1 === res.identities){
+						if(Index+1 === res.identities.length){
 							this.tabsIndex = Index
 						}else{
 							this.tabsIndex = Index+1