登录页onLoad改成onShow

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.json

@@ -42,7 +42,7 @@
 			}
 		},
 		{
-			"path": "pages/cash/cash",
+			"path": "pages/agent-withdraw/agent-withdraw",
 			"style": {
 				"navigationBarTitleText": "代理提现",
 				"navigationBarBackgroundColor": "#1783FF",
@@ -58,7 +58,7 @@
 			}
 		},
 		{
-			"path": "pages/history/history",
+			"path": "pages/agent-withdraw-history/agent-withdraw-history",
 			"style": {
 				"navigationBarTitleText": "代理提现历史",
 				"navigationBarBackgroundColor": "#1783FF",

agentApp/pages/account-opened/account-opened.vue

@@ -91,7 +91,7 @@ export default {
 	methods: {
 		cashManager() {
 			uni.navigateTo({
-				url: '/pages/history/history'
+				url: '/pages/agent-withdraw-history/agent-withdraw-history'
 			});
 		}
 	}

agentApp/pages/agent-index/index.vue

@@ -115,7 +115,7 @@
 			},
 			cashManager() {
 				uni.navigateTo({
-					url: '/pages/cash/cash'
+					url: '/pages/agent-withdraw/agent-withdraw'
 				});
 			}
 		},

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
 			};
 		},
+		onShow() {
+			// 如果已登录就跳转到代理主页
+			agentAccountInfo({}, false).then(data => {
+				uni.navigateTo({
+					url: '/pages/agent-index/index'
+				});
+			})
+		},
 		methods: {
 			getCode() {
 				if (!this.phone) {

agentApp/pages/cash/cash.vue → agentApp/pages/agent-withdraw/agent-withdraw.vue

@@ -119,7 +119,7 @@
 				<view class="fee-desc">
 					扣手续费{{calcFee}}元，实际到账{{calcReceiveAmount}}元
 				</view>
-				<view class="tips">
+				<view class="tips" v-if="sysConfig.withdraw_tips">
 					<view class="tips-item" v-for="(line,index) in sysConfig.withdraw_tips.split('\n')" :key="index">{{line}}
 					</view>
 				</view>
@@ -213,7 +213,7 @@
 			},
 			cashManager() {
 				uni.navigateTo({
-					url: '/pages/history/history'
+					url: '/pages/agent-withdraw-history/agent-withdraw-history'
 				});
 			},
 			getSysConfig() {

agentApp/pages/allpages/index.vue

@@ -58,7 +58,7 @@
 					
 					case 17:
 					uni.navigateTo({
-						url: '/pages/history/history'
+						url: '/pages/agent-withdraw-history/agent-withdraw-history'
 					});
 					break;
 					case 20:
@@ -100,7 +100,7 @@
 					break;
 					case 11:
 					uni.navigateTo({
-						url: '/pages/cash/cash'
+						url: '/pages/agent-withdraw/agent-withdraw'
 					});
 					break;
 					case 12:
@@ -110,7 +110,7 @@
 					break;
 					case 13:
 					uni.navigateTo({
-						url: '/pages/history/history'
+						url: '/pages/agent-withdraw-history/agent-withdraw-history'
 					});
 					break;
 					default: 

agentApp/pages/cashdetail/cashdetail.vue

@@ -91,7 +91,7 @@ export default {
 	methods: {
 		cashManager() {
 			uni.navigateTo({
-				url: '/pages/history/history'
+				url: '/pages/agent-withdraw-history/agent-withdraw-history'
 			});
 		}
 	}

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
 			};
 		},
+		onShow() {
+			// 如果已登录就跳转到商户主页
+			merchantAccountInfo({}, false).then(data => {
+				uni.navigateTo({
+					url: '/pages/merchant-index/index'
+				});
+			})
+		},
 		methods: {
 			getCode() {
 				if (!this.phone) {

agentApp/pages/merchant-withdrawal-management/merchant-withdrawal-management.vue

@@ -119,7 +119,7 @@
 				<view class="fee-desc">
 					扣手续费{{calcFee}}元，实际到账{{calcReceiveAmount}}元
 				</view>
-				<view class="tips">
+				<view class="tips" v-if="sysConfig.withdraw_tips">
 					<view class="tips-item" v-for="(line,index) in sysConfig.withdraw_tips.split('\r\n')" :key="index">{{line}}</view>
 				</view>
 			</view>

agentApp/pages/withdrawal-management/withdrawal-management.vue

@@ -119,7 +119,7 @@
 				<view class="fee-desc">
 					扣手续费{{calcFee}}元，实际到账{{calcReceiveAmount}}元
 				</view>
-				<view class="tips">
+				<view class="tips" v-if="sysConfig.withdraw_tips">
 					<view class="tips-item" v-for="(line,index) in sysConfig.withdraw_tips.split('\n')" :key="index">{{line}}</view>
 				</view>
 			</view>