From 775a93f76692f4ddc63b7eb49dc651d2314725a5 Mon Sep 17 00:00:00 2001 From: wangxiaowei <1121133807@qq.com> Date: Sat, 13 Dec 2025 17:15:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/copilot-instructions.md | 47 ++++ env/.env | 2 +- src/bundle/account/switch.vue | 54 +++++ src/bundle/finance/finance.vue | 133 ++++++++++ src/bundle/store/verify-code.vue | 73 ++++++ src/bundle/store/verify-record.vue | 79 ++++++ src/manifest.json | 210 +++++++++------- src/pages.json | 67 +++++- src/pages/index/index.vue | 373 ++++++++++------------------- src/pages/login/login.vue | 256 +++++++++++++------- src/pages/login/password.vue | 224 +++++++++++++++++ src/pages/login/set-password.vue | 223 +++++++++++++++++ src/static/tabbar/home.png | Bin 799 -> 1276 bytes src/static/tabbar/home_s.png | Bin 1769 -> 1425 bytes src/static/tabbar/my_s.png | Bin 1132 -> 1781 bytes src/static/tabbar/order.png | Bin 0 -> 654 bytes src/static/tabbar/order_s.png | Bin 0 -> 758 bytes src/static/tabbar/reserve.png | Bin 656 -> 0 bytes src/static/tabbar/reserve_s.png | Bin 1659 -> 0 bytes src/static/tabbar/store.png | Bin 0 -> 1208 bytes src/static/tabbar/store_s.png | Bin 0 -> 1439 bytes src/tabbar/config.ts | 20 +- 22 files changed, 1329 insertions(+), 432 deletions(-) create mode 100644 .github/copilot-instructions.md create mode 100644 src/bundle/account/switch.vue create mode 100644 src/bundle/finance/finance.vue create mode 100644 src/bundle/store/verify-code.vue create mode 100644 src/bundle/store/verify-record.vue create mode 100644 src/pages/login/password.vue create mode 100644 src/pages/login/set-password.vue create mode 100644 src/static/tabbar/order.png create mode 100644 src/static/tabbar/order_s.png delete mode 100644 src/static/tabbar/reserve.png delete mode 100644 src/static/tabbar/reserve_s.png create mode 100644 src/static/tabbar/store.png create mode 100644 src/static/tabbar/store_s.png diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md new file mode 100644 index 0000000..2fa9907 --- /dev/null +++ b/.github/copilot-instructions.md @@ -0,0 +1,47 @@ +# Copilot Instructions for chazhi_store + +## 项目架构与核心约定 + +- 本项目基于 UniApp（Unibest 3.8.2），采用 Vue 3 + TypeScript，目录结构以 `src/` 为主，分为页面、组件、API、服务、工具等模块。 +- 页面与组件的方法命名规范：对外暴露方法统一以 `handle` 前缀命名（如 `handleLogin`），内部方法无需加前缀，所有方法集中在对象底部。 +- 组件/页面对外方法对象名建议与文件名一致，若冲突可加 `s` 后缀。 +- 路由、页面配置见 `src/pages.json`、`src/router/`，布局在 `src/layouts/`。 +- 样式采用 `unocss`，全局样式在 `src/uni.scss`，图标需在 `uno.config.ts` 的 `safelist` 配置。 + +## 网络请求与数据流 + +- 支持三种请求库： + - 简单版 http（`src/http/http.ts`），示例见 `src/api/foo.ts` + - alova（`src/http/alova.ts`），示例见 `src/api/foo-alova.ts` + - vue-query（`src/http/vue-query.ts`），自动生成接口，示例见 `src/service/` +- 选择建议：简单场景用 http，复杂/自动化用 alova 或 vue-query。 +- 状态管理采用 `pinia`，入口在 `src/store/`。 + +## Tabbar 策略 + +- 支持 4 种 tabbar：无、原生、自定义有缓存、自定义无缓存，详见 `src/tabbar/README.md`。 +- tabbar 配置需与接口返回的 path 对齐，使用 unocss 图标需在 `uno.config.ts` safelist 配置。 + +## 关键开发流程 + +- 构建/运行：使用 HBuilderX 或 `vite`，配置见 `vite.config.ts`。 +- 依赖管理：使用 `pnpm`，依赖锁定在 `pnpm-lock.yaml`。 +- 约定优于配置，所有新增页面/组件/服务请遵循现有命名与结构。 + +## 重要文件/目录参考 + +- `src/pages/` 页面目录 +- `src/components/` 通用组件 +- `src/api/` 接口定义 +- `src/http/` 请求库实现 +- `src/service/` 业务服务层 +- `src/store/` 状态管理 +- `src/utils/` 工具函数 +- `src/layouts/` 布局 +- `src/tabbar/` tabbar 策略与配置 + +## 其他说明 + +- 代码注释与文档以中文为主。 +- 详细用法、特殊约定见各模块下 README.md。 +- 遇到不明确的约定，优先参考现有实现和 README。 diff --git a/env/.env b/env/.env index a63ca5a..e8d1d55 100644 --- a/env/.env +++ b/env/.env @@ -1,5 +1,5 @@ VITE_APP_TITLE = '茶址' -VITE_APP_PORT = 9000 +VITE_APP_PORT = 9002 VITE_UNI_APPID = '__UNI__D1E5001' VITE_WX_APPID = 'wx63e106209b842919' diff --git a/src/bundle/account/switch.vue b/src/bundle/account/switch.vue new file mode 100644 index 0000000..b50968c --- /dev/null +++ b/src/bundle/account/switch.vue @@ -0,0 +1,54 @@ +{ + "layout": "default", + "style": { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#F6F7F9" + } +} + + + + + + + diff --git a/src/bundle/finance/finance.vue b/src/bundle/finance/finance.vue new file mode 100644 index 0000000..5bc698d --- /dev/null +++ b/src/bundle/finance/finance.vue @@ -0,0 +1,133 @@ +{ + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarBackgroundColor": "#F6F7F8" + } +} + + + + + + + diff --git a/src/bundle/store/verify-code.vue b/src/bundle/store/verify-code.vue new file mode 100644 index 0000000..8bebbe5 --- /dev/null +++ b/src/bundle/store/verify-code.vue @@ -0,0 +1,73 @@ +{ + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarBackgroundColor": "#F6F7F9" + } +} + + + + + + + diff --git a/src/bundle/store/verify-record.vue b/src/bundle/store/verify-record.vue new file mode 100644 index 0000000..469f96e --- /dev/null +++ b/src/bundle/store/verify-record.vue @@ -0,0 +1,79 @@ +{ + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarBackgroundColor": "#F6F7F8" + } +} + + + + + + + diff --git a/src/manifest.json b/src/manifest.json index fa783d9..09cbe33 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,6 +1,6 @@ { - "name": "茶址", - "appid": "__UNI__D1E5001", + "name": "", + "appid": "", "description": "", "versionName": "1.0.0", "versionCode": "100", @@ -18,93 +18,22 @@ "modules": {}, "distribute": { "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "minSdkVersion": 30, - "targetSdkVersion": 30, - "abiFilters": [ - "armeabi-v7a", - "arm64-v8a" - ] + "permissions": [] }, "ios": {}, - "sdkConfigs": {}, - "icons": { - "android": { - "hdpi": "static/app/icons/72x72.png", - "xhdpi": "static/app/icons/96x96.png", - "xxhdpi": "static/app/icons/144x144.png", - "xxxhdpi": "static/app/icons/192x192.png" - }, - "ios": { - "appstore": "static/app/icons/1024x1024.png", - "ipad": { - "app": "static/app/icons/76x76.png", - "app@2x": "static/app/icons/152x152.png", - "notification": "static/app/icons/20x20.png", - "notification@2x": "static/app/icons/40x40.png", - "proapp@2x": "static/app/icons/167x167.png", - "settings": "static/app/icons/29x29.png", - "settings@2x": "static/app/icons/58x58.png", - "spotlight": "static/app/icons/40x40.png", - "spotlight@2x": "static/app/icons/80x80.png" - }, - "iphone": { - "app@2x": "static/app/icons/120x120.png", - "app@3x": "static/app/icons/180x180.png", - "notification@2x": "static/app/icons/40x40.png", - "notification@3x": "static/app/icons/60x60.png", - "settings@2x": "static/app/icons/58x58.png", - "settings@3x": "static/app/icons/87x87.png", - "spotlight@2x": "static/app/icons/80x80.png", - "spotlight@3x": "static/app/icons/120x120.png" - } - } - } - }, - "compatible": { - "ignoreVersion": true + "sdkConfigs": {} } }, "quickapp": {}, "mp-weixin": { - "appid": "wx63e106209b842919", + "appid": "", "setting": { - "urlCheck": false, - "es6": true, - "minified": true + "urlCheck": false }, - "usingComponents": true, - "requiredPrivateInfos": [ - "getLocation" - ], - "optimization": { - "subPackages": true - }, - "permission": { - "scope.userLocation": { - "desc": "我们需要获取您的位置，以方便推荐附近茶室给您" - } - } + "usingComponents": true }, "mp-alipay": { - "usingComponents": true, - "styleIsolation": "shared" + "usingComponents": true }, "mp-baidu": { "usingComponents": true @@ -116,7 +45,126 @@ "enable": false }, "vueVersion": "3", - "h5": { - "router": {} + "default": { + "name": "茶址", + "appid": "__UNI__D1E5001", + "description": "", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + "h5": { + "router": {} + }, + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "compatible": { + "ignoreVersion": true + }, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + "modules": {}, + "distribute": { + "android": { + "minSdkVersion": 30, + "targetSdkVersion": 30, + "abiFilters": [ + "armeabi-v7a", + "arm64-v8a" + ], + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + "ios": {}, + "sdkConfigs": {}, + "icons": { + "android": { + "hdpi": "static/app/icons/72x72.png", + "xhdpi": "static/app/icons/96x96.png", + "xxhdpi": "static/app/icons/144x144.png", + "xxxhdpi": "static/app/icons/192x192.png" + }, + "ios": { + "appstore": "static/app/icons/1024x1024.png", + "ipad": { + "app": "static/app/icons/76x76.png", + "app@2x": "static/app/icons/152x152.png", + "notification": "static/app/icons/20x20.png", + "notification@2x": "static/app/icons/40x40.png", + "proapp@2x": "static/app/icons/167x167.png", + "settings": "static/app/icons/29x29.png", + "settings@2x": "static/app/icons/58x58.png", + "spotlight": "static/app/icons/40x40.png", + "spotlight@2x": "static/app/icons/80x80.png" + }, + "iphone": { + "app@2x": "static/app/icons/120x120.png", + "app@3x": "static/app/icons/180x180.png", + "notification@2x": "static/app/icons/40x40.png", + "notification@3x": "static/app/icons/60x60.png", + "settings@2x": "static/app/icons/58x58.png", + "settings@3x": "static/app/icons/87x87.png", + "spotlight@2x": "static/app/icons/80x80.png", + "spotlight@3x": "static/app/icons/120x120.png" + } + } + } + } + }, + "quickapp": {}, + "mp-weixin": { + "appid": "wx63e106209b842919", + "setting": { + "urlCheck": false, + "es6": true, + "minified": true + }, + "requiredPrivateInfos": [ + "getLocation" + ], + "optimization": { + "subPackages": true + }, + "usingComponents": true, + "permission": { + "scope.userLocation": { + "desc": "我们需要获取您的位置，以方便推荐附近茶室给您" + } + } + }, + "mp-alipay": { + "usingComponents": true, + "styleIsolation": "shared" + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "3" } } \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index d7bbdb8..2e35a31 100644 --- a/src/pages.json +++ b/src/pages.json @@ -32,10 +32,16 @@ "text": "首页" }, { - "iconPath": "static/tabbar/reserve.png", - "selectedIconPath": "static/tabbar/reserve_s.png", + "iconPath": "static/tabbar/order.png", + "selectedIconPath": "static/tabbar/order_s.png", "pagePath": "pages/reserve/reserve", - "text": "预约" + "text": "订单" + }, + { + "iconPath": "static/tabbar/store.png", + "selectedIconPath": "static/tabbar/store_s.png", + "pagePath": "pages/login/login", + "text": "门店管理" }, { "iconPath": "static/tabbar/my.png", @@ -102,13 +108,30 @@ "path": "pages/login/login", "type": "page", "layout": "default", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/login/mobile", + "type": "page", + "layout": "default", "style": { "navigationBarTitleText": "", "navigationBarBackgroundColor": "#fff" } }, { - "path": "pages/login/mobile", + "path": "pages/login/password", + "type": "page", + "layout": "default", + "style": { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#fff" + } + }, + { + "path": "pages/login/set-password", "type": "page", "layout": "default", "style": { @@ -181,6 +204,15 @@ { "root": "bundle", "pages": [ + { + "path": "account/switch", + "type": "page", + "layout": "default", + "style": { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#F6F7F9" + } + }, { "path": "collect/collect", "type": "page", @@ -216,6 +248,15 @@ "navigationBarTitleText": "分包页面" } }, + { + "path": "finance/finance", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarBackgroundColor": "#F6F7F8" + } + }, { "path": "profile/profile", "type": "page", @@ -249,6 +290,24 @@ "navigationStyle": "custom" } }, + { + "path": "store/verify-code", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarBackgroundColor": "#F6F7F9" + } + }, + { + "path": "store/verify-record", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarBackgroundColor": "#F6F7F8" + } + }, { "path": "store-recharge/store-recharge", "type": "page", diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 254420a..2368feb 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -9,121 +9,126 @@ } @@ -311,36 +208,6 @@ page { background-repeat: no-repeat; } -.search-box { - display: flex; - height: 100%; - margin-right: 40px; - --wot-search-padding: 0; - --wot-search-side-padding: 0; - - :deep() { - .wd-search { - background: transparent !important; - width: 100% !important; - } - - .wd-search__block { - background-color: #fff !important; - } - - .wd-search__input { - // #ifdef MP - padding-left: 32px !important; - padding-right: 32px !important; - // #endif - - // #ifndef MP - padding-right: 0 !important; - // #endif - } - } -} - .rounded { border-radius: 20rpx 0rpx 20rpx 0rpx; } diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 64579e4..f768c3b 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -1,112 +1,202 @@ { "layout": "default", "style": { - "navigationBarTitleText": "", - "navigationBarBackgroundColor": "#fff" + "navigationStyle": "custom" } } + diff --git a/src/pages/login/password.vue b/src/pages/login/password.vue new file mode 100644 index 0000000..52010ab --- /dev/null +++ b/src/pages/login/password.vue @@ -0,0 +1,224 @@ +{ + "layout": "default", + "style": { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#fff" + } +} + + + + + + + diff --git a/src/pages/login/set-password.vue b/src/pages/login/set-password.vue new file mode 100644 index 0000000..10229f0 --- /dev/null +++ b/src/pages/login/set-password.vue @@ -0,0 +1,223 @@ +{ + "layout": "default", + "style": { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#fff" + } +} + + + + + + + diff --git a/src/static/tabbar/home.png b/src/static/tabbar/home.png index 2fa5c0a02e8c400771bf3a99d8b4088c26c5531f..87992da8ee46a4dcc1cc624d65750ddc71376b17 100644 GIT binary patch delta 1267 zcmV990y@H=h_N8n8mZmq7JN zWp}ZD6cr*dGZ~91 zB@YntFL@v5Q;F5`$#Mn`xXLk14khG z`|j>;H+T}q8h?pPrsx1j{=+J5d@g z07sbZ$1!Yfv=1FfDkjVi>kwqmlWh(HhtQHdwlz69*^^GE|B^$1^gk056DOGMQ(SKX z$z2T%4OwD*oJb_@kfRb*M0jj$EZW@MtRGgwm1GtBk$+SwHHr3>si~34f1JbBS1P;%$BwveM_wf*>{V;F@vgfq7^20KB z@Awbmi#&hw1dl7Hi4W<=jBT_ZVbi9&{C@A^1{o0k!Ii4nWjkh3!cLD{?5jrjpdUzW zhJSC`440dDaB%SMa>_)@vRW<6dO~l}a%21T3$-M88@E&1~_7Qeq2}PKV{dF?y_1#Y0vCIv8Mj84X1TYBK5UIn3Y4TeTJ?=Z`wN^hwUhr@@CSK4;!9Y)G}8=H zK{JQW1O>&Q=mx0!xs)mrabYn ze5RwM6sUZ7LCUcyMnC`kUtbXD%YNC%d`Cj;+pY7zC%xbLZS%InA2%0nxNrXT?%~58 z^<{y~7oPoIa84y)HDkJ;^=o~G^~H*!6+&y?MzK!V!`JT4a!Qc<)j5W$HS^wtHf~ux zeQp4Q>J1-e*98&=+YMz;?1+|LXA*GNbYUFliZx|#KXcjO!o)ZW8- zyx<`Z ntd;10e`WgV$M^qDuVXs5YP!kN^rqFoC}i+-^>bP0l+XkKNS|~4 diff --git a/src/static/tabbar/home_s.png b/src/static/tabbar/home_s.png index b58714d35a36433127044a8d4cfff23424d79c47..305753d4f22abb966811572f7bc98a5ca78e3d9e 100644 GIT binary patch delta 1407 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 diff --git a/src/static/tabbar/my_s.png b/src/static/tabbar/my_s.png index 85a80c327fcc33b10b6b49d8bf607ab36689a0ae..ff791cc751f6378258e8b288003169f7dc19552a 100644 GIT binary patch delta 1776 zcmV&3bO}jzSl(4LEbEJ>V#9}mpU|(^-`@ytVp)gpAxiHeS z!{ls&-G7jh&DM1Z>-O4-cO{&3j?IJ;yam0TA{4xVT*!gk-~fH8)FsT!FDy9nC|34D zyFFSZ2aj5GcKCU#*Vc6j>o4uHPC@8@Y4vv3fq(CRWpju~b%U}t)DgnZ=8})F?)&J( zmO68TE?4ySmovZ7MdU;#Z~zzRwGtt`mJ*v69QZ1BsfBiXwMs6&YO^fnQn5w|hhbPf zdFj-cs<{1oWo^z{E|x)rFgx^s?PTI*Z@o5l#WnLEHkMt!&+4|05Vjq6YaJmhA^mR2 z>VM;@na|d`xZXdO+@YUC{mGA$mBZ2EZqquLOK$GYKl5&^6Pd^+6QqR%@~2jd?g(Lh z2mf02VBS*I>nI?(#&IvP@YsfX-0$^EV*gS%-2jd{uBDG zT3nS}^0;-IB|ox;B7`qwy=yuZ=6@M)T>lU~VF8xbUk`ZK!%z-aPh0As1hxIWla+89fr?R7|W1V~bgY*>5|2S{}7g};f2%}$UOL@yzZI1E@9mkYqnzZ#4MFc4jHy~38lJCTN~=Sgo}OUlAcem zz=4U^Gr8|kjLXYEm3On;%T`~~#N?$tV&H3xE$UdRm&sz&a*gyF>joj`3w z=%q})Gh_5N6b4&!Sm;H$t#Q6?NVqUq^7OHqd8G3x!J(Y#$)_Hhk6X10n7~Gk3aCt& z+?7V8Y)BZMJQrk1=sI*=@g1Q!B_uHIRVaW3Okf*0&Be39pwSx?O$lS6%zw`LJv!3U zh}Su`SwiQsd4w?BfdB(oz%(%Wk&9f&Y1$2nri2l5VaU5i5*)Ck&1i%&k;$cV&wZM% z9+co4M-YQpQVfHIASH_&CKuXGq$Od*7W%!5vva|2J3TPpn7B7c&{QVZ`N4tl)ZWT2 z1@EY!4?gfk3}S&{JarlX8-F=WyG0R;Ffj1zdCuRXBW)HUY?@eKd34NW*X!8o-qOEb zzs2b3<9^?WJ_Xp&2OlOn#`>D1>LnAv1a{TbLWxZnIGA7he(fQjQX*vD)38^Bai&PJ zjyww;H=?@sC5ae)WG@q|7=>*45HPJhPQ5I`77(wUVqa;u?uh${>3<_3nLm42k7#Xt z;488ZvA~FWwYIE?u!Sw^j#%g|y;{tcx9iF3QMISSFwE+IzsDiaVM8B$jIYM1ZN+yi z!dNsor0aZqyOFG=#EZ&eubyGIvTz3kI&A1`6bJjk@$?XKsBg|7EfO literal 1132 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv9xeFqQ=Pgt!8^Ake_z(BR-O-@$E> zp7mU7mzgd=w)-4Q-+o0!NRT4jywIeC7gW?Y-wa12uZibM&3(>M`5FXSR#ad>8Mz_TF=yJ!d=l z05#5Y_MYeHHOJX|fs5BXXRmpVo^u?$<~sTS*>fGe<~e~C0NGAHK=xdqGN2kKkjlA0 zDWD0?ol=YquX3qhVAiW^#Knj4mKvn?R-aw5YHvmbX0v8{kz4L+2a003X zng(+4e4s9%t6YG(fLz~sKm^nXVuMWsv4K)RH6R2w0VoBL1&e^S15E?T0>zQ_f{g`9 zxh#7vDFY1i>XIP8UJ!*Jwt078yj0&J9~Qv2M0$- zCubLT4{sm;fZ&j@$e8$q#N_0Z^o-2xoSeME;_}Lxn!5Uyw$ARJ{{BgmCQqI+ZTjr_ zYu0bvyk+0M{rmTyK6CEkmD{)PKY#h={riufK7aZC{pauBf2Pk@O=VzU((!b046!)9 zcS>%!P@qU_|HR0MWlN@IYB{Mcduh6K$(vrC>Wyo3R9kgcsI1x0z4*tUpLPa)htJ5K z*&6lM-?)5U>9u*a?<|%62fn@dvZTuDR-J|Ao|r>nFW(k8n?x<}Yt2xQI>!`nE?rE_ z=%*3G&4PyON(s8(+OpO!Tj7#`hAR=5JT|#1l8) zj$d3Y+!c2}^1@xEv$=njA3s+9n|qdTt>WvGJgbr~6$M(p%Dq`0)cT8sd&8wGmJ4HM zy~tTrd)ndPS+xUJ#w%>3EaFZdX=>q)Yr8&us(*N2XU7R8ot+Pa&S*93b#$B%n8J61 z5W(76me9Qvz$1lqR+BU{+VmZ@bEA-M@s{zUeB%j#!rz#!L0g{67-5 z_x^srJd1xNfB)2=>osOVAI_#N-}d99kLJ>Qp*Qv|y;6Fg-)%vXdwD+pkDpIpi&+%Z zmIO7am%S9f{hRqmcATc^qwFpn=e+x0-Yl1G@Orl_$Sd~Kc56m!P4!0U;`MRoZf-mG zOMjBcgW`bTJ>elq8@}I>`TRof$SZeM_G`}nU9D7OrNVfbqrY8zzVx)o2BDP=PYaE1 zn5=Rv|Ixm0KU1}Qu->;7Y@(m(0FD${$m#=JvQt87`c;-0d!(zq`8YwYUATzu2(v1J;@yP9~E}N~uG*s{^Oh z=rJ8BYllhfhP!+|e}=#YOxA&wL?W?HozSovCgT*uBts!S*=9VGra{-#2o0lQIy+9r z3`o4N8RfNJ81RhLNmDO0jD|TZ(}9c~Od3T3>%32mhN;{II-d2U(WA|9UA=JxJKz%D zV8m3sX$)hq59B-3$LToFJT#igaHzrZ7h}Wa9jW#H|L8E^V!33?HQ)8#LUOxZy6@WI zS&FTIT((`1T+u+Hx^OjoLzyRVy|0j5(LkcQa5Bs(@eUKte$`x*F7sI~?qWk9pi-A6*S&rU#1$y4s#E1tCN`Trc$Y4yFa000I_L_t&o09F0pXtHEP#{d8T07*qoM6N<$f>szQNB{r; literal 0 HcmV?d00001 diff --git a/src/static/tabbar/order_s.png b/src/static/tabbar/order_s.png new file mode 100644 index 0000000000000000000000000000000000000000..32d5fb9a704f374d673e3cda9302fff7d94a80aa GIT binary patch literal 758 zcmV}3VEY9vg1q(qBZS6MffnXviDk2H=j)R6#d*pgD>+PM!=hE(YJQJd(m`H zA#>Pj908(eCK6{CACj-`ArZxuo&(gySQ;mLE%> zVFav~vp-S-+pck0;j+T13Y1@oR6z>wYAZ}ggQt^2Gv^C;P6__)K|fQ&gRUN!M5tyt z2#+sqRL-h?(XG^Gkf%yF2Jt~%r(2$vzLoUf)uU}7Y9~E7bBNp?|CRKecV}OU45=x# z0pWDti#_|^{m$@73oNJZ{t~wdAOiJ5oaf!y$sz+-Q^`v&>8bjo+Du@%%j(p-6+v_p zkk(m1!rO@F(nESlPxjFsnZPP*vk|^-uY_y7GpksNd(uPsWwrkVoFy>nu@cyJ#s2^R o0RR8mx0JvD000I_L_t&o0HE|ucfxXfumAu607*qoM6N<$f{6lVVgLXD literal 0 HcmV?d00001 diff --git a/src/static/tabbar/reserve.png b/src/static/tabbar/reserve.png deleted file mode 100644 index 9f817e71cbacd2f172b6720709f5c7e764c270c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 656 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv81SV*x%Pu0Xm03ADAf0eP*htq`&1 z=4K!RLNi>+69eL=Bv5Y;1(EAq*gi3E+yU%P{$!_6X<`$C4nwUiXvP?*7TM=PzEqdh_o6hmW5=fBE|D z`;VW$e*gLVZ)x|elMD=u7M?DSAr_~vPQ4j)$U(#p-Eb5!FD^oM2F7}x%+b8Ou?UuxzE=mCq&n*xutDeV1Af!N?1<*-Dh9&7_HB4 zUl`=IlI2*|%E+w4%m1?OHecegYwo7Fme#1^9lVQ$AD^-AH~8w}lEQIy5%af&ib_gS zp%Qmh&n!>lyf3u2e95JtzK3@F-j#bdZc=Bfm|Q2mZ${m&Z679{)6!_;PrtBTX0cK0 zfsM`DhAqqH{CyYu?fOsU4x3;pS&p)2IV={|W#=FawVbZSHySlu)5_d~)Eu3dM^-8UtK#;tHyqFA(5C%_IKbLh* G2~7ZG$tz_5 diff --git a/src/static/tabbar/reserve_s.png b/src/static/tabbar/reserve_s.png deleted file mode 100644 index dc9c686cf67ba30a33fd2a5d6daa204146647061..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1659 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 tIuHK?00960_zvUH00006Nkl_72 literal 0 HcmV?d00001 diff --git a/src/tabbar/config.ts b/src/tabbar/config.ts index 20ce39f..bf2529c 100644 --- a/src/tabbar/config.ts +++ b/src/tabbar/config.ts @@ -42,23 +42,23 @@ export const nativeTabbarList: NativeTabBarItem[] = [ text: '首页', }, { - iconPath: 'static/tabbar/reserve.png', - selectedIconPath: 'static/tabbar/reserve_s.png', + iconPath: 'static/tabbar/order.png', + selectedIconPath: 'static/tabbar/order_s.png', pagePath: 'pages/reserve/reserve', - text: '预约', + text: '订单', + }, + { + iconPath: 'static/tabbar/store.png', + selectedIconPath: 'static/tabbar/store_s.png', + pagePath: 'pages/login/login', + text: '门店管理', }, { iconPath: 'static/tabbar/my.png', selectedIconPath: 'static/tabbar/my_s.png', pagePath: 'pages/my/my', text: '我的', - }, - // { - // iconPath: 'static/tabbar/example.png', - // selectedIconPath: 'static/tabbar/exampleHL.png', - // pagePath: 'pages/about/about', - // text: '关于', - // }, + } ] // pagePath 是 nativeTabbarList 和 customTabbarList 的关联点，如果没有对应上，会有问题！！