diff --git a/pages/found/index.vue b/pages/found/index.vue
index 98e5e68..0d0b8dd 100644
--- a/pages/found/index.vue
+++ b/pages/found/index.vue
@@ -54,12 +54,14 @@
能量碎片任务
-
-
- {{item.title}}
- {{item.remark}}
- {{item.tips}}
-
+
+
+
+ {{item.title}}
+ {{item.remark}}
+ {{item.is_finish ? '已完成' : item.tips}}
+
+
@@ -153,7 +155,14 @@
},
// 能量跳转
- JumpUrl(open, title) {
+ JumpUrl(open, title, finish) {
+ if(finish) {
+ uni.showToast({
+ title: '您已完成此任务',
+ icon : 'none'
+ })
+ return
+ }
var type = open.openType;
switch(type){
case 'switchTab':
@@ -371,6 +380,10 @@
color: #999;
font-size: 26rpx;
line-height: 30rpx;
+ text{
+ font-size: $title-size-sm - 6;
+ margin-left: $margin/2;
+ }
}
.task-label {
position: absolute;
@@ -382,6 +395,9 @@
display: -webkit-box;
display: -webkit-flex;
display: flex;
+ &.active {
+ color: $text-gray-m;
+ }
.task-label-icon {
width: 34rpx;
height: 34rpx;
diff --git a/pages/user/code.vue b/pages/user/code.vue
index 2bbc213..a82eefd 100644
--- a/pages/user/code.vue
+++ b/pages/user/code.vue
@@ -218,7 +218,7 @@
{
type: 'text',
x: 86,
- y: 630,
+ y: 628,
zIndex: 99,
w: width - (20 * 2),
text: '邀请码:' + invite,
@@ -353,7 +353,7 @@
}
}
.button {
- background: $mian-color-deep;
+ background: $text-price;
border-radius: 0;
height: 90rpx;
line-height: 90rpx;
@@ -375,7 +375,7 @@
left: 10rpx;
bottom: 0;
width: 100%;
- padding: 10rpx 30rpx 20rpx;
+ padding: 16rpx 30rpx 20rpx;
box-sizing: border-box;
z-index: 9;
.codeCont-avatar {
@@ -389,7 +389,7 @@
width: 100%;
left: 0;
top: 0;
- padding: 10rpx 40rpx 0 140rpx;
+ padding: 14rpx 40rpx 0 140rpx;
box-sizing: border-box;
.codeCont-name {
color: #FFFFFF;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index c0f4bb4..783b3df 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -725,8 +725,9 @@ export default {
margin: 15px 0 2.5px;
font-size: 36rpx;
.user-name-identity {
+ vertical-align: top;
width: 90rpx;
- height: 15px;
+ height: 32rpx;
margin: 5px 0 0 5px;
}
}
@@ -928,6 +929,7 @@ export default {
.userNew-icon {
width: 40rpx;
height: 40rpx;
+ vertical-align: top;
margin: 24rpx 20rpx 0 0;
}
}
diff --git a/router/index.js b/router/index.js
index d04e494..ca262ed 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/user/userNew_icon.png b/static/user/userNew_icon.png
index 0bf71e4..ebc3d1c 100644
Binary files a/static/user/userNew_icon.png and b/static/user/userNew_icon.png differ