shish 11 ヶ月 前
コミット
80201c9424

+ 23 - 7
hdApp/src/admin/billing/affirm.vue

@@ -184,10 +184,17 @@
           </tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
-						<view class="tui-title">送货日期</view>
-						<picker mode="date" :value="form.sendTimeWant" @change="bindDateChange" style="width:400upx;">
-							<view class="uni-input" v-if="form.sendTimeWant==''" style="color:#CCCCCC;">请选择</view>
-							<view class="uni-input">{{form.sendTimeWant}}</view>
+						<view class="tui-title">配送日期</view>
+						<picker mode="date" :value="form.reachDate" @change="bindDateChange" style="width:400upx;">
+							<view class="uni-input" v-if="form.reachDate==''" style="color:#CCCCCC;">请选择,默认当天</view>
+							<view class="uni-input">{{form.reachDate}}</view>
+						</picker>
+					</tui-list-cell>
+
+					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
+						<view class="tui-title">配送时间</view>
+						<picker mode="multiSelector" :range="timeOptions" @change="bindTimeChange">
+							<view class="uni-input" style="width:450upx;">{{form.reachPeriod}}<text style="margin-left:10upx;">前</text></view>
 						</picker>
 					</tui-list-cell>
 
@@ -361,7 +368,8 @@ export default {
         sendType: 1,
         sendSide: "2",
         sendDate: "",
-        sendTimeWant: "",
+        reachDate: "",
+				reachPeriod: "23:00",
         historyDate:"",
         sendCost: "",
         customId: "",
@@ -390,7 +398,8 @@ export default {
       diffPriceList:[],
       currentShop:{default:0},
       forwardPayWay:0,//不影响原有的form.payWay方式,重新定义一个
-      reduceStock:0
+      reduceStock:0,
+      timeOptions: [['00', '01', '02','03','04','05','06','07','08','09','10','11','12','13', '14','15','16','17','18','19','20','21','22','23'],['00', '05', '10','15','20','25','30','35','40','45','50','55']],
     };
   },
   onLoad (option) {
@@ -511,7 +520,14 @@ export default {
 		},
 		bindDateChange(e){
 			let date = e.detail.value
-			this.form.sendTimeWant = date
+			this.form.reachDate = date
+		},
+		bindTimeChange(event){
+			let val = event.detail.value
+			let before = Number(val[0])
+			let after = Number(val[1])
+			let timeOptions = this.timeOptions
+			this.form.reachPeriod = timeOptions[0][before]+':'+timeOptions[1][after]
 		},
     showDiscount(){
       this.$refs.discountRef.open('center')

+ 1 - 1
mallApp/src/pages/billing/affirmGhs.vue

@@ -149,7 +149,7 @@ export default {
 			list:[],
 			form: {
 				reachDate: "",
-				reachPeriod: "12:00",
+				reachPeriod: "20:00",
 				province: "",
 				city: "",
 				floor: "",