Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb

components/my-components/my-date-pickerview.vue

@@ -467,14 +467,19 @@
 		const startTotal = returnDateString(e.detail.value, true).getTime()
 		const endTotal = returnDateString(value1.value, true).getTime()
 		value.value = e.detail.value
-
-		nextTick(() => {
+		setTimeout(()=>{
 			if (props.isArea) {
 				value.value = startTotal > endTotal ? value1.value : e.detail.value
 			}
-			console.log(value.value);
 			debounce(changeDays(false, value.value), 100)
-		})
+		},10)
+		// nextTick(() => {
+		// 	if (props.isArea) {
+		// 		value.value = startTotal > endTotal ? value1.value : e.detail.value
+		// 	}
+		// 	console.log(value.value);
+		// 	debounce(changeDays(false, value.value), 100)
+		// })
 	}
 
 	function bindChange1(e) {

pageStaff/index.vue

@@ -1,6 +1,6 @@
 <template>
-	<ul class="liststyle">
-		<li v-for="item in datas.list " :key="item.id">
+	<view class="liststyle">
+		<view v-for="item in datas.list " :key="item.id">
 			<view class="">
 				<view class="">
 					<span style="font-size: 28rpx;color: #333333; ">{{item.name}}&nbsp;</span>
@@ -24,9 +24,9 @@
 						text="编辑"></up-button>
 				</view>
 			</view>
-		</li>
-		<li style="background-color: rgba(0,0,0,0);"></li>
-	</ul>
+		</view>
+		<view style="background-color: rgba(0,0,0,0);"></view>
+	</view>
 	<view v-if="datas.list.length==0" style="text-align: center;">
 		<image src="./bg.png" style="width: 325rpx;height: 335rpx;" mode=""></image>
 		<view style="font-size: 28rpx;color: #999;">暂无员工</view>
@@ -124,13 +124,9 @@
 
 
 
-	ul,
-	li {
-		list-style: none;
-	}
 
 	.liststyle {
-		>li {
+		>view {
 			// width: 694rpx;
 			height: 192rpx;
 			background: #FFFFFF;

pagesOrder/index/compoents/filter.vue

@@ -49,7 +49,7 @@
 				<uni-dateformat format="yyyy-MM-dd hh:mm:ss" :date="time[1]"></uni-dateformat>
 			</view>
 		</view> -->
-		<my-date-pickerview @confirm="datePickerConfirm" ref="datePicker"></my-date-pickerview>
+		<my-date-pickerview @confirm="datePickerConfirm" ref="datePicker" mode="all"></my-date-pickerview>
 		<!-- 更多状态选择筛选 -->
 		<up-popup :round="10" :show="statusData.moreShow" :closeable="true" @close="moreShowHide">
 			<view class="u-text-center font-bold u-font-32 u-p-t-30">选择状态</view>