diff --git a/pages.json b/pages.json
index 0fad0e7..a8ff17f 100644
--- a/pages.json
+++ b/pages.json
@@ -19,7 +19,7 @@
"name": "User",
"aliasPath": "/user",
"auth": true,
- "style": {
+ "style": {
"navigationBarTitleText": "节点中心"
}
}, {
@@ -336,6 +336,14 @@
"path" : "pages/wxAuth/wxAuth",
"name" : "wxAuth",
"aliasPath": "/wechat-auth"
+ },{
+ "path" : "pages/clearOpen/clearOpen",
+ "style" : {
+ "navigationBarTitleText": "提现记录",
+ "enablePullDownRefresh": false
+ },
+ "name": "clearOpen",
+ "aliasPath": "/inside/clear-open"
}
],
"globalStyle": {
diff --git a/pages/clearOpen/clearOpen.vue b/pages/clearOpen/clearOpen.vue
new file mode 100644
index 0000000..1d63cac
--- /dev/null
+++ b/pages/clearOpen/clearOpen.vue
@@ -0,0 +1,35 @@
+
+
+ {{text}}
+
+
+
+
+
+
+
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/pages/user/index.vue b/pages/user/index.vue
index 4e91a69..0c4da1f 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,457 +1,460 @@
-
-
-
-
-
- 扫描上方微信二维码,添加您的专属VIP客服
-
-
-
-
-
-
-
-
-
- {{newList[newPopIndex].title}}
-
-
-
-
-
- 下一条
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{userData.nickname}}
-
-
-
- 邀请码:{{userData.invite}}
-
- 复制
-
-
-
-
-
-
-
- 开通{{userIdentity.right.name}}。
-
-
- 去开通
-
-
- 终身有效
-
-
-
-
-
-
-
-
-
- 查看会员专属权益
- 全部更多
-
-
-
-
-
- {{item.name}}
-
-
-
-
- 敬请期待
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
- 当前能量球价值¥{{userData.account.stone_value || 0}}
-
-
- 去提现
-
-
-
-
- 我的资产
-
-
-
- 能量球钱包
- {{userData.account.stone || 0}}
-
-
- 能量碎片
- {{userData.account.score || 0}}
-
-
-
-
-
-
-
-
- 我的伙伴
-
-
-
- 伙伴总数
- {{userData.relation_count.all || 0}}
-
-
- 直接伙伴
- {{userData.relation_count.one || 0}}
-
-
- 间接伙伴
- {{userData.relation_count.two || 0}}
-
-
-
-
-
-
-
- 企业工具
-
-
-
-
- 商品权证
-
-
-
- 优惠券管理
-
-
-
- 营销推广码
-
-
-
- 基础信息
-
-
-
- 部门门店
-
-
-
- 员工管理
-
-
-
-
-
-
-
-
- 我的服务
-
-
-
-
- 专属客服
-
-
-
- 邀请好友
-
-
-
- 帮助中心
-
-
-
- 服务条款
-
-
-
-
-
-
+
+
+
+
+
+ 扫描上方微信二维码,添加您的专属VIP客服
+
+
+
+
+
+
+
+
+ {{newList[newPopIndex].title}}
+
+
+
+
+
+ 下一条
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+ 当前能量球价值¥{{userData.account.stone_value || 0}}
+
+
+ 去提现
+
+
+
+
+ 我的资产
+
+
+
+ 能量球钱包
+ {{userData.account.stone || 0}}
+
+
+ 能量碎片
+ {{userData.account.score || 0}}
+
+
+
+
+
+
+
+ 我的伙伴
+
+
+
+ 伙伴总数
+ {{userData.relation_count.all || 0}}
+
+
+ 直接伙伴
+ {{userData.relation_count.one || 0}}
+
+
+ 间接伙伴
+ {{userData.relation_count.two || 0}}
+
+
+
+
+
+
+ 企业工具
+
+
+
+
+ 商品权证
+
+
+
+ 优惠券管理
+
+
+
+ 营销推广码
+
+
+
+ 基础信息
+
+
+
+ 部门门店
+
+
+
+ 员工管理
+
+
+
+
+
+
+
+ 我的服务
+
+
+
+
+ 专属客服
+
+
+
+ 邀请好友
+
+
+
+ 帮助中心
+
+
+
+ 服务条款
+
+
+
+
+
diff --git a/pages/user/new_file.vue b/pages/user/new_file.vue
new file mode 100644
index 0000000..2665353
--- /dev/null
+++ b/pages/user/new_file.vue
@@ -0,0 +1,1100 @@
+
+
+
+
+
+
+
+ 扫描上方微信二维码,添加您的专属VIP客服
+
+
+
+
+
+
+
+
+
+ {{newList[newPopIndex].title}}
+
+
+
+
+
+ 下一条
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{userData.nickname}}
+
+
+
+ 邀请码:{{userData.invite}}
+
+ 复制
+
+
+
+
+
+
+
+ 开通{{userIdentity.right.name}}。
+
+
+ 去开通
+
+
+ 终身有效
+
+
+
+
+
+
+
+
+
+ 查看会员专属权益
+ 全部更多
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+ 敬请期待
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+ 当前能量球价值¥{{userData.account.stone_value || 0}}
+
+
+ 去提现
+
+
+
+
+ 我的资产
+
+
+
+ 能量球钱包
+ {{userData.account.stone || 0}}
+
+
+ 能量碎片
+ {{userData.account.score || 0}}
+
+
+
+
+
+
+
+
+ 我的伙伴
+
+
+
+ 伙伴总数
+ {{userData.relation_count.all || 0}}
+
+
+ 直接伙伴
+ {{userData.relation_count.one || 0}}
+
+
+ 间接伙伴
+ {{userData.relation_count.two || 0}}
+
+
+
+
+
+
+
+ 企业工具
+
+
+
+
+ 商品权证
+
+
+
+ 优惠券管理
+
+
+
+ 营销推广码
+
+
+
+ 基础信息
+
+
+
+ 部门门店
+
+
+
+ 员工管理
+
+
+
+
+
+
+
+
+ 我的服务
+
+
+
+
+ 专属客服
+
+
+
+ 邀请好友
+
+
+
+ 帮助中心
+
+
+
+ 服务条款
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/user/partner.vue b/pages/user/partner.vue
index 73d7e5d..996fca5 100644
--- a/pages/user/partner.vue
+++ b/pages/user/partner.vue
@@ -6,23 +6,30 @@
直接
间接
-
-
-
-
-
-
-
- {{item.nickname}}
-
-
-
-
- {{item.username}}
-
-
-
-
+
+
+
+
+
+
+
+ {{item.nickname}}
+
+
+
+
+ {{item.username}}
+
+
+
+
+
+
+
+
+ 暂未数据
+
+
@@ -66,6 +73,34 @@
.content{
padding-top: 90rpx;
}
+
+ // 空提示
+ .list-null{
+ width: 100vw;
+ height: 100vh;
+ padding-bottom: 20vh;
+ box-sizing: border-box;
+ background: white;
+ text-align: center;
+ @extend .vertical;
+ .sub-title{
+ color: $text-gray;
+ font-size: $title-size-m;
+ }
+ .icon{
+ width: 288rpx;
+ }
+ .sub-btn{
+ width: 200rpx;
+ height: 70rpx;
+ line-height: 70rpx;
+ text-align: center;
+ background: $mian-color;
+ color: white;
+ display: inline-block;
+ margin-top: $margin*2;
+ }
+ }
// tabs
.tabs{
diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue
index d9db62f..8edd33c 100644
--- a/pages/vip/vip.vue
+++ b/pages/vip/vip.vue
@@ -231,7 +231,7 @@ export default {
},
// 微信支付
- wechatPay(id, wx) {
+ wechatPay(id, wx) {
vipWechatPay(id, {
openid: this.$store.getters.getCode
}).then(payConfig => {
@@ -253,7 +253,12 @@ export default {
})
}
});
- });
+ }).catch(err => {
+ uni.showToast({
+ title: err.message,
+ icon : 'none'
+ })
+ })
},
// 勾选协议
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
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index 06fc798..a32eb3a 100644
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,2 +1,2 @@
链商星球
\ No newline at end of file
+ document.write('')