Merge branch 'main' of http://10.10.14.176:3000/huanghai/YltProject

MiniProgram/rzyc-weapp-ylt-main/src/services/charging.ts

@@ -58,7 +58,7 @@ export type IsThirdPartyStationReq = {
 };
 export const isThirdPartyStation = async (params: IsThirdPartyStationReq) => {
   const res = await RzRequest.postNew(
-    '/ZhuQue/Ylt/isThirdPartyStation',
+    '/ZhuQue/station/isThirdPartyStation',
     params
   );
   return res;

MiniProgram/rzyc-weapp-ylt-main/src/services/my-car.ts

@@ -87,7 +87,7 @@ export type SyncChargePilePayReq = {
 };
 export const syncChargePilePay = async (params: SyncChargePilePayReq) => {
   const res = await RzRequest.postNew(
-    '/ZhuQue/Ylt/SyncChargePilePay',
+    '/ZhuQue/station/SyncChargePilePay',
     params
   );
   return res;

MiniProgram/rzyc-weapp-ylt-main/src/utils/request-enhance.ts

@@ -10,7 +10,7 @@ export const BASE_URL = 'https://ylt.ikbvip.com';
 //本地
 //export const BASE_URL = 'http://10.10.21.20:7001';
 // export const BASE_URL = 'http://10.10.14.77:7001';
-export const BASE_URL_ZQ = 'http://www.wmarkj.com:28888';
+export const BASE_URL_ZQ = 'http://www.wmarkj.com:27021';
 
 
 // export const BASE_URL = 'https://wechatapps.test-ylt.ikbvip.com/';

Web/ms-manager-sass-ui-ylt-main/config/index.js

@@ -12,7 +12,7 @@ module.exports = {
     proxyTable: {},
 
     // Various Dev Server settings
-    host: '10.10.14.67', // can be overwritten by process.env.HOST
+    host: 'localhost', // can be overwritten by process.env.HOST
     // host: '192.168.2.224', // can be overwritten by process.env.HOST
     port: 7000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,

Web/ms-manager-sass-ui-ylt-main/src/views/customer-management/order.vue

@@ -1023,8 +1023,7 @@ export default {
                 '成功',
                 'edit'
               )
-              that.detailsVisible = false
+              that.detailsVisible = false              
-              // that.OrderList.pageNum = 1
               that.getOrderListData()
             }
           })