diff --git a/CHANGELOG.md b/CHANGELOG.md index afba35d..dfa9c0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,11 @@ - | indexedDB | [687394e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/687394e) 富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/ed3d644) pinch | alloy finger实现图片的pinch放大缩小 | [de01343](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/de01343) + - | db store | [6414c4f](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/6414c4f) + - | indexedDB | [687394e](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/687394e) + - | 标题栏角色栏全局任务组件新建 | [0500cb4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/0500cb4) + pinch | alloy finger实现图片的pinch放大缩小 | [de01343](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/de01343) + 富文本插件 | 富文本插件demo测试 | [ed3d644](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/ed3d644) ### 🎨 代码样式 @@ -22,24 +27,25 @@ - | 图标修改 | [54bca09](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/54bca09) - | 无基本变化 | [21ac4bb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/21ac4bb) - | 组件新建 | [89c0035](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/89c0035) + - | 组件新建 | [89c0035](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/89c0035) ### 🐛 Bug 修复 范围|描述|commitId --|--|-- - - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/749ae9a) + - | 修改main | [749ae9a](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/749ae9a) ### 📝 文档 范围|描述|commitId --|--|-- - - | README.md | [ab0eb05](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/ab0eb05) + - | README.md | [ab0eb05](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/ab0eb05) ### 🔨 代码重构 范围|描述|commitId --|--|-- - template | eslint prettier sass uview tailwindcss | [9c966a1](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/9c966a1) + template | eslint prettier sass uview tailwindcss | [9c966a1](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/9c966a1) ### 🚀 性能优化 @@ -49,18 +55,20 @@ - | 组件文件夹新建 | [22bfe7b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/22bfe7b) - | 组件文件夹新建 | [17bb8c9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/17bb8c9) - | 组件文件夹新建 | [1421504](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1421504) + - | 组件文件夹新建 | [22bfe7b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/22bfe7b) + - | 组件文件夹新建 | [17bb8c9](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/17bb8c9) + - | 组件文件夹新建 | [1421504](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1421504) ### chore 范围|描述|commitId --|--|-- - pwa 小程序 | 移除了pwa,alloyFinger添加平台判断 | [875fab4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/875fab4) - - | uview-ui | [a9ea34b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a9ea34b) - 信息配置 | 配置eslint等配置 | [7421443](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/7421443) + pwa 小程序 | 移除了pwa,alloyFinger添加平台判断 | [875fab4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/875fab4) + - | uview-ui | [a9ea34b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/a9ea34b) + 信息配置 | 配置eslint等配置 | [7421443](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/7421443) 范围|描述|commitId --|--|-- - - | !2 基础模板v1.1.0 | [f5e61dd](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/f5e61dd) - - | init | [c0f1deb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c0f1deb) - + - | !2 基础模板v1.1.0 | [f5e61dd](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/f5e61dd) + - | init | [c0f1deb](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/c0f1deb) diff --git a/package.json b/package.json index b173962..e340040 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "serve": "npm run dev:h5", "build": "npm run build:h5", "lint": "vue-cli-service lint", + "fix": "vue-cli-service lint --fix", "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build", "build:custom": "cross-env NODE_ENV=production uniapp-cli custom", "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build", @@ -66,6 +67,7 @@ "core-js": "^3.6.5", "dayjs": "^1.10.6", "postcss": "^7", + "lodash": "^4.17.21", "postcss-loader": "^6.1.1", "regenerator-runtime": "^0.12.1", "register-service-worker": "^1.7.1", diff --git a/public/index.html b/public/index.html index 269488e..f3b1b9a 100644 --- a/public/index.html +++ b/public/index.html @@ -23,11 +23,6 @@
- - diff --git a/src/main.js b/src/main.js index 4cc3367..a23cc71 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,9 @@ import './registerServiceWorker'; import AlloyFinger from 'alloyfinger'; import AlloyFingerPlugin from 'alloyfinger/vue/alloy_finger_vue'; Vue.use(AlloyFingerPlugin, { AlloyFinger }); +// indexedDB +import indexedDB from '@/utils/indexedDB'; +Vue.use(indexedDB); //#endif Vue.config.productionTip = false; diff --git a/src/mock/rich-text.js b/src/mock/mock.js similarity index 59% rename from src/mock/rich-text.js rename to src/mock/mock.js index c62a460..633cd8c 100644 --- a/src/mock/rich-text.js +++ b/src/mock/mock.js @@ -30,4 +30,42 @@ export default [ }); }, }, + { + path: '/users/userId', + handler: (req, res) => { + return res.json({ + code: 200, + msg: 'ok', + success: true, + data: { + account: 'wally', + id: 123, + phone: '18603454788', + refresh_token: 'string', + token: 'string', + wxInfo: { + city: 'string', + country: 'string', + headImgUrl: 'string', + language: 'string', + nickname: 'string', + province: 'string', + sex: 0, + }, + }, + }); + }, + }, + { + path: '/test1', + method: 'post', + handler: (req, res) => { + return res.json({ + code: 200, + msg: 'ok', + success: true, + data: { account: 'wally' }, + }); + }, + }, ]; diff --git a/src/pages.json b/src/pages.json index ee7915d..a4991ec 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,45 +1,45 @@ -{ - "pages": [ - { - "path": "pages/index/index", - "style": { - "navigationStyle": "custom" , - "navigationBarTextStyle": "white" - } - }, - { - "path": "pages/plugin-test/plugin-test", - "style": { - "navigationBarTitleText": "iframe-测试" - } - }, - { - "path": "pages/rich-text/rich-text", - "style": { - "navigationBarTitleText": "rich-text 测试" - } - }, - { - "path": "pages/pinch/pinch", - "style": { - "navigationBarTitleText": "pinch 测试" - } - }, - { - "path": "components/Title/Title", - "style": { - "navigationStyle": "custom" , - "navigationBarTextStyle": "white" - } - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" - }, - "easycom": { - "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" - } -} +{ + "pages": [ + { + "path": "pages/index/index", + "style": { + "navigationStyle": "custom" , + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/plugin-test/plugin-test", + "style": { + "navigationBarTitleText": "iframe-测试" + } + }, + { + "path": "pages/rich-text/rich-text", + "style": { + "navigationBarTitleText": "rich-text 测试" + } + }, + { + "path": "pages/pinch/pinch", + "style": { + "navigationBarTitleText": "pinch 测试" + } + }, + { + "path": "components/Title/Title", + "style": { + "navigationStyle": "custom" , + "navigationBarTextStyle": "white" + } + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8" + }, + "easycom": { + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" + } +} diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 488688a..efc4e94 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,3 +1,4 @@ +<<<<<<< HEAD