代码合并

pages/me/index.vue

@@ -9,7 +9,7 @@
 					class="info-box-c flex align-center justify-between">
 					<view class="info-box-c-l flex align-center">
 						<view class="info-box-c-l-avatar">
-							<image :src="avatar?avatar:'../../static/images/logo.png'" mode=""></image>
+							<image :src="avatar?avatar:'../../static/images/me/default_avatar.png'" mode=""></image>
 						</view>
 						<view class="info-box-c-l-name">
 							<view class="info-box-c-l-name-t">
@@ -53,12 +53,12 @@
 						我的积分
 					</view>
 				</view> -->
-				<view class="statistics-box-item" @click="goNav('/me/balance/index',{amount: userInfo.amount})">
+				<view class="statistics-box-item" @click="goNav('/me/invite/cashDetail',{amount: userInfo.amount})">
 					<view class="statistics-box-item-top">
 						{{userInfo.amount || '0.00'}}
 					</view>
 					<view class="statistics-box-item-btn">
-						我的余额
+						我的红包
 					</view>
 				</view>
 			</view>
@@ -90,7 +90,7 @@
 				<view class="">
 					<view class="money-box-title flex align-center">
 						<view class="money-box-title-l">
-							金豆余额
+							金币余额
 						</view>
 						<view @click="isShoMoney = !isShoMoney" class="money-box-title-r" style="margin-left: 12rpx;">
 							<u-icon :name="isShoMoney?'eye':'eye-off'" color="#5A4A32" size="40"></u-icon>
@@ -125,7 +125,7 @@
 						</view>
 					</view>
 					<!-- #endif -->
-					<view v-if="kmPaySel != '否'" @click="openKaMiShow()"
+					<!-- <view v-if="kmPaySel != '否'" @click="openKaMiShow()"
 						class="tool-box-content-item flex align-center justify-center flex-wrap">
 						<view class="tool-box-content-item-img">
 							<image src="../../static/images/me/kami.png" mode=""></image>
@@ -133,7 +133,7 @@
 						<view class="tool-box-content-item-txt">
 							卡密兑换
 						</view>
-					</view>
+					</view> -->
 					<view class="tool-box-content-item flex align-center justify-center flex-wrap"
 						@click="goNav('/me/choujiang/choujiang')">
 						<view class="tool-box-content-item-img">
@@ -287,7 +287,7 @@
 				rate: 0,
 				kmPaySel: '否',
 				isWxIosPay: true, //微信下是否显示支付功能
-				userInfo: {amount:0},
+				userInfo: {},
 			}
 		},
 		onLoad() {