Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

src/main/nine-space/src/views/Discover.vue

@@ -33,9 +33,9 @@
                     <img class="grid-img" src="../assets/info_icon_zhuzaozhe.png" />
                 </template>
             </van-grid-item>
-            <van-grid-item text="拍卖系列" @click="wait">
+            <van-grid-item text="系列活动" @click="wait">
                 <template v-slot:icon>
-                    <img class="grid-img" src="../assets/info_icon_paimaixilie.png" />
+                    <img class="grid-img" src="../assets/info_icon_xiliehuodong.png" />
                 </template>
             </van-grid-item>
             <!-- <van-grid-item text="铸造商店" @click="wait">

src/main/nine-space/src/views/Mine.vue

@@ -113,7 +113,7 @@
             </van-grid-item>
             <van-grid-item text="我赞过的" :to="{ path: '/mineLikes' }">
                 <template #icon>
-                    <van-icon :name="require('../assets/icon-dianzan.png')" class="search-icon" />
+                    <van-icon :name="require('../assets/icon-dianzan1.png')" class="search-icon" />
                 </template>
             </van-grid-item>
             <van-grid-item text="地址管理" @click="wait">

src/main/nine-space/src/views/order/Orders.vue

@@ -117,8 +117,10 @@ export default {
     display: flex;
     padding: 10px 16px;
     background-color: @bg;
+    align-items: center;
     .top-btn {
         flex-grow: 1;
+        .flex();
         .btn {
             font-size: @font3;
             line-height: 26px;