1

property_ui/api/logins.js

@@ -0,0 +1,111 @@
+import request from '@/utils/request'
+
+// 登录方法tenantId,
+export function login(username, password, code, uuid,clientId,grantType,phonenumber,smsCode) {
+  const data = {
+    username,
+    password,
+    code,
+    uuid,
+	clientId,
+	grantType,
+	phonenumber,smsCode
+  }
+  return request({///auth
+    'url': '/login',
+    headers: {
+      isToken: false
+    },
+    'method': 'post',
+    'data': data
+  })
+}
+// 解码接口
+export function getweChatOpenid(data) {
+  return request({
+    'url': '/weChatOpenid',
+    'method': 'post',
+	'data':data
+  })
+}
+// 微信登录
+export function getweChatLogin(data) {
+  return request({
+    'url': '/auth/weChatLogin',
+    'method': 'post',
+	'data':data
+  })
+}
+// 获取用户详细信息
+export function getInfo() {///system/user
+  return request({
+    'url': '/getInfo',
+    'method': 'get'
+  })
+}
+// 获取用户详细信息
+export function gettenantList() {
+  return request({
+    'url': '/auth/tenant/list',
+    'method': 'get'
+  })
+}
+// 注册方法
+export function register(data) {
+  return request({
+    url: '/auth/register',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data: data
+  })
+}
+// 通用注册
+export function getRegisterFn(data) {
+  return request({
+    'url': '/register/common',
+    'method': 'post',
+	'data':data
+  })
+}
+export function sendSmszcOnly(data) {
+  return request({
+    'url': '/sendSms/sendRegisterSms',
+    'method': 'POST',
+	data:data
+  })
+}
+
+export function sendSmsCode(data) {
+  return request({
+    'url': '/wuYe/resource/sms/code',
+    'method': 'get',
+	data:data
+  })
+}
+// 退出方法
+export function logout() {
+  return request({
+    'url': '/auth/logout',
+    'method': 'post'
+  })
+}
+// 切换租户
+export function gettenantCheck(data) {
+  return request({
+    'url': '/system/tenant/dynamic/'+data,
+    'method': 'get',
+  })
+}
+// 获取验证码 /auth/code
+export function getCodeImg() {
+  return request({
+    'url': '/captchaImage',
+    headers: {
+      isToken: false
+    },
+    method: 'get',
+    timeout: 20000
+  })
+}

property_ui/pages/register.vue → property_ui/mine/pages/register.vue

@@ -99,7 +99,7 @@
 	
 	methods:{
 		getlogin(){
-			this.$tab.redirectTo(`/pages/tlogin?type=1`)
+			this.$tab.redirectTo(`/mine/pages/tlogin?type=1`)
 		},
 		handlePrivacy(){
 			this.$tab.navigateTo(`/pages/agreement`)  

property_ui/pages/tlogin.vue → property_ui/mine/pages/tlogin.vue

@@ -175,7 +175,7 @@
 			this.$tab.navigateTo(`/mine/pages/pwd/forgetpwd`)
 		},
 		 getregister(){
-			 this.$tab.redirectTo(`/pages/register`)
+			 this.$tab.redirectTo(`/mine/pages/register`)
 			 // this.$tab.navigateTo(`/mine/pages/mine/applyregister`)
 			 // this.$tab.navigateTo(`/mine/pages/mine/auth`)
 		 },

property_ui/pages.json

@@ -20,22 +20,7 @@
 	      "navigationBarTitleText": "康养",
 	      "navigationStyle": "custom"
 	    }
-	  },
-	 
-  {
-    "path": "pages/tlogin",
-    "style": {
-      "navigationBarTitleText": "登录",
-  	  "navigationStyle": "custom"
-    }
-  }, 
-  {
-    "path": "pages/register",
-    "style": {
-      "navigationBarTitleText": "注册",
-	  "navigationStyle": "custom"
-    }
-  },  
+	  }, 
   {
     "path": "pages/agreement",
     "style": {
@@ -178,6 +163,13 @@
 	{
 		"root": "mine",
 		"pages": [
+			{
+			  "path": "pages/register",
+			  "style": {
+			    "navigationBarTitleText": "注册",
+				  "navigationStyle": "custom"
+			  }
+			},
 			{
 			  "path": "pages/news/index",
 			  "style": {
@@ -185,6 +177,13 @@
 				"h5":{"titleNView":false}
 			  }
 			},
+			{
+			  "path": "pages/tlogin",
+			  "style": {
+			    "navigationBarTitleText": "登录",
+				  "navigationStyle": "custom"
+			  }
+			},
 			{
 			  "path": "pages/info",
 			  "style": {

property_ui/pages/login.vue

@@ -63,10 +63,10 @@
 				this.$tab.navigateTo(`/pages/agreement`)
 			},
 			getlogin(e){
-				this.$tab.navigateTo(`/pages/tlogin?type=${e}`)
+				this.$tab.navigateTo(`/mine/pages/tlogin?type=${e}`)
 			},
 			getregister(){
-				this.$tab.navigateTo(`/pages/register`)
+				this.$tab.navigateTo(`/mine/pages/register`)
 			},
 			async getuserinfo(e) {
 				// if(!this.checkflag){

property_ui/permission.js

@@ -5,7 +5,7 @@ const loginPage = "/pages/login"
   
 // 页面白名单
 const whiteList = ['/pages/index/index','/pages/agreement',
-  '/pages/login','/pages/tlogin', '/pages/register', '/pages/common/webview/index','/mine/pages/pwd/resetpwd','/mine/pages/pwd/forgetpwd',
+  '/pages/login','/mine/pages/tlogin', '/mine/pages/register', '/pages/common/webview/index','/mine/pages/pwd/resetpwd','/mine/pages/pwd/forgetpwd',
 ]
 
 // 检查地址白名单