tremble 5 năm trước cách đây
mục cha
commit
86f4421581

+ 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))

+ 2 - 2
mobile/src/pages/account/manage/payselect/index.vue

@@ -81,8 +81,8 @@ export default {
 
       if (PAYS[item.id] !== 'paypal') {
         if (this.isWeixin) {
-          let href = spaceId ? `https://open.weixin.qq.com/connect/oauth2/authorize?redirect_uri=http%3a%2f%2fwww.4dkankan.com%2fapi%2forder%2fpay%2fwechatPreJsPay%3forderId=${orderId}%26spaceId=${spaceId || null}%26orderType=${Number(orderType)}&appid=wx779dbafb46bab697&response_type=code&scope=snsapi_base&state=1&connect_redirect=1#wechat_redirect`
-            : `https://open.weixin.qq.com/connect/oauth2/authorize?redirect_uri=http%3a%2f%2fwww.4dkankan.com%2fapi%2forder%2fpay%2fwechatPreJsPay%3forderId=${orderId}%26orderType=${Number(orderType)}&appid=wx779dbafb46bab697&response_type=code&scope=snsapi_base&state=1&connect_redirect=1#wechat_redirect`
+          let href = spaceId ? `https://open.weixin.qq.com/connect/oauth2/authorize?redirect_uri=http%3a%2f%2ftest.4dkankan.com%2fapi%2forder%2fpay%2fwechatPreJsPay%3forderId=${orderId}%26spaceId=${spaceId || null}%26orderType=${Number(orderType)}&appid=wx779dbafb46bab697&response_type=code&scope=snsapi_base&state=1&connect_redirect=1#wechat_redirect`
+            : `https://open.weixin.qq.com/connect/oauth2/authorize?redirect_uri=http%3a%2f%2ftest.4dkankan.com%2fapi%2forder%2fpay%2fwechatPreJsPay%3forderId=${orderId}%26orderType=${Number(orderType)}&appid=wx779dbafb46bab697&response_type=code&scope=snsapi_base&state=1&connect_redirect=1#wechat_redirect`
           return location.replace(href)
         }
         let response = await this.$http

+ 1 - 1
mobile/src/pages/account/manage/submit/index.vue

@@ -217,7 +217,7 @@ export default {
 
       if (Number(payType) !== 2) {
         if (this.isWeixin) {
-          return location.replace(`https://open.weixin.qq.com/connect/oauth2/authorize?redirect_uri=http%3a%2f%2fwww.4dkankan.com%2fapi%2forder%2fpay%2fwechatPreJsPay%3forderId=${this.orderId}%26orderType=${Number(this.orderType)}&appid=wx779dbafb46bab697&response_type=code&scope=snsapi_base&state=1&connect_redirect=1#wechat_redirect`)
+          return location.replace(`https://open.weixin.qq.com/connect/oauth2/authorize?redirect_uri=http%3a%2f%2ftest.4dkankan.com%2fapi%2forder%2fpay%2fwechatPreJsPay%3forderId=${this.orderId}%26orderType=${Number(this.orderType)}&appid=wx779dbafb46bab697&response_type=code&scope=snsapi_base&state=1&connect_redirect=1#wechat_redirect`)
         }
         let response = await this.$http
           .post(`order/pay/${paytypes[payType]}`, data, {

+ 2 - 6
mobile/src/pages/account/register/index.vue

@@ -108,15 +108,11 @@ 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[3008])
-      }
       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

+ 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)

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

@@ -78,10 +78,12 @@ export default {
     let username = localStorage.getItem('username')
     let password = localStorage.getItem('password')
 
+    console.log(remember)
+
     return {
       phone: username,
       password: password,
-      rememberMe: remember,
+      rememberMe: parseInt(remember),
       codeImg: '',
       isFirst: true,
       t1: null,
@@ -150,12 +152,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))

+ 2 - 6
pc/src/page/layout/aside/temp/ltemp/register.vue

@@ -98,15 +98,11 @@ 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[3008])
-      }
       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