From 08ce9386963e8bc0062a83033083ea01352d9f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Fri, 3 May 2024 22:50:53 +0800 Subject: [PATCH 1/8] chore: delete page.json + manifest.json --- src/manifest.json | 79 ----------------------------------------- src/pages.json | 89 ----------------------------------------------- 2 files changed, 168 deletions(-) delete mode 100644 src/manifest.json delete mode 100644 src/pages.json diff --git a/src/manifest.json b/src/manifest.json deleted file mode 100644 index f6ad007..0000000 --- a/src/manifest.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "name": "unibest-base", - "appid": "H57F2ACE4", - "description": "", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, - "app-plus": { - "usingComponents": true, - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "modules": {}, - "distribute": { - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "minSdkVersion": 30, - "targetSdkVersion": 30, - "abiFilters": [ - "armeabi-v7a", - "arm64-v8a" - ] - }, - "ios": {}, - "sdkConfigs": {}, - "icons": { - "android": {}, - "ios": {} - } - } - }, - "quickapp": {}, - "mp-weixin": { - "appid": "wxa2abb91f64032a2b", - "setting": { - "urlCheck": false - }, - "usingComponents": true - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - }, - "uniStatistics": { - "enable": false - }, - "vueVersion": "3", - "h5": { - "router": { - "base": "/" - } - } -} \ No newline at end of file diff --git a/src/pages.json b/src/pages.json deleted file mode 100644 index 468dc66..0000000 --- a/src/pages.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "globalStyle": { - "navigationStyle": "default", - "navigationBarTitleText": "unibest", - "navigationBarBackgroundColor": "#f8f8f8", - "navigationBarTextStyle": "black", - "backgroundColor": "#FFFFFF" - }, - "easycom": { - "autoscan": true, - "custom": { - "^wd-(.*)": "wot-design-uni/components/wd-$1/wd-$1.vue" - } - }, - "tabBar": { - "color": "#999999", - "selectedColor": "#018d71", - "backgroundColor": "#F8F8F8", - "borderStyle": "black", - "height": "50px", - "fontSize": "10px", - "iconWidth": "24px", - "spacing": "3px", - "list": [ - { - "iconPath": "static/tabbar/home.png", - "selectedIconPath": "static/tabbar/homeHL.png", - "pagePath": "pages/index/index", - "text": "首页" - }, - { - "iconPath": "static/tabbar/example.png", - "selectedIconPath": "static/tabbar/exampleHL.png", - "pagePath": "pages/index/about", - "text": "关于" - } - ] - }, - "pages": [ - { - "path": "pages/index/index", - "type": "home", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "首页" - } - }, - { - "path": "pages/index/about", - "type": "page", - "style": { - "navigationBarTitleText": "关于" - } - }, - { - "path": "pages/index/request", - "type": "page", - "layout": "demo", - "style": { - "navigationBarTitleText": "请求" - } - }, - { - "path": "pages/index/request2", - "type": "page", - "layout": "demo", - "style": { - "navigationBarTitleText": "请求-状态一体化" - } - }, - { - "path": "pages/index/upload", - "type": "page", - "layout": "default", - "style": { - "navigationBarTitleText": "上传" - } - }, - { - "path": "pages/index/upload2", - "type": "page", - "layout": "default", - "style": { - "navigationBarTitleText": "上传-状态一体化" - } - } - ], - "subPackages": [] -} \ No newline at end of file From 960aee04aff5c26fbc921952f65be68bdaeee188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Fri, 3 May 2024 22:53:13 +0800 Subject: [PATCH 2/8] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=20.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ee50950..025366d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,12 +22,9 @@ dist .hbuilderx .stylelintcache -# rollup-plugin-visualizer 生成的分析文件 -stats.html + # unplugin-auto-import 生成的类型文件 auto-import.d.ts -# unplugin-vue-components 生成的类型文件 -components.d.ts # vite-plugin-uni-pages 生成的类型文件 uni-pages.d.ts @@ -36,7 +33,6 @@ src/pages.json src/manifest.json # lock 文件还是不要了，我主要的版本写死就好了 -# github actions 需要这些文件，所以main分支需要留着 pnpm-lock.yaml package-lock.json From 5a118585ed46c697eb6ffa3c908ae135a5c9bd50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Fri, 3 May 2024 22:57:38 +0800 Subject: [PATCH 3/8] build: npx @dcloudio/uvm@latest --- .gitignore | 3 +++ package.json | 40 ++++++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 025366d..23fc323 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,6 @@ package-lock.json # git rm -r --cached file1 file2 ## 针对某些文件 # git rm -r --cached dir1 dir2 ## 针对某些文件夹 # git rm -r --cached . ## 针对所有文件 + +# 更新 uni-app 官方版本 +# npx @dcloudio/uvm@latest diff --git a/package.json b/package.json index 5a549f4..cfc05da 100644 --- a/package.json +++ b/package.json @@ -79,35 +79,35 @@ "bin-wrapper": "npm:bin-wrapper-china" }, "dependencies": { - "@dcloudio/uni-app": "3.0.0-4000820240401001", - "@dcloudio/uni-app-plus": "3.0.0-4000820240401001", - "@dcloudio/uni-components": "3.0.0-4000820240401001", - "@dcloudio/uni-h5": "3.0.0-4000820240401001", - "@dcloudio/uni-mp-alipay": "3.0.0-4000820240401001", - "@dcloudio/uni-mp-baidu": "3.0.0-4000820240401001", - "@dcloudio/uni-mp-jd": "3.0.0-4000820240401001", - "@dcloudio/uni-mp-kuaishou": "3.0.0-4000820240401001", - "@dcloudio/uni-mp-lark": "3.0.0-4000820240401001", - "@dcloudio/uni-mp-qq": "3.0.0-4000820240401001", - "@dcloudio/uni-mp-toutiao": "3.0.0-4000820240401001", - "@dcloudio/uni-mp-weixin": "3.0.0-4000820240401001", - "@dcloudio/uni-mp-xhs": "3.0.0-4000820240401001", - "@dcloudio/uni-quickapp-webview": "3.0.0-4000820240401001", + "@dcloudio/uni-app": "3.0.0-4010420240430001", + "@dcloudio/uni-app-plus": "3.0.0-4010420240430001", + "@dcloudio/uni-components": "3.0.0-4010420240430001", + "@dcloudio/uni-h5": "3.0.0-4010420240430001", + "@dcloudio/uni-mp-alipay": "3.0.0-4010420240430001", + "@dcloudio/uni-mp-baidu": "3.0.0-4010420240430001", + "@dcloudio/uni-mp-jd": "3.0.0-4010420240430001", + "@dcloudio/uni-mp-kuaishou": "3.0.0-4010420240430001", + "@dcloudio/uni-mp-lark": "3.0.0-4010420240430001", + "@dcloudio/uni-mp-qq": "3.0.0-4010420240430001", + "@dcloudio/uni-mp-toutiao": "3.0.0-4010420240430001", + "@dcloudio/uni-mp-weixin": "3.0.0-4010420240430001", + "@dcloudio/uni-mp-xhs": "3.0.0-4010420240430001", + "@dcloudio/uni-quickapp-webview": "3.0.0-4010420240430001", "dayjs": "1.11.10", "pinia": "2.0.36", "pinia-plugin-persistedstate": "3.2.1", "qs": "6.5.3", - "vue": "3.3.11", + "vue": "3.4.26", "wot-design-uni": "^1.2.13" }, "devDependencies": { "@commitlint/cli": "^18.4.3", "@commitlint/config-conventional": "^18.4.3", "@dcloudio/types": "^3.4.8", - "@dcloudio/uni-automator": "3.0.0-4000820240401001", - "@dcloudio/uni-cli-shared": "3.0.0-4000820240401001", - "@dcloudio/uni-stacktracey": "3.0.0-4000820240401001", - "@dcloudio/vite-plugin-uni": "3.0.0-4000820240401001", + "@dcloudio/uni-automator": "3.0.0-4010420240430001", + "@dcloudio/uni-cli-shared": "3.0.0-4010420240430001", + "@dcloudio/uni-stacktracey": "3.0.0-4010420240430001", + "@dcloudio/vite-plugin-uni": "3.0.0-4010420240430001", "@iconify-json/carbon": "^1.1.27", "@types/node": "^20.11.5", "@types/wechat-miniprogram": "^3.4.7", @@ -148,7 +148,7 @@ "unocss": "^0.58.0", "unocss-applet": "^0.7.8", "unplugin-auto-import": "^0.17.2", - "vite": "4.3.5", + "vite": "5.2.8", "vite-plugin-restart": "^0.4.0", "vue-tsc": "^1.8.25" } From d40fb087aaf529a35a8dab3c48164fe9d849d2fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Fri, 3 May 2024 23:01:03 +0800 Subject: [PATCH 4/8] =?UTF-8?q?build:=20stylelint-config-standard=20?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=88=90=E4=BA=86=E6=9B=B4=E5=AE=BD=E6=9D=BE?= =?UTF-8?q?=E7=9A=84=20stylelint-config-recommended?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .stylelintrc.cjs | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs index b2f0a8f..2cb661a 100644 --- a/.stylelintrc.cjs +++ b/.stylelintrc.cjs @@ -3,7 +3,8 @@ module.exports = { root: true, extends: [ - 'stylelint-config-standard', + // stylelint-config-standard 替换成了更宽松的 stylelint-config-recommended + 'stylelint-config-recommended', // stylelint-config-standard-scss 替换成了更宽松的 stylelint-config-recommended-scss 'stylelint-config-recommended-scss', 'stylelint-config-recommended-vue/scss', diff --git a/package.json b/package.json index cfc05da..0e7b3c0 100644 --- a/package.json +++ b/package.json @@ -139,9 +139,9 @@ "stylelint": "^16.0.2", "stylelint-config-html": "^1.1.0", "stylelint-config-recess-order": "^4.4.0", + "stylelint-config-recommended": "^14.0.0", "stylelint-config-recommended-scss": "^14.0.0", "stylelint-config-recommended-vue": "^1.5.0", - "stylelint-config-standard": "^35.0.0", "stylelint-prettier": "^5.0.0", "terser": "^5.26.0", "typescript": "^4.9.5", From 7beb03a89e41dc1c2ef87cba1359414714e5503d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Sat, 4 May 2024 22:39:45 +0800 Subject: [PATCH 5/8] =?UTF-8?q?chore:=20proxy=20=E5=8F=AF=E9=80=89?= =?UTF-8?q?=EF=BC=8C=E9=9D=9E=E5=BF=85=E9=A1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vite.config.ts b/vite.config.ts index e678465..24acf1c 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -110,13 +110,13 @@ export default ({ command, mode }) => { hmr: true, port: Number.parseInt(VITE_APP_PORT, 10), // 仅 H5 端生效，其他端不生效（其他端走build，不走devServer) - proxy: { - '/api': { - target: VITE_SERVER_BASEURL, - changeOrigin: true, - rewrite: (path) => path.replace(/^\/api/, ''), - }, - }, + // proxy: { + // '/api': { + // target: VITE_SERVER_BASEURL, + // changeOrigin: true, + // rewrite: (path) => path.replace(/^\/api/, ''), + // }, + // }, }, build: { // 方便非h5端调试 From cc53167750a659a27b0b6aa7ec75fb3d1e277772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Sat, 4 May 2024 23:29:21 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8=20http.get=20?= =?UTF-8?q?=E6=9B=BF=E4=BB=A3=20httpGet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/index/foo.ts | 8 ++++++-- src/utils/http.ts | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/service/index/foo.ts b/src/service/index/foo.ts index 7263dfc..dac3519 100644 --- a/src/service/index/foo.ts +++ b/src/service/index/foo.ts @@ -1,4 +1,4 @@ -import { http, httpGet } from '@/utils/http' +import { http } from '@/utils/http' export interface IFooItem { id: string name: string @@ -15,7 +15,7 @@ export const getFooAPI = (name: string) => { /** GET 请求 - 再次简化，看大家是否喜欢这种简化 */ export const getFooAPI2 = (name: string) => { - return httpGet('/foo', { name }) + return http.get('/foo', { name }) } /** POST 请求 */ @@ -27,3 +27,7 @@ export const postFooAPI = (name: string) => { data: { name }, }) } +/** POST 请求 - 再次简化，看大家是否喜欢这种简化 */ +export const postFooAPI2 = (name: string) => { + return http.post('/foo', { name }, { name }) +} diff --git a/src/utils/http.ts b/src/utils/http.ts index db4c6aa..4e3f38c 100644 --- a/src/utils/http.ts +++ b/src/utils/http.ts @@ -41,6 +41,7 @@ export const http = (options: CustomRequestOptions) => { }) }) } + /** * GET 请求 * @param url 后台地址 @@ -74,3 +75,6 @@ export const httpPost = ( method: 'POST', }) } + +http.get = httpGet +http.post = httpPost From 3967084fda278da3d10fe1868ff75db499c60500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Wed, 8 May 2024 10:23:59 +0800 Subject: [PATCH 7/8] =?UTF-8?q?build:=20add=20uni=5Fmodules=20=E5=B9=B6=20?= =?UTF-8?q?=E5=8A=A0=E5=85=A5ignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintignore | 1 + .stylelintignore | 1 + src/uni_modules/.gitkeep | 0 3 files changed, 2 insertions(+) create mode 100644 .eslintignore create mode 100644 .stylelintignore create mode 100644 src/uni_modules/.gitkeep diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..2ce5c91 --- /dev/null +++ b/.eslintignore @@ -0,0 +1 @@ +src/uni_modules/ diff --git a/.stylelintignore b/.stylelintignore new file mode 100644 index 0000000..2ce5c91 --- /dev/null +++ b/.stylelintignore @@ -0,0 +1 @@ +src/uni_modules/ diff --git a/src/uni_modules/.gitkeep b/src/uni_modules/.gitkeep new file mode 100644 index 0000000..e69de29 From 1914f439727f531347db4861d21ab341510bba30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Wed, 8 May 2024 15:33:31 +0800 Subject: [PATCH 8/8] refine: index.ts --- src/utils/index.ts | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/utils/index.ts b/src/utils/index.ts index 98fe2b6..715c123 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,16 +1,18 @@ -import pagesJson from '@/pages.json' - -console.log(pagesJson) +import { pages, subPackages, tabBar } from '@/pages.json' /** 判断当前页面是否是tabbar页 */ export const getIsTabbar = () => { - if (!Object.keys(pagesJson).includes('tabBar')) { + if (!tabBar) { return false } - const pages = getCurrentPages() - const lastPage = pages.at(-1) + if (!tabBar.list.length) { + // 通常有tabBar的话，list不能有空，且至少有2个元素，这里其实不用处理 + return false + } + // getCurrentPages() 至少有1个元素，所以不再额外判断 + const lastPage = getCurrentPages().at(-1) const currPath = lastPage.route - return !!pagesJson.tabBar.list.find((e) => e.pagePath === currPath) + return !!tabBar.list.find((e) => e.pagePath === currPath) } /** @@ -19,10 +21,8 @@ export const getIsTabbar = () => { * redirectPath 如 ‘/pages/demo/base/route-interceptor’ */ export const currRoute = () => { - const pages = getCurrentPages() - console.log('pages:', pages) - - const lastPage = pages.at(-1) + // getCurrentPages() 至少有1个元素，所以不再额外判断 + const lastPage = getCurrentPages().at(-1) const currRoute = (lastPage as any).$page // console.log('lastPage.$page:', currRoute) // console.log('lastPage.$page.fullpath:', currRoute.fullPath) @@ -66,8 +66,8 @@ export const getUrlObj = (url: string) => { */ export const getAllPages = (key = 'needLogin') => { // 这里处理主包 - const pages = [ - ...pagesJson.pages + const mainPages = [ + ...pages .filter((page) => !key || page[key]) .map((page) => ({ ...page, @@ -76,7 +76,7 @@ export const getAllPages = (key = 'needLogin') => { ] // 这里处理分包 const subPages: any[] = [] - pagesJson.subPackages.forEach((subPageObj) => { + subPackages.forEach((subPageObj) => { // console.log(subPageObj) const { root } = subPageObj @@ -89,7 +89,7 @@ export const getAllPages = (key = 'needLogin') => { }) }) }) - const result = [...pages, ...subPages] + const result = [...mainPages, ...subPages] console.log(`getAllPages by ${key} result: `, result) return result }