diff --git a/components/attachment-select/attachment-select.vue b/components/attachment-select/attachment-select.vue deleted file mode 100644 index d2a1f8a..0000000 --- a/components/attachment-select/attachment-select.vue +++ /dev/null @@ -1,207 +0,0 @@ - - - - - diff --git a/components/bottom-tool-bar/bottom-tool-bar.vue b/components/bottom-tool-bar/bottom-tool-bar.vue deleted file mode 100644 index 3a1d034..0000000 --- a/components/bottom-tool-bar/bottom-tool-bar.vue +++ /dev/null @@ -1,194 +0,0 @@ - - - - - diff --git a/components/journal-card/journal-card.vue b/components/journal-card/journal-card.vue deleted file mode 100644 index 9a45020..0000000 --- a/components/journal-card/journal-card.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - - - \ No newline at end of file diff --git a/main.js b/main.js index 6ac5337..13d44f5 100644 --- a/main.js +++ b/main.js @@ -1,10 +1,5 @@ import App from "./App"; import Vue from "vue"; -import { - router, - RouterMount -} from './router/router.js' -Vue.use(router) // 挂载全局工具类 import utils from "./utils/index.js"; @@ -75,10 +70,4 @@ const app = new Vue({ ...App, }); -// #ifdef H5 -RouterMount(app, router, '#app') -// #endif - -// #ifndef H5 -app.$mount(); //为了兼容小程序及app端必须这样写才有效果 -// #endif +app.$mount(); diff --git a/package.json b/package.json deleted file mode 100644 index c8d9569..0000000 --- a/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "uni-halo", - "version": "1.0.0", - "description": "

\r \"logo\"\r

\r

uni-halo

\r

uni-halo 基于Halo一款现代化的开源博客/CMS系统API开发的可多端编译应用

", - "repository": { - "type": "git", - "url": "git+https://gitee.com/ialley-workshop-open/uni-halo.git" - }, - "keywords": [ - "uni-halo", - "小莫唐尼", - "巷子工坊" - ], - "author": "巷子工坊丨小莫唐尼", - "license": "AGPL-3.0", - "bugs": { - "url": "https://gitee.com/ialley-workshop-open/uni-halo/issues" - }, - "homepage": "https://uni-halo.925i.cn", - "devDependencies": { - "vue-i18n": "^9.1.10" - }, - "dependencies": { - "qs": "^6.12.1", - "uni-read-pages": "^1.0.5", - "uni-simple-router": "^2.0.8-beta.4" - } -} diff --git a/pages.json b/pages.json index cd60e02..17de5aa 100644 --- a/pages.json +++ b/pages.json @@ -185,20 +185,7 @@ } } } - }, - { - "path": "journal/journal", - "style": { - "navigationBarTitleText": "个人日记", - "enablePullDownRefresh": true, - "app-plus": { - "pullToRefresh": { - "color": "#03a9f4", - "style": "circle" - } - } - } - }, + }, { "path": "articles/articles", "style": { @@ -272,13 +259,7 @@ } } } - }, - { - "path": "test-page/test-page", - "style": { - "navigationBarTitleText": "" - } - }, + }, { "path": "advertise/advertise", "style": { diff --git a/pages/tabbar/about/about.vue b/pages/tabbar/about/about.vue index 4ca2cb2..d9b3048 100644 --- a/pages/tabbar/about/about.vue +++ b/pages/tabbar/about/about.vue @@ -174,38 +174,37 @@ export default { // #ifdef MP-WEIXIN _isWx = true; // #endif - this.navList = [ - { - key: 'archives', - title: '文章归档', - leftIcon: 'halocoloricon-classify', - leftIconColor: 'red', - rightText: '已归档的文章', - path: '/pagesA/archives/archives', - isAdmin: false, - type: 'page', - show: false - }, { - key: 'love', - title: '恋爱日记', - leftIcon: 'halocoloricon-attent', - leftIconColor: 'red', - rightText: '甜蜜恋人的专属', - path: '/pagesA/love/love', - isAdmin: false, - type: 'page', - show: this.haloConfigs.loveConfig.loveEnabled - }, { - key: 'disclaimers', - title: '友情链接', - leftIcon: 'icon-lianjie', - leftIconColor: 'blue', - rightText: '看看朋友们吧', - path: '/pagesA/friend-links/friend-links', - isAdmin: false, - type: 'page', - show: true - }, + this.navList = [{ + key: 'archives', + title: '文章归档', + leftIcon: 'halocoloricon-classify', + leftIconColor: 'red', + rightText: '已归档的文章', + path: '/pagesA/archives/archives', + isAdmin: false, + type: 'page', + show: false + }, { + key: 'love', + title: '恋爱日记', + leftIcon: 'halocoloricon-attent', + leftIconColor: 'red', + rightText: '甜蜜恋人的专属', + path: '/pagesA/love/love', + isAdmin: false, + type: 'page', + show: this.haloConfigs.loveConfig.loveEnabled + }, { + key: 'disclaimers', + title: '友情链接', + leftIcon: 'icon-lianjie', + leftIconColor: 'blue', + rightText: '看看朋友们吧', + path: '/pagesA/friend-links/friend-links', + isAdmin: false, + type: 'page', + show: true + }, { key: 'disclaimers', title: '免责声明', @@ -400,9 +399,9 @@ export default { break; } } else if (type == 'page') { - this.$Router.push({ - path: path - }); + uni.navigateTo({ + url: path + }) } }, diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index 954085e..b810770 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -90,7 +90,6 @@ import tmIcons from '@/tm-vuetify/components/tm-icons/tm-icons.vue'; import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue'; import eSwiper from '@/components/e-swiper/e-swiper.vue'; -import qs from 'qs' export default { components: { @@ -209,15 +208,8 @@ export default { }); }; - const paramsStr = qs.stringify(this.queryParams, { - allowDots: true, - encodeValuesOnly: true, - skipNulls: true, - encode: true, - arrayFormat: 'repeat' - }) uni.request({ - url: this.$baseApiUrl + '/apis/api.content.halo.run/v1alpha1/posts?' + paramsStr, + url: this.$baseApiUrl + '/apis/api.content.halo.run/v1alpha1/posts', method: 'GET', params: this.queryParams, success: (res) => { @@ -241,25 +233,14 @@ export default { }, // 文章列表 fnGetArticleList() { - // uni.showLoading({ - // mask: true, - // title: '加载中...' - // }); // 设置状态为加载中 if (!this.isLoadMore) { this.loading = 'loading'; } this.loadMoreText = '加载中...'; - const paramsStr = qs.stringify(this.queryParams, { - allowDots: true, - encodeValuesOnly: true, - skipNulls: true, - encode: true, - arrayFormat: 'repeat' - }) uni.request({ - url: this.$baseApiUrl + '/apis/api.content.halo.run/v1alpha1/posts?' + paramsStr, + url: this.$baseApiUrl + '/apis/api.content.halo.run/v1alpha1/posts?', method: 'GET', params: this.queryParams, success: (res) => { diff --git a/pages/template.vue b/pages/template.vue deleted file mode 100644 index 310ae76..0000000 --- a/pages/template.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - - diff --git a/pagesA/friend-links/friend-links.vue b/pagesA/friend-links/friend-links.vue index fce5775..481183f 100644 --- a/pagesA/friend-links/friend-links.vue +++ b/pagesA/friend-links/friend-links.vue @@ -290,9 +290,9 @@ export default { }); }, toSubmitLinkPage() { - this.$Router.push({ - path: '/pagesA/submit-link/submit-link' - }); + uni.navigateTo({ + url: '/pagesA/submit-link/submit-link' + }) } } }; diff --git a/pagesA/journal/journal.vue b/pagesA/journal/journal.vue deleted file mode 100644 index 9435c80..0000000 --- a/pagesA/journal/journal.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - - - diff --git a/pagesA/start/start.vue b/pagesA/start/start.vue index ffff379..171a86d 100644 --- a/pagesA/start/start.vue +++ b/pagesA/start/start.vue @@ -48,10 +48,10 @@ diff --git a/pagesA/test-page/test-page.vue b/pagesA/test-page/test-page.vue deleted file mode 100644 index 30c07fc..0000000 --- a/pagesA/test-page/test-page.vue +++ /dev/null @@ -1,289 +0,0 @@ - - - - - \ No newline at end of file diff --git a/router/router.js b/router/router.js deleted file mode 100644 index 991ac00..0000000 --- a/router/router.js +++ /dev/null @@ -1,24 +0,0 @@ -// router.js -import { - RouterMount, - createRouter -} from 'uni-simple-router'; - -const router = createRouter({ - platform: process.env.VUE_APP_PLATFORM, - routes: [...ROUTES] -}); - -//全局路由前置守卫 -router.beforeEach((to, from, next) => { - next(); -}); -// 全局路由后置守卫 -router.afterEach((to, from) => { - console.log('跳转结束') -}) - -export { - router, - RouterMount -} diff --git a/vue.config.js b/vue.config.js index ad28b05..141b8c6 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,8 +1,4 @@ //vue.config.js -const TransformPages = require('uni-read-pages') -const { - webpack -} = new TransformPages() module.exports = { devServer: { disableHostCheck: true, @@ -16,17 +12,5 @@ module.exports = { } } } - }, - configureWebpack: { - plugins: [ - new webpack.DefinePlugin({ - ROUTES: webpack.DefinePlugin.runtimeValue(() => { - const tfPages = new TransformPages({ - includes: ['path', 'name', 'aliasPath', "meta"] - }); - return JSON.stringify(tfPages.routes) - }, true) - }) - ] } -} \ No newline at end of file +}