Merge branch 'zhanghui' into 'develop'

解决组件命名address会报错



See merge request !25

src/components/Settings/Address.vue

@@ -5,7 +5,6 @@
       <div class="c">{{query_coin_type|uppercase}}收益地址</div>
     </div>
     <div class="page-content bg-blue">
-      <!-- {{puid}} {{query_type}} {{query_coin_type}} -->
       <div class="address">
         <label>当前收益地址</label>
         <div class="mock-input">{{address}}</div>
@@ -17,10 +16,9 @@
 <script>
 import fn from '@/utils/function.js'
 export default {
-  name: 'address',
+  name: 'modifyAddress',
   data() {
     return {
-      ttt: {},
       address: '',
     }
   },
@@ -42,12 +40,13 @@ export default {
     getUser() {
       fn.getUser(this.puid).then(res => {
         if (res.data.err_no == 0) {
-          this.ttt = res.data.data
           if (res.data.data.coins.hasOwnProperty(this.query_coin_type)) {
             this.address = res.data.data.coins[this.query_coin_type].address
           } else {
             this.address = '未设置'
           }
+        }else{
+          this.$toast("获取用户信息错误！")
         }
       })
     }

src/router/index.js

@@ -114,7 +114,7 @@ const router = new Router({
       }]
     },{
       path: '/address',
-      name: 'address',
+      name: 'modifyAddress',
       component: resolve => require(['@/components/Settings/Address.vue'], resolve),
       meta: {
         title: 'Address.vue'