预售

ghsApp/src/admin/item/presell.vue

@@ -100,6 +100,7 @@ export default {
 		}
 	},
 	submitPresell(){
+		let that = this
 		let arr = []
 		if(!this.$util.isEmpty(this.form.date1)){
 			arr.push(this.form.date1)
@@ -118,7 +119,12 @@ export default {
 			return false
 		}
 		changePresell({date:JSON.stringify(arr),presell:this.form.presell,id:this.option.id}).then(res=>{
-
+			if(res.code == 1){
+				that.$msg(res.msg)
+				setTimeout(function(){
+					uni.navigateBack({})
+				},1200)
+			}
 		})
 	},
 	presellChangeFn(e){

hdApp/src/admin/billing/affirmGhs.vue

@@ -99,9 +99,10 @@
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
-						<view class="tui-title ">配送时间</view>
+						<view class="tui-title ">送花时间</view>
 						<picker mode="date" :value="sendTimeWant" @change="bindDateChange" style="width:400upx;">
-						<view class="uni-input">{{sendTimeWant || '今天'}}</view>
+							<view class="uni-input" v-if="sendTimeWant==''" style="color:#CCCCCC;">请选择日期，默认当天</view>
+							<view class="uni-input">{{sendTimeWant}}</view>
 						</picker>
 					</tui-list-cell>
 

hdApp/src/pagesPurchase/components/item.vue

@@ -33,10 +33,10 @@
 						</text>
 						<i class="iconfont iconzeng" :class="addAnimationData?'animation':''" @click.stop="addEvents(info.variety)"></i>
 					</view>
-<template v-if="showStock && showStock == 1">
-					<text v-if="Number(info.stock) > Number(info.stockWarning)" style="color:#333;margin-right:65upx;">还剩 {{ parseFloat(info.stock) }}</text>
-					<text v-else style="color:red;font-weight:bold;margin-right:65upx;">还剩 {{ parseFloat(info.stock) }}</text>
-</template>
+					<template v-if="showStock && showStock == 1">
+						<text v-if="Number(info.stock) > Number(info.stockWarning)" style="color:#333;margin-right:65upx;">还剩 {{ parseFloat(info.stock) }}</text>
+						<text v-else style="color:red;font-weight:bold;margin-right:65upx;">还剩 {{ parseFloat(info.stock) }}</text>
+					</template>
 				</view>
 			</view>
 		</view>

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -30,8 +30,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 ">
@@ -52,7 +51,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 :class="[productItem.variety == 1 ? 'color-box' : 'box']"  :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"
@@ -70,6 +69,12 @@
 								<view v-if="productItem.variety && productItem.variety == 1" class="has-color" @click="goToSpecialVariety(productItem)">
 									<view class="has-color-button">点我选颜色</view>
 								</view>
+								<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>
@@ -882,7 +887,11 @@ export default {
 		.box{
 			height: 185upx
 		}
-		.color-box{
+		.middle-box{
+			height: 215upx;
+			position:relative;
+		}
+		.big-box{
 			height: 285upx
 		}
 		.has-color{