Merge branch 'refs/heads/hotfix/second-image'
Showing
5 changed files
with
14 additions
and
11 deletions
@@ -7,8 +7,8 @@ | @@ -7,8 +7,8 @@ | ||
7 | <image-format | 7 | <image-format |
8 | :class="product.status === 100 ? 'dim-imge' : 'second-image'" | 8 | :class="product.status === 100 ? 'dim-imge' : 'second-image'" |
9 | :src="product.secondhand_image" | 9 | :src="product.secondhand_image" |
10 | - :width="180" | ||
11 | - :height="180"/> | 10 | + :width="360" |
11 | + :height="360"/> | ||
12 | <div v-if="product.status === 100" class="dim-out"></div> | 12 | <div v-if="product.status === 100" class="dim-out"></div> |
13 | </div> | 13 | </div> |
14 | 14 |
@@ -19,8 +19,8 @@ | @@ -19,8 +19,8 @@ | ||
19 | :lazy="false" | 19 | :lazy="false" |
20 | alt="图片加载失败" | 20 | alt="图片加载失败" |
21 | :src="item" | 21 | :src="item" |
22 | - :width="375" | ||
23 | - :height="375" | 22 | + :width="750" |
23 | + :height="750" | ||
24 | /> | 24 | /> |
25 | <div class="pole-dot-area"></div> | 25 | <div class="pole-dot-area"></div> |
26 | </cube-slide-item> | 26 | </cube-slide-item> |
@@ -51,8 +51,8 @@ | @@ -51,8 +51,8 @@ | ||
51 | class="image" | 51 | class="image" |
52 | :alt="info.image" | 52 | :alt="info.image" |
53 | :src="info.image" | 53 | :src="info.image" |
54 | - :width="70" | ||
55 | - :height="70" | 54 | + :width="140" |
55 | + :height="140" | ||
56 | /> | 56 | /> |
57 | <div class="middle" @click="'productId'"> | 57 | <div class="middle" @click="'productId'"> |
58 | <p class="name ellipsis">{{ info.productName }}</p> | 58 | <p class="name ellipsis">{{ info.productName }}</p> |
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | <SecondList ref="second" :list="skupList.list" :yasParams="yasParams"></SecondList> | 11 | <SecondList ref="second" :list="skupList.list" :yasParams="yasParams"></SecondList> |
12 | </LayoutScroll> | 12 | </LayoutScroll> |
13 | 13 | ||
14 | - <UfoNoItem class="empty" :tip="`暂无数据`" v-else></UfoNoItem> | 14 | + <UfoNoItem v-if="isShowEmpty" class="empty" :tip="`暂无数据`"></UfoNoItem> |
15 | </LayoutApp> | 15 | </LayoutApp> |
16 | </template> | 16 | </template> |
17 | 17 | ||
@@ -43,7 +43,7 @@ export default { | @@ -43,7 +43,7 @@ export default { | ||
43 | }; | 43 | }; |
44 | }, | 44 | }, |
45 | computed: { | 45 | computed: { |
46 | - ...mapState(['skupList', 'isMore']) | 46 | + ...mapState(['skupList', 'isMore', 'isShowEmpty']) |
47 | }, | 47 | }, |
48 | methods: { | 48 | methods: { |
49 | ...mapActions(['fetchSecondSkupList']), | 49 | ...mapActions(['fetchSecondSkupList']), |
@@ -34,7 +34,7 @@ export default function() { | @@ -34,7 +34,7 @@ export default function() { | ||
34 | } | 34 | } |
35 | } | 35 | } |
36 | }, | 36 | }, |
37 | - errorData(state) { | 37 | + showEmpty(state) { |
38 | state.isShowEmpty = true; | 38 | state.isShowEmpty = true; |
39 | } | 39 | } |
40 | }, | 40 | }, |
@@ -55,8 +55,11 @@ export default function() { | @@ -55,8 +55,11 @@ export default function() { | ||
55 | let data = result.data; | 55 | let data = result.data; |
56 | 56 | ||
57 | commit('addList', { data, isReset }); | 57 | commit('addList', { data, isReset }); |
58 | + if (data && !data.total) { | ||
59 | + commit('showEmpty'); | ||
60 | + } | ||
58 | } else { | 61 | } else { |
59 | - commit('errorData'); | 62 | + commit('showEmpty'); |
60 | } | 63 | } |
61 | return result.data || []; | 64 | return result.data || []; |
62 | }, | 65 | }, |
-
Please register or login to post a comment