如果商户、代理已经是登录状态，则进入登录页后自动调整到各自主页

agentApp/common/api.js

@@ -53,8 +53,11 @@ export const userWithdrawList = (params) => http.post(baseUrl + '/api/user/withd
 
 
 // 带上代理token
-const agentConfig = function() {
+const agentConfig = function(toast) {
 	return {
+		custom: {
+			toast
+		},
 		header: {
 			'Agent-Token': uni.getStorageSync('agent_token')
 		}
@@ -62,7 +65,7 @@ const agentConfig = function() {
 }
 
 export const agentSmsLogin = (params) => http.post(baseUrl + '/api/agent/smsLogin', params)
-export const agentAccountInfo = (params) => http.post(baseUrl + '/api/agent/accountInfo', params, agentConfig())
+export const agentAccountInfo = (params, toast) => http.post(baseUrl + '/api/agent/accountInfo', params, agentConfig(toast))
 export const agentMerchantList = (params) => http.post(baseUrl + '/api/agent/merchantList', params, agentConfig())
 export const agentOrderList = (params) => http.post(baseUrl + '/api/agent/orderList', params, agentConfig())
 export const agentFillAlipayAccount = (params) => http.post(baseUrl + '/api/agent/fillAlipayAccount', params, agentConfig())
@@ -71,8 +74,11 @@ export const agentWithdrawList = (params) => http.post(baseUrl + '/api/agent/wit
 
 
 // 带上商户token
-const merchantConfig = function() {
+const merchantConfig = function(toast) {
 	return {
+		custom: {
+			toast
+		},
 		header: {
 			'Merchant-Token': uni.getStorageSync('merchant_token')
 		}
@@ -80,7 +86,7 @@ const merchantConfig = function() {
 }
 
 export const merchantSmsLogin = (params) => http.post(baseUrl + '/api/merchant/smsLogin', params)
-export const merchantAccountInfo = (params) => http.post(baseUrl + '/api/merchant/accountInfo', params, merchantConfig())
+export const merchantAccountInfo = (params, toast) => http.post(baseUrl + '/api/merchant/accountInfo', params, merchantConfig(toast))
 export const merchantOrderList = (params) => http.post(baseUrl + '/api/merchant/orderList', params, merchantConfig())
 export const merchantOrderRefund = (params) => http.post(baseUrl + '/api/merchant/orderRefund', params, merchantConfig())
 export const merchantFillAlipayAccount = (params) => http.post(baseUrl + '/api/merchant/fillAlipayAccount', params, merchantConfig())

agentApp/pages/agent-login/index.vue

@@ -41,7 +41,8 @@
 <script>
 	import {
 		publicSendSms,
-		agentSmsLogin
+		agentSmsLogin,
+		agentAccountInfo
 	} from '../../common/api.js'
 	import md5 from 'js-md5'
 
@@ -58,6 +59,14 @@
 				countdown: 0
 			};
 		},
+		onLoad() {
+			// 如果已登录就跳转到代理主页
+			agentAccountInfo({}, false).then(data => {
+				uni.navigateTo({
+					url: '/pages/agent-index/index'
+				});
+			})
+		},
 		methods: {
 			getCode() {
 				if (!this.phone) {

agentApp/pages/merchant-login/index.vue

@@ -41,7 +41,8 @@
 <script>
 	import {
 		publicSendSms,
-		merchantSmsLogin
+		merchantSmsLogin,
+		merchantAccountInfo
 	} from '../../common/api.js'
 	import md5 from 'js-md5'
 
@@ -58,6 +59,14 @@
 				countdown: 0
 			};
 		},
+		onLoad() {
+			// 如果已登录就跳转到商户主页
+			merchantAccountInfo({}, false).then(data => {
+				uni.navigateTo({
+					url: '/pages/merchant-index/index'
+				});
+			})
+		},
 		methods: {
 			getCode() {
 				if (!this.phone) {