feat:搜索bug

src/pages/tabbar/individualOrder.vue

@@ -1,32 +1,15 @@
 <template>
 	<crud-layout bg="/static/page/blue-bg.png">
-		<z-paging
+		<z-paging ref="pageRef" :fixed="false" v-model="pageHook.list" :default-page-size="10" safe-area-inset-bottom
-			ref="pageRef"
+			:loading-more-enabled="true" :show-scrollbar="false" @query="query" :auto-clean-list-when-reload="false"
-			:fixed="false"
+			:auto-scroll-to-top-when-reload="false" @scroll="pageHook.scroll">
-			v-model="pageHook.list"
-			:default-page-size="10"
-			safe-area-inset-bottom
-			:loading-more-enabled="true"
-			:show-scrollbar="false"
-			@query="query"
-			:auto-clean-list-when-reload="false"
-			:auto-scroll-to-top-when-reload="false"
-			@scroll="pageHook.scroll"
-		>
 			<template #top>
 				<view class="h-30rpx" />
 				<view class="flex justify-between items-center bg-white rounded-16rpx px-20rpx">
 					<z-tabs :list="tabs" @change="tabChange" />
-					<tm-between-time
+					<tm-between-time start="2020-1-1" end="2050-1-1" v-model="state.date"
-						start="2020-1-1"
+						v-model:model-str="state.formatVal" @confirm="datePickerConfirm" format="YYYY-MM-DD"
-						end="2050-1-1"
+						:quickDate="[]" drawerSize="900">
-						v-model="state.date"
-						v-model:model-str="state.formatVal"
-						@confirm="datePickerConfirm"
-						format="YYYY-MM-DD"
-						:quickDate="[]"
-						drawerSize="900"
-					>
 						<view class="mb-6rpx flex items-center gap-1">
 							<image class="w-[30rpx] h-[30rpx]" src="@/static/page/filter.svg" />
 							<view class="text-center second-text-28 text-30 whitespace-nowrap">筛选</view>
@@ -44,7 +27,8 @@
 						<view class="flex-row items-center justify-between">
 							<view class="flex-row items-center">
 								<view class="main-text-28">{{ v.merchantName }}</view>
-								<view v-if="false" class="m-l-15rpx color-#999 font-size-26rpx! iconfont icon-youjiantou" />
+								<view v-if="false"
+									class="m-l-15rpx color-#999 font-size-26rpx! iconfont icon-youjiantou" />
 							</view>
 							<tm-tag v-if="v.orderStatus == 1" color="info" size="xs">未支付</tm-tag>
 							<tm-tag v-if="v.orderStatus == 5" color="success" size="xs">已支付</tm-tag>
@@ -57,73 +41,73 @@
 								<text>{{ v.username }}</text>
 								<text class="m-l-10rpx">{{ v.userMobile }}</text>
 							</view>
-							<view class="second-text-22 h-30rpx">{{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }}</view>
+							<view class="second-text-22 h-30rpx">{{ hooks.useEnum("hardwareRefundStatusEnum",
+								v.refundStatus) }}
+							</view>
 						</view>
 						<view class="flex justify-between items-center">
 							<view class="second-text-22">
 								<text>下单时间</text>
-								<text class="m-l-10rpx">{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</text>
+								<text class="m-l-10rpx">{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}")
+								}}</text>
+							</view>
+							<view class="main-text-30 color-red! min-w-140rpx text-right">¥ {{
+								hooks.useMoney(v.totalPrice) }}
 							</view>
-							<view class="main-text-30 color-red! min-w-140rpx text-right">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
 							<!-- <view class="second-text-24">共 {{ v.carList.length }} 件</view> -->
 						</view>
 						<view v-if="v.payType == '9'" class="sub-text-24">{{ v.productDesc }}</view>
 					</view>
 				</view>
 				<view class="flex justify-end items-center mt-1">
-					<view v-if="v.orderType == '1' && v.refundStatus" class="ml-1 botder_btn" @tap.stop="refundDetail(v)">售后详情</view>
+					<view v-if="v.orderType == '1' && v.refundStatus" class="ml-1 botder_btn"
-					<view
+						@tap.stop="refundDetail(v)">售后详情
-						v-if="v.orderStatus == '5' && v.orderType == '1' && v.payType != '9'"
+					</view>
-						class="ml-1 botder_btn"
+					<view v-if="v.orderStatus == '5' && v.orderType == '1' && v.payType != '9'" class="ml-1 botder_btn"
-						@tap.stop="doIndividualRefund(v)"
+						@tap.stop="doIndividualRefund(v)">
-					>
 						申请退款
 					</view>
 				</view>
 			</view>
 		</z-paging>
 
-		<tm-drawer title="退款" :showClose="true" size="90%" bgColor="#EBF6FF" v-model:show="state.showDrawer" zIndex="999">
+		<tm-drawer title="退款" :showClose="true" size="90%" bgColor="#EBF6FF" v-model:show="state.showDrawer"
+			zIndex="999">
 			<view class="bg-white rounded-16rpx px-10rpx m-b-10rpx animate-both">
-				<z-tabs
+				<z-tabs :list="['同意退款', '拒绝退款']" bar-width="300" bar-height="0" :active-style="{
-					:list="['同意退款', '拒绝退款']"
+					width: '300rpx',
-					bar-width="300"
+					height: '70rpx',
-					bar-height="0"
+					backgroundColor: '#0779FDdd',
-					:active-style="{
+					color: '#000000',
-						width: '300rpx',
+					textAlign: 'center',
-						height: '70rpx',
+					lineHeight: '70rpx',
-						backgroundColor: '#0779FDdd',
+					fontWeight: 'bold',
-						color: '#000000',
+					fontSize: '30rpx',
-						textAlign: 'center',
+					borderRadius: '10rpx',
-						lineHeight: '70rpx',
+					marginTop: '10rpx',
-						fontWeight: 'bold',
+				}" :inactive-style="{
-						fontSize: '30rpx',
+					width: '300rpx',
-						borderRadius: '10rpx',
+					height: '70rpx',
-						marginTop: '10rpx',
+					color: '#000000',
-					}"
+					textAlign: 'center',
-					:inactive-style="{
+					lineHeight: '70rpx',
-						width: '300rpx',
+					fontWeight: 'bold',
-						height: '70rpx',
+					fontSize: '30rpx',
-						color: '#000000',
+					borderRadius: '10rpx',
-						textAlign: 'center',
+					marginTop: '10rpx',
-						lineHeight: '70rpx',
+				}" @change="refundTabChange" />
-						fontWeight: 'bold',
-						fontSize: '30rpx',
-						borderRadius: '10rpx',
-						marginTop: '10rpx',
-					}"
-					@change="refundTabChange"
-				/>
 			</view>
 
 			<view class="flex-col justify-center card p-x-15rpx p-y-25rpx m-b-10rpx">
 				<view class="flex-row items-center">
-					<image class="w-100rpx h-100rpx rounded-8rpx" :src="filePath(state.curOrder.logoPic)" mode="aspectFill" />
+					<image class="w-100rpx h-100rpx rounded-8rpx" :src="filePath(state.curOrder.logoPic)"
+						mode="aspectFill" />
 					<view class="flex-1 flex-col m-l-20rpx">
 						<view class="flex-row items-center justify-between">
 							<view class="flex-row items-center">
 								<view class="main-text-28">{{ state.curOrder.merchantName }}</view>
-								<view v-if="false" class="m-l-15rpx color-#999 font-size-26rpx! iconfont icon-youjiantou" />
+								<view v-if="false"
+									class="m-l-15rpx color-#999 font-size-26rpx! iconfont icon-youjiantou" />
 							</view>
 							<tm-tag v-if="state.curOrder.orderStatus == 1" color="info" size="xs">未支付</tm-tag>
 							<tm-tag v-if="state.curOrder.orderStatus == 5" color="success" size="xs">已支付</tm-tag>
@@ -144,12 +128,16 @@
 								</view>
 							</view>
 							<view class="flex flex-col items-end justify-center m-t-5rpx">
-								<view class="second-text-22">{{ hooks.useEnum("hardwareRefundStatusEnum", state.curOrder.refundStatus) }}</view>
+								<view class="second-text-22">{{ hooks.useEnum("hardwareRefundStatusEnum",
+									state.curOrder.refundStatus) }}</view>
 								<view class="flex">
-									<view v-if="state.curOrder.carList?.length" class="m-t-4rpx m-r-10rpx second-text-26">
+									<view v-if="state.curOrder.carList?.length"
+										class="m-t-4rpx m-r-10rpx second-text-26">
 										共 {{ state.curOrder.carList.length }} 件
 									</view>
-									<view class="main-text-30 color-red!">¥ {{ hooks.useMoney(state.curOrder.totalPrice) }}</view>
+									<view class="main-text-30 color-red!">¥ {{ hooks.useMoney(state.curOrder.totalPrice)
+									}}
+									</view>
 								</view>
 							</view>
 						</view>
@@ -188,7 +176,8 @@
 					<view>{{ state.refundDetail.applyDescription }}</view>
 				</view>
 			</view>
-			<view v-if="state.refundDetail.status == 62" class="card p-x-20rpx p-y-30rpx space-y-10rpx m-b-10rpx second-text-24">
+			<view v-if="state.refundDetail.status == 62"
+				class="card p-x-20rpx p-y-30rpx space-y-10rpx m-b-10rpx second-text-24">
 				<view class="flex-row items-center">
 					<view>审核人：</view>
 					<view>{{ state.refundDetail.auditUsername }}</view>
@@ -210,24 +199,12 @@
 			</view>
 			<view v-else class="h-270rpx" />
 			<view class="flex">
-				<tm-modal
+				<tm-modal v-if="state.refundScene === 0" style="flex: 1" height="250" title="确定同意退款吗？"
-					v-if="state.refundScene === 0"
+					:show-footer="true" @confirm="doAgreeRefund()">
-					style="flex: 1"
-					height="250"
-					title="确定同意退款吗？"
-					:show-footer="true"
-					@confirm="doAgreeRefund()"
-				>
 					<template v-slot:trigger><tm-button block>同意退款</tm-button></template>
 				</tm-modal>
-				<tm-modal
+				<tm-modal v-if="state.refundScene === 1" style="flex: 1" height="250" title="确定拒绝退款吗？"
-					v-if="state.refundScene === 1"
+					:show-footer="true" @confirm="doRefuseRefund()">
-					style="flex: 1"
-					height="250"
-					title="确定拒绝退款吗？"
-					:show-footer="true"
-					@confirm="doRefuseRefund()"
-				>
 					<template v-slot:trigger><tm-button block color="danger">拒绝退款</tm-button></template>
 				</tm-modal>
 			</view>
@@ -293,7 +270,11 @@ const query = (page: number, pagesize: number) => {
 
 // 时间范围选择器确认
 const datePickerConfirm = (date: any) => {
-	state.pa.createTimeList = formatVal.value.split("~")
+	const list = formatVal.value.split("~")
+	state.pa.createTimeList = [
+		list[0] + " 00:00:00",
+		list[1] + " 23:59:59",
+	]
 	pageRef.value.reload(false)
 }