panhui hace 3 años
padre
commit
f09c49c6db

BIN
src/assets/icon_fengcun.png


BIN
src/assets/icon_paimai.png


BIN
src/assets/icon_qiyongchaolian.png


BIN
src/assets/icon_sosuo.png


BIN
src/assets/icon_sosuo_dark.png


BIN
src/assets/icon_xing tu.png


BIN
src/assets/icon_zengsong.png


+ 4 - 5
src/components/rice/Task.vue

@@ -48,13 +48,10 @@
                                 <!-- 每天寄售商品购买成功次数 ≤4 次获得1积分,4次以上获得2积分(2积分可兑换1点能量) -->
                             </div>
                         </div>
-
-                        <van-button type="primary" class="not" round v-if="taskInfo.exchangeCount" @click="exchange"
-                            >兑换</van-button
-                        >
-                        <van-button type="primary" round v-else-if="taskInfo.isCanExchangeScore" @click="exchange"
+                        <van-button type="primary" round v-if="taskInfo.isCanExchangeScore" @click="exchange"
                             >兑换</van-button
                         >
+                        <van-button type="primary" class="not" round v-else-if="selfScore">兑换</van-button>
                         <van-button type="primary" round v-else @click="$router.push('/hopeMarket')">去看看</van-button>
                     </div>
                     <div class="box-item">
@@ -114,6 +111,7 @@ function sign() {
 
 const taskInfo = ref({});
 const helpCount = ref(0);
+const selfScore = ref(0);
 function getTask() {
     http.http.get('/rice/taskInitialization').then(res => {
         taskInfo.value = res.map;
@@ -121,6 +119,7 @@ function getTask() {
     http.http.get('/rice/current').then(res => {
         // this.info = res.data;
         helpCount.value = Number(res.data.helpCount);
+        selfScore.value = Number(res.data.selfScore);
     });
 }
 function init() {

+ 16 - 3
src/views/Home.vue

@@ -14,15 +14,23 @@
                 <div class="text1">WELCOME</div>
                 <div class="text2" :class="{ text3: isLogin }">{{ isLogin ? `${userInfo.nickname}!` : '探索者!' }}</div>
             </div>
-            <van-image
+            <!-- <van-image
                 width="38"
                 height="38"
                 :radius="32"
                 :class="{ activeAvatar: isLogin && userInfo.useCollectionPic }"
                 :src="isLogin ? userInfo.avatar : require('@assets/img_default_photo.png')"
             >
-            
-            </van-image>
+            </van-image> -->
+
+            <img
+                src="@/assets/icon_sosuo_dark.png"
+                @click="$router.push('/searchAll')"
+                v-if="darkTheme"
+                alt=""
+                class="search-all"
+            />
+            <img src="@/assets/icon_sosuo.png" @click="$router.push('/searchAll')" v-else alt="" class="search-all" />
         </div>
 
         <div class="card swiper-card">
@@ -884,6 +892,11 @@ export default {
             }
         }
     }
+
+    .search-all {
+        width: 54px;
+        height: 54px;
+    }
 }
 
 .listSwiper {