Explorar el Código

开单人优化

shish hace 8 meses
padre
commit
1898dbbe1b

+ 20 - 16
ghsApp/src/admin/billing/affirm.vue

@@ -189,18 +189,16 @@
             <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">
-						<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>
-						</picker>
-					</tui-list-cell>
+				<tui-list-cell class="line-cell" :hover="false" :arrow="true">
+					<view class="tui-title">送货日期</view>
+          <view class="uni-input" v-if="form.sendTimeWant==''" style="color:#CCCCCC;width:400upx;font-size:34upx;" @click="bindDateChange">今天</view>
+          <view class="uni-input" @click="bindDateChange" v-else style="width:400upx;font-size:34upx;">{{form.sendTimeWant}}</view>
+				</tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="true">
             <div class="tui-title">开单人</div>
-            <view class="uni-input" v-if="form.getStaffId==0" style="color:#CCCCCC;width:400upx;" @click="changeStaff()">请选择</view>
-            <view class="uni-input" v-else @click="changeStaff()" style="width:400upx;">{{ form.getStaffName ? form.getStaffName : '请选择' }}</view>
+            <view class="uni-input" v-if="form.getStaffId==0" style="color:#CCCCCC;width:400upx;font-size:34upx;" @click="changeStaff()">自己</view>
+            <view class="uni-input" v-else @click="changeStaff()" style="width:400upx;font-size:34upx;">{{ form.getStaffName ? form.getStaffName : '请选择' }}</view>
           </tui-list-cell>
 
           <uni-popup ref="staffRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
@@ -223,8 +221,8 @@
 
 					<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;width:400upx;" @click="bindHistoryDateChange">请选择,默认当天</view>
-            <view class="uni-input" @click="bindHistoryDateChange" v-else style="width:400upx;">{{form.historyDate}}</view>
+            <view class="uni-input" v-if="form.historyDate==''" style="color:#CCCCCC;width:400upx;font-size:34upx;" @click="bindHistoryDateChange">今天</view>
+            <view class="uni-input" @click="bindHistoryDateChange" v-else style="width:400upx;font-size:34upx;">{{form.historyDate}}</view>
 					</tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -326,6 +324,7 @@ export default {
     return {
 			defaultPickerDate:'',
 			showPicker: false,
+			pickerType: '', // 'history' 或 'sendDate'
       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,
@@ -501,16 +500,21 @@ export default {
   methods: {
     ...mapActions(["initMerchantInfo"]),
     bindHistoryDateChange(){
+			this.pickerType = 'history'
 			this.showPicker = true
     },
+		bindDateChange(){
+			this.pickerType = 'sendDate'
+			this.showPicker = true
+		},
 		confirmPicker(e) {
-			this.form.historyDate = e.value
+			if(this.pickerType === 'history'){
+				this.form.historyDate = e.value
+			} else if(this.pickerType === 'sendDate'){
+				this.form.sendTimeWant = e.value
+			}
       this.showPicker = false
 		},
-		bindDateChange(e){
-			let date = e.detail.value
-			this.form.sendTimeWant = date
-		},
     showDiscount(){
       this.$refs.discountRef.open('center')
     },

+ 3 - 3
mallApp/src/pages/order/components/app-delivery.vue

@@ -170,8 +170,8 @@
         <tui-list-cell class="line-cell" :hover="false" :arrow="true">
           <div class="tui-title">配送日期</div>
           <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" style="font-size:32upx;">{{ form.reachDate }}</div>
+            <div v-else style="font-size:32upx;">今天</div>
           </picker>
         </tui-list-cell>
         
@@ -504,7 +504,7 @@ export default {
   flex-direction: column;
   max-height: 94vh;
   padding: 0;
-  padding-bottom:125upx;
+  padding-bottom:135upx;
 }
 
 .popup-header {