diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 4bbcf3c..14c6b7b 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -14,6 +14,10 @@ { "launchtype" : "local" }, + "mp-qq" : + { + "launchtype" : "local" + }, "mp-weixin" : { "launchtype" : "local" diff --git a/config/halo.config.template.js b/config/halo.config.template.js index 28853a0..5a69ebf 100644 --- a/config/halo.config.template.js +++ b/config/halo.config.template.js @@ -18,7 +18,8 @@ export default { apiAuthorization: '', // Api认证key [必填]: Halo中-系统-博客设置-切换到高级选项-API设置-Access key title: '', // 博客标题 [建议必填]:在某些页面没有设置具体的页面名称时候,使用该值显示 - miniCodeImageUrl: '', // 小程序的太阳码/二维码的图片地址 [建议必填]:主要用于文章详情页面的生成海报的功能 + miniCodeImageUrl: '', // 小程序的太阳码/二维码的图片地址 [建议必填] + aboutProfileImageUrl: '', // 关于页面中的资料卡背景图 [建议必填] // 启动页面的配置(页面地址`/pagesA/start/start`) @@ -80,8 +81,8 @@ export default { list: [], }, - quickNav: { // 快捷导航配置 - use: true, + quickNav: { // 快捷导航配置(如不需要恋爱日记,请注释或删除94-101行的代码) + use: true, // 是否在个人中心显示以下页面的入口 list: [{ icon: 'halocoloricon-classify', text: '文章归档', diff --git a/manifest.json b/manifest.json index 11b0aeb..90c689f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,162 +1,217 @@ { - "name" : "uni-halo", - "appid" : "__UNI__5748B6E", - "description" : "uni-halo博客:基于halo开源博客系统API开发的多端博客。", - "versionName" : "1.0.0", - "versionCode" : 100, - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : { - "OAuth" : {}, - "Share" : {} - }, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : { - "dSYMs" : false, - "capabilities" : { - "entitlements" : { - "com.apple.developer.associated-domains" : [ "applinks:static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com" ] - } - } - }, - /* SDK配置 */ - "sdkConfigs" : { - "ad" : { - "gdt" : {}, - "csj" : {}, - "360" : {}, - "ks" : {}, - "sigmob" : {}, - "hw" : {}, - "bd" : {} - }, - "oauth" : { - "weixin" : { - "appid" : "wxd971954762ec4744", - "UniversalLinks" : "https://static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com/uni-universallinks/__UNI__5748B6E/" - } - }, - "share" : { - "weixin" : { - "appid" : "wxd971954762ec4744", - "UniversalLinks" : "https://static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com/uni-universallinks/__UNI__5748B6E/" - } - } - }, - "icons" : { - "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" - }, - "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", - "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" - }, - "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" - } - } - } - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "wx1bb161867082c72f", - "setting" : { - "urlCheck" : false, - "minified" : true - }, - "usingComponents" : true - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "2", - "h5" : { - "title" : "uni-halo", - "devServer" : { - "disableHostCheck" : true, - "proxy" : { - "/api" : { - "target" : "https://b.925i.cn", - "changeOrigin" : true, - "secure" : false, - "pathRewrite" : { - "^/api" : "" - } - } - } - }, - "optimization" : { - "preload" : true, - "treeShaking" : { - "enable" : true - } - } - }, - "_spaceID" : "699a26a5-a6cd-4b54-b603-5155b312a5f5" -} + "name": "uni-halo", + "appid": "__UNI__5748B6E", + "description": "uni-halo博客:基于halo开源博客系统API开发的多端博客。", + "versionName": "1.0.0", + "versionCode": 100, + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": { + "OAuth": {}, + "Share": {} + }, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": { + "dSYMs": false, + "capabilities": { + "entitlements": { + "com.apple.developer.associated-domains": ["applinks:static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com"] + } + } + }, + /* SDK配置 */ + "sdkConfigs": { + "ad": { + "gdt": {}, + "csj": {}, + "360": {}, + "ks": {}, + "sigmob": {}, + "hw": {}, + "bd": {} + }, + "oauth": { + "weixin": { + "appid": "wxd971954762ec4744", + "UniversalLinks": "https://static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com/uni-universallinks/__UNI__5748B6E/" + } + }, + "share": { + "weixin": { + "appid": "wxd971954762ec4744", + "UniversalLinks": "https://static-699a26a5-a6cd-4b54-b603-5155b312a5f5.bspapp.com/uni-universallinks/__UNI__5748B6E/" + } + } + }, + "icons": { + "android": { + "hdpi": "unpackage/res/icons/72x72.png", + "xhdpi": "unpackage/res/icons/96x96.png", + "xxhdpi": "unpackage/res/icons/144x144.png", + "xxxhdpi": "unpackage/res/icons/192x192.png" + }, + "ios": { + "appstore": "unpackage/res/icons/1024x1024.png", + "ipad": { + "app": "unpackage/res/icons/76x76.png", + "app@2x": "unpackage/res/icons/152x152.png", + "notification": "unpackage/res/icons/20x20.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "proapp@2x": "unpackage/res/icons/167x167.png", + "settings": "unpackage/res/icons/29x29.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "spotlight": "unpackage/res/icons/40x40.png", + "spotlight@2x": "unpackage/res/icons/80x80.png" + }, + "iphone": { + "app@2x": "unpackage/res/icons/120x120.png", + "app@3x": "unpackage/res/icons/180x180.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "notification@3x": "unpackage/res/icons/60x60.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "settings@3x": "unpackage/res/icons/87x87.png", + "spotlight@2x": "unpackage/res/icons/80x80.png", + "spotlight@3x": "unpackage/res/icons/120x120.png" + } + } + } + }, + "uniStatistics": { + "enable": true + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wx1bb161867082c72f", + "setting": { + "urlCheck": false, + "minified": true + }, + "usingComponents": true, + "uniStatistics": { + "enable": true + } + }, + "mp-alipay": { + "usingComponents": true, + "uniStatistics": { + "enable": true + } + }, + "mp-baidu": { + "usingComponents": true, + "uniStatistics": { + "enable": true + } + }, + "mp-toutiao": { + "usingComponents": true, + "uniStatistics": { + "enable": true + } + }, + "uniStatistics": { + "enable": true, + "version": "2" + }, + "vueVersion": "2", + "h5": { + "title": "uni-halo", + "devServer": { + "disableHostCheck": true, + "proxy": { + "/api": { + "target": "https://b.925i.cn", + "changeOrigin": true, + "secure": false, + "pathRewrite": { + "^/api": "/api" + } + } + } + }, + "optimization": { + "preload": true, + "treeShaking": { + "enable": true + } + }, + "uniStatistics": { + "enable": true + } + }, + "_spaceID": "699a26a5-a6cd-4b54-b603-5155b312a5f5", + "mp-qq": { + "appid": "1112285420", + "setting": { + "minified": true, + "postcss": true, + "es6": true + }, + "uniStatistics": { + "enable": true + } + }, + "mp-jd": { + "uniStatistics": { + "enable": true + } + }, + "mp-kuaishou": { + "uniStatistics": { + "enable": true + } + }, + "mp-lark": { + "uniStatistics": { + "enable": true + } + }, + "quickapp-webview-huawei": { + "uniStatistics": { + "enable": true + } + }, + "quickapp-webview-union": { + "uniStatistics": { + "enable": true + } + } +} \ No newline at end of file diff --git a/pages.json b/pages.json index 5952fb2..738a626 100644 --- a/pages.json +++ b/pages.json @@ -549,8 +549,8 @@ "backgroundColor": "#F8F8F8" }, "tabBar": { - "backgroundColor": "white", - "borderStyle": "white", + "backgroundColor": "#fff", + "borderStyle": "#fff", "color": "#303133", "selectedColor": "#03a9f4", "list": [{ diff --git a/pages/tabbar/about/about.vue b/pages/tabbar/about/about.vue index abe1219..13fdbf4 100644 --- a/pages/tabbar/about/about.vue +++ b/pages/tabbar/about/about.vue @@ -277,6 +277,10 @@ export default { }, fnGetNavList() { const systemInfo = uni.getSystemInfoSync(); + let _isWx = false; + // #ifdef MP-WEIXIN + _isWx = true; + // #endif this.navList = [ { key: 'disclaimers', @@ -310,7 +314,7 @@ export default { isAdmin: false, type: 'page', openType: 'contact', - show: true + show: _isWx }, { key: 'feedback', @@ -322,7 +326,7 @@ export default { isAdmin: false, type: 'page', openType: 'feedback', - show: true + show: _isWx }, { key: 'about', diff --git a/pagesA/article-detail/article-detail.vue b/pagesA/article-detail/article-detail.vue index c9fbaec..a288fe4 100644 --- a/pagesA/article-detail/article-detail.vue +++ b/pagesA/article-detail/article-detail.vue @@ -73,7 +73,10 @@ - + @@ -101,7 +104,10 @@ /> - + @@ -657,6 +663,7 @@ export default { }, fnSavePoster() { this.$refs.rCanvas.saveImage(this.poster.res.tempFilePath); + uni.$tm.toast('保存成功'); }, fnShareTo() { // #ifdef MP-WEIXIN diff --git a/pagesA/comment/comment.vue b/pagesA/comment/comment.vue index 344aee2..5807245 100644 --- a/pagesA/comment/comment.vue +++ b/pagesA/comment/comment.vue @@ -3,19 +3,7 @@ - + @@ -30,134 +18,136 @@ + + .poup-content { + width: 500rpx; + + ::v-deep { + .slider_id { + width: 100% !important; + } + } + } + \ No newline at end of file diff --git a/pagesA/contact/contact.vue b/pagesA/contact/contact.vue index 2b06537..c9484da 100644 --- a/pagesA/contact/contact.vue +++ b/pagesA/contact/contact.vue @@ -4,14 +4,18 @@ {{ bloggerInfo.nickname }} - {{ bloggerInfo.description || '这个博主很懒,竟然没写介绍~' }} + + {{ bloggerInfo.description || '这个博主很懒,竟然没写介绍~' }} + + + diff --git a/tm-vuetify/tool/function/dayjs/zh-cn.min.js b/tm-vuetify/tool/function/dayjs/zh-cn.min.js index 2d4932b..f46280f 100644 --- a/tm-vuetify/tool/function/dayjs/zh-cn.min.js +++ b/tm-vuetify/tool/function/dayjs/zh-cn.min.js @@ -4,4 +4,4 @@ * * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files */ -!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("./dayjs.min")):"function"==typeof define&&define.amd?define(["./dayjs.min"],_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_zh_cn=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"zh-cn",weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),ordinal:function(e,_){switch(_){case"W":return e+"周";default:return e+"日"}},weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日Ah点mm分",LLLL:"YYYY年M月D日ddddAh点mm分",l:"YYYY/M/D",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},relativeTime:{future:"%s后",past:"%s前",s:"几秒",m:"1 分钟",mm:"%d 分钟",h:"1 小时",hh:"%d 小时",d:"1 天",dd:"%d 天",M:"1 个月",MM:"%d 个月",y:"1 年",yy:"%d 年"},meridiem:function(e,_){var t=100*e+_;return t<600?"凌晨":t<900?"早上":t<1100?"上午":t<1300?"中午":t<1800?"下午":"晚上"}};return t.default.locale(d,null,!0),d})); \ No newline at end of file +!function(e,_){"object"==typeof exports&&"undefined"!=typeof module?module.exports=_(require("./dayjs.min.js")):"function"==typeof define&&define.amd?define(require("./dayjs.min.js"),_):(e="undefined"!=typeof globalThis?globalThis:e||self).dayjs_locale_zh_cn=_(e.dayjs)}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"zh-cn",weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),ordinal:function(e,_){switch(_){case"W":return e+"周";default:return e+"日"}},weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日Ah点mm分",LLLL:"YYYY年M月D日ddddAh点mm分",l:"YYYY/M/D",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},relativeTime:{future:"%s后",past:"%s前",s:"几秒",m:"1 分钟",mm:"%d 分钟",h:"1 小时",hh:"%d 小时",d:"1 天",dd:"%d 天",M:"1 个月",MM:"%d 个月",y:"1 年",yy:"%d 年"},meridiem:function(e,_){var t=100*e+_;return t<600?"凌晨":t<900?"早上":t<1100?"上午":t<1300?"中午":t<1800?"下午":"晚上"}};return t.default.locale(d,null,!0),d})); \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 6f6fbe5..e7aa6b9 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,7 +12,7 @@ module.exports = { changeOrigin: true, secure: true, pathRewrite: { - "^/api": "" + "^/api": "/api" } } } @@ -29,4 +29,4 @@ module.exports = { }) ] } -} +} \ No newline at end of file