Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/Discover.vue

@@ -18,8 +18,8 @@
                 <div class="top">
                     <img src="@assets/nav_logo.png" class="logo" alt="" />
 
-                    <div class="search" @click="$router.push('/searchAll')">
-                        <!-- <div class="search" @click="$router.push('/productSearch')"> -->
+                    <!-- <div class="search" @click="$router.push('/searchAll')"> -->
+                    <div class="search" @click="$router.push('/productSearch')">
                         <img src="@assets/icon-sosuo.png" alt="" />
                         <span> 搜索你要的精彩 </span>
                     </div>

src/views/Home.vue

@@ -15,23 +15,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
+            <!-- <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" />
+            <img src="@/assets/icon_sosuo.png" @click="$router.push('/searchAll')" v-else alt="" class="search-all" /> -->
         </div>
 
         <div class="card swiper-card">