diff --git a/App.vue b/App.vue index cb0f4c6..7c9cb1e 100644 --- a/App.vue +++ b/App.vue @@ -64,14 +64,10 @@ export default { @import './common/icons/mphtmliconfont.css'; /* #ifndef MP-WEIXIN */ -@import './common/markdown/markdown.scss'; //引入markdown呈现 +@import './common/markdown/markdown.scss'; /* #endif */ page { - // background-color: #f3f5f7; - // background-color: #f7f7f7; - // background-color: #ffffff; background-color: #fafafa; - // background-color: #f4f5f5; } diff --git a/common/mixins/index.js b/common/mixins/index.js index 2edcaf9..e08b55c 100644 --- a/common/mixins/index.js +++ b/common/mixins/index.js @@ -24,7 +24,7 @@ export default { computed: { // 获取全局应用设置 globalAppSettings() { - return uni.$tm.vx.getters().setting.getSettings; + return uni.$tm.vx.getters().getSettings; } }, created() { diff --git a/components/article-card/article-card.vue b/components/article-card/article-card.vue index 93c9371..2e09444 100644 --- a/components/article-card/article-card.vue +++ b/components/article-card/article-card.vue @@ -160,7 +160,7 @@ export default { padding: 0; .left { width: 100%; - height: 300rpx; + height: 340rpx; .thumbnail { ::v-deep uni-image { border-radius: 6rpx 6rpx 0 0 !important; @@ -188,7 +188,7 @@ export default { flex-direction: column; .left { width: 100%; - height: 260rpx; + height: 340rpx; order: 2; margin-top: 24rpx; } diff --git a/components/comment-item/comment-item.vue b/components/comment-item/comment-item.vue index 1d1a0ff..5a5b92a 100644 --- a/components/comment-item/comment-item.vue +++ b/components/comment-item/comment-item.vue @@ -74,7 +74,7 @@ export default { computed: { // 获取博主信息 bloggerInfo() { - let blogger = this.$tm.vx.getters().blogger.getBlogger; + let blogger = this.$tm.vx.getters().getBlogger; blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true); return blogger; } diff --git a/components/journal-card/journal-card.vue b/components/journal-card/journal-card.vue index 0410cdb..e32a2c9 100644 --- a/components/journal-card/journal-card.vue +++ b/components/journal-card/journal-card.vue @@ -96,7 +96,7 @@ export default { computed: { // 获取博主信息 bloggerInfo() { - let blogger = this.$tm.vx.getters().blogger.getBlogger; + let blogger = this.$tm.vx.getters().getBlogger; blogger.avatar = this.$utils.checkAvatarUrl(blogger.avatar, true); return blogger; } diff --git a/config/halo.config.template.js b/config/halo.config.template.js index 5da4b91..d7fc7f8 100644 --- a/config/halo.config.template.js +++ b/config/halo.config.template.js @@ -14,14 +14,17 @@ export default { showAbout: true, // 显示关于项目入口 uni_halo_logo: 'https://b.925i.cn/uni_halo/uni_halo_logo.png', // uni-halo的logo - apiUrl: '', // Api基础域名(您的halo博客基础域名或者是Halo后台管理系统api地址) - apiAuthorization: '', // Halo中-系统-博客设置-切换到高级选项-API设置-Access key + apiUrl: '', // Api基础域名 [必填] :你的Halo博客基础域名 + apiAuthorization: '', // Api认证key [必填]: Halo中-系统-博客设置-切换到高级选项-API设置-Access key - title: '', // 博客标题 - miniCodeImageUrl: '', // 小程序码地址 + title: '', // 博客标题 [建议必填]:在某些页面没有设置具体的页面名称时候,使用该值显示 + miniCodeImageUrl: '', // 小程序的太阳码/二维码的图片地址 [建议必填]:主要用于文章详情页面的生成海报的功能 + aboutProfileImageUrl: '', // 关于页面中的资料卡背景图 [建议必填] - start: { // 首次启动页配置 - title: 'uni-halo', // 标题 + // 启动页面的配置(页面地址`/pagesA/start/start`) + start: { + use: true, // 是否使用首次启动页:用户第一次使用你的应用会显示否则不显示 + title: 'uni-halo', // 启动页面中的文字标题 bg: '', // 留空则使用默认 开屏首页背景,可以是颜色值或者图片图片地址 logo: 'https://b.925i.cn/uni_halo/uni_halo_logo.png', // logo desc1: '全新UI,准备出发', // 描述信息1 @@ -29,12 +32,17 @@ export default { btnText: '全新触发' // 按钮文字 }, + // 博主信息 author: { - name: '', // 昵称 - avatar: '', // 头像地址 - motto: '', // 格言 + use: true, // 是否启用这里配置的信息,不启用则获取PC端博客设置的信息 + nickname: '', // 昵称 + avatar: '', // 头像 + email: '', // 邮箱 + description: '', // 介绍 }, + // 社交信息(将会在`/pagesA/contact/contact`页面中展示) + // 具体的某个参数值留空则不展示 social: { qq: "", // qq号 wechat: "", // 微信号 diff --git a/manifest.json b/manifest.json index ebb9a33..83d6083 100644 --- a/manifest.json +++ b/manifest.json @@ -1,157 +1,164 @@ { - "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" : { - "https" : false, - "disableHostCheck" : true, - "proxy" : { - "/api" : { - "target" : "https://b.925i.cn", - "changeOrigin" : true, - "secure" : false, - "pathRewrite" : { - "^/api" : "" - } - } - } - } - }, - "_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" + } + } + } + } + }, + /* 快应用特有相关 */ + "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" } diff --git a/pages/index/index.vue b/pages/index/index.vue index dd188b7..ae31e72 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -5,11 +5,17 @@ diff --git a/tm-vuetify/components/tm-input/tm-input.vue b/tm-vuetify/components/tm-input/tm-input.vue index d267ee8..95fb842 100644 --- a/tm-vuetify/components/tm-input/tm-input.vue +++ b/tm-vuetify/components/tm-input/tm-input.vue @@ -25,7 +25,7 @@ - * + * {{title}} @@ -368,6 +368,9 @@ }; }, computed: { + _required(){ + return this.required + }, height_rpx:function(){ return this.height; }, @@ -430,7 +433,7 @@ set:function(val){ this.$emit('input', val) this.$emit('update:value', val) - if (this.required) { + if (this._required) { this.$nextTick(function(){ this.verifyInput(); }) diff --git a/tm-vuetify/components/tm-listitem/tm-listitem.vue b/tm-vuetify/components/tm-listitem/tm-listitem.vue index 5f4915c..321902e 100644 --- a/tm-vuetify/components/tm-listitem/tm-listitem.vue +++ b/tm-vuetify/components/tm-listitem/tm-listitem.vue @@ -1,6 +1,6 @@ diff --git a/tm-vuetify/components/tm-segTabs/tm-segTabs.vue b/tm-vuetify/components/tm-segTabs/tm-segTabs.vue index 1615ebd..352d3db 100644 --- a/tm-vuetify/components/tm-segTabs/tm-segTabs.vue +++ b/tm-vuetify/components/tm-segTabs/tm-segTabs.vue @@ -191,10 +191,10 @@ }, mounted() { let t = this; - uni.$tm.sleep(30).then(()=>{ - t.setInits(); - - }) + t.setInits(); + }, + updated() { + this.setInits(); }, methods: { setInits() { diff --git a/tm-vuetify/components/tm-sheet/tm-sheet.vue b/tm-vuetify/components/tm-sheet/tm-sheet.vue index a1d5d3d..86f0317 100644 --- a/tm-vuetify/components/tm-sheet/tm-sheet.vue +++ b/tm-vuetify/components/tm-sheet/tm-sheet.vue @@ -25,7 +25,7 @@ ]" > - + @@ -151,25 +151,7 @@ export default { return this.$tm.vx.state().tmVuetify.black; } }, - data() { - return { - showSheet:true, - }; - }, - created() { - // #ifdef APP-VUE || APP-PLUS || MP - this.showSheet = false; - // #endif - }, - mounted() { - let t= this; - - // #ifdef APP-VUE || APP-PLUS || MP - setTimeout(function() { - t.showSheet = true; - }, 30); - // #endif - } + }; diff --git a/tm-vuetify/components/tm-translate/tm-translate.vue b/tm-vuetify/components/tm-translate/tm-translate.vue index a4c8a15..a24b8bd 100644 --- a/tm-vuetify/components/tm-translate/tm-translate.vue +++ b/tm-vuetify/components/tm-translate/tm-translate.vue @@ -13,7 +13,7 @@ * @property {Number} wait 延时 * @property {String} animation-name = [fadeUp|fadeDown|fadeLeft|fadeRight|zoomIn|zoomOut|fadeIn|fadeOut] 动画效果名称. * @property {String|Boolean} auto = [true|false] 默认:true,是否自动播放动画. - * @example + * @example */ export default { name:"tm-translate", diff --git a/tm-vuetify/components/tm-upload/tm-upload.vue b/tm-vuetify/components/tm-upload/tm-upload.vue index 022baf8..4bd1206 100644 --- a/tm-vuetify/components/tm-upload/tm-upload.vue +++ b/tm-vuetify/components/tm-upload/tm-upload.vue @@ -1,5 +1,5 @@