预售

mallApp/src/pages/billing/affirmGhs.vue

@@ -84,8 +84,8 @@
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.sendType == 2">
 						<view class="tui-title ">配送日期</view>
 						<picker mode="date" :value="form.reachDate" @change="selTimeFn" class="tui-input">
-						<div v-if="form.reachDate">{{ form.reachDate }}</div>
-						<div v-else>今天</div>
+							<div v-if="form.reachDate">{{ form.reachDate }}</div>
+							<div v-else style="color:#CCCCCC;">请选日期，默认当天</div>
 						</picker>
 					</tui-list-cell>
 
@@ -108,7 +108,7 @@
 
 		<view class="under-bar">
 			<view class="price-view"> </view>
-			<button class="admin-button-com blue middle" style="border:none;height:68upx;margin-right:38upx;" @click="confirmForm">提交</button>
+			<button class="admin-button-com blue big" style="border:none;margin-right:38upx;width:280upx;" @click="confirmForm">提交</button>
 		</view>
 
 	</view>
@@ -446,9 +446,6 @@ export default {
 				}
 			}
 		}
-		.admin-button-com {
-			width: 200upx;
-		}
 	}
   .coupon_box{
     flex: 1;

mallApp/src/pages/item/components/subItem.vue

@@ -4,7 +4,10 @@
 			<image :src="info.cover" v-if="isImg"></image>
 		</view>
 		<view class="cmd-info_bx">
-			<view class="tit" >{{ info.itemName}}</view>
+			<view class="tit" >
+				<text style="font-size:22upx;border:1upx solid #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" v-if="info.presell == 1">预售</text>
+				{{ info.itemName}}
+			</view>
 			<view class="kc num-open_bx flex-space">
 				<view v-if="!offPrice">
 					<view class="flex-space" style="margin-top:20upx;" v-if="Number(info.discountPrice)>0">

mallApp/src/pages/item/item.vue

@@ -13,8 +13,7 @@
 		<view class="scroll-middle_bx">
 			<scroll-view scroll-y scroll-with-animation class="tab-view" :scroll-top="scrollTop" >
 				<div v-for="(item, index) in filterProductInfo" :key="index" class="tab-bar-item" :class="[classIndex == index ? 'active' : '']" :data-current="index" @tap.stop="swichClass(index)">
-					<!--<text>{{ item.className || "" }}</text>-->
-					<text v-if="item.classId=='-1'" style="color: red">{{ item.className || "" }}</text>
+					<text v-if="item.classId=='-1' || item.classId=='-3'" style="color:red;font-weight:bold;">{{ item.className || "" }}</text>
 					<text v-else>{{ item.className }}</text>
 					<text class="tag" v-if=" getSelectClassById(item.classId).bigCount > 0 || getSelectClassById(item.classId).smallCount > 0">
 						<text v-if=" getSelectClassById(item.classId).bigCount > 0 || getSelectClassById(item.classId).smallCount > 0 ">
@@ -33,7 +32,7 @@
 					<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 style="height: 185upx" :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
+							<view :class="[productItem.variety == 1 ? 'big-box' : productItem.presell == 1 ? 'middle-box' : 'box']" :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
 								<Commondity v-if="classItem.isActive"
 									:info="productItem"
 									:offVerifyRepertory="true"
@@ -46,6 +45,12 @@
 									@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>
+									</block>
+								</view>
 							</view>
 						</template>
 					</view>
@@ -569,10 +574,34 @@ export default {
 		box-sizing: border-box;
 	}
 	.item_list_bx {
-		padding: 40upx 16upx 100upx 16upx;
+		padding: 40upx 16upx 20upx 16upx;
 		&:last-child{
 			margin-bottom:70upx;
 		}
+		.box{
+			height: 185upx
+		}
+		.middle-box{
+			height: 215upx;
+			position:relative;
+		}
+		.big-box{
+			height: 285upx
+		}
+		.has-color{
+			display:flex;
+			justify-content:center;
+			align-items:center;
+			height:110upx;
+			border-bottom:1upx solid rgb(247, 243, 243);
+			.has-color-button{
+				border:1upx solid #5a99f7;
+				border-radius:15upx;
+				padding:13upx 16upx;
+				font-size:30upx;
+				color:#3385ff;
+			}
+		}
 	}
 	.item_list_title {
 		margin-bottom: 20upx;