Merge remote-tracking branch 'origin/dev' into feature-hb

components/mobile/changeManager/StepAppeal.vue

@@ -66,7 +66,7 @@
                       placeholder="注册地址"
                       v-model="regAddress"
                       @click.native="chooseAddress"></mt-field>
-            <i class="fa fa-map-marker fa-p"></i>
+            <i class="fa fa-map-marker fa-p" v-show="regAddress.length === 0"></i>
           </div>
           <div class="page-part">
             <mt-field placeholder="申诉说明"

components/mobile/enterpriseCertification/stepOne.vue

@@ -47,7 +47,7 @@
                       placeholder="注册地址"
                       v-model="regAddress"
                       @click.native="chooseAddress"></mt-field>
-            <i class="fa fa-map-marker fa-p"></i>
+            <i class="fa fa-map-marker fa-p" v-show="regAddress.length === 0"></i>
           </div>
           <div class="form-btn">
             <div class="page-part">

components/mobile/reset/stepBefore.vue

@@ -14,7 +14,7 @@
                   v-model="password"></mt-field>
       </div>
       <div class="page-part">
-        <mt-button size="large" type="primary" @click="sureAccount('new')">下一步</mt-button>
+        <mt-button size="large" type="primary" @click="sureAccount('security')">下一步</mt-button>
       </div>
     </div>
   </div>

components/reset/PasswordStepBefore.vue

@@ -88,7 +88,7 @@
             .then(response => {
               this.isShowLoading = false
               if (response.data.success) {
-                this.$emit('stepEvent', 'new')
+                this.$emit('stepEvent', 'security')
                 this.$emit('tokenEvent', response.data.content.token)
               } else {
                 return Promise.reject(response.data)

components/validation/EmailStepJump.vue

@@ -0,0 +1,53 @@
+<template>
+  <div class="validation">
+    <div class="jump">
+      <loading/>
+      <p>跳转中，请稍后...</p>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Loading from '~components/common/loading/Loading.vue'
+  export default {
+    name: 'validation',
+    props: ['tokenId'],
+    components: {
+      Loading
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.jump()
+      })
+    },
+    methods: {
+      jump () {
+        this.$http.get(`/update/user/email`, {params: {token: this.$route.query.token ? this.$route.query.token : this.tokenId}})
+          .then(response => {
+            if (response.data.success) {
+              this.$emit('stepEvent', 'last')
+            } else {
+              this.$emit('stepEvent', 'fail')
+              return Promise.reject(response.data)
+            }
+          }).catch(err => {
+            this.$message.error(err.errMsg)
+          })
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .jump{
+    p{
+      position: fixed;
+      left: 0;
+      right:0;
+      top: 54%;
+      z-index: 1000;
+      text-align: center;
+      font-size: 14px;
+      color:#333;
+    }
+  }
+</style>

components/validation/index.js

@@ -9,6 +9,7 @@ import EmailStepMobile from './EmailStepMobile.vue'
 import EmailStepEmail from './EmailStepEmail.vue'
 import EmailStepSecurity from './EmailStepSecurity.vue'
 import EmailStepNew from './EmailStepNew.vue'
+// import EmailStepJump from './EmailStepJump.vue'
 import EmailStepSuccess from './EmailStepSuccess.vue'
 import ValidationFail from './ValidationFail.vue'