'commit'

MiniProgram/rzyc-weapp-ylt-main/src/pages/charging/charging.tsx

@@ -122,7 +122,7 @@ export const Charging: Taro.FC<ChargingProps> = () => {
         //是否为合作道闸车场，如果是有免费停车时长，跳转到选车界面
         const freeTimeRes = await isThirdPartyStation({
           order_no: router.params.orderNo,
-        });
+        });       
 
         if (freeTimeRes.success) {
           const freeRes = await showModalOnlyWithConfirmBtn(

MiniProgram/rzyc-weapp-ylt-main/src/pages/index/components/FilterView/FilterView.tsx

@@ -169,7 +169,7 @@ export const FilterView: Taro.FC<FilterViewProps> = ({
               className="filter__search"
               hoverClass="btn-hover"
               onClick={() => onSearch(stationName)}>
-              <Text className="filter__search-txt">搜索1</Text>
+              <Text className="filter__search-txt">搜索</Text>
             </View>
           </AtInput>
         </View>

MiniProgram/rzyc-weapp-ylt-main/src/pages/index/index.tsx

@@ -60,10 +60,11 @@ export default function Index() {
   };
 
   const handleTest = async () => {
+    console.log("test");
     // const res = await huangHaiTest();    
     // console.log(res.data[0].columns.dictValue);
 
-    Taro.redirectTo({ url: `/pages/select-free-plate/select-free-plate?order_no=123456` });
+    //Taro.redirectTo({ url: `/pages/select-free-plate/select-free-plate?order_no=123456` });
 
     // Taro.navigateTo({
     //   url: `/pages/labor-union/labor-union`,
@@ -197,7 +198,7 @@ export default function Index() {
         onScrollToLower={handleScrollToLower}>
         {currentTabElement}
       </ScrollView> */}
-      <Button size='mini' onClick={handleTest}>按钮</Button>
+      <Button size='mini' onClick={handleTest}>测试</Button>
       <View className="index">{currentTabElement}</View>
       <AtTabBar
         fixed

MiniProgram/rzyc-weapp-ylt-main/src/pages/select-free-plate/select-free-plate.tsx

@@ -22,6 +22,9 @@ export const SelectFreePlate: Taro.FC = () => {
     const [carList, setCarList] = useState<GetUserCarRes[]>([]);
 
     const validateCarPlate = (plate) => {
+        //新能源车牌号正则
+        // const pattern = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z](([DF]((?![IO])[a-zA-Z0-9](?![IO]))[0-9]{4})|([0-9]{5}[DF]))$/;
+        //新能源+非新能源车牌号正则
         const pattern = /^(([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z](([0-9]{5}[DF])|([DF]([A-HJ-NP-Z0-9])[0-9]{4})))|([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-Z][A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳使领]))$/
         return pattern.test(plate);
     };

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

@@ -75,7 +75,7 @@ const request = (
         Taro.hideLoading();
       }
       Taro.showToast({
-        title: error.message || 'error(─‿─)',
+        title: error.message || 'error(─‿─)1',
         icon: 'none',
         duration: 1500,
         mask: true,
@@ -146,7 +146,7 @@ const requestNew = (
         Taro.hideLoading();
       }
       Taro.showToast({
-        title: error.message || 'error(─‿─)',
+        title: error.message || 'error(─‿─)2',
         icon: 'none',
         duration: 1500,
         mask: true,

Web/ms-manager-sass-ui-ylt-main/package.json

@@ -9,6 +9,7 @@
     "build": "cross-env NODE_ENV=production env_config=prod node build/build.js",
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "dev:test": "webpack-dev-server --inline --progress --config build/webpack.sit.conf.js",
+    "build:dev": "cross-env NODE_ENV=staging env_config=dev node build/build.js",
     "build:test": "cross-env NODE_ENV=staging env_config=test node build/build.js",
     "build:prod": "cross-env NODE_ENV=production env_config=prod node build/build.js",
     "build:sit": "cross-env NODE_ENV=production env_config=sit node build/build.js",

资料/源码/request-enhance.ts

@@ -0,0 +1,98 @@
+import Taro, { clearStorage } from '@tarojs/taro';
+import { CommonRes } from '../services/common';
+import { showModal } from './wechat-ui';
+import { getGlobalData, setGlobalData } from './global-data';
+// export const BASE_URL = 'http://i100c.3322.org:31233';
+export const BASE_URL = 'https://ylt.ikbvip.com';
+// export const BASE_URL = 'https://wechatapps.test-ylt.ikbvip.com/';
+
+// export const BASE_URL =
+//   process.env.NODE_ENV === 'development'
+//     ? 'http://i100c.3322.org:30701'
+//     : 'https://ylt.ikbvip.com'; //测试线
+
+type Method =
+  | 'OPTIONS'
+  | 'GET'
+  | 'HEAD'
+  | 'POST'
+  | 'PUT'
+  | 'DELETE'
+  | 'TRACE'
+  | 'CONNECT';
+export const RzRequestEnhance = <T>(
+  url: string,
+  data?: unknown,
+  method: Method = 'POST',
+  headers = {},
+  isShowLoading = true
+): Promise<T> => {
+  const option = {
+    url: BASE_URL + url,
+    data,
+    method,
+    header: {
+      Authorization: Taro.getStorageSync('authorization'),
+      ...headers,
+    },
+  };
+
+  if (isShowLoading) {
+    Taro.showLoading({ title: '加载中..' });
+  }
+
+  return new Promise((resolve, reject) => {
+    Taro.request(option)
+      .then(({ statusCode, data }: { statusCode: number; data: CommonRes }) => {
+        console.log('response data', data);
+        if (isShowLoading) {
+          Taro.hideLoading();
+        }
+        if (statusCode >= 200 && statusCode < 300) {
+          if (data.code === 1000) {
+            resolve(data.data);
+          } else if (data.code === 1002) {
+            clearStorage();
+            if (!getGlobalData('isNavToLogin')) {
+              setGlobalData('isNavToLogin', true);
+              showModal(
+                '提示',
+                '凭证过期需要重新登录以访问更多功能，是否需要登录？'
+              ).then((res) => {
+                if (res.confirm) {
+                  Taro.navigateTo({ url: '/pages/login/login' }).then(() => {
+                    setTimeout(() => {
+                      setGlobalData('isNavToLogin', false);
+                    }, 3000);
+                  });
+                }
+              });
+            }
+            reject({ msg: data.msg, code: 1002 });
+          } else if (data.code === 1007) {
+            reject({ msg: data.msg, code: 1007 });
+          } else if (data.code === 1009) {
+            reject({ msg: data.msg, code: 1009 });
+          } else {
+            console.log('data.msg', data.msg);
+            reject(data.msg);
+          }
+        } else {
+          const msg = `Error: code ${statusCode}`;
+          reject(msg);
+        }
+      })
+      .catch((error) => {
+        if (isShowLoading) {
+          Taro.hideLoading();
+        }
+        Taro.showToast({
+          title: JSON.stringify(error),
+          icon: 'none',
+          duration: 1500,
+          mask: true,
+        });
+        reject(error);
+      });
+  });
+};