From e85720aa888b1c1286438bdfaafbd05ba34f3b29 Mon Sep 17 00:00:00 2001
From: mutoe <mutoe@foxmail.com>
Date: Wed, 19 Sep 2018 10:53:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(certificate):=20(#513)=20=E6=9C=AA=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E7=94=A8=E6=88=B7=E7=82=B9=E5=87=BB=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=97=B6=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/Profile.vue               | 42 ++++++++----------------------
 src/page/profile/Certificate.vue   | 28 +++++++++-----------
 src/page/profile/Certification.vue | 17 +++---------
 3 files changed, 27 insertions(+), 60 deletions(-)

diff --git a/src/page/Profile.vue b/src/page/Profile.vue
index 391eb34d..245185b7 100644
--- a/src/page/Profile.vue
+++ b/src/page/Profile.vue
@@ -52,9 +52,7 @@
               <use xlink:href="#profile-home"/>
             </svg>
             <span class="m-text-box m-flex-grow1">个人主页</span>
-            <v-icon
-              type="base-arrow-r"
-              class="m-entry-append"/>
+            <v-icon type="base-arrow-r" class="m-entry-append"/>
           </router-link>
           <router-link
             to="/profile/news/released"
@@ -64,9 +62,7 @@
               <use xlink:href="#profile-plane"/>
             </svg>
             <span class="m-text-box m-flex-grow1">我的投稿</span>
-            <v-icon
-              type="base-arrow-r"
-              class="m-entry-append"/>
+            <v-icon type="base-arrow-r" class="m-entry-append"/>
           </router-link>
           <!--           <router-link to="/upgrade" tag="li" class="m-entry">
             <svg class='m-style-svg m-svg-def m-entry-prepend'>
@@ -92,27 +88,19 @@
             to="/wallet"
             class="m-entry"
             tag="li">
-            <v-icon
-              type="profile-wallet"
-              class="m-entry-prepend"/>
+            <v-icon type="profile-wallet" class="m-entry-prepend"/>
             <span class="m-text-box m-flex-grow1">钱包</span>
             <span class="m-entry-extra">{{ new_balance }}</span>
-            <v-icon
-              type="base-arrow-r"
-              class="m-entry-append"/>
+            <v-icon type="base-arrow-r" class="m-entry-append"/>
           </router-link>
           <router-link
             tag="li"
             to="/currency"
             class="m-entry">
-            <v-icon
-              type="profile-integral"
-              class="m-entry-prepend"/>
+            <v-icon type="profile-integral" class="m-entry-prepend"/>
             <span class="m-text-box m-flex-grow1">{{ currency_name }}</span>
             <span class="m-entry-extra">{{ sum }}</span>
-            <v-icon
-              class="m-entry-append"
-              type="base-arrow-r"/>
+            <v-icon class="m-entry-append" type="base-arrow-r"/>
           </router-link>
           <router-link
             to="/profile/collection/feeds"
@@ -122,23 +110,17 @@
               <use xlink:href="#profile-collect"/>
             </svg>
             <span class="m-text-box m-flex-grow1">收藏</span>
-            <v-icon
-              type="base-arrow-r"
-              class="m-entry-append"/>
+            <v-icon type="base-arrow-r" class="m-entry-append"/>
           </router-link>
         </ul>
         <ul class="m-box-model m-entry-group">
-          <li
-            class="m-entry"
-            @click="selectCertType">
+          <li class="m-entry" @click="selectCertType">
             <svg class="m-style-svg m-svg-def m-entry-prepend">
               <use xlink:href="#profile-approve"/>
             </svg>
             <span class="m-text-box m-flex-grow1">认证</span>
             <span class="m-entry-extra">{{ verifiedText }}</span>
-            <v-icon
-              type="base-arrow-r"
-              class="m-entry-append"/>
+            <v-icon type="base-arrow-r" class="m-entry-append"/>
           </li>
           <router-link
             to="/setting"
@@ -148,9 +130,7 @@
               <use xlink:href="#profile-setting"/>
             </svg>
             <span class="m-text-box m-flex-grow1">设置</span>
-            <v-icon
-              type="base-arrow-r"
-              class="m-entry-append"/>
+            <v-icon type="base-arrow-r" class="m-entry-append"/>
           </router-link>
         </ul>
       </div>
@@ -202,7 +182,7 @@ export default {
   },
   watch: {
     verified(to) {
-      if (to) to.status = Number(to.status);
+      if (to && to.status) to.status = Number(to.status);
       if (to && to.status === 0) {
         this.verifiedText = "待审核";
       } else if (to && to.status === 1) {
diff --git a/src/page/profile/Certificate.vue b/src/page/profile/Certificate.vue
index 8186d1f8..a33a6c11 100644
--- a/src/page/profile/Certificate.vue
+++ b/src/page/profile/Certificate.vue
@@ -1,21 +1,14 @@
 <template>
   <div class="p-profile-certificate">
-    <header class="m-box m-pos-f m-main m-bb1 m-head-top">
-      <div
-        class="m-box m-aln-center m-flex-none"
-        @click="step > 1 ? step-- : goBack()">
-        <v-icon type="base-back" />
-      </div>
-      <div class="m-box m-aln-center m-flex-auto m-justify-center m-head-top-title">
-        <span>{{ step === 1 ? '基本信息' : '上传资料' }}</span>
-      </div>
-      <div class="m-box m-aln-center m-flex-none btn-submit">
-        <span
-          v-show="step === 2"
-          :class="['btn-submit', disabled]"
-          @click="validate(onSubmit)">提交</span>
-      </div>
-    </header>
+
+    <common-header :back="back">
+      {{ step === 1 ? '基本信息' : '上传资料' }}
+      <span
+        v-show="step === 2"
+        slot="right"
+        :class="['btn-submit', disabled]"
+        @click="validate(onSubmit)">提交</span>
+    </common-header>
 
     <transition-group
       :enter-active-class="animated.enter"
@@ -315,6 +308,9 @@ export default {
     });
   },
   methods: {
+    back() {
+      this.step > 1 ? this.step-- : this.goBack();
+    },
     onSubmit() {
       const postData = Object.assign({ files: this.files }, this.formData);
       if (this.status === 0) {
diff --git a/src/page/profile/Certification.vue b/src/page/profile/Certification.vue
index 41d620ab..6ee54d7b 100644
--- a/src/page/profile/Certification.vue
+++ b/src/page/profile/Certification.vue
@@ -1,16 +1,8 @@
 <template>
   <div class="p-profile-certification">
-    <header class="m-box m-pos-f m-main m-bb1 m-head-top">
-      <div
-        class="m-box m-aln-center m-flex-none"
-        @click="goBack">
-        <v-icon type="base-back" />
-      </div>
-      <div class="m-box m-aln-center m-flex-auto m-justify-center m-head-top-title">
-        <span>{{ type === 'user' ? '个人' : '企业' }}认证</span>
-      </div>
-      <div class="m-box m-aln-center m-flex-none btn-submit"/>
-    </header>
+
+    <common-header>{{ type === 'user' ? '个人' : '企业' }}认证</common-header>
+
     <main class="m-box-model main">
       <div
         v-if="verified.status === 0"
@@ -55,6 +47,7 @@
         </div>
       </div>
     </main>
+
   </div>
 </template>
 
@@ -131,8 +124,6 @@ export default {
   background-color: #fff;
 
   main {
-    padding-top: 0.9rem;
-
     .info-bar {
       background-color: #4bb893;
       color: #fff;