diff --git a/pages/found/index.vue b/pages/found/index.vue index ecf8324..98e5e68 100644 --- a/pages/found/index.vue +++ b/pages/found/index.vue @@ -131,6 +131,7 @@ showHelp() { uni.showModal({ title: '能量碎片', + confirmColor: '#8b64fd', content: this.energyShard.description, showCancel: false }) diff --git a/pages/user/code.vue b/pages/user/code.vue index ed0774b..2bbc213 100644 --- a/pages/user/code.vue +++ b/pages/user/code.vue @@ -70,7 +70,7 @@ inviteData: [] ,//二维码信息 codeIndex : 0, posterImg : '', - defaultImg: '/static/dev/WechatIMG9663.png', + defaultImg: '', loaded : false, posterShow: false }; @@ -96,7 +96,6 @@ // 生成海报 async coverCode(){ - // let { img, title, price, head, tips } = this let img = this.inviteData[this.codeIndex].code let back = this.inviteData[this.codeIndex].cover let name = this.inviteData[this.codeIndex].user_info.nickname @@ -105,14 +104,14 @@ let date = this.inviteData[this.codeIndex].date draw = new Draw({ width: 375, - height: 745, + height: 667, canvasId:'myCanvas', _this: this, background: { type: 'color', color: 'white', w: 375, - h: 745, + h: 667, }, }) let res = await draw.createdSharePoster(({ bgObj }) => { @@ -127,7 +126,7 @@ y: 0, src: back, w: 375, - h: 745, + h: 667, zIndex: 0, }, @@ -135,7 +134,7 @@ { type: 'rect', x: 280, - y: 20, + y: 10, w: 60, // 宽度 必填 h: 80, // 高度 必填 zIndex: 99, @@ -149,7 +148,7 @@ type: 'line', zIndex: 99, x: 280, - y: 74, + y: 62, w: 60, // 宽度 默认整个画布的宽度 - x轴的距离 color: '#ffffff', // 颜色 默认#000000 在不考虑字节跳动小程序的前提下可简写(#000) alpha: 1, // 透明度 默认1 取值范围 0~1 @@ -162,7 +161,7 @@ { type: 'text', x: 284, - y: 28, + y: 18, zIndex: 99, w: width - (20 * 2), text: date.solar.month, @@ -175,14 +174,14 @@ // 日历-日 { type: 'text', - x: 296, - y: 50, + x: 298, + y: 40, zIndex: 99, w: width - (20 * 2), text: date.solar.day, color: '#ffffff', font: { - size: 20, + size: 18, weight: 'bold' } }, @@ -191,7 +190,7 @@ { type: 'text', x: 282, - y: 80, + y: 70, zIndex: 99, w: width - (20 * 2), text: date.lunar, @@ -204,39 +203,39 @@ // 用户昵称 { type: 'text', - x: 90, - y: 650, + x: 86, + y: 600, zIndex: 99, w: width - (20 * 2), text: name, color: '#ffffff', font: { - size: 18 + size: 16 } }, // 邀请码 { type: 'text', - x: 90, - y: 685, + x: 86, + y: 630, zIndex: 99, w: width - (20 * 2), text: '邀请码:' + invite, color: '#c4a1cb', font: { - size: 16 + size: 14 } }, // 用户头像 { type: 'image', - x: 20, - y: 650, + x: 24, + y: 598, src: avatar, - w: 54, - h: 54, + w: 46, + h: 46, drawType: 'arc', zIndex: 99, borderWidth: 5, // 图片边框大小 默认0 @@ -246,10 +245,10 @@ // 二维码 { type: 'image', - x: 270, - y: 630, - w: 90, - h: 90, + x: 280, + y: 585, + w: 72, + h: 72, zIndex: 99, src: img } @@ -305,7 +304,7 @@ .code{ position: relative; width: 100%; - padding-top: calc(199% - 280rpx - #{$padding * 2}); + padding-top: calc(183% - 280rpx - #{$padding * 2}); .code-swiper{ position: absolute; top: 0; @@ -373,11 +372,10 @@ // 头像昵称 .codeCont { position: absolute; - left: 0; + left: 10rpx; bottom: 0; width: 100%; - left: 0; - padding: 10rpx 30rpx 50rpx; + padding: 10rpx 30rpx 20rpx; box-sizing: border-box; z-index: 9; .codeCont-avatar { @@ -391,7 +389,7 @@ width: 100%; left: 0; top: 0; - padding: 10rpx 40rpx 0 150rpx; + padding: 10rpx 40rpx 0 140rpx; box-sizing: border-box; .codeCont-name { color: #FFFFFF; @@ -405,17 +403,17 @@ } } .codeCont-img { - width: 140rpx; - height: 140rpx; + width: 120rpx; + height: 120rpx; position: absolute; - right: 30rpx; - bottom: 30rpx; + right: 50rpx; + bottom: 10rpx; } } // 日历 .codDate { position: absolute; - top: 30rpx; + top: 15rpx; right: 70rpx; z-index: 9; color: #FFFFFF; @@ -441,7 +439,7 @@ // canvas .my-canvas{ width: 375px; - height: 745px; + height: 667px; position: fixed; top: -99999999999rpx; left: -99999999999rpx; diff --git a/router/index.js b/router/index.js index ca262ed..d04e494 100644 --- a/router/index.js +++ b/router/index.js @@ -24,11 +24,11 @@ const router = createRouter({ router.beforeEach((to, from, next) => { const token = store.getters.getToken || uni.getStorageSync('token') // 检查是否需要微信授权 - // if(store.getters.getCode === '' && to.name != 'wxAuth'){ - // next({ - // name: 'wxAuth' - // }) - // } + if(store.getters.getCode === '' && to.name != 'wxAuth'){ + next({ + name: 'wxAuth' + }) + } // 检查是否需要登录 if(to.auth && token === ''){ next({ diff --git a/static/dev/WechatIMG9663.png b/static/dev/WechatIMG9663.png index a7c51c7..7c51a10 100644 Binary files a/static/dev/WechatIMG9663.png and b/static/dev/WechatIMG9663.png differ