tremble 5 vuotta sitten
vanhempi
commit
3ed071709b

+ 0 - 5
mobile/src/pages/account/codeLogin/index.vue

@@ -87,12 +87,7 @@ export default {
       // if (!reg.phone.test(this.phone)) {
       //   return
       // }
-      let resp = await this.$http
-        .post('/sso/user/checkUser', {phoneNum: this.phone})
 
-      if (resp.data.code !== 0) {
-        return this.$toast.show('warn', this.langToast[resp.data.code])
-      }
       let res = await this.$store.dispatch('getAuthCode', {
         phone: this.phone,
         code: Number(this.codeActive[1].substr(1))

+ 3 - 1
mobile/src/pages/account/register/index.vue

@@ -108,9 +108,11 @@ export default {
       // if (!reg.phone.test(this.phone)) {
       //   return
       // }
+
       let res = await this.$store.dispatch('getAuthCode', {
         phone: this.phone,
-        code: Number(this.codeActive[1].substr(1))
+        code: Number(this.codeActive[1].substr(1)),
+        type: 'resigter'
       })
       if (res) {
         this.interl && clearInterval(this.interl)

+ 17 - 1
mobile/src/store/user.js

@@ -341,9 +341,25 @@ export default {
     async getAuthCode (context, item) {
       let toastCode = localStorage.getItem('language') === 'en' ? toastEN : toastZH
 
-      let {phone, code} = item
+      let {phone, code, type = ''} = item
       let areaNum = Number(code) || 86
       if (phone) {
+        let resp = await http
+          .post('/sso/user/checkUser', {phoneNum: phone})
+
+        switch (type) {
+          case 'resigter':
+            if (resp.data.code === 0) {
+              return vue.$toast.show('warn', toastCode[3008])
+            }
+            break
+
+          default:
+            if (resp.data.code !== 0) {
+              return vue.$toast.show('warn', toastCode[resp.data.code])
+            }
+            break
+        }
         let params = {
           phoneNum: Number(phone),
           areaNum

+ 2 - 2
pc/src/page/layout/aside/temp/ctemp/detail.vue

@@ -186,8 +186,8 @@
             <span>
               <img v-if="showCluse" :src="`${$cdn}images/icon-click.png`" alt="">
             </span>
-            <!-- <router-link class="jump-a" target="_blank" :to="{name: 'service_list', params: {id: 'clause', active: 'pro'}}">同意商城销售协议</router-link> -->
-            <span>同意商城销售协议</span>
+            <!-- <router-link class="jump-a" target="_blank" :to="{name: 'service_list', params: {id: 'clause', active: 'pro'}}">同意四维看看销售协议</router-link> -->
+            <span>同意四维看看销售协议</span>
           </div>
           <div class="c-button purchase" :style="{backgroundColor:showCluse?'#1fe4dc':'#e2e2e2'}" @click="pay">付款</div>
         </div>

+ 1 - 0
pc/src/page/layout/aside/temp/ltemp/forget.vue

@@ -70,6 +70,7 @@ export default {
       // if (!reg.phone.test(this.phone)) {
       //   return
       // }
+
       let res = await this.$store.dispatch('getAuthCode', {
         phone: this.phone,
         code: this.codeActive[1].substr(1)

+ 1 - 6
pc/src/page/layout/aside/temp/ltemp/login.vue

@@ -81,7 +81,7 @@ export default {
     return {
       phone: username,
       password: password,
-      rememberMe: remember,
+      rememberMe: parseInt(remember),
       codeImg: '',
       isFirst: true,
       t1: null,
@@ -150,12 +150,7 @@ export default {
       // if (!reg.phone.test(this.phone)) {
       //   return
       // }
-      let resp = await this.$http
-        .post('/sso/user/checkUser', {phoneNum: this.phone})
 
-      if (resp.data.code !== 0) {
-        return this.$toast.show('warn', this.langToast[resp.data.code])
-      }
       let res = await this.$store.dispatch('getAuthCode', {
         phone: this.phone,
         code: Number(this.codeActive[1].substr(1))

+ 3 - 1
pc/src/page/layout/aside/temp/ltemp/register.vue

@@ -98,9 +98,11 @@ export default {
       // if (!reg.phone.test(this.phone)) {
       //   return
       // }
+
       let res = await this.$store.dispatch('getAuthCode', {
         phone: this.phone,
-        code: Number(this.codeActive[1].substr(1))
+        code: Number(this.codeActive[1].substr(1)),
+        type: 'resigter'
       })
       if (res) {
         this.interl && clearInterval(this.interl)

+ 18 - 1
pc/src/store/user.js

@@ -404,9 +404,26 @@ export default {
     async getAuthCode (context, item) {
       let toastCode = localStorage.getItem('language') === 'en' ? toastEN : toastZH
 
-      let {phone, code} = item
+      let {phone, code, type = ''} = item
       let areaNum = Number(code) || 86
+
       if (phone) {
+        let resp = await http
+          .post('/sso/user/checkUser', {phoneNum: phone})
+
+        switch (type) {
+          case 'resigter':
+            if (resp.data.code === 0) {
+              return vue.$toast.show('warn', toastCode[3008])
+            }
+            break
+
+          default:
+            if (resp.data.code !== 0) {
+              return vue.$toast.show('warn', toastCode[resp.data.code])
+            }
+            break
+        }
         let params = {
           phoneNum: Number(phone),
           areaNum