merge

pages/user/index.vue

@@ -136,7 +136,7 @@
 						</view>
 						<view class="assets-label" @click="$Router.push({name:'walletRedProperty'})">
 							<view class="assets-label-name">现金红包
-								<image @click.stop="showHelp('wallet')" class="assets-label-icon"
+								<image @click.stop="showHelp('money')" class="assets-label-icon"
 									src="/static/user/userAssets_tips.png" />
 							</view>
 							<view class="assets-label-number">{{userData.account.cash || 0}}</view>
@@ -360,9 +360,9 @@
 							name:'companyApprove'
 						})
 					}).catch(err=>{
-						this.$refs.uToast.show({
+						uni.showToast({
 							title: err.message,
-							type: 'primary',
+							icon:'none',
 							duration: 3000
 						})
 					})
@@ -480,8 +480,11 @@
 			},
 			// 友情提示信息
 			showHelp(type) {
-				let title = '通证',
+				console.log(type)
+				let title = '通证钱包',
 					content = this.helpDoc.energy_ball.description
+				if (type == 'money') title = '现金红包'
+				if (type == 'money') content = this.helpDoc.red_bag.description
 				if (type == 'chip') title = '贡献值'
 				if (type == 'chip') content = this.helpDoc.energy_shard.description
 				uni.showModal({