From 34ea859950c230b0a222ba7b3d64a6637fe4e835 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Tue, 28 Sep 2021 11:33:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[.=E5=88=86=E4=BA=AB=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E7=A9=BA=E7=99=BD=E5=A4=84=E7=90=86.]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/code.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/user/code.vue b/pages/user/code.vue
index 1ae2b87..c767aa3 100644
--- a/pages/user/code.vue
+++ b/pages/user/code.vue
@@ -114,9 +114,9 @@
     
     // 内容
     .codeContent {
-        position: absolute;
-        left: 0;
-        top: 0;
+        // position: absolute;
+        // left: 0;
+        // top: 0;
         width: 100%;
         padding: 120rpx 80rpx 40rpx;
         box-sizing: border-box;

From e9343f9085118949d803dbbf5bdcd09a42da13d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Tue, 28 Sep 2021 11:41:17 +0800
Subject: [PATCH 2/3] merge

---
 pages/user/index.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pages/user/index.vue b/pages/user/index.vue
index 1f4a539..3a3f0e6 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -128,7 +128,7 @@
             <view class="userAssets">
                 <view class="userAssets-top">
                     <view class="withdraw-name">
-                        当前能量球价值<view class="withdraw-number">￥0.00</view>
+                        当前能量球价值<view class="withdraw-number">￥{{userData.account.stone_value || 0}}</view>
                     </view>
                     <view class="withdraw-btn" @click="$Router.push({name: 'Extract'})">
                         去提现
@@ -141,7 +141,7 @@
                     <view class="assets-list" v-if="userData.account">
                         <view class="assets-label" @click="$Router.push({name:'walletProperty'})">
                             <view class="assets-label-name">能量球钱包<image @click.stop="showHelp('wallet')" class="assets-label-icon" src="/static/user/userAssets_tips.png"></image></view>
-                            <view class="assets-label-number">{{userData.account.coins || 0}}</view>
+                            <view class="assets-label-number">{{userData.account.stone || 0}}</view>
                         </view>
                         <view class="assets-label" @click="$Router.push({name:'Fragment'})">
                             <view class="assets-label-name">能量碎片<image @click.stop="showHelp('chip')" class="assets-label-icon" src="/static/user/userAssets_tips.png"></image></view>
@@ -294,6 +294,13 @@
             userInfo() {
                 // 读取配置信息
                 userIndex().then(res=>{
+					res.account = {
+						stone: res.stone,
+						stone_value: res.stone_value,
+						...res.account
+					}
+					
+					
                     this.userData     = res
                     this.helpDoc      = res.help_doc
                     this.userIdentity = res.identityShow

From 2da99587efd07a8663773bbac539ec0b6621456e Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Tue, 28 Sep 2021 14:17:25 +0800
Subject: [PATCH 3/3] [...]

---
 pages/wallet/extract.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pages/wallet/extract.vue b/pages/wallet/extract.vue
index 31c9d18..0e9b553 100644
--- a/pages/wallet/extract.vue
+++ b/pages/wallet/extract.vue
@@ -24,8 +24,9 @@
 		<view class="withdrawing-content">
 			<view class="item">
 				<view style="flex: 1;">
+					<view class="inputTxt">提现数量</view>
 					<input class="input_num" v-model="withdraw_input" @input='inputNum' type="number"
-						placeholder-style="color:#999;font-weight:normal; font-size:34rpx;" placeholder="提现数量" />
+						placeholder-style="color:#999;font-weight:normal; font-size:34rpx;" placeholder="请输入提现数量" />
 				</view>
 				<view class="all" @click="all">全部提现</view>
 			</view>
@@ -71,6 +72,7 @@
 					this.tax = res.tax
 					this.cost = res.cost
 					this.bank_accounts = res.bank_accounts.length
+					this.withdraw_input = Number(res.balance)
 					uni.setStorageSync('refresh', false)
 				}).catch(err => {
 					uni.showToast({
@@ -313,15 +315,18 @@
 			align-items: center;
 			justify-content: flex-start;
 			box-sizing: border-box;
-			padding: $padding 0;
+			padding: 20rpx 0;
 
 			span:nth-child(1) {
 				color: #666;
 				margin-right: 20rpx;
 			}
-
+			.inputTxt{
+				color: #999;
+				padding-bottom: 20rpx;
+			}
 			.input_num {
-				font-size: $title-size*1.5;
+				font-size: 60rpx;
 				color: #3a3a3a;
 				font-weight: bolder;
 				flex: 1;