Merge branch 'dk-dev' of http://39.101.143.165:8090/dong_k/zhapp into dk-dev

manifest.json

@@ -2,8 +2,8 @@
     "name" : "晋掌柜",
     "appid" : "__UNI__05D695B",
     "description" : "晋掌柜app",
-    "versionName" : "1.0.9",
-    "versionCode" : 109,
+    "versionName" : "1.1.0",
+    "versionCode" : 110,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/my/my.vue

@@ -28,7 +28,7 @@
 				<view class="balance dis j-s a-c">
 					<view class="item dis f-c a-c">
 						<text>余额(元)</text>
-						<text>{{walletInfo.walletBalance}}</text>
+						<text>{{walletInfo.walletBalanceRemoveWithdraw}}</text>
 					</view>
 					<u-line length="35" color="#EEEEEE" direction="col" :hairline="false"></u-line>
 					<view class="item dis f-c a-c">

pages/wallet/myWallet.vue

@@ -10,7 +10,7 @@
 					<text>我的余额</text> <!-- 标题 -->
 					<!-- 金额展示行 -->
 					<view class="mt-2 mb-1 dis a-c j-s">
-						<text class="sum">{{walletInfo.walletBalance}}</text> <!-- 当前余额 -->
+						<text class="sum">{{walletInfo.walletBalanceRemoveWithdraw}}</text> <!-- 当前余额 -->
 						<view class="cashOut-btn" @click="goWithdrawal">提现</view> <!-- 提现操作入口 -->
 					</view>
 					<text>还有{{walletInfo.withdrawingBalance}}元待审核</text> <!-- 状态提示 -->