no message

api/common.js

@@ -2,10 +2,10 @@ import {request} from '@/service/ajax'
 
 const commonUrl = '/api/common/'
 // 发送短信
-export const commonSend = (data) => request(commonUrl + 'send', 'post', { ...data })
+export const commonSend = (data) => request(commonUrl + 'send', 'post', { ...data },true,true)
 export const getRegion = (data) => request(commonUrl + 'region', 'post', { ...data })
 export const getTxySts = (data) => request(commonUrl + 'tx-sts', 'post', { ...data })
-export const getMessage = (data) => request(commonUrl + 'message', 'post', { ...data },false)
+export const getMessage = (data) => request(commonUrl + 'message', 'get', { ...data },false,true)
 export const getBaiDuImgRecognition = (data) => request(commonUrl + 'recognition', 'post', { ...data })
 export const getSn = (data) => request(commonUrl + 'sn', 'post', { ...data },true)
 

api/login.js

@@ -1,9 +1,9 @@
 import {request} from '@/service/ajax'
 
-const newsUrl = '/api/member/'
+const newsUrl = '/api/'
 // 登陆
-export const login = (data) => request(newsUrl + 'login', 'post', { ...data },false)
+export const login = (data) => request(newsUrl + 'login', 'post', { ...data },false,true)
 //微信登陆
-export const wxLogin = (data) => request(newsUrl + 'wx-login', 'post', { ...data },true)
-export const register = (data) => request(newsUrl + 'register', 'post', { ...data },true)
-export const retrievePassword = (data) => request(newsUrl + 'retrieve', 'post', { ...data },false)
+export const wxLogin = (data) => request(newsUrl + 'wx-login', 'post', { ...data },true,true)
+export const register = (data) => request(newsUrl + 'register', 'post', { ...data },true,true)
+export const retrievePassword = (data) => request(newsUrl + 'retrieve', 'post', { ...data },false,true)

page_subpack/system_setting/system_setting.vue

@@ -190,7 +190,7 @@
               'send_type': 'retrieve',
               'wxCode':loginRes.code
             }).then((res) => {
-              if (res.code === 1) {
+              if (res.code === 0) {
                 tools.success(res.msg);
                 this.timeNum = 60;
                 this.timer = setInterval(() => {

pages/login/forget.vue

@@ -69,6 +69,9 @@ export default {
       },
       deep: true
     },
+    'isConsent':function (){
+      this.verifyData(false)
+    }
   },
   methods: {
     goToUrl(type) {
@@ -116,6 +119,7 @@ export default {
           this.$refs.agreement.setConsentShake()
         }
       }
+      console.log(isRegister,this.accountData,this.isConsent)
       if (!isRegister) {
         setTimeout(() => {
           if (this.shakeNum > 0) this.shakeNum = 0
@@ -130,12 +134,11 @@ export default {
         return;
       }
       if (this.isAJAX) {
-        return
+        // return
       }
       this.isAJAX = true
       retrievePassword(this.accountData).then((res) => {
-        if (res.code === 1) {
-          tools.setLoginData(res.data, false)
+        if (res.code === 0) {
           tools.success('修改成功')
           setTimeout(() => {
             this.isAJAX = false;
@@ -170,7 +173,7 @@ export default {
             'send_type': 'register',
             'wxCode':loginRes.code
           }).then((res) => {
-            if (res.code === 1) {
+            if (res.code === 0) {
               tools.success(res.msg);
               this.timeNum = 60;
               this.timer = setInterval(() => {

pages/login/index.vue

@@ -136,14 +136,14 @@
 						}).then((res) => {
 							if (res.code === 403) {
 								tools.error('当前用户未注册')
-								uni.setStorageSync('openid', res.data.openid)
+								// uni.setStorageSync('openid', res.data.openid)
 								setTimeout(() => {
 									//跳转至注册页面
 									uni.navigateTo({
 										url: '/pages/login/register'
 									});
 								}, 1500)
-							} else if (res.code === 1) {
+							} else if (res.code === 0) {
                 if (res.data.status * 1 === 0){
                   tools.error('信息正在审核...')
                 }else {
@@ -212,8 +212,9 @@
 					tools.error('请阅读并同意协议');
 					return;
 				}
+        this.loginData.tabType=this.type===1?1:0
 				login(this.loginData).then((res) => {
-					if (res.code === 1) {
+					if (res.code === 0) {
 						tools.setLoginData(res.data, true)
 					} else {
 						tools.error(res.msg)
@@ -245,10 +246,10 @@
           success: (loginRes) => {
             commonSend({
               'phone': this.loginData.phone,
-              'send_type': 'retrieve',
+              'smsType': 'retrieve',
               'wxCode':loginRes.code
             }).then((res) => {
-              if (res.code === 1) {
+              if (res.code === 0) {
                 tools.success(res.msg);
                 this.timeNum = 60;
                 this.timer = setInterval(() => {

pages/login/model/agreement.vue

@@ -55,7 +55,7 @@ export default {
       const res = await getMessage({
         type: 2
       })
-      if (res.code === 1) {
+      if (res.code === 0) {
         this.content = tools.imgDeal(res.data)
       }
     },
@@ -65,7 +65,6 @@ export default {
       this.$refs.consentObj.open('bottom')
     },
     moveHandle() {
-      console.log('--------------------------------hhhhhhhhhhhhhh')
       return false
     },
     setIsConsent(){

pages/login/register.vue

@@ -223,7 +223,7 @@ export default {
         success: (loginRes) => {
           this.accountData.wxCode=loginRes.code;
           register(this.accountData).then((res)=>{
-            if(res.code===1){
+            if(res.code===0){
               tools.setLoginData(res.data,false)
               tools.success('注册成功')
               setTimeout(()=>{
@@ -266,7 +266,7 @@ export default {
             'send_type': 'register',
             'wxCode':loginRes.code
           }).then((res) => {
-            if (res.code === 1) {
+            if (res.code === 0) {
               tools.success(res.msg);
               this.timeNum = 60;
               this.timer = setInterval(() => {

service/router.js

@@ -15,7 +15,7 @@ const router = createRouter({
     routes: [...ROUTES]
 });
 //全局路由前置守卫
-const whiteList = ['/pages/login/index','/pages/login/register']
+const whiteList = ['/pages/login/index','/pages/login/register','/pages/login/forget']
 
 router.beforeEach(async (to, from, next) => {
     // tools.showLoading()