Merge branch 'master' of http://git.ycjcjy.com/xuchengxiang/niucai-user

config/index.js

@@ -12,7 +12,8 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/api': {
-        target: 'https://app.xnsport.cn',
+        target: 'http://127.0.0.1:8080',
+        // target: 'https://app.xnsport.cn',
         // target: 'http://123.57.65.31:9004',
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         pathRewrite: { '^/api': '/api' }

src/pages/WoDe/UserCenter/index.vue

@@ -10,7 +10,7 @@
             </div>
             <router-link :to="{ name: 'SignIn' }" v-if="UserInfo === null">点击注册/登录</router-link>
             <span v-else>{{UserInfo.name}}</span>
-            <span v-if="UserInfo !== null && UserInfo.account !== undefined" style="margin-top: 0; line-height: 0.2rem;">账户余额：{{UserInfo.account.cash  }}牛币</span>
+            <span v-if="UserInfo !== null && UserInfo.account !== undefined" style="margin-top: 0; line-height: 0.2rem;">账户余额：{{UserInfo.account.amount}}牛币</span>
           </div>
         </div>