Merge branch 'master' of http://172.16.100.91:3000/xuminyi/store-management-app

package-lock.json

@@ -27,6 +27,7 @@
         "sass": "^1.77.8",
         "uninstall": "^0.0.0",
         "uview-plus": "^3.3.28",
+        "vconsole": "^3.15.1",
         "vue": "^3.4.21",
         "vue-i18n": "^9.1.9"
       },
@@ -5743,6 +5744,17 @@
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
       "dev": true
     },
+    "node_modules/copy-text-to-clipboard": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz",
+      "integrity": "sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/core-js": {
       "version": "3.38.1",
       "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.38.1.tgz",
@@ -9637,6 +9649,11 @@
       "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
+    "node_modules/mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
+    },
     "node_modules/nanoid": {
       "version": "3.3.7",
       "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz",
@@ -11732,6 +11749,17 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/vconsole": {
+      "version": "3.15.1",
+      "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.15.1.tgz",
+      "integrity": "sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==",
+      "dependencies": {
+        "@babel/runtime": "^7.17.2",
+        "copy-text-to-clipboard": "^3.0.1",
+        "core-js": "^3.11.0",
+        "mutation-observer": "^1.0.3"
+      }
+    },
     "node_modules/vite": {
       "version": "5.2.8",
       "resolved": "https://registry.npmmirror.com/vite/-/vite-5.2.8.tgz",

package.json

@@ -62,6 +62,7 @@
     "sass": "^1.77.8",
     "uninstall": "^0.0.0",
     "uview-plus": "^3.3.28",
+    "vconsole": "^3.15.1",
     "vue": "^3.4.21",
     "vue-i18n": "^9.1.9"
   },

src/components/navBar/index.vue

@@ -35,13 +35,14 @@ const backhandle = () => {
   if (pages.length === 1) return;
   uni.navigateBack();
 };
+const currentWebView = plus.webview.getWebviewById("wv");
 const root = document.documentElement;
 root.style.setProperty(
   "--statusBarHeight",
   `${
-    plus.storage.getItem("RunTime") === "app"
+    currentWebView.RunTime === "app"
       ? plus.navigator.getStatusbarHeight()
-      : 0
+      : 0 ?? 0
   }px`
 );
 </script>

src/main.js

@@ -2,7 +2,10 @@ import { createSSRApp } from "vue";
 import App from "./App.vue";
 import uviewPlus from "uview-plus";
 import globalComponents from "./components";
-
+import VConsole from "vconsole";
+if (import.meta.env.VITE_APP_MODE === "dev") {
+  new VConsole();
+}
 export function createApp() {
   const app = createSSRApp(App);
   globalComponents(app);

src/pages/login/index.vue

@@ -4,7 +4,7 @@
     <view class="container-box">
       <view class="title">
         <span>登录</span>
-        <span style="color: #efc54e">仓库管理v1.0</span>
+        <span style="color: #efc54e">仓库管理</span>
       </view>
       <view>使用你的手机号登录</view>
       <view class="login">