Merge branch 'master' of https://gitee.com/nny_1/oilSystem

# Conflicts: # gasStation-uni/package-lock.json
2023-11-27 15:56:34 +08:00 · 2023-11-27 15:56:34 +08:00 · bcb44f5e91
commit bcb44f5e91
parent 3d27b2c386 3a0115921e
3 changed files with 6 additions and 1931 deletions
--- a/gasStation-uni/.npmignore
+++ b/gasStation-uni/.npmignore
@ -0,0 +1,2 @@
+dist/
+
--- a/gasStation-uni/manifest.json
+++ b/gasStation-uni/manifest.json
@ -7,6 +7,7 @@
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
+        "output": "dist/myapp",
        "usingComponents" : true,
        "nvueStyleCompiler" : "uni-app",
        "compilerVersion" : 3,
@ -50,6 +51,7 @@
    "quickapp" : {},
    /* 小程序特有相关 */
    "mp-weixin" : {
+        "output-path": "dist/myapp",
        "appid" : "wx7ad01a99a7247643",
        "setting" : {
            "urlCheck" : false,
--- a/gasStation-uni/package-lock.json
+++ b/gasStation-uni/package-lock.json