更新

ghsApp/src/admin/item/presell.vue

@@ -34,6 +34,68 @@
 				<view class="tui-input" @click="showDatePicker(4)" style="width:350upx;" v-else>{{ form.date4 }}</view>
 				<button class="admin-button-com mini-btn blue" @click="form.date4=''">清空</button>
 			</tui-list-cell>
+
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期5</div>
+				<view class="tui-input" v-if="form.date5==''" @click="showDatePicker(5)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(5)" style="width:350upx;" v-else>{{ form.date5 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date5=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期6</div>
+				<view class="tui-input" v-if="form.date6==''" @click="showDatePicker(6)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(6)" style="width:350upx;" v-else>{{ form.date6 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date6=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期7</div>
+				<view class="tui-input" v-if="form.date7==''" @click="showDatePicker(7)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(7)" style="width:350upx;" v-else>{{ form.date7 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date7=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期8</div>
+				<view class="tui-input" v-if="form.date8==''" @click="showDatePicker(8)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(8)" style="width:350upx;" v-else>{{ form.date8 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date8=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期9</div>
+				<view class="tui-input" v-if="form.date9==''" @click="showDatePicker(9)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(9)" style="width:350upx;" v-else>{{ form.date9 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date9=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期10</div>
+				<view class="tui-input" v-if="form.date10==''" @click="showDatePicker(10)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(10)" style="width:350upx;" v-else>{{ form.date10 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date10=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期11</div>
+				<view class="tui-input" v-if="form.date11==''" @click="showDatePicker(11)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(11)" style="width:350upx;" v-else>{{ form.date11 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date11=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期12</div>
+				<view class="tui-input" v-if="form.date12==''" @click="showDatePicker(12)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(12)" style="width:350upx;" v-else>{{ form.date12 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date12=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期13</div>
+				<view class="tui-input" v-if="form.date13==''" @click="showDatePicker(13)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(13)" style="width:350upx;" v-else>{{ form.date13 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date13=''">清空</button>
+			</tui-list-cell>
+			<tui-list-cell class="line-cell" :hover="false">
+				<div class="tui-title">到货日期14</div>
+				<view class="tui-input" v-if="form.date14==''" @click="showDatePicker(14)" style="color:#CCCCCC;width:350upx;">请填写日期</view>
+				<view class="tui-input" @click="showDatePicker(14)" style="width:350upx;" v-else>{{ form.date14 }}</view>
+				<button class="admin-button-com mini-btn blue" @click="form.date14=''">清空</button>
+			</tui-list-cell>
+
 			</block>
         </div>
 		<view style="width:100%;text-align:center;font-size:36upx;" v-if="form.presell == 1">
@@ -62,7 +124,8 @@ export default {
     return {
 		showPicker:false,
 		form:{
-			date1:'',date2:'',date3:'',date4:'',presell:0
+			date1:'',date2:'',date3:'',date4:'',date5:'',date6:'',date7:'',date8:'',date9:'',date10:'',
+			date11:'',date12:'',date13:'',date14:'',presell:0
 		},
 		index:1
     }
@@ -82,6 +145,26 @@ export default {
 						that.form.date3 = item
 					}else if(idx == 3){
 						that.form.date4 = item
+					}else if(idx == 4){
+						that.form.date5 = item
+					}else if(idx == 5){
+						that.form.date6 = item
+					}else if(idx == 6){
+						that.form.date7 = item
+					}else if(idx == 7){
+						that.form.date8 = item
+					}else if(idx == 8){
+						that.form.date9 = item
+					}else if(idx == 9){
+						that.form.date10 = item
+					}else if(idx == 10){
+						that.form.date11 = item
+					}else if(idx == 11){
+						that.form.date12 = item
+					}else if(idx == 12){
+						that.form.date13 = item
+					}else if(idx == 13){
+						that.form.date14 = item
 					}else{
 
 					}
@@ -110,6 +193,26 @@ export default {
 			this.form.date3 = e.value
 		}else if(this.index == 4){
 			this.form.date4 = e.value
+		}else if(this.index == 5){
+			this.form.date5 = e.value
+		}else if(this.index == 6){
+			this.form.date6 = e.value
+		}else if(this.index == 7){
+			this.form.date7 = e.value
+		}else if(this.index == 8){
+			this.form.date8 = e.value
+		}else if(this.index == 9){
+			this.form.date9 = e.value
+		}else if(this.index == 10){
+			this.form.date10 = e.value
+		}else if(this.index == 11){
+			this.form.date11 = e.value
+		}else if(this.index == 12){
+			this.form.date12 = e.value
+		}else if(this.index == 13){
+			this.form.date13 = e.value
+		}else if(this.index == 14){
+			this.form.date14 = e.value
 		}else{
 			this.$msg('暂无选项')
 		}
@@ -129,6 +232,36 @@ export default {
 		if(!this.$util.isEmpty(this.form.date4)){
 			arr.push(this.form.date4)
 		}
+		if(!this.$util.isEmpty(this.form.date5)){
+			arr.push(this.form.date5)
+		}
+		if(!this.$util.isEmpty(this.form.date6)){
+			arr.push(this.form.date6)
+		}
+		if(!this.$util.isEmpty(this.form.date7)){
+			arr.push(this.form.date7)
+		}
+		if(!this.$util.isEmpty(this.form.date8)){
+			arr.push(this.form.date8)
+		}
+		if(!this.$util.isEmpty(this.form.date9)){
+			arr.push(this.form.date9)
+		}
+		if(!this.$util.isEmpty(this.form.date10)){
+			arr.push(this.form.date10)
+		}
+		if(!this.$util.isEmpty(this.form.date11)){
+			arr.push(this.form.date11)
+		}
+		if(!this.$util.isEmpty(this.form.date12)){
+			arr.push(this.form.date12)
+		}
+		if(!this.$util.isEmpty(this.form.date13)){
+			arr.push(this.form.date13)
+		}
+		if(!this.$util.isEmpty(this.form.date14)){
+			arr.push(this.form.date14)
+		}
 		if(this.form.presell == 1 && this.$util.isEmpty(arr)){
 			this.$msg('请填写日期')
 			return false
@@ -152,6 +285,7 @@ export default {
 .app-content {
   min-height: calc(100vh - 20upx);
   padding-top: 20upx;
+  padding-bottom: 180upx;
 }
 .prompt-text {
   color: $fontColor3;
@@ -175,7 +309,12 @@ export default {
 }
 .confirm-btn {
   width: calc(100% - 60upx);
-  margin: 60upx 30upx 20upx;
+  position: fixed;
+  left: 30upx;
+  right: 30upx;
+  bottom: 20upx;
+  margin: 0;
+  z-index: 10;
   .admin-button-com {
     width: 100%;
   }

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -75,7 +75,7 @@
 									<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="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" style="">{{dateItem}}<text v-if="dateIndex!=productItem.presellDateShow.length-1">，</text></text>
 										</block>

hdApp/src/pagesPurchase/ghsProduct2.vue

@@ -71,7 +71,7 @@
 									<text style="font-weight:bold;" v-if="Number(productItem.reachNum)>0">
 										满{{productItem.reachNum}}扎 ¥{{productItem.reachPrice}}<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="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" style="">{{dateItem}}<text v-if="dateIndex!=productItem.presellDateShow.length-1">，</text></text>
 										</block>

mallApp/src/pages/item/detail.vue

@@ -22,7 +22,7 @@
       </view>
       <view class="shop-express app-color-3" v-if="data.presell == 1">
         <view>
-          到货日期：
+          到货日期:
           <block v-if="!$util.isEmpty(data.presellDateShow)">
             <text v-for="(dateItem, dateIndex) in data.presellDateShow" :key="dateIndex" style="">{{dateItem}}<text v-if="dateIndex!=data.presellDateShow.length-1">，</text></text>
           </block>