Merge branch 'master' of http://192.168.1.218:3000/hmp/guosen-ldt-client

assets/http/api.js

@@ -26,11 +26,10 @@ const loginUser={
 	detail:p => http.get('cyzh-ldt/loginuser/detail', {params:p}),
 	submit:p => http.post('cyzh-ldt/loginuser/submit', p),
 	login:p => http.post('cyzh-ldt/loginuser/login', p),
-	payBefore:p => http.post('cyzh-ldt/loginuser/payBefore', p),
+	payBefore:p => http.post('cyzh-ldt/loginuser/payBeforeNew', p),
 	payBeforeForNormal:p => http.post('cyzh-ldt/loginuser/payBeforeForNormal', p),
 	getBillrecordFromRedis:p => http.get('cyzh-ldt/loginuser/getBillrecordFromRedis', {params:p}),
 	clearBillRecordCache:p => http.get('cyzh-ldt/loginuser/clearBillRecordCache', {params:p}),
-	
 }
 
 //商户管理

assets/http/global.js

@@ -1,9 +1,9 @@
 let global = {}
 
 // global.baseUrl='http://192.168.1.244:1888/api/'
-// global.baseUrl='https://ldt.guosen-fumao.cn/api/'
+global.baseUrl='https://ldt.guosen-fumao.cn/api/'
 
-global.baseUrl='http://localhost:2539/'
+// global.baseUrl='http://localhost:2539/'
 
 global.WebSocketUrl='wss://ldt.guosen-fumao.cn/websocket/'