公共工具库修改

static/css/common.scss

@@ -260,7 +260,7 @@
 .ui-btn {
 	height: 88rpx;
 	background: radial-gradient(at 0% 0%, #01243A 0%, #004576 100%);
-	border-radius: 40rpx;
+	border-radius: 88rpx;
 	font-size: 30rpx;
 	font-weight: 400;
 	color: #fff!important;
@@ -271,7 +271,7 @@
 .ui-btn-normal {
 	height: 88rpx;
 	background: #FFFFFF;
-	border-radius: 40rpx;
+	border-radius: 88rpx;
 	border: 2px solid #DCDCDC;
 	font-size: 30rpx;
 	font-weight: 400;
@@ -282,7 +282,7 @@
 .ui-btn-another {
 	height: 88rpx;
 	background:linear-gradient(90deg, #CCB375 0%, #E7D398 100%);
-	border-radius: 40rpx;
+	border-radius: 88rpx;
 	font-size: 30rpx;
 	font-weight: 400;
 	color: #fff!important;

subpackage/search/refund-info-run-water/list.vue

@@ -6,7 +6,8 @@
 		</view>
 		<view class="content">
 			<view class="title">填写查询条件</view>
-			<uni-datetime-picker ref="filterDate" v-model="state.range" type="daterange" />
+			<view style="line-height: 70rpx; color: #01243A; margin-bottom: 24rpx;">车牌：{{ state.searchForm.exVehPlate }}</view>
+			<uni-datetime-picker ref="filterDate" v-model="state.range" type="daterange"  :clear-icon="false"/>
 			<view class="search-btns">
 				<button type="default" class="ui-btn search-btn" @click="getList()" style="width: auto;">
 					查询
@@ -21,31 +22,34 @@
 		</view>
 	</view>
 	
-	<view class="list-title">查询结果列表</view>
-	
-	<view class="list">
-		<view
-			class="item"
-			v-for="(item, index) in state.list"
-			:key="index">
-			<view class="head">
-				{{ item.enTollStationName }}  - {{ item.exTollStationName }}
-			</view>
-			<view class="list-main">
-				<view class="left">
-					<view class="money-out">金额：<text class="money"><text class="unit">￥</text>{{ item.tollAmount }}</text></view>
-					<view class="start-time">入口时间：{{ item.enTime }}</view>
-					<view>出口时间：{{ item.exTime }}</view>
+	<view class="page-content">
+		<view class="list-title">查询结果列表</view>
+		
+		<template v-if="state.list && state.list.length > 0">
+			<view class="list">
+				<view
+					class="item"
+					v-for="(item, index) in state.list"
+					:key="index">
+					<view class="head">
+						{{ item.enTollStationName }}  - {{ item.exTollStationName }}
+					</view>
+					<view class="list-main">
+						<view class="left">
+							<view class="money-out">金额：<text class="money"><text class="unit">￥</text>{{ item.tollAmount }}</text></view>
+							<view class="start-time">入口时间：{{ item.enTime }}</view>
+							<view>出口时间：{{ item.exTime }}</view>
+						</view>
+					</view>
+					<view class="bottom">
+						<view class="right-state" @click="apply(item)">申请退费</view>
+					</view>
 				</view>
 			</view>
-			<view class="bottom">
-				<view class="right-state" @click="apply(item)">申请退费</view>
-			</view>
-		</view>
+			<view style="text-align: center;margin: 20rpx;font-size: 30rpx; color: #999999;">我是有底线的~</view>
+		</template>
+		<no-data-view v-else :text="'暂无通行流水信息'"></no-data-view>
 	</view>
-	
-	<view style="text-align: center;margin: 20rpx;font-size: 30rpx; color: #999999;">我是有底线的~</view>
-	
 </template>
 
 <script setup lang="ts">
@@ -55,6 +59,7 @@
 	import { getProvinceEtcTransactionFlow, exportProvinceEtcTransactionFlow } from '@/utils/network/api.js'
 	import navBar from "@/components/nav-bar/nav-bar2.vue";
 	import FixedFooter from "@/components/common/FixedFooter";
+	import { getFirstDayOfMonth, getLastDayOfMonth } from '@/utils/utils'
 	
 	const scrollTop = ref(0); //滚动距离
 	const filterDate = ref(null)
@@ -68,9 +73,12 @@
 	const state = reactive({
 		vehicleNum: '',
 		searchForm: {
-			exVehPlate: '贵BXE005',
-			start: '2024-04-02',
-			end: '2024-04-03'
+			exVehPlate: '',
+			start: '',
+			end: '',
+			// exVehPlate: '贵BXE005', 测试数据
+			// start: '2024-04-02',
+			// end: '2024-04-03'
 		},
 		vehiclePlateColor: '',
 		range: [],
@@ -88,8 +96,11 @@
 		let { vehicleId } = option
 		if (vehicleId) {
 			let vehicleArr = vehicleId.split('_')
-			// state.searchForm.exVehPlate = vehicleArr[0]
+			state.searchForm.exVehPlate = decodeURIComponent(vehicleArr[0])
 			state.vehiclePlateColor = vehicleArr[1]
+			state.searchForm.start = getFirstDayOfMonth()
+			state.searchForm.end = getLastDayOfMonth()
+			state.range = [getFirstDayOfMonth(), getLastDayOfMonth()]
 			getList()
 		}
 	})
@@ -205,8 +216,13 @@
 			padding: 0 28rpx;
 		}
 	}
+	.page-content{
+		padding-top: 643rpx;
+	}
+	.list-title{
+		padding: 0 32rpx;
+	}
 	.list{
-		margin-top: 500rpx;
 		border-radius: 12rpx;
 		.item{
 			background-color: #FFFFFF;

utils/network/request.js

@@ -321,8 +321,8 @@ export function requestNew(code, options = {}, start = false, clie = () => {}) {
 	  options.url = envs[process.env.NODE_ENV].baseUrl + "/newDev/ndev" + code;
 	  // options.url = envs[process.env.NODE_ENV].baseUrl + "/newProd/prod" + code;
   } else if (process.env.NODE_ENV === 'production') {
-	  options.url = envs[process.env.NODE_ENV].baseUrl + "/newDev/ndev" + code;
-	  // options.url = envs[process.env.NODE_ENV].baseUrl + "/newProd/prod" + code;
+	  // options.url = envs[process.env.NODE_ENV].baseUrl + "/newDev/ndev" + code;
+	  options.url = envs[process.env.NODE_ENV].baseUrl + "/newProd/prod" + code;
   }
   //默认json数据格式提交`
   let contentType = "application/json";

utils/utils.ts

@@ -595,8 +595,8 @@ export const uploadFile = (tempImagePath, imageType: number | string = 100) => {
 		if (process.env.NODE_ENV === 'development') {
 			url = envs[process.env.NODE_ENV].baseUrl + "/newDev/ndev/minIo/upload";
 		} else if (process.env.NODE_ENV === 'production') {
-			url = envs[process.env.NODE_ENV].baseUrl + "/newDev/ndev/minIo/upload";
-			// url = envs[process.env.NODE_ENV].baseUrl + "/newProd/prod/minIo/upload";
+			// url = envs[process.env.NODE_ENV].baseUrl + "/newDev/ndev/minIo/upload";
+			url = envs[process.env.NODE_ENV].baseUrl + "/newProd/prod/minIo/upload";
 		}
 		uni.uploadFile({
 			url: url,
@@ -862,4 +862,18 @@ export const objectToQueryString = (obj: object) => {
 	return Object.keys(filteredObj).map(key => 
 		key + '=' + filteredObj[key]
 	).join('&');
+}
+
+// 获取月初第一天
+export const getFirstDayOfMonth = () => {
+	const today = new Date(); // 获取当前日期
+	const firstDay = new Date(today.getFullYear(), today.getMonth(), 1); // 设置日期为当前月份的第一天
+	return `${getFormatDate(firstDay, 'yyyy-MM-dd')}`;
+}
+
+// 获取月份最后一天
+export const getLastDayOfMonth = () => {
+    const today = new Date(); // 获取当前日期
+	let lastDay = new Date(today.getFullYear(), today.getMonth() + 1, 0); // 设置日期为下个月的第一天的前一天，即当前月的最后一天
+	return `${getFormatDate(lastDay, 'yyyy-MM-dd')}`;
 }