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] 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