Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zmr

This commit is contained in:
zmr900709
2020-08-18 11:35:37 +08:00
11 changed files with 114 additions and 22 deletions

View File

@@ -9,7 +9,7 @@
<view class="text">{{ content.geval_content }}</view>
</view>
<view class="image-container">
<image :src="src" v-for="(src, index) in content.geval_image" :key="index"></image>
<image :src="src" v-for="(src, index) in content.geval_image" :key="index" @click="previewImage(content.geval_image)"></image>
</view>
<view class="reply" v-if="reply && content.geval_explain">
<view class="title">掌柜回复</view>
@@ -39,6 +39,14 @@ export default {
},
created() {
if(this.content.hasOwnProperty('scores_two')) this.rate = this.content.scores_two;
},
methods: {
previewImage(urls) {
console.log(urls);
// uni.previewImage({
// urls: urls,
// });
},
}
};
</script>

View File

@@ -8,7 +8,6 @@
</view>
</view>
<view class="label">
<!-- <u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper> -->
<u-tabs :list="classifyList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24" inactive-color="#333333"></u-tabs>
</view>
<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 340rpx;">

View File

@@ -11,7 +11,7 @@
<view class="user">
<view class="avatar">
<image :src="info.member_avatar[0]"></image>
<image :src="info.member_avatar[1]"></image>
<image src="/static/image/common/31.png"></image>
</view>
<view class="num">{{ info.pintuan_limit_number }}人团</view>
</view>

View File

@@ -2,11 +2,12 @@
<view class="coupon-swiper">
<view class="top">
<view class="title">全部优惠券</view>
<view class="view-more" @click="toCouponPage">查看更多></view>
<view class="view-more" @click="toCouponPage">
<text>查看更多</text>
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
</view>
</view>
<!-- <u-tabs-swiper ref="coupon" :list="couponGroupList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="couponCurrent" font-size="24" :show-bar="false" @change="couponTabsChange" height="60" ></u-tabs-swiper> -->
<u-tabs :list="couponGroupList" name="gc_name" :is-scroll="true" :current="couponCurrent" @change="couponTabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24" inactive-color="#333333"></u-tabs>
<!-- :style="{ height: swiperHeight }" -->
<swiper class="box" :current="swiperCouponCurrent" @animationfinish="couponAnimationFinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-coupon-item" v-for="(_, i) in couponGroupList" :key="i">
<!-- 最多显示四个 -->
@@ -114,6 +115,8 @@ export default {
.view-more {
font-size: 20rpx;
color: rgba(153,153,153,1);
display: flex;
align-items: center;
}
}
.box {