From 4e7f4e3b79f5bf8b791e013efb05f7ec5089b1e4 Mon Sep 17 00:00:00 2001
From: zhangmanman <994797151@qq.com>
Date: Thu, 30 Sep 2021 14:52:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/found/index.vue | 30 +++++++++++++++++++++++-------
pages/user/code.vue | 8 ++++----
pages/user/index.vue | 4 +++-
router/index.js | 10 +++++-----
static/user/userNew_icon.png | Bin 451 -> 1440 bytes
5 files changed, 35 insertions(+), 17 deletions(-)
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 0bf71e488258758d7159738ff25b83ddbe62fd5c..ebc3d1c341eaa06168131254e22b335d3be75fc1 100644
GIT binary patch
literal 1440
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%!-*I5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij}#MrJI?7lcABJlbNBRtFxtvi;eVfhA0@OMY@`Zfaf$Om7N8uMtkYpp=kX0JPa9wJ5VJHN~wcKUV?lW2;P@ZgF(O
zX&zK>3U0R;;MA)Rbc{YIUXkJ%CIn18ASOK30y*$>pPC0u>_xy-{VvULF9QRUsHcl#
zNX4x;(@$%=6p9>w-leoqWyzY3r020-B8kmYCZ$A7aQC`-!b`LBP}9{7GlC|GE^?dH
zYJcF6+YN(9f}4SRQ9KeKmn-XGFU=
zxH#Nkb%`!5v6{;|BT}PTQlfbG-S_o+4UNGDcMTZ*3;6zS;Fq)iJK5l?0Qc&Snyoqw
z387ib0u-73oSAf-7tQ~-RcRgLy9DVv@rGo+Wvr8)PG!ry!1mpM$NS8)iTh-2R+s#G
z`ZT^nvO%wMD~q0B;y%_*+qEY={(PDH%*g}paqms#{}=U0Z%W`_mLNX=yuDH#q)pPvB2f&3X7@W0Ca->r~NM%zFg`*%sYY+{XC{N@G
zv1duvdF~sw+l-lNCta8S*H_cJI?*L!b>g|3SC4JbIK1v8+ZUnBtDOX!Do&P|Ccijj
z)&8OP>)mT?cR~ucJ5I>U-*!Xtn~3NY#g%Tiw#WNT_#1l0Hz14cc5ty=49Bhw!V@R1
zuJZ1BDEoJT!>xr=R8^a9|`k6GO^lTN(hmATHN@7A?#PL)|v1BYZ!mt<1ueP;VJ
Date: Thu, 30 Sep 2021 15:06:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/instrument/Spread.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/instrument/Spread.vue b/pages/instrument/Spread.vue
index 3da95e6..1aa64c3 100644
--- a/pages/instrument/Spread.vue
+++ b/pages/instrument/Spread.vue
@@ -13,9 +13,9 @@
-
+
-
+
长按二维码，进行保存
From 7e8d8beb90951851daaa7d48125f6f808e6e6bc4 Mon Sep 17 00:00:00 2001
From: zhangmanman <994797151@qq.com>
Date: Thu, 30 Sep 2021 15:13:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/instrument/Spread.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pages/instrument/Spread.vue b/pages/instrument/Spread.vue
index 1aa64c3..5d5b48e 100644
--- a/pages/instrument/Spread.vue
+++ b/pages/instrument/Spread.vue
@@ -204,6 +204,8 @@
height: 360rpx;
margin: 0 0 20rpx;
border: 2px solid #f3f3f3;
+ padding: 30rpx;
+ box-sizing: border-box;
}
.codeImg-text {
font-size: 32rpx;