소스 검색

Merge branch 'master' of http://git.huaml.com/zhh/front-end

shish 2 달 전
부모
커밋
1ec9d47b64
1개의 변경된 파일18개의 추가작업 그리고 11개의 파일을 삭제
  1. 18 11
      mallApp/src/pages/item/item.vue

+ 18 - 11
mallApp/src/pages/item/item.vue

@@ -42,8 +42,12 @@
 				<block v-if="!$util.isEmpty(filterProductInfo)">
 					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in filterProductInfo" :key="classIndex" :id="`class_${classIndex}`">
 						<view class="item_list_title">{{ classItem.className }}</view>
-						<template v-for="(productItem, productIndex) in classItem.child">
-							<view :class="[productItem.presell == 1 ? 'middle-box' : 'box']" :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
+						<view
+							v-for="(productItem, productIndex) in classItem.child"
+							:key="productIndex"
+							:class="[(productItem.presell == 1 || Number(productItem.reachNum) > 0) ? 'middle-box' : 'box']"
+							:id="`class_${classItem.classId}_${productItem.id}`"
+						>
 								<Commondity v-if="classItem.isActive"
 									:info="productItem"
 									:offVerifyRepertory="true"
@@ -56,17 +60,20 @@
 									@showBigCover="showBigCover"
 									@goToSpecialVariety="goToSpecialVariety"
 								></Commondity>
-								<view v-if="productItem.presell && productItem.presell == 1" style="position:absolute;top:150upx;font-size:26upx;color:#3385ff;white-space: nowrap;text-overflow: hidden;">
-									配送日:
-									<block v-if="!$util.isEmpty(productItem.presellDateShow)">
-										<text v-for="(dateItem, dateIndex) in productItem.presellDateShow" :key="dateIndex" style="">
-											{{dateItem}}
-											<text v-if="dateIndex!=productItem.presellDateShow.length-1">,</text>
-										</text>
+								<view v-if="productItem.presell == 1 || Number(productItem.reachNum) > 0" style="position:absolute;top:150upx;font-size:26upx;color:#3385ff;white-space: normal;word-wrap: break-word;">
+									<text style="font-weight:bold;" v-if="Number(productItem.reachNum) > 0">
+										满{{ productItem.reachNum }}扎,每扎优惠 ¥{{ parseFloat(productItem.reachNumDiscount) }}<block v-if="productItem.presell == 0">(提交订单后优惠)</block>
+									</text>
+									<block v-if="productItem.presell && productItem.presell == 1"><block v-if="Number(productItem.reachNum) > 0">,</block>配送日:
+										<block v-if="!$util.isEmpty(productItem.presellDateShow)">
+											<text v-for="(dateItem, dateIndex) in productItem.presellDateShow" :key="dateIndex">
+												{{ dateItem }}
+												<text v-if="dateIndex != productItem.presellDateShow.length - 1">,</text>
+											</text>
+										</block>
 									</block>
 								</view>
-							</view>
-						</template>
+						</view>
 					</view>
 				</block>
 				<block v-else>