代码合并

2024-10-23 13:56:39 +08:00
parent a37c89eb72 076fa01fef
commit 6383be3082
6 changed files with 23 additions and 14 deletions
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -229,7 +229,7 @@
 		
 		{
 			title: '退出登录',
-			icon: '/static/indexImg/PAGE_SALES_SUMMARY.svg',
+			icon: '/static/indexImg/icon-login-out.svg',
 			pageUrl: 'PAGES_LOGIN',
 			clickFunc:()=>{
 				storageManage.cleanByLogout()
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -259,10 +259,12 @@

 	function accountTypeChange(e) {
 		// #ifdef H5
-		if (e == 1) {
-			// vdata.formData.merchantName = '18049104914'
-			// vdata.formData.merchantName = ''
-			// vdata.formData.username = ''
+		if(e==1){
+			vdata.formData.merchantName = '18049104914'
+			vdata.formData.username = '13666666666'
+			vdata.formData.pwd = '123456'
+		}else{
+			vdata.formData.pwd = 'qwer1234'
 		}
 		// #endif
 	}