liuxiangxin 6 місяців тому
батько
коміт
5c46df5e7c
3 змінених файлів з 28 додано та 6 видалено
  1. 6 3
      pages/coupon/active.vue
  2. 21 2
      pages/product/index.vue
  3. 1 1
      pages/user/follow.vue

+ 6 - 3
pages/coupon/active.vue

@@ -6,7 +6,7 @@
 		<view class="active_info">
 			<view class="active_name">{{activeInfo.name}}</view>
 			<view class="active_time">活动时间:{{activeInfo.start_date}} ~ {{activeInfo.end_date}}</view>
-			<view class="active_citys">活动范围:{{activeInfo.city_ids}}</view>
+			<view class="active_citys" v-if="activeInfo.city_ids">活动范围:{{activeInfo.city_ids}}</view>
 		</view>
 		<view class="active_coupon">
 			<view class="active_subtitle">优惠券</view>
@@ -26,7 +26,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="active_product">
+		<view class="active_product" v-if="activeInfo.product_list.length" >
 			<view class="active_subtitle">活动商品</view>
 			<view class="product_list" :class="show_more_product?'more':''">
 				<view class="product_item" v-for="(item,index) in activeInfo.product_list" :key="index" >
@@ -44,7 +44,7 @@
 				<uni-icons type="down" size="20" ></uni-icons>
 			</view>
 		</view>
-		<view class="active_rule">
+		<view class="active_rule" v-if="activeInfo.active_rule">
 			<view class="active_subtitle">活动规则</view>
 			<view class="active_rule_info">
 				<rich-text class="rich_text" :nodes="activeInfo.active_rule"></rich-text>
@@ -263,9 +263,12 @@
 					.rebate{
 						color: #E03519;
 						height: 60rpx;
+						overflow: hidden;
 						font-size: 36rpx;
 						line-height: 60rpx;
 						font-weight: bold;
+						white-space: nowrap;
+						text-overflow: ellipsis;
 					}
 					.std_pay{
 						color: #666666;

+ 21 - 2
pages/product/index.vue

@@ -1,9 +1,16 @@
 <template>
 	<page-meta :page-style="'overflow:'+(show?'hidden':'visible')"></page-meta>
 	<view>
-		<view class="product_image_box">
+		<view class="product_image_box" v-if="!productInfo.photo_list.length">
 			<image class="product_image" :src="productInfo.thumb"></image>
 		</view>
+		<view class="product_image_box" v-if="productInfo.photo_list.length">
+			<swiper class="photo_list" :autoplay="true" >
+				<swiper-item v-for="(item,index) in productInfo.photo_list" :key="index">
+					<image :src="item.thumb" class="photo_image" ></image>
+				</swiper-item>
+			</swiper>
+		</view>
 		<view class="product_info">
 			<view class="stock_price" v-if="isShowPrice">
 				<view class="product_price" >
@@ -165,7 +172,7 @@
 			<view class="add_follow">
 				<view class="close_area"><button class="close_btn" @click="closeAddFollow()">关闭</button></view>
 				<view class="info_alter">
-					<text v-if="follow_linkurl">长按或点击二维码添加客服</text>
+					<text v-if="follow_linkurl">点击二维码添加客服</text>
 					<text v-if="!follow_linkurl">长按二维码添加客服</text>
 				</view>
 				<view class="qr_code_area" @click="followLinkurl">
@@ -202,6 +209,7 @@
 						desc:"",
 					},
 					product_attr:[],
+					photo_list:[],
 					product_sku:[],
 				},
 				requestParam:{
@@ -845,6 +853,17 @@
 			width: 750rpx;
 			height: 750rpx;
 		}
+		.photo_list{
+			display: block;
+			width: 750rpx;
+			height: 750rpx;
+			line-height: 750rpx;
+			text-align: center;
+			.photo_image{
+				width: 750rpx;
+				height: 750rpx;
+			}
+		}
 	}
 	.product_info{
 		display: block;

+ 1 - 1
pages/user/follow.vue

@@ -9,7 +9,7 @@
 					<image v-if="followQrcode" :src="followQrcode" class="qr_code" mode="" show-menu-by-longpress></image>
 				</view>
 				<view class="info_alter">
-					<text v-if="follow_linkurl">长按或点击二维码添加客服</text>
+					<text v-if="follow_linkurl">点击二维码添加客服</text>
 					<text v-if="!follow_linkurl">长按二维码添加客服</text>
 				</view>
 				<view class="rule_info">