merge

pages.json

@@ -211,7 +211,7 @@
 			"name": "userPartner",
 			"auth": true,
 			"style": {
-				"navigationBarTitleText": "我的伙伴"
+				"navigationBarTitleText": "我的粉丝"
 			}
 		}, {
 			"path": "pages/user/clause",

pages/user/index.vue

@@ -154,19 +154,19 @@
 			<!-- 我的伙伴 -->
 			<view class="userPartner">
 				<view class="partner-title">
-					我的伙伴
+					我的粉丝
 				</view>
 				<view class="partner-list" v-if="userData.relation_count">
 					<view class="partner-label" @click="$Router.push({name: 'userPartner', params:{larer:''}})">
-						<view class="partner-label-name">伙伴总数</view>
+						<view class="partner-label-name">粉丝总数</view>
 						<view class="partner-label-number">{{userData.relation_count.all || 0}}</view>
 					</view>
 					<view class="partner-label" @click="$Router.push({name: 'userPartner', params:{larer:1}})">
-						<view class="partner-label-name">直接伙伴</view>
+						<view class="partner-label-name">直接粉丝</view>
 						<view class="partner-label-number">{{userData.relation_count.one || 0}}</view>
 					</view>
 					<view class="partner-label" @click="$Router.push({name: 'userPartner', params:{larer:2}})">
-						<view class="partner-label-name">间接伙伴</view>
+						<view class="partner-label-name">间接粉丝</view>
 						<view class="partner-label-number">{{userData.relation_count.two || 0}}</view>
 					</view>
 				</view>
@@ -362,24 +362,24 @@
 		methods: {
 			// 开通VIP
 			openVip(identityId) {
-				if (!this.userData.certification) {
+				// if (!this.userData.certification) {
-					uni.showModal({
+				// 	uni.showModal({
-						title: '提示',
+				// 		title: '提示',
-						content: '为了保障您的用户权益，未个人认证无法开通节点',
+				// 		content: '为了保障您的用户权益，未个人认证无法开通节点',
-						cancelColor: '#555',
+				// 		cancelColor: '#555',
-						cancelText: '稍后开通',
+				// 		cancelText: '稍后开通',
-						confirmColor: '#8b64fd',
+				// 		confirmColor: '#8b64fd',
-						confirmText: '去认证',
+				// 		confirmText: '去认证',
-						success: res => {
+				// 		success: res => {
-							if (res.confirm) {
+				// 			if (res.confirm) {
-								this.$Router.push({
+				// 				this.$Router.push({
-									name: 'Personal'
+				// 					name: 'Personal'
-								})
+				// 				})
-							}
+				// 			}
-						}
+				// 		}
-					})
+				// 	})
-					return
+				// 	return
-				}
+				// }
 				this.$Router.push({
 					name: 'vipIndex',
 					params: {

pages/user/partner.vue

@@ -106,6 +106,9 @@
     .tabs{
     	position: fixed;
     	top: 0;
+		//#ifdef H5
+		top:100rpx;
+		//#endif
     	left: 0;
     	right: 0;
     	z-index: 99;

pages/wallet/extract.vue

@@ -45,7 +45,8 @@
 				card: '', // 银行卡号
 				withdraw_input: '', // 提现通证数量
 				bank_accounts: 0,
-				bankInfo: {}
+				bankInfo: {},
+				certification:false,//默认没有认证
 			};
 		},
 		onLoad() {
@@ -65,6 +66,7 @@
 					this.balance = res.balance
 					this.cost = res.cost
 					this.total = Number(res.balance) * Number(res.cost)
+					this.certification = res.certification
 					uni.setStorageSync('refresh', false)
 				}).catch(err => {
 					uni.showToast({
@@ -125,6 +127,24 @@
 					})
 					return;
 				}
+				if (!this.certification) {
+					uni.showModal({
+						title: '提示',
+						content: '为了保障您的用户权益，未个人认证无法提现通证',
+						cancelColor: '#555',
+						cancelText: '稍后认证',
+						confirmColor: '#8b64fd',
+						confirmText: '立即认证',
+						success: res => {
+							if (res.confirm) {
+								this.$Router.push({
+									name: 'Personal'
+								})
+							}
+						}
+					})
+					return
+				}
 				uni.showModal({
 					title: '温馨提示',
 					content:'您是否确认提现到现金红包账户，交易将免手续费',

pages/wallet/extractRed.vue

@@ -51,7 +51,8 @@
 				card: '', // 银行卡号
 				withdraw_input: '', // 提现通证金额
 				bank_accounts: 0,
-				bankInfo: {}
+				bankInfo: {},
+				certification:false,// 认证状态
 			};
 		},
 		onLoad() {
@@ -73,6 +74,7 @@
 					this.bank_accounts = res.bank_accounts.length
 					this.withdraw_input = Number(res.balance)
 					this.total = Number(res.balance) * Number(res.cost)
+					this.certification = res.certification
 					uni.setStorageSync('refresh', false)
 				}).catch(err => {
 					uni.showToast({
@@ -105,10 +107,7 @@
 						this.withdraw_input = this.balance
 						this.total = this.balance * this.cost
 					}
-
-
 				}
-
 			},
 			//  点击全部
 			all() {
@@ -144,6 +143,24 @@
 					})
 					return;
 				}
+				if (!this.certification) {
+					uni.showModal({
+						title: '提示',
+						content: '为了保障您的用户权益，未个人认证无法提现红包',
+						cancelColor: '#555',
+						cancelText: '稍后认证',
+						confirmColor: '#8b64fd',
+						confirmText: '立即认证',
+						success: res => {
+							if (res.confirm) {
+								this.$Router.push({
+									name: 'Personal'
+								})
+							}
+						}
+					})
+					return
+				}
 				uni.showModal({
 					title: '温馨提示',
 					content:this.tax === '0'?'您是否确认提现，交易将免手续费':'您是否确认提现，将会扣除' + this.tax + '%手续费',