chenrui 4 years ago
parent
commit
f50d9146d1
2 changed files with 17 additions and 12 deletions
  1. 1 4
      pages/myShopTour/myShopTour.vue
  2. 16 8
      pages/shopTourRecord/shopTourRecord.vue

+ 1 - 4
pages/myShopTour/myShopTour.vue

@@ -79,7 +79,6 @@
 			</view>
 		</u-popup>
 		<!-- 选择创建时间 -->
-		<!-- <mx-date-picker class="choose-date-wrap" :show="showPicker" :type="type" :value="searchForm.creatTime" :show-tips="true" :begin-text="'开始'" :end-text="'结束'" :show-seconds="true" @confirm="onSelected" @cancel="onSelected" /> -->
 		<w-picker
 			:visible.sync="showPicker"
 			mode="range" 
@@ -95,10 +94,9 @@
 
 <script>
 	import wPicker from "@/components/w-picker/w-picker.vue"
-	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue"
 	import { queryMyTask } from '@/api/task.js'
 	export default {
-		components: { MxDatePicker, wPicker },
+		components: { wPicker },
 		data() {
 			return {
 				tabList: [  //  tab切换  类型
@@ -124,7 +122,6 @@
 				},
 				showPicker: false,  //  是否选择创建时间
 				range: [],  //  筛选创建时间的默认值
-				type: 'range',  //  日期时间类型
 				storeName: '',  //  筛选的门店名称
 				typeId: '',  //  记录状态
 				action:'swiperChange', // 操作类型,上划分页,或左右滑动

+ 16 - 8
pages/shopTourRecord/shopTourRecord.vue

@@ -82,14 +82,24 @@
 		</view>
 		
 		<!-- 选择时间区间 -->
-		<mx-date-picker class="choose-date-wrap" :show="showPicker" :type="type" :value="searchForm.creatTime" :show-tips="true" :begin-text="'开始'" :end-text="'结束'" :show-seconds="true" @confirm="onSelected" @cancel="onSelected" />
+		<w-picker
+			:visible.sync="showPicker"
+			mode="range" 
+			startYear="2017" 
+			endYear="2030"
+			:value="searchForm.creatTime"
+			:current="false"
+			@confirm="onSelected($event,'range')"
+			@cancel="onSelected"
+			ref="range"></w-picker>
 	</view>
 </template>
 
 <script>
-	import MxDatePicker from "@/components/mx-datepicker/mx-datepicker.vue"
+	import wPicker from "@/components/w-picker/w-picker.vue"
+	import { queryMyTask } from '@/api/task.js'
 	export default{
-		components: { MxDatePicker },
+		components: { wPicker },
 		data(){
 			return{
 				screenClass: [  // 过滤条件  类型
@@ -118,7 +128,6 @@
 				},
 				showPicker: false,  //  是否选择创建时间
 				range: [],  //  筛选创建时间的默认值
-				type: 'range',  //  日期时间类型
 				pageNo: 1,  //  当前页码
 				pageSize: 15,  //  一页多少条
 				total: 0,  //  总条数
@@ -149,7 +158,7 @@
 					pageNo: this.pageNo,
 					pageSize: this.pageSize
 				}
-				getTaskList(params).then(res => {
+				queryMyTask(params).then(res => {
 					if (res.status == 200) {
 						if (this.pageNo > 1) {
 							this.list = this.list.concat(res.data.list || [])
@@ -200,15 +209,14 @@
 			},
 			//  显示日期选择
 			onShowDatePicker(type){
-				this.type = type
 				this.showPicker = true
-				this.searchForm.creatTime = this[type]
+				this.searchForm.creatTime = this.range
 			},
 			//  日期选择
 			onSelected(e) {
 				this.showPicker = false
 				if(e) {
-					this[this.type] = e.value
+					this.range = e.value
 				}
 			},
 		}