Merge branch 'work20230919' into develop

.gitignore

@@ -9,7 +9,6 @@ _roadhog-api-doc
 # production
 /dist
 dist.zip
-/.vscode
 
 # misc
 .DS_Store
@@ -21,7 +20,6 @@ yarn-error.log
 yarn.lock
 package-lock.json
 *bak
-.vscode
 
 # visual studio code
 .history

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "preLaunchTask": "Worl Load Start",
+      "type": "chrome",
+      "request": "launch",
+      "name": "WorkLoad",
+      "url": "http://localhost:8000",
+      "webRoot": "${workspaceFolder}",
+      "runtimeArgs": ["--auto-open-devtools-for-tabs"]
+    }
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,25 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "npm",
+      "script": "start",
+      "label": "Worl Load Start",
+      "detail": "cross-env APP_TYPE=site UMI_UI=none umi dev",
+      "isBackground": true,
+      "problemMatcher": [
+        {
+          "owner": "yarn",
+          "pattern": {
+            "regexp": ""
+          },
+          "background": {
+            "activeOnStart": true,
+            "beginsPattern": "cross-env APP_TYPE=site UMI_UI=none umi dev",
+            "endsPattern": "Compiled successfully"
+          }
+        }
+      ]
+    }
+  ]
+}

package.json

@@ -5,7 +5,7 @@
   "private": true,
   "scripts": {
     "presite": "cd functions && npm install",
-    "start": "cross-env NODE_OPTIONS=--max-old-space-size=8000 APP_TYPE=site UMI_UI=none umi dev",
+    "start": "cross-env NODE_OPTIONS=--max-old-space-size=8000 APP_TYPE=site UMI_UI=none BROWSER=none umi dev",
     "start:no-mock": "cross-env MOCK=none umi dev",
     "build": "umi build",
     "build-prod": "cross-env UMI_ENV=prod umi build umi build",

src/pages/PurchaseAdmin/PurchaseList/DailyRecord/index.js

@@ -175,17 +175,12 @@ const DailyRecord = props => {
     let params = '';
     if (dateString) {
       params = {
-        pageSize: 9,
-        currentPage: 1,
         s_time: `${dateString} 00:00:00`,
         e_time: `${dateString} 23:59:59`,
       };
-    } else {
-      params = {
-        pageSize: 9,
-        currentPage: 1,
-      };
     }
+    params.pageSize = 9;
+    params.currentPage = 1;
     setQueryListParams(params);
   };
 
@@ -215,6 +210,7 @@ const DailyRecord = props => {
         <Button
           type="primary"
           onClick={() => {
+            setLogDetail([]);
             setWriteVisible(true);
           }}
         >