Merge branch 'main' of https://git.evo-techina.com/hbyt/hd-miniprogram

src/components/mytabbar/mytabbar.vue

@@ -66,6 +66,7 @@
 								uni.scanCode({
 									onlyFromCamera:true,
 									success(res){
+										console.log(res)
 										let pars = ''
 										if(res.path){
 											pars = res.path.split('?')[1]

src/pages.json

@@ -72,6 +72,9 @@
 				},
 				{
 					"path": "company/index"		//所属公司
+				},
+				{
+					"path": "invoice/index"		//电子发票
 				}
 			]
 		}

src/utils/request.ts

@@ -31,8 +31,8 @@ export function request(method:any,url:string,data?:any,isLoading?:any){
 			//url:`${conf.config.apiBaseUrl}${url}`,
 			//url:'http://192.168.5.200:9104'+ url,
 			//url:'http://192.168.7.152:9104'+ url,
-			//url:'http://192.168.5.14:9104'+ url,
-			url:'https://api.evo-techina.com'+url,
+			url:'http://192.168.5.14:9104'+ url,
+			//url:'https://api.evo-techina.com'+url,
 			//url:'http://192.168.7.152:9100'+ url,
 			method,
 			data:data,