wip: 临时提交

src/layouts/tabbar.vue

@@ -25,6 +25,11 @@
 </template>
 
 <script setup lang="ts">
+import { useRoute } from "vue-router";
+import { useTheme } from "@/composables/useTheme";
+import { useTabbar } from "@/composables/useTabbar";
+import { useRouter } from "uni-mini-router";
+
 const router = useRouter();
 const route = useRoute();
 const { themeVars, theme } = useTheme();
@@ -42,8 +47,11 @@ onMounted(() => {
   uni.hideTabBar();
   // #endif
   nextTick(() => {
-    if (route.name && route.name !== activeTabbar.value.name) {
-      setTabbarItemActive(route.name);
+    if (route.name) {
+      const routeName = typeof route.name === "string" ? route.name : "";
+      if (routeName !== activeTabbar.value.name) {
+        setTabbarItemActive(routeName);
+      }
     }
   });
 });

src/manifest.json

@@ -54,7 +54,9 @@
     "setting": {
       "urlCheck": false
     },
-    "usingComponents": true
+    "usingComponents": true,
+    "darkMode": true,
+    "themeLocation": "theme.json"
   },
   "mp-alipay": {
     "usingComponents": true
@@ -68,5 +70,9 @@
   "uniStatistics": {
     "enable": false
   },
-  "vueVersion": "3"
+  "vueVersion": "3",
+  "h5": {
+    "darkmode": true,
+    "themeLocation": "theme.json"
+  }
 }

src/pages.json

@@ -79,25 +79,32 @@
     }
   ],
   "globalStyle": {
-    "navigationStyle": "custom",
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "youlai-mall-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
+    "navigationBarBackgroundColor": "@navBgColor",
+    "navigationBarTextStyle": "@navTxtStyle",
+    "navigationBarTitleText": "Wot-Demo",
+    "backgroundColor": "@bgColor",
+    "backgroundTextStyle": "@bgTxtStyle",
+    "backgroundColorTop": "@bgColorTop",
+    "backgroundColorBottom": "@bgColorBottom",
+    "enablePullDownRefresh": false,
+    "onReachBottomDistance": 50,
+    "animationType": "pop-in",
+    "animationDuration": 300
   },
   "tabBar": {
     "custom": true,
-    "height": "0px",
-    "color": "#00000000",
-    "selectedColor": "#00000000",
-    "backgroundColor": "#00000000",
+    "customize": true,
+    "overlay": true,
+    "height": "0",
+    "color": "@tabColor",
+    "selectedColor": "@tabSelectedColor",
+    "backgroundColor": "@tabBgColor",
+    "borderStyle": "@tabBorderStyle",
     "list": [
       {
-        "text": "首页",
         "pagePath": "pages/index/index"
       },
       {
-        "text": "我的",
         "pagePath": "pages/mine/index"
       }
     ]

src/router/index.ts

@@ -1,5 +1,7 @@
 import { pages, subPackages } from "virtual:uni-pages";
 import { isLoggedIn } from "@/utils/auth";
+
+import { createRouter } from "uni-mini-router";
 // 生成路由配置
 function generateRoutes() {
   const routes = pages.map((page: { path: string; [key: string]: any }) => {

src/theme.json

@@ -0,0 +1,26 @@
+{
+  "light": {
+    "bgColor": "#F8F8F8",
+    "bgColorBottom": "#F8F8F8",
+    "bgColorTop": "#F8F8F8",
+    "bgTxtStyle": "dark",
+    "navBgColor": "#FFF",
+    "navTxtStyle": "black",
+    "tabBgColor": "#ffffff",
+    "tabBorderStyle": "black",
+    "tabColor": "#bfbfbf",
+    "tabSelectedColor": "#0165FF"
+  },
+  "dark": {
+    "bgColor": "#000",
+    "bgColorBottom": "#000",
+    "bgColorTop": "#000",
+    "bgTxtStyle": "light",
+    "navBgColor": "#000000",
+    "navTxtStyle": "white",
+    "tabBgColor": "#1a1a1a",
+    "tabBorderStyle": "white",
+    "tabColor": "#bfbfbf",
+    "tabSelectedColor": "#0165FF"
+  }
+}