瀏覽代碼

救援修改

twt 2 周之前
父節點
當前提交
e6b5e6047a
共有 1 個文件被更改,包括 36 次插入11 次删除
  1. 36 11
      pages/rescue/rescueOrder.vue

+ 36 - 11
pages/rescue/rescueOrder.vue

@@ -28,7 +28,7 @@
 			</view>
 			<!-- 筛选框 -->
 			<view class="screen">
-			  <view class="screenLine" @click="ckShopAppFn">
+			  <view class="screenLine screenLine1" @click="ckShopAppFn">
 				  <!-- <span class="screenLineSpan">救援门店</span> -->
 				 <!-- <view class="">
 					   <picker @change="bindPickerChange" :value="pickerindex" :range-key="'shopName'" :range="pickerarray">
@@ -39,19 +39,22 @@
 					   </picker>
 				  </view> -->
 				 
-				 	<span class="screenLineSpan">{{shopName?shopName:'救援门店'}}</span>	
+				 	 <span class="screenLineSpan">{{shopName?shopName:'救援门店'}}</span>
+				<!-- 	<span class="screenLineSpan">连锁一号测试门店测试</span> -->
 				 	<img src="../../static/img/arrow_down.png" alt="" class="screenLineImg">
 				
 			  </view>
-			  <view class="screenLine" @click="orderTimesxSHow=true">
-				  <span class="screenLineSpan">下单时间</span>
+			  <view class="screenLine screenLine2" @click="cktimeFn">
+				 <!-- <span class="screenLineSpan">下单时间</span> -->
+				 <span class="screenLineSpan">{{date1}}-{{date2}}</span>
 				  <img src="../../static/img/arrow_down.png" alt="" class="screenLineImg">
 			  </view>
-			  <view class="screenLine" @click="typeSHow=true">
+			  <view class="screenLine screenLine3" @click="typeSHow=true">
 				  <span class="screenLineSpan">更多</span>
 				  <img src="../../static/img/arrow_down.png" alt="" class="screenLineImg">
 			  </view>
 			  <view class="orderTimesxBox" v-if="orderTimesxSHow">
+				  <view class="orderTimesxBoxTitle">下单时间</view>
 				  <view class="sdTimeBox">
 				   <picker mode="date" :value="date1"  @change="bindDateChange1">
 				  		<view class="dateinput">{{date1?date1:'选择日期'}}</view>
@@ -222,6 +225,8 @@
 				orderTimesxSHow:false,
 				typeSHow:false,
 				iStatusBarHeight:'',
+				olddate1:'',
+				olddate2:'',
 			}
 		},
 		onLoad(opt) {
@@ -260,6 +265,12 @@
 		}, 
 		
 		methods: {
+			cktimeFn(){
+				this.orderTimesxSHow=true
+				this.olddate1=this.date1
+				this.olddate2=this.date2
+			},
+			
 			ckShopAppFn(){
 				var obj={
 					value:this.mrshopId,
@@ -319,9 +330,11 @@
 			},
 			closeTime(){
 				this.orderTimesxSHow=false
-				this.date2=''
-				this.date1=''
-				this.getData();
+				this.date1=this.olddate1
+			    this.date2 =this.olddate2
+				/* this.date2=''
+				this.date1='' */
+				//this.getData();
 			},
 			sub(){
 				this.screenSHow=false;
@@ -338,8 +351,8 @@
 				this.getData();
 			},
 			resetting(){
-				this.date1='';
-				this.date2='';
+				this.date1=this.time(new Date())
+				this.date2=this.time(new Date())
 				this.typeLineIndex='';
 				this.shopName=this.mrshopName;
 				this.shopId=this.mrshopId;
@@ -664,7 +677,7 @@
 		  width: 500rpx;
 	}
 	.dateinput{
-		width: 270rpx;color: #999999;
+		width: 305rpx;color: #999999;
 		height: 64rpx;font-size: 24rpx;line-height: 64rpx;
 		background: #F4F5F7;padding-left: 20rpx;
 		border-radius: 36rpx;
@@ -926,4 +939,16 @@
 		height: 40rpx;
 		padding-top: 16rpx;
 	}
+	.screenLine3{
+		width: 100rpx;
+	}
+	.screenLine1{
+		max-width: 260rpx;
+	}
+	.orderTimesxBoxTitle{
+		padding-left: 24rpx;
+		color: #666;
+		font-size: 24rpx;
+		padding-top: 16rpx;
+	}
 </style>