Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

pages/index/index.vue

@@ -119,11 +119,11 @@
 			icon: '/static/indexImg/icon-work.svg',
 			pageUrl: 'PAGES_WORK_INDEX',
 		},
-		{
-			title: '极速开票',
-			icon: '/static/indexImg/red-envelope.svg',
-			pageUrl: 'PAGES_INVOICE'
-		},
+		// {
+		// 	title: '极速开票',
+		// 	icon: '/static/indexImg/red-envelope.svg',
+		// 	pageUrl: 'PAGES_INVOICE'
+		// },
 		{
 			title: '排队',
 			icon: '/static/indexImg/icon-line-up.svg',
@@ -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()

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
 	}