shish 7 сар өмнө
parent
commit
7085a211b6

+ 30 - 13
hdApp/src/admin/billing/affirm.vue

@@ -178,20 +178,22 @@
             <text v-if="modifyPrice > 0 && modifyPrice < finalPrice" style="font-size:25upx;margin-left:20upx;color:green;">优惠 ¥{{parseFloat((finalPrice-modifyPrice).toFixed(2))}}</text>
           </tui-list-cell>
 
-					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
+				<tui-list-cell class="line-cell" :hover="false" :arrow="true">
             <view class="tui-title" v-if="form.sendType == 1">取花日期</view>
-						<view class="tui-title" v-else>配送日期</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>
+					<view class="tui-title" v-else>配送日期</view>
+					<view class="uni-input" v-if="form.reachDate==''" @click="bindReachDateChange">
+            <view style="width:410upx;font-size:32upx;color:#CCCCCC;">今天</view>
+          </view>
+					<view class="uni-input" @click="bindReachDateChange">
+            <view style="width:410upx;font-size:32upx;">{{form.reachDate}}</view>
+          </view>
+				</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
             <view class="tui-title" v-if="form.sendType == 1">取花时间</view>
 						<view class="tui-title" v-else>配送时间</view>
 						<picker mode="multiSelector" :range="timeOptions" @change="bindTimeChange">
-							<view class="uni-input" style="width:450upx;">{{form.reachPeriod}}<text style="margin-left:10upx;">前</text></view>
+							<view class="uni-input" style="width:450upx;">{{form.reachPeriod}}</view>
 						</picker>
 					</tui-list-cell>
 
@@ -206,8 +208,12 @@
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
 						<view class="tui-title">账单日期</view>
-            <view class="uni-input" v-if="form.historyDate==''" style="color:#CCCCCC;" @click="bindHistoryDateChange">请选择,默认当天</view>
-            <view class="uni-input" @click="bindHistoryDateChange">{{form.historyDate}}</view>
+            <view class="uni-input" v-if="form.historyDate==''" @click="bindHistoryDateChange">
+              <view  style="width:410upx;font-size:32upx;color:#CCCCCC;">今天</view>
+            </view>
+            <view class="uni-input" @click="bindHistoryDateChange">
+              <view style="width:410upx;font-size:32upx;">{{form.historyDate}}</view>
+            </view>
 					</tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -313,6 +319,8 @@
 
     <mx-date-picker :show="showPicker" format="yyyy-mm-dd" type="date" :value="defaultPickerDate" :show-tips="true" @confirm="confirmPicker" @cancel="showPicker = false" />
 
+    <mx-date-picker :show="reachDatePickerShow" format="yyyy-mm-dd" type="date" :value="reachDatePickerValue" :show-tips="true" @confirm="confirmReachDatePicker" @cancel="reachDatePickerShow = false" />
+
     </view>
   </view>
 </template>
@@ -353,6 +361,8 @@ export default {
     return {
 			defaultPickerDate:'',
 			showPicker: false,
+			reachDatePickerShow: false,
+			reachDatePickerValue: '',
       discountList:[{name:'1折',value:0.1},{name:'2折',value:0.2},{name:'3折',value:0.3},{name:'4折',value:0.4},{name:'5折',value:0.5},{name:'6折',value:0.6},{name:'7折',value:0.7},{name:'8折',value:0.8},{name:'9折',value:0.9},{name:'不打折',value:1}],
       discountValue:0,
       autoLoad: false,
@@ -505,6 +515,14 @@ export default {
 			this.form.historyDate = e.value
       this.showPicker = false
 		},
+		bindReachDateChange(){
+			this.reachDatePickerShow = true
+			this.reachDatePickerValue = this.form.reachDate
+		},
+		confirmReachDatePicker(e) {
+			this.form.reachDate = e.value
+			this.reachDatePickerShow = false
+		},
 		bindDateChange(e){
 			let date = e.detail.value
 			this.form.reachDate = date
@@ -1004,12 +1022,11 @@ console.log(params)
      }
    }
 }
-
 .remark-class{
-  z-index:0
+  z-index:0;
+  color:#CCCCCC;
 }
 .warning-price{
 	color:red;
 }
-
 </style>