TmOct5/BlockChainH5
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

merge

Browse Source
This commit is contained in:
唐明明
2021-09-30 12:57:47 +08:00
parent 036424eac0 7ef9ad26ac
commit 2918fcee25
4 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pages/found/index.vue
View File

@@ -131,6 +131,7 @@
showHelp() { showHelp() {
uni.showModal({ uni.showModal({
title: '能量碎片', title: '能量碎片',
confirmColor: '#8b64fd',
content: this.energyShard.description, content: this.energyShard.description,
showCancel: false showCancel: false
}) })

72
pages/user/code.vue
View File

@@ -70,7 +70,7 @@
inviteData: [] ,//二维码信息 inviteData: [] ,//二维码信息
codeIndex : 0, codeIndex : 0,
posterImg : '', posterImg : '',
defaultImg: '/static/dev/WechatIMG9663.png', defaultImg: '',
loaded : false, loaded : false,
posterShow: false posterShow: false
}; };
@@ -96,7 +96,6 @@
// 生成海报 // 生成海报
async coverCode(){ async coverCode(){
// let { img, title, price, head, tips } = this
let img = this.inviteData[this.codeIndex].code let img = this.inviteData[this.codeIndex].code
let back = this.inviteData[this.codeIndex].cover let back = this.inviteData[this.codeIndex].cover
let name = this.inviteData[this.codeIndex].user_info.nickname let name = this.inviteData[this.codeIndex].user_info.nickname
@@ -105,14 +104,14 @@
let date = this.inviteData[this.codeIndex].date let date = this.inviteData[this.codeIndex].date
draw = new Draw({ draw = new Draw({
width: 375, width: 375,
height: 745, height: 667,
canvasId:'myCanvas', canvasId:'myCanvas',
_this: this, _this: this,
background: { background: {
type: 'color', type: 'color',
color: 'white', color: 'white',
w: 375, w: 375,
h: 745, h: 667,
}, },
}) })
let res = await draw.createdSharePoster(({ bgObj }) => { let res = await draw.createdSharePoster(({ bgObj }) => {
@@ -127,7 +126,7 @@
y: 0, y: 0,
src: back, src: back,
w: 375, w: 375,
h: 745, h: 667,
zIndex: 0, zIndex: 0,
}, },
@@ -135,7 +134,7 @@
{ {
type: 'rect', type: 'rect',
x: 280, x: 280,
y: 20, y: 10,
w: 60, // 宽度 必填 w: 60, // 宽度 必填
h: 80, // 高度 必填 h: 80, // 高度 必填
zIndex: 99, zIndex: 99,
@@ -149,7 +148,7 @@
type: 'line', type: 'line',
zIndex: 99, zIndex: 99,
x: 280, x: 280,
y: 74, y: 62,
w: 60, // 宽度 默认整个画布的宽度 - x轴的距离 w: 60, // 宽度 默认整个画布的宽度 - x轴的距离
color: '#ffffff', // 颜色 默认#000000 在不考虑字节跳动小程序的前提下可简写(#000) color: '#ffffff', // 颜色 默认#000000 在不考虑字节跳动小程序的前提下可简写(#000)
alpha: 1, // 透明度 默认1 取值范围 0~1 alpha: 1, // 透明度 默认1 取值范围 0~1
@@ -162,7 +161,7 @@
{ {
type: 'text', type: 'text',
x: 284, x: 284,
y: 28, y: 18,
zIndex: 99, zIndex: 99,
w: width - (20 * 2), w: width - (20 * 2),
text: date.solar.month, text: date.solar.month,
@@ -175,14 +174,14 @@
// 日历-日 // 日历-日
{ {
type: 'text', type: 'text',
x: 296, x: 298,
y: 50, y: 40,
zIndex: 99, zIndex: 99,
w: width - (20 * 2), w: width - (20 * 2),
text: date.solar.day, text: date.solar.day,
color: '#ffffff', color: '#ffffff',
font: { font: {
size: 20, size: 18,
weight: 'bold' weight: 'bold'
} }
}, },
@@ -191,7 +190,7 @@
{ {
type: 'text', type: 'text',
x: 282, x: 282,
y: 80, y: 70,
zIndex: 99, zIndex: 99,
w: width - (20 * 2), w: width - (20 * 2),
text: date.lunar, text: date.lunar,
@@ -204,39 +203,39 @@
// 用户昵称 // 用户昵称
{ {
type: 'text', type: 'text',
x: 90, x: 86,
y: 650, y: 600,
zIndex: 99, zIndex: 99,
w: width - (20 * 2), w: width - (20 * 2),
text: name, text: name,
color: '#ffffff', color: '#ffffff',
font: { font: {
size: 18 size: 16
} }
}, },
// 邀请码 // 邀请码
{ {
type: 'text', type: 'text',
x: 90, x: 86,
y: 685, y: 630,
zIndex: 99, zIndex: 99,
w: width - (20 * 2), w: width - (20 * 2),
text: '邀请码：' + invite, text: '邀请码：' + invite,
color: '#c4a1cb', color: '#c4a1cb',
font: { font: {
size: 16 size: 14
} }
}, },
// 用户头像 // 用户头像
{ {
type: 'image', type: 'image',
x: 20, x: 24,
y: 650, y: 598,
src: avatar, src: avatar,
w: 54, w: 46,
h: 54, h: 46,
drawType: 'arc', drawType: 'arc',
zIndex: 99, zIndex: 99,
borderWidth: 5, // 图片边框大小 默认0 borderWidth: 5, // 图片边框大小 默认0
@@ -246,10 +245,10 @@
// 二维码 // 二维码
{ {
type: 'image', type: 'image',
x: 270, x: 280,
y: 630, y: 585,
w: 90, w: 72,
h: 90, h: 72,
zIndex: 99, zIndex: 99,
src: img src: img
} }
@@ -305,7 +304,7 @@
.code{ .code{
position: relative; position: relative;
width: 100%; width: 100%;
padding-top: calc(199% - 280rpx - #{$padding * 2}); padding-top: calc(183% - 280rpx - #{$padding * 2});
.code-swiper{ .code-swiper{
position: absolute; position: absolute;
top: 0; top: 0;
@@ -373,11 +372,10 @@
// 头像昵称 // 头像昵称
.codeCont { .codeCont {
position: absolute; position: absolute;
left: 0; left: 10rpx;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
left: 0; padding: 10rpx 30rpx 20rpx;
padding: 10rpx 30rpx 50rpx;
box-sizing: border-box; box-sizing: border-box;
z-index: 9; z-index: 9;
.codeCont-avatar { .codeCont-avatar {
@@ -391,7 +389,7 @@
width: 100%; width: 100%;
left: 0; left: 0;
top: 0; top: 0;
padding: 10rpx 40rpx 0 150rpx; padding: 10rpx 40rpx 0 140rpx;
box-sizing: border-box; box-sizing: border-box;
.codeCont-name { .codeCont-name {
color: #FFFFFF; color: #FFFFFF;
@@ -405,17 +403,17 @@
} }
} }
.codeCont-img { .codeCont-img {
width: 140rpx; width: 120rpx;
height: 140rpx; height: 120rpx;
position: absolute; position: absolute;
right: 30rpx; right: 50rpx;
bottom: 30rpx; bottom: 10rpx;
} }
} }
// 日历 // 日历
.codDate { .codDate {
position: absolute; position: absolute;
top: 30rpx; top: 15rpx;
right: 70rpx; right: 70rpx;
z-index: 9; z-index: 9;
color: #FFFFFF; color: #FFFFFF;
@@ -441,7 +439,7 @@
// canvas // canvas
.my-canvas{ .my-canvas{
width: 375px; width: 375px;
height: 745px; height: 667px;
position: fixed; position: fixed;
top: -99999999999rpx; top: -99999999999rpx;
left: -99999999999rpx; left: -99999999999rpx;

10
router/index.js
View File

@@ -24,11 +24,11 @@ const router = createRouter({
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
const token = store.getters.getToken || uni.getStorageSync('token') const token = store.getters.getToken || uni.getStorageSync('token')
// 检查是否需要微信授权 // 检查是否需要微信授权
// if(store.getters.getCode === '' && to.name != 'wxAuth'){ if(store.getters.getCode === '' && to.name != 'wxAuth'){
// next({ next({
// name: 'wxAuth' name: 'wxAuth'
// }) })
// } }
// 检查是否需要登录 // 检查是否需要登录
if(to.auth && token === ''){ if(to.auth && token === ''){
next({ next({

BIN
static/dev/WechatIMG9663.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 152 KiB