更新

pages/found/index.vue

@@ -54,12 +54,14 @@
             <view class="task-liest">
                 能量碎片任务
             </view>
-            <view class="task-item" v-for="(item, index) in task" :key="index" @click="JumpUrl(item.url, item.title)">
+            <block v-for="(item, index) in task" :key="index">
-                <image class="task-icon" :src="item.ico" mode="aspectFill"></image>
+                <view class="task-item" v-if="item.rule.name != 'sign_crystal'" @click="JumpUrl(item.url, item.title, item.is_finish)">
-                <view class="task-title">{{item.title}}</view>
+                    <image class="task-icon" :src="item.ico" mode="aspectFill"></image>
-                <view class="task-subtitle">{{item.remark}}</view>
+                    <view class="task-title">{{item.title}}</view>
-                <view class="task-label">{{item.tips}}<image @click.stop="showHelp" class="task-label-icon" src="@/static/imgs/user-crystalMark-grey.png"></image></view>
+                    <view class="task-subtitle">{{item.remark}}</view>
-            </view>
+                    <view class="task-label" :class="{'active' : item.is_finish}">{{item.is_finish ? '已完成' : item.tips}}<image @click.stop="showHelp" class="task-label-icon" src="@/static/imgs/user-crystalMark-grey.png"></image></view>
+                </view>
+            </block>
         </view>
 	</view>
 </template>
@@ -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;

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;

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;
 		    }
 		}

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'){
+	// if(store.getters.getCode === '' && to.name != 'wxAuth'){
-		next({
+	// 	next({
-			name: 'wxAuth'
+	// 		name: 'wxAuth'
-		})
+	// 	})
-	}
+	// }
 	// 检查是否需要登录
 	if(to.auth && token === ''){
 		next({