panhui 4 лет назад
Родитель
Сommit
793ff890df
37 измененных файлов с 38 добавлено и 41 удалено
  1. BIN
      src/main/nine-space/src/assets/icon-anquan.png
  2. BIN
      src/main/nine-space/src/assets/icon-dianzan.png
  3. BIN
      src/main/nine-space/src/assets/icon-guanyuwomen.png
  4. BIN
      src/main/nine-space/src/assets/icon-jifen.png
  5. BIN
      src/main/nine-space/src/assets/icon-qiabao.png
  6. BIN
      src/main/nine-space/src/assets/icon_dizhi.png
  7. BIN
      src/main/nine-space/src/assets/icon_liaojiegengduo.png
  8. BIN
      src/main/nine-space/src/assets/img_default_photo.png
  9. BIN
      src/main/nine-space/src/assets/info_icon_jiaoyijilu.png
  10. BIN
      src/main/nine-space/src/assets/logo.png
  11. BIN
      src/main/nine-space/src/assets/renzheng_icon.png
  12. BIN
      src/main/nine-space/src/assets/tabbar_icon_01.png
  13. BIN
      src/main/nine-space/src/assets/tabbar_icon_01_pre.png
  14. BIN
      src/main/nine-space/src/assets/tabbar_icon_02.png
  15. BIN
      src/main/nine-space/src/assets/tabbar_icon_02_pre.png
  16. BIN
      src/main/nine-space/src/assets/tabbar_icon_03.png
  17. BIN
      src/main/nine-space/src/assets/tabbar_icon_03_pre.png
  18. BIN
      src/main/nine-space/src/assets/tabbar_icon_04.png
  19. BIN
      src/main/nine-space/src/assets/tabbar_icon_04_pre.png
  20. 1 6
      src/main/nine-space/src/mixins/common.js
  21. 1 1
      src/main/nine-space/src/views/Creator.vue
  22. 1 1
      src/main/nine-space/src/views/Discover.vue
  23. 2 2
      src/main/nine-space/src/views/Home.vue
  24. 8 8
      src/main/nine-space/src/views/Index.vue
  25. 13 11
      src/main/nine-space/src/views/Mine.vue
  26. 1 1
      src/main/nine-space/src/views/Store.vue
  27. 1 1
      src/main/nine-space/src/views/creator/Detail.vue
  28. 1 1
      src/main/nine-space/src/views/creator/List.vue
  29. 1 1
      src/main/nine-space/src/views/creator/Search.vue
  30. 1 1
      src/main/nine-space/src/views/order/Detail.vue
  31. 1 1
      src/main/nine-space/src/views/order/Orders.vue
  32. 1 1
      src/main/nine-space/src/views/product/Detail.vue
  33. 1 1
      src/main/nine-space/src/views/product/List.vue
  34. 1 1
      src/main/nine-space/src/views/product/Search.vue
  35. 1 1
      src/main/nine-space/src/views/user/Followers.vue
  36. 1 1
      src/main/nine-space/src/views/user/Follows.vue
  37. 1 1
      src/main/nine-space/src/views/user/Likes.vue

BIN
src/main/nine-space/src/assets/icon-anquan.png


BIN
src/main/nine-space/src/assets/icon-dianzan.png


BIN
src/main/nine-space/src/assets/icon-guanyuwomen.png


BIN
src/main/nine-space/src/assets/icon-jifen.png


BIN
src/main/nine-space/src/assets/icon-qiabao.png


BIN
src/main/nine-space/src/assets/icon_dizhi.png


BIN
src/main/nine-space/src/assets/icon_liaojiegengduo.png


BIN
src/main/nine-space/src/assets/img_default_photo.png


BIN
src/main/nine-space/src/assets/info_icon_jiaoyijilu.png


BIN
src/main/nine-space/src/assets/logo.png


BIN
src/main/nine-space/src/assets/renzheng_icon.png


BIN
src/main/nine-space/src/assets/tabbar_icon_01.png


BIN
src/main/nine-space/src/assets/tabbar_icon_01_pre.png


BIN
src/main/nine-space/src/assets/tabbar_icon_02.png


BIN
src/main/nine-space/src/assets/tabbar_icon_02_pre.png


BIN
src/main/nine-space/src/assets/tabbar_icon_03.png


BIN
src/main/nine-space/src/assets/tabbar_icon_03_pre.png


BIN
src/main/nine-space/src/assets/tabbar_icon_04.png


BIN
src/main/nine-space/src/assets/tabbar_icon_04_pre.png


+ 1 - 6
src/main/nine-space/src/mixins/common.js

@@ -100,12 +100,7 @@ export default {
             return info ? info.label : '';
         },
         scrollRefreash() {
-            if (this.bs.value) {
-                setTimeout(() => {
-                    this.$toast.clear();
-                    this.bs.value.refresh();
-                }, 50);
-            }
+            this.$toast.clear();
         }
     }
 };

+ 1 - 1
src/main/nine-space/src/views/Creator.vue

@@ -77,7 +77,7 @@ export default {
                 )
                 .then(res => {
                     this.miners = res.content;
-                    this.scrollRefreash();
+                    this.$toast.clear();
                 });
         }
     }

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

@@ -160,7 +160,7 @@ export default {
                 )
                 .then(res => {
                     this.list = res.content;
-                    this.scrollRefreash();
+                    this.$toast.clear();
                 });
         },
         change(isFixed) {

+ 2 - 2
src/main/nine-space/src/views/Home.vue

@@ -6,9 +6,9 @@
             :centeredSlides="true"
             :slidesPerView="'auto'"
             :coverflowEffect="{
-                rotate: 0,
+                rotate: 40,
                 stretch: 0,
-                depth: -100,
+                depth: 80,
                 modifier: 1,
                 slideShadows: true
             }"

+ 8 - 8
src/main/nine-space/src/views/Index.vue

@@ -20,26 +20,26 @@ export default {
             {
                 name: 'home',
                 title: '首页',
-                icon: require('../assets/svgs/tabbar_icon_01.svg'),
-                preIcon: require('../assets/svgs/tabbar_icon_01_pre.svg')
+                icon: require('../assets/tabbar_icon_01.png'),
+                preIcon: require('../assets/tabbar_icon_01_pre.png')
             },
             {
                 name: 'discover',
                 title: '发现',
-                icon: require('../assets/svgs/tabbar_icon_02.svg'),
-                preIcon: require('../assets/svgs/tabbar_icon_02_pre.svg')
+                icon: require('../assets/tabbar_icon_02.png'),
+                preIcon: require('../assets/tabbar_icon_02_pre.png')
             },
             {
                 name: 'store',
                 title: '柜子',
-                icon: require('../assets/svgs/tabbar_icon_03.svg'),
-                preIcon: require('../assets/svgs/tabbar_icon_03_pre.svg')
+                icon: require('../assets/tabbar_icon_03.png'),
+                preIcon: require('../assets/tabbar_icon_03_pre.png')
             },
             {
                 name: 'mine',
                 title: '我的',
-                icon: require('../assets/svgs/tabbar_icon_04.svg'),
-                preIcon: require('../assets/svgs/tabbar_icon_04_pre.svg')
+                icon: require('../assets/tabbar_icon_04.png'),
+                preIcon: require('../assets/tabbar_icon_04_pre.png')
             }
         ];
         const active = ref('home');

+ 13 - 11
src/main/nine-space/src/views/Mine.vue

@@ -8,7 +8,7 @@
                         round
                         width="78"
                         height="78"
-                        :src="userInfo.avatar || require('../assets/svgs/img_default_photo.svg')"
+                        :src="userInfo.avatar || require('../assets/img_default_photo.png')"
                         fit="cover"
                         @click="$router.push('/setting')"
                     />
@@ -34,7 +34,6 @@
                         <div class="text1">{{ userInfo.followers }}</div>
                         <div class="text2">粉丝</div>
                     </div>
-                    <div class="flex1"></div>
                     <van-button
                         plain
                         color="#939599"
@@ -51,7 +50,7 @@
                         plain
                         color="#939599"
                         size="mini"
-                        :icon="require('../assets/svgs/person.svg')"
+                        :icon="require('../assets/renzheng_icon.png')"
                         round
                         v-else
                         @click="goAuth"
@@ -126,38 +125,38 @@
         <van-cell-group :border="false" class="menu">
             <van-cell title="钱包" is-link :to="{ path: '/mineWallet' }">
                 <template #icon>
-                    <van-icon :name="require('../assets/svgs/icon-qiabao.svg')" class="search-icon" />
+                    <van-icon :name="require('../assets/icon-qiabao.png')" class="search-icon" />
                 </template>
             </van-cell>
 
             <van-cell title="积分" is-link :to="{ path: '/minePoint' }">
                 <template #icon>
-                    <van-icon :name="require('../assets/svgs/icon-jifen.svg')" class="search-icon" />
+                    <van-icon :name="require('../assets/icon-jifen.png')" class="search-icon" />
                 </template>
             </van-cell>
             <van-cell title="我赞过的" :to="{ path: '/mineLikes' }" is-link>
                 <template #icon>
-                    <van-icon :name="require('../assets/svgs/icon-dianzan.svg')" class="search-icon" />
+                    <van-icon :name="require('../assets/icon-dianzan.png')" class="search-icon" />
                 </template>
             </van-cell>
             <van-cell title="地址管理" is-link>
                 <template #icon>
-                    <van-icon :name="require('../assets/svgs/icon_dizhi.svg')" class="search-icon" />
+                    <van-icon :name="require('../assets/icon_dizhi.png')" class="search-icon" />
                 </template>
             </van-cell>
             <van-cell title="了解更多" is-link>
                 <template #icon>
-                    <van-icon :name="require('../assets/svgs/icon_liaojiegengduo.svg')" class="search-icon" />
+                    <van-icon :name="require('../assets/icon_liaojiegengduo.png')" class="search-icon" />
                 </template>
             </van-cell>
             <van-cell title="关于我们" is-link>
                 <template #icon>
-                    <van-icon :name="require('../assets/svgs/icon-guanyuwomen.svg')" class="search-icon" />
+                    <van-icon :name="require('../assets/icon-guanyuwomen.png')" class="search-icon" />
                 </template>
             </van-cell>
             <van-cell title="账号与安全" is-link :to="{ path: '/security' }">
                 <template #icon>
-                    <van-icon :name="require('../assets/svgs/icon-anquan.svg')" class="search-icon" />
+                    <van-icon :name="require('../assets/icon-anquan.png')" class="search-icon" />
                 </template>
             </van-cell>
         </van-cell-group>
@@ -320,7 +319,6 @@ export default {
         // padding-bottom: 16px;
         align-items: center;
         .collect {
-            width: 20%;
             display: flex;
             flex-direction: column;
             align-items: center;
@@ -335,6 +333,10 @@ export default {
                 color: #939599;
                 line-height: 24px;
             }
+            &:nth-child(2) {
+                flex-grow: 1;
+                margin: 0 10px;
+            }
         }
 
         /deep/.van-button {

+ 1 - 1
src/main/nine-space/src/views/Store.vue

@@ -151,7 +151,7 @@ export default {
                 .then(res => {
                     this.list = res.content;
                     this.empty = res.empty;
-                    this.scrollRefreash();
+                    this.$toast.clear();
                     this.$toast.clear();
                 });
         },

+ 1 - 1
src/main/nine-space/src/views/creator/Detail.vue

@@ -187,7 +187,7 @@ export default {
                 .then(res => {
                     this.list = res.content;
                     this.empty = res.empty;
-                    this.scrollRefreash();
+                    this.$toast.clear();
                 });
         },
         changeMenu(menu) {

+ 1 - 1
src/main/nine-space/src/views/creator/List.vue

@@ -106,7 +106,7 @@ export default {
                 .then(res => {
                     this.list = res.content;
                     this.empty = res.empty;
-                    this.scrollRefreash();
+                    this.$toast.clear();
                 });
         }
     }

+ 1 - 1
src/main/nine-space/src/views/creator/Search.vue

@@ -95,7 +95,7 @@ export default {
                 .then(res => {
                     this.list = res.content;
                     this.empty = res.empty;
-                    this.scrollRefreash();
+                    this.$toast.clear();
                 });
         }
     }

+ 1 - 1
src/main/nine-space/src/views/order/Detail.vue

@@ -90,7 +90,7 @@ export default {
         });
         this.$http.get('/order/get/' + this.$route.query.id).then(res => {
             this.info = res;
-            this.scrollRefreash();
+            this.$toast.clear();
         });
     },
     methods: {

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

@@ -100,7 +100,7 @@ export default {
                 .then(res => {
                     this.list = res.content;
                     this.empty = res.empty;
-                    this.scrollRefreash();
+                    this.$toast.clear();
                 });
         },
         changeStatus(name) {

+ 1 - 1
src/main/nine-space/src/views/product/Detail.vue

@@ -206,7 +206,7 @@ export default {
                         this.blindBoxItems = res.content;
                     }
 
-                    this.scrollRefreash();
+                    this.$toast.clear();
                 });
         },
         likeProduct() {

+ 1 - 1
src/main/nine-space/src/views/product/List.vue

@@ -121,7 +121,7 @@ export default {
                 .then(res => {
                     this.list = res.content;
                     this.empty = res.empty;
-                    this.scrollRefreash();
+                    this.$toast.clear();
                 });
         }
     }

+ 1 - 1
src/main/nine-space/src/views/product/Search.vue

@@ -107,7 +107,7 @@ export default {
                 .then(res => {
                     this.list = res.content;
                     this.empty = res.empty;
-                    this.scrollRefreash();
+                    this.$toast.clear();
                 });
         }
     }

+ 1 - 1
src/main/nine-space/src/views/user/Followers.vue

@@ -34,7 +34,7 @@ export default {
         this.$http.get('/user/myFollowers').then(res => {
             this.list = res;
             this.empty = res.length === 0;
-            this.scrollRefreash();
+            this.$toast.clear();
         });
     }
 };

+ 1 - 1
src/main/nine-space/src/views/user/Follows.vue

@@ -45,7 +45,7 @@ export default {
             this.$http.get('/user/myFollows').then(res => {
                 this.list = res;
                 this.empty = res.length === 0;
-                this.scrollRefreash();
+                this.$toast.clear();
             });
         }
     }

+ 1 - 1
src/main/nine-space/src/views/user/Likes.vue

@@ -84,7 +84,7 @@ export default {
             this.$http.get('/collection/myLikes').then(res => {
                 this.list = res;
                 this.empty = res.length === 0;
-                this.scrollRefreash();
+                this.$toast.clear();
             });
         }
     }