Commit a499547b authored by Xuguangxing's avatar Xuguangxing

fix

parent 909ef749
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
<script> <script>
import { mapState } from 'vuex'; import { mapState } from 'vuex';
import NetError from '@/components/NetError'; import NetError from '@/components/NetError';
import { isApp, isWxMp, isWechat } from '@/service/validation.service'; // import { isApp, isWxMp, isWechat } from '@/service/validation.service';
import store from '@/store'; // import store from '@/store';
import Weapp from '@/components/weapp'; import Weapp from '@/components/weapp';
import goodsShare from '@/components/groupShare'; import goodsShare from '@/components/groupShare';
...@@ -52,11 +52,11 @@ export default { ...@@ -52,11 +52,11 @@ export default {
} }
}, },
$route() { $route() {
store.dispatch('change_show_mini_app_guide', { // store.dispatch('change_show_mini_app_guide', {
bool: !isApp && !isWxMp && !isWechat ? true : false, // bool: !isApp && !isWxMp && !isWechat ? true : false,
pointer: this // pointer: this
}); // });
store.dispatch('change_is_weixin_browser', !isApp && !isWxMp && isWechat ? true : false); // store.dispatch('change_is_weixin_browser', !isApp && !isWxMp && isWechat ? true : false);
} }
}, },
methods: { methods: {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<cr-image width="25px" src="@/assets/images/new-user.png" /> <cr-image width="25px" src="@/assets/images/new-user.png" />
</div> </div>
</div> </div>
<div class="placeholder" :style="widthStyle"> <div v-if="avators.length < 10" class="placeholder" :style="widthStyle">
<div class="content">?</div> <div class="content">?</div>
</div> </div>
<div class="more" :style="widthStyle" @click="showMoreAvator"> <div class="more" :style="widthStyle" @click="showMoreAvator">
...@@ -79,6 +79,15 @@ export default { ...@@ -79,6 +79,15 @@ export default {
return this.avators.length == 6 ? { width: '25%' } : { width: '20%' }; return this.avators.length == 6 ? { width: '25%' } : { width: '20%' };
} }
}, },
created() {
if (this.groupInfo.groupBuyAllUserInfoList) {
this.avators = this.groupInfo.groupBuyAllUserInfoList.map(v => {
return v.avatar;
});
} else {
this.avators = [];
}
},
methods: { methods: {
showMoreAvator() { showMoreAvator() {
this.showDialogSlot = true; this.showDialogSlot = true;
...@@ -98,12 +107,14 @@ export default { ...@@ -98,12 +107,14 @@ export default {
.avator-img { .avator-img {
width: 44px; width: 44px;
height: 44px; height: 44px;
/deep/ img {
border-radius: 50%;
}
} }
.avator { .avator {
background: url('../assets/images/leaderBorder.png'); background: url('../assets/images/leaderBorder.png');
// border: px solid rgba(255, 212, 0, 0.24); // border: px solid rgba(255, 212, 0, 0.24);
background-size: cover; background-size: cover;
border-radius: 50%;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
align-items: center; align-items: center;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
> >
<swiper-slide v-for="(item, index) in avatorData" :key="index" class="avator-swiper_item"> <swiper-slide v-for="(item, index) in avatorData" :key="index" class="avator-swiper_item">
<div class="avator-swiper_item"> <div class="avator-swiper_item">
<img :src="item" /> <img :src="item | Img2Thumb" />
</div> </div>
</swiper-slide> </swiper-slide>
</swiper> </swiper>
...@@ -18,12 +18,16 @@ ...@@ -18,12 +18,16 @@
<script> <script>
import { swiper, swiperSlide } from 'vue-awesome-swiper'; import { swiper, swiperSlide } from 'vue-awesome-swiper';
import 'swiper/dist/css/swiper.css'; import 'swiper/dist/css/swiper.css';
import Img2Thumb from '@/filters/img2Thumb.filter';
export default { export default {
name: 'AvatorSwiper', name: 'AvatorSwiper',
components: { components: {
swiper, swiper,
swiperSlide swiperSlide
}, },
filters: {
Img2Thumb
},
props: { props: {
avatorData: { avatorData: {
type: Array, type: Array,
......
...@@ -259,8 +259,9 @@ export default { ...@@ -259,8 +259,9 @@ export default {
if (res.size) { if (res.size) {
this.loading = false; this.loading = false;
this.showLoading = false; this.showLoading = false;
res.items[5].goodsCount = 0; // res.items[5].goodsCount = 0;
this.goodsList = res.items || []; this.goodsList = res.items || [];
console.log(this.goodsList, 'this.goodsList');
if (!res.hasNext) { if (!res.hasNext) {
this.finished = true; this.finished = true;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment