Merge branch 'develop' of http://git.yoho.cn/fe/xianyu-ufo-app-web into develop

@@ -3,7 +3,7 @@
       <div v-if="validStatus === 1">
       <div v-if="validStatus === 1">
           <div class="account">
           <div class="account">
               <p class="account-tip">支付宝账号</p>
               <p class="account-tip">支付宝账号</p>
-              <p class="account-name">{{alipayAccount}}</p>
+              <p class="account-name">{{alipayAccount?alipayAccount:nickName}}</p>
           </div>
           </div>
           <p class="tip"><i class="cubeic-warn"></i><span>已绑定的支付宝账号暂无法提供系统换绑和解除，如
           <p class="tip"><i class="cubeic-warn"></i><span>已绑定的支付宝账号暂无法提供系统换绑和解除，如
 需要帮助可致电<a class="phone" href="tel:400-8890-9646"> 400-8890-9646 </a>联系电话客服</span></p>
 需要帮助可致电<a class="phone" href="tel:400-8890-9646"> 400-8890-9646 </a>联系电话客服</span></p>
@@ -26,7 +26,7 @@ export default {
       this.fetchUserAliPayAccount()
       this.fetchUserAliPayAccount()
   },
   },
   computed: {
   computed: {
-      ...mapState(['alipayAccount','certName', 'validStatus'])
+      ...mapState(['alipayAccount','certName', 'validStatus','nickName'])
   },
   },
   methods: {
   methods: {
       ...mapActions(['fetchUserAliPayAccount']),
       ...mapActions(['fetchUserAliPayAccount']),

@@ -5,6 +5,7 @@ export default function() {
     state: {
     state: {
       alipayAccount: '',
       alipayAccount: '',
       certName: '',
       certName: '',
+      nickName: '',
       validStatus: 0
       validStatus: 0
     },
     },
     mutations: {
     mutations: {
@@ -12,10 +13,12 @@ export default function() {
         let {
         let {
           alipayAccount,
           alipayAccount,
           certName,
           certName,
+          nickName,
           validStatus
           validStatus
         } = data;
         } = data;
 
 
         state.alipayAccount = maskAccount(alipayAccount);
         state.alipayAccount = maskAccount(alipayAccount);
+        state.nickName = nickName || '';
         state.certName = certName;
         state.certName = certName;
         state.validStatus = validStatus;
         state.validStatus = validStatus;
       }
       }