From c86d29bd8d4022fb9197d0c2c735db1558c5fb00 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 3 Sep 2025 16:02:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                              |  19 +++-
 src/pages/apply/foreign-apply.vue           |  39 +++-----
 src/pages/apply/foreign-list.vue            |  26 ++---
 src/pages/car/userCar/apply.vue             | 101 ++++++++++++++++++++
 src/pages/car/userCar/list.vue              |  81 ++++++++++++++++
 src/pages/human-face/list.vue               |  23 ++---
 src/pages/integrated/visitor/invitation.vue |  44 ++-------
 src/pages/tabbar/my.vue                     |  21 ++--
 src/pages/wallet/list.vue                   |  76 ++++-----------
 src/sheep/api/index.ts                      |   4 +-
 src/sheep/api/userCar.ts                    |  22 +++++
 src/sheep/constant/service-enum.ts          |   8 ++
 src/static/icon/service_6.png               | Bin 0 -> 3830 bytes
 13 files changed, 300 insertions(+), 164 deletions(-)
 create mode 100644 src/pages/car/userCar/apply.vue
 create mode 100644 src/pages/car/userCar/list.vue
 create mode 100644 src/sheep/api/userCar.ts
 create mode 100644 src/static/icon/service_6.png

diff --git a/src/pages.json b/src/pages.json
index cf79dc5..060e1f6 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -512,6 +512,23 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "pages/car",
+			"pages": [
+				{
+					"path": "userCar/apply",
+					"style": {
+						"navigationBarTitleText": "申请车辆"
+					}
+				},
+				{
+					"path": "userCar/list",
+					"style": {
+						"navigationBarTitleText": "我的车辆"
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {
@@ -597,4 +614,4 @@
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/src/pages/apply/foreign-apply.vue b/src/pages/apply/foreign-apply.vue
index e2dcc40..dcc7408 100644
--- a/src/pages/apply/foreign-apply.vue
+++ b/src/pages/apply/foreign-apply.vue
@@ -35,7 +35,7 @@ onLoad((options: any) => {
 		getDetail()
 	}
 })
-onShow(() => {})
+onShow(() => { })
 
 const getDetail = async () => {
 	if (isEmpty(state.detailId)) return
@@ -88,18 +88,14 @@ const doSubmit = async () => {
 		<view class="card p-x-30rpx p-y-40rpx">
 			<tm-form ref="applyFormRef" v-model="applyForm" :rules="applyFormRules" direction="vertical">
 				<tm-form-item name="displayTimeRangeStr" label="使用时间" :showBottom="false">
-					<tm-between-time
-						start="2020-1-1"
-						end="2030-1-1"
-						:quickDate="[]"
-						v-model="applyForm.displayTimeRange"
-						v-model:model-str="applyForm.displayTimeRangeStr"
-						format="YYYY-MM-DD"
-					>
+					<tm-between-time start="2020-1-1" end="2030-1-1" :quickDate="[]"
+						v-model="applyForm.displayTimeRange" v-model:model-str="applyForm.displayTimeRangeStr"
+						format="YYYY-MM-DD">
 						<view :style="{ pointerEvents: state.detailType == 'view' ? 'auto' : 'none' }">
 							<tm-input v-model="applyForm.displayTimeRangeStr" disabled placeholder="请选择使用时间..">
 								<template v-slot:rightIcon>
-									<text v-if="state.detailType != 'view'" class="p-0.5rem color-#b1b1b1 iconfont icon-xiangxiajiantouxiao"></text>
+									<text v-if="state.detailType != 'view'"
+										class="p-0.5rem color-#b1b1b1 iconfont icon-xiangxiajiantouxiao"></text>
 								</template>
 							</tm-input>
 						</view>
@@ -107,31 +103,20 @@ const doSubmit = async () => {
 				</tm-form-item>
 				<view class="h-30rpx" />
 				<tm-form-item name="count" label="申请数量" :showBottom="false">
-					<tm-input
-						v-model="applyForm.count"
-						type="number"
-						:disabled="state.detailType == 'view'"
-						:showClear="state.detailType != 'view'"
-						placeholder="请输入申请数量.."
-					/>
+					<tm-input v-model="applyForm.count" type="number" :disabled="state.detailType == 'view'"
+						:showClear="state.detailType != 'view'" placeholder="请输入申请数量.." />
 				</tm-form-item>
 				<view class="h-30rpx" />
 				<tm-form-item name="remark" label="备注" :required="false" :showBottom="false">
-					<tm-input
-						v-model="applyForm.remark"
-						type="textarea"
-						:disabled="state.detailType == 'view'"
+					<tm-input v-model="applyForm.remark" type="textarea" :disabled="state.detailType == 'view'"
 						:showClear="state.detailType != 'view'"
-						:placeholder="state.detailType == 'view' ? '' : '请输入备注..'"
-					></tm-input>
+						:placeholder="state.detailType == 'view' ? '' : '请输入备注..'"></tm-input>
 				</tm-form-item>
 			</tm-form>
 		</view>
-		<view
-			v-if="state.detailType != 'view'"
+		<view v-if="state.detailType != 'view'"
 			class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!"
-			@tap="doSubmit"
-		>
+			@tap="doSubmit">
 			提交
 		</view>
 	</crud-layout>
diff --git a/src/pages/apply/foreign-list.vue b/src/pages/apply/foreign-list.vue
index 55559f0..15b489e 100644
--- a/src/pages/apply/foreign-list.vue
+++ b/src/pages/apply/foreign-list.vue
@@ -27,7 +27,7 @@ const query = (page: number, pagesize: number) => {
 	pageHook.startPage(page, pagesize, false, state.pa)
 }
 
-onLoad(() => {})
+onLoad(() => { })
 onShow(() => {
 	if (pageRef.value) {
 		pageRef.value.reload(false)
@@ -55,20 +55,9 @@ const doCard = (v: any) => {
 
 <template>
 	<crud-layout title="外来人员就餐" bg="/static/page/blue-bg.png">
-		<z-paging
-			ref="pageRef"
-			height="100%"
-			:fixed="false"
-			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"
-		>
+		<z-paging ref="pageRef" height="100%" :fixed="false" 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="bg-white rounded-16rpx px-20rpx">
@@ -76,7 +65,8 @@ const doCard = (v: any) => {
 				</view>
 			</template>
 			<view class="h-20rpx" />
-			<view class="flex-col card p-x-20rpx p-y-30rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i" @tap="doCard(v)">
+			<view class="flex-col card p-x-20rpx p-y-30rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i"
+				@tap="doCard(v)">
 				<view class="flex-row items-center justify-between">
 					<view class="sub-text-30">电子餐券</view>
 					<view class="flex-row items-center">
@@ -127,7 +117,9 @@ const doCard = (v: any) => {
 				</view>
 			</view>
 			<template #bottom>
-				<view class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!" @tap="doApply">
+				<view
+					class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!"
+					@tap="doApply">
 					申请
 				</view>
 				<view class="h-30rpx" />
diff --git a/src/pages/car/userCar/apply.vue b/src/pages/car/userCar/apply.vue
new file mode 100644
index 0000000..a89aff6
--- /dev/null
+++ b/src/pages/car/userCar/apply.vue
@@ -0,0 +1,101 @@
+<script setup lang="ts">
+import { ref, reactive } from "vue"
+import { onLoad, onShow } from "@dcloudio/uni-app"
+
+import { hooks, router } from "@@/index"
+import { userCarApi } from "@@/api"
+import { serviceEnum } from "@/sheep/constant"
+
+const { carTypeEnum } = serviceEnum
+
+const applyFormRef = ref<any>(null)
+
+const visitorReasonList = ref<Array<{ title: string; id: string }>>(Object.keys(carTypeEnum).map((key) => ({
+    title: carTypeEnum[key],
+    id: key,
+})))
+
+const applyForm = reactive<any>({
+    id: "",
+    carType: "",
+    carTypeStr: "",
+    carNumber: "",
+})
+
+
+const applyFormRules = reactive<any>({
+    carTypeStr: [{ required: true, message: "请选择车辆类型" }],
+    carNumber: [{ required: true, message: "请输入车牌号" }],
+})
+
+
+onLoad(() => {
+    // 默认第一个
+    if (!applyForm.carType) {
+        const target = visitorReasonList.value[0]
+        applyForm.carType = target.id
+        applyForm.carTypeStr = target.title
+    }
+})
+onShow(() => {
+})
+
+// 选择车俩类型
+const carNumberPickerConfirm = (e) => {
+    const target = visitorReasonList.value.find((item) => item.id == e[0])
+    if (!target) return
+    applyForm.carType = target.id
+    applyForm.carTypeStr = target.title
+}
+
+const doSubmit = async () => {
+    applyFormRef.value.submit()
+    const { isPass } = applyFormRef.value.validate()
+    if (!isPass) return
+    try {
+        uni.showLoading({ title: "申请中...", mask: false })
+        const _pa = {
+            ...applyForm
+        }
+        const { data, code }: any = await userCarApi.apply(_pa)
+        if (code != 0) throw new Error()
+        uni.hideLoading()
+        uni.showToast({ title: "申请成功", icon: "none" })
+        router.back()
+    } catch (error) {
+        console.error(error)
+        uni.hideLoading()
+    }
+}
+</script>
+
+<template>
+    <crud-layout title="申请车辆" bg="/static/page/blue-bg.png">
+        <view class="h-30rpx" />
+        <view class="card p-x-30rpx p-y-40rpx">
+            <tm-form ref="applyFormRef" v-model="applyForm" :rules="applyFormRules" direction="vertical">
+                <tm-form-item name="carTypeStr" label="车辆类型" :showBottom="false">
+                    <tm-picker @confirm="carNumberPickerConfirm" :list="visitorReasonList">
+                        <tm-input :modelValue="applyForm.carTypeStr" placeholder="请选择车辆类型" style="pointer-events: none">
+                        </tm-input>
+                    </tm-picker>
+                </tm-form-item>
+                <tm-form-item name="carNumber" label="车牌号" :showBottom="false">
+                    <tm-input v-model="applyForm.carNumber" placeholder="请输入" show-char-count></tm-input>
+                </tm-form-item>
+            </tm-form>
+        </view>
+        <view class=" bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!"
+            @tap="doSubmit">
+            提交
+        </view>
+    </crud-layout>
+</template>
+
+<style lang="scss" scoped>
+:deep() {
+    .tmFormItemLabel {
+        padding-bottom: 10rpx !important;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/car/userCar/list.vue b/src/pages/car/userCar/list.vue
new file mode 100644
index 0000000..6354230
--- /dev/null
+++ b/src/pages/car/userCar/list.vue
@@ -0,0 +1,81 @@
+<script setup lang="ts">
+import { ref, reactive } from "vue"
+import { onLoad, onShow } from "@dcloudio/uni-app"
+
+import { hooks, router } from "@@/index"
+import { userCarApi } from "@@/api"
+import { serviceEnum } from "@/sheep/constant"
+
+import { filePath } from "@@/utils/file"
+
+const { carTypeEnum } = serviceEnum
+
+const state = reactive<any>({
+    pa: {
+        pagesize: 10,
+    },
+})
+
+const pageRef = ref<any>(null)
+const pageHook = hooks.usePage(pageRef, userCarApi.page, null, "data.records")
+const query = (page: number, pagesize: number) => {
+    pageHook.startPage(page, pagesize, false, state.pa)
+}
+
+
+onLoad(() => { })
+onShow(() => {
+    if (pageRef.value) {
+        pageRef.value.reload(false)
+    }
+})
+
+const doApply = () => {
+    router.jump("/pages/car/userCar/apply")
+}
+
+</script>
+
+<template>
+    <crud-layout title="我的车辆" bg="/static/page/blue-bg.png">
+        <z-paging ref="pageRef" height="100%" :fixed="false" 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">
+            <view class="h-20rpx" />
+            <view class="position-relative card p-x-20rpx p-y-30rpx m-b-20rpx overflow-hidden"
+                v-for="(v, i) in pageHook.list" :key="v.id">
+                <view class="flex justify-between items-center m-t-20rpx">
+                    <view>
+                        <!-- 私家车 -->
+                        <tm-tag v-if="v.carType == 1" size="m">{{ carTypeEnum[v.carType] }}</tm-tag>
+                        <!-- 公车 -->
+                        <tm-tag v-if="v.carType == 2" size="m">{{ carTypeEnum[v.carType] }}</tm-tag>
+                        <!-- 军车 -->
+                        <tm-tag v-if="v.carType == 3" size="m">{{ carTypeEnum[v.carType] }}</tm-tag>
+                        <!-- 警车 -->
+                        <tm-tag v-if="v.carType == 4" size="m">{{ carTypeEnum[v.carType] }}</tm-tag>
+                    </view>
+                    <view class="flex items-center" @tap.stop="hooks.useCopy(v.carNumber)">
+                        <text class="main-text-28 m-r-6rpx">{{ v.carNumber }}</text>
+                        <text v-if="v.carNumber" class="iconfont icon-fuzhi" />
+                    </view>
+                </view>
+                <view class="flex justify-end m-t-10rpx">
+                    <text class="second-text-26">{{ v.createTime }}</text>
+                </view>
+                <view class="position-absolute right-0 top-0 sub-text-24 color-white!">
+                    <view class="p-x-8rpx p-y-6rpx bg-green rounded-bl-16rpx" v-if="v.enableStatus == 1">已启用</view>
+                    <view class="p-x-8rpx p-y-6rpx bg-red rounded-bl-16rpx" v-if="v.enableStatus == 0">已禁用</view>
+                </view>
+            </view>
+            <template #bottom>
+                <view
+                    class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!"
+                    @tap="doApply">
+                    申请
+                </view>
+                <view class="h-30rpx" />
+            </template>
+        </z-paging>
+    </crud-layout>
+</template>
\ No newline at end of file
diff --git a/src/pages/human-face/list.vue b/src/pages/human-face/list.vue
index af9ccc3..cce03c3 100644
--- a/src/pages/human-face/list.vue
+++ b/src/pages/human-face/list.vue
@@ -19,7 +19,7 @@ const query = (page: number, pagesize: number) => {
 	pageHook.startPage(page, pagesize, false, state.pa)
 }
 
-onLoad(() => {})
+onLoad(() => { })
 onShow(() => {
 	if (pageRef.value) {
 		pageRef.value.reload(false)
@@ -49,20 +49,9 @@ const doDel = (id: string) => {
 
 <template>
 	<crud-layout title="人脸管理" bg="/static/page/blue-bg.png">
-		<z-paging
-			ref="pageRef"
-			height="100%"
-			:fixed="false"
-			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"
-		>
+		<z-paging ref="pageRef" height="100%" :fixed="false" 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">
 			<view class="h-20rpx" />
 			<view class="flex-col card p-x-20rpx p-y-30rpx m-b-20rpx" v-for="(v, i) in pageHook.list" :key="v.id">
 				<view class="flex items-center justify-between second-text-26">
@@ -81,7 +70,9 @@ const doDel = (id: string) => {
 				</view>
 			</view>
 			<template #bottom>
-				<view v-if="false" class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!" @tap="doAdd">
+				<view v-if="false"
+					class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!"
+					@tap="doAdd">
 					添加
 				</view>
 				<view class="h-30rpx" />
diff --git a/src/pages/integrated/visitor/invitation.vue b/src/pages/integrated/visitor/invitation.vue
index 20897c2..70783a3 100644
--- a/src/pages/integrated/visitor/invitation.vue
+++ b/src/pages/integrated/visitor/invitation.vue
@@ -19,26 +19,16 @@
 						<span>拜访开始时间 </span>
 						<tm-icon name="arrow-right-s-line" />
 					</template>
-					<tm-input
-						:modelValue="form.vStartDate"
-						placeholder="请选择拜访开始时间"
-						style="pointer-events: none"
-						disabled
-						color="transparent"
-					/>
+					<tm-input :modelValue="form.vStartDate" placeholder="请选择拜访开始时间" style="pointer-events: none"
+						disabled color="transparent" />
 				</tm-form-item>
 				<tm-form-item name="vEndDate" label="拜访离开时间 >" @click="endDatePicker('vEndDate')">
 					<template #label>
 						<span>拜访离开时间 </span>
 						<tm-icon name="arrow-right-s-line" />
 					</template>
-					<tm-input
-						:modelValue="form.vEndDate"
-						placeholder="请选择拜访离开时间"
-						style="pointer-events: none"
-						disabled
-						color="transparent"
-					/>
+					<tm-input :modelValue="form.vEndDate" placeholder="请选择拜访离开时间" style="pointer-events: none" disabled
+						color="transparent" />
 				</tm-form-item>
 
 				<!-- <tm-form-item name="deptId" label="拜访部门">
@@ -74,31 +64,13 @@
 			</tm-form>
 		</tm-sheet>
 
-		<tm-drawer
-			title="请选择时间"
-			:showClose="true"
-			:showFooter="false"
-			size="auto"
-			placement="bottom"
-			v-model:show="showDatePicker"
-			:duration="100"
-			zIndex="100"
-		>
+		<tm-drawer title="请选择时间" :showClose="true" :showFooter="false" size="auto" placement="bottom"
+			v-model:show="showDatePicker" :duration="100" zIndex="100">
 			<time-range-picker @confirm="onDatePickerConfirm" @cancel="showDatePicker = false" />
 		</tm-drawer>
 
-		<tm-modal
-			v-model:show="modalShow"
-			:overlayClick="false"
-			title="提示"
-			position="bottom"
-			height="auto"
-			:showCancel="true"
-			cancelText="取消"
-			confirmText="确定"
-			@confirm="confirmSubmit"
-			@cancel="modalShow = false"
-		>
+		<tm-modal v-model:show="modalShow" :overlayClick="false" title="提示" position="bottom" height="auto"
+			:showCancel="true" cancelText="取消" confirmText="确定" @confirm="confirmSubmit" @cancel="modalShow = false">
 			<view class="text-center"><tm-text font-size="30" color="#999999">确认提交吗？</tm-text></view>
 		</tm-modal>
 
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 4adb0c2..6391ac9 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -3,13 +3,10 @@
 		<tm-sticky>
 			<tm-sticky-header>
 				<view class="flex-row items-center bg-#ECF4F9 py-3">
-					<image
-						v-if="state.userInfo?.sysUser?.avatar"
-						class="w-100rpx h-100rpx rounded-full"
-						:src="filePath(state.userInfo.sysUser.avatar)"
-						mode="aspectFill"
-					/>
-					<image v-else class="w-100rpx h-100rpx rounded-full" src="/static/icon/default-avatar.png" mode="aspectFill" />
+					<image v-if="state.userInfo?.sysUser?.avatar" class="w-100rpx h-100rpx rounded-full"
+						:src="filePath(state.userInfo.sysUser.avatar)" mode="aspectFill" />
+					<image v-else class="w-100rpx h-100rpx rounded-full" src="/static/icon/default-avatar.png"
+						mode="aspectFill" />
 					<view class="m-l-30rpx" v-if="state.userInfo?.sysUser?.userId">
 						<view class="flex-row items-center">
 							<text class="sub-text-30">{{ state.userInfo?.sysUser?.name }}</text>
@@ -25,7 +22,8 @@
 			</tm-sticky-header>
 
 			<view class="m-t-10rpx rounded-20rpx shadow-main p-30rpx p-b-40rpx bg-white!">
-				<view class="service_item flex-row items-center justify-between" v-for="(v, i) in state.menuList" :key="i" @tap="onTabMenu(v)">
+				<view class="service_item flex-row items-center justify-between" v-for="(v, i) in state.menuList"
+					:key="i" @tap="onTabMenu(v)">
 					<view class="flex-row-center">
 						<image class="w-40rpx h-40rpx" :src="v.icon" mode="aspectFill" />
 						<text class="sub-text-28 m-l-20rpx">{{ v.text }}</text>
@@ -35,13 +33,15 @@
 			</view>
 
 			<view v-if="isDevEnv()" class="flex-col-center m-t-40rpx m-x-30rpx">
-				<view class="w-full text-center sub-text-28 p-y-20rpx rounded-40rpx border-solid border border-#0094ff" @tap="doLogout">
+				<view class="w-full text-center sub-text-28 p-y-20rpx rounded-40rpx border-solid border border-#0094ff"
+					@tap="doLogout">
 					退出登录
 				</view>
 			</view>
 			<view class="h-30rpx" />
 			<view v-if="state.appInfo == APPENV.SH" class="flex-col-center m-t-40rpx m-x-30rpx">
-				<view class="w-full text-center sub-text-28 p-y-20rpx rounded-40rpx border-solid border border-#0094ff" @tap="doChangeRole">
+				<view class="w-full text-center sub-text-28 p-y-20rpx rounded-40rpx border-solid border border-#0094ff"
+					@tap="doChangeRole">
 					切换角色
 				</view>
 			</view>
@@ -86,6 +86,7 @@ const state = reactive<{
 		{ text: "扫一扫", icon: "/static/icon/scan.png", router: "" },
 		{ text: "钱包管理", icon: "/static/icon/service_3.png", router: "/pages/wallet/list" },
 		{ text: "人脸管理", icon: "/static/icon/service_5.png", router: "/pages/human-face/list" },
+		// { text: "车辆管理", icon: "/static/icon/service_6.png", router: "/pages/car/userCar/list" },
 		{ text: "清除缓存", icon: "/static/icon/clear-storage.png", router: "" },
 	],
 	appInfo: "",
diff --git a/src/pages/wallet/list.vue b/src/pages/wallet/list.vue
index aa1ccf3..d6b4bda 100644
--- a/src/pages/wallet/list.vue
+++ b/src/pages/wallet/list.vue
@@ -29,7 +29,7 @@ const freezeForm = reactive<any>({
 	remark: "",
 })
 
-onLoad(() => {})
+onLoad(() => { })
 onShow(async () => {
 	const isLogin = await hooks.useCheckLogin()
 	if (!isLogin) return
@@ -140,35 +140,22 @@ const doTransferMoney = (v: any) => {
 
 <template>
 	<crud-layout bg="/static/page/blue-bg.png">
-		<z-paging
-			ref="pageRef"
-			height="100%"
-			:fixed="false"
-			v-model="pageHook.list"
-			:default-page-size="5"
-			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"
-		>
+		<z-paging ref="pageRef" height="100%" :fixed="false" v-model="pageHook.list" :default-page-size="5"
+			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">
 			<view class="h-30rpx" />
-			<view
-				class="card flex-col rounded-20rpx p-x-30rpx p-y-20rpx m-b-30rpx"
-				v-for="(v, i) in pageHook.list"
-				:key="i"
-				@tap="router.jump('/pages/wallet/detail', { id: v.id })"
-			>
+			<view class="card flex-col rounded-20rpx p-x-30rpx p-y-20rpx m-b-30rpx" v-for="(v, i) in pageHook.list"
+				:key="i" @tap="router.jump('/pages/wallet/detail', { id: v.id })">
 				<view class="flex-col">
 					<view class="flex-row items-center justify-between">
 						<view class="flex-row-center">
 							<text v-if="v.cardNumber" class="second-text-28">卡号: {{ v.cardNumber }}</text>
 						</view>
 						<view class="second-text-50">
-							<text v-if="v.cardNumber" class="iconfont icon-fuzhi" @tap.stop="hooks.useCopy(v.cardNumber)" />
-							<text v-if="v.walletTypeUniqueCode != '2'" class="m-l-20rpx iconfont icon-erweima" @tap.stop="doPreviewQrCode(v)" />
+							<text v-if="v.cardNumber" class="iconfont icon-fuzhi"
+								@tap.stop="hooks.useCopy(v.cardNumber)" />
+							<text v-if="v.walletTypeUniqueCode != '2'" class="m-l-20rpx iconfont icon-erweima"
+								@tap.stop="doPreviewQrCode(v)" />
 						</view>
 					</view>
 					<view v-if="v.cardNumber" class="h-1px m-t-10rpx bg-#999 bg-opacity-5" />
@@ -191,14 +178,12 @@ const doTransferMoney = (v: any) => {
 				<view class="flex-row items-center justify-end space-x-20rpx m-t-10rpx">
 					<!-- <view v-if="v.walletTypeUniqueCode == 1 && !v.cardNumber" class="botder_btn" @tap.stop="openBindDialog(v)">绑定</view> -->
 					<view v-if="v.isRule == '1'" class="botder_btn" @tap.stop="doTransferMoney(v)">转账</view>
-					<view v-if="v.walletTypeUniqueCode == 1 && v.cardNumber && v.isFreeze != 1" class="botder_btn" @tap.stop="openFreezeDialog(v)">
+					<view v-if="v.walletTypeUniqueCode == 1 && v.cardNumber && v.isFreeze != 1" class="botder_btn"
+						@tap.stop="openFreezeDialog(v)">
 						申请冻结
 					</view>
-					<view
-						v-if="false && v.walletTypeUniqueCode == 2"
-						class="botder_btn"
-						@tap.stop="router.jump('/pages/wallet/recharge', { id: v.id })"
-					>
+					<view v-if="false && v.walletTypeUniqueCode == 2" class="botder_btn"
+						@tap.stop="router.jump('/pages/wallet/recharge', { id: v.id })">
 						去充值
 					</view>
 				</view>
@@ -206,15 +191,8 @@ const doTransferMoney = (v: any) => {
 		</z-paging>
 	</crud-layout>
 
-	<tm-drawer
-		z-index="100"
-		v-model:show="state.showBindDialog"
-		:overlayClick="false"
-		title="绑定饭卡"
-		:show-close="true"
-		position="bottom"
-		size="40%"
-	>
+	<tm-drawer z-index="100" v-model:show="state.showBindDialog" :overlayClick="false" title="绑定饭卡" :show-close="true"
+		position="bottom" size="40%">
 		<view class="h-50rpx" />
 		<tm-form ref="bindFormRef" v-model="bindForm" :rules="bindFormRules">
 			<tm-form-item name="cardNumber" :showLabel="false" :showBottom="false">
@@ -224,15 +202,8 @@ const doTransferMoney = (v: any) => {
 		<view class="h-50rpx" />
 		<view class="bg-#0094ff p-y-20rpx text-center rounded-40rpx sub-text-30 color-white!" @tap="doBind">绑定</view>
 	</tm-drawer>
-	<tm-drawer
-		z-index="100"
-		v-model:show="state.showFreezeDialog"
-		:overlayClick="false"
-		title="申请冻结"
-		:show-close="true"
-		position="bottom"
-		size="40%"
-	>
+	<tm-drawer z-index="100" v-model:show="state.showFreezeDialog" :overlayClick="false" title="申请冻结" :show-close="true"
+		position="bottom" size="40%">
 		<view class="h-50rpx" />
 		<tm-form ref="bindFormRef" v-model="freezeForm">
 			<tm-form-item name="remark" :showLabel="false" :showBottom="false">
@@ -242,15 +213,8 @@ const doTransferMoney = (v: any) => {
 		<view class="h-50rpx" />
 		<view class="bg-#0094ff p-y-20rpx text-center rounded-40rpx sub-text-30 color-white!" @tap="doFreeze">冻结</view>
 	</tm-drawer>
-	<tm-drawer
-		z-index="100"
-		v-model:show="state.showQrCodeDialog"
-		:overlayClick="false"
-		title="钱包二维码"
-		:show-close="true"
-		position="bottom"
-		size="50%"
-	>
+	<tm-drawer z-index="100" v-model:show="state.showQrCodeDialog" :overlayClick="false" title="钱包二维码"
+		:show-close="true" position="bottom" size="50%">
 		<view class="flex-col-center">
 			<view class="h-80rpx" />
 			<canvas canvas-id="qrcodeId" class="size-200px" />
diff --git a/src/sheep/api/index.ts b/src/sheep/api/index.ts
index fd63da5..b2fc1a4 100644
--- a/src/sheep/api/index.ts
+++ b/src/sheep/api/index.ts
@@ -38,4 +38,6 @@ export { default as noticeApi } from "./notice"
 
 export { default as invitationApi } from "./invitation"
 
-export { default as totalApi } from "./total" 
+export { default as totalApi } from "./total"
+
+export { default as userCarApi } from "./userCar"
\ No newline at end of file
diff --git a/src/sheep/api/userCar.ts b/src/sheep/api/userCar.ts
new file mode 100644
index 0000000..da7919d
--- /dev/null
+++ b/src/sheep/api/userCar.ts
@@ -0,0 +1,22 @@
+import request from "@/sheep/utils/request"
+
+export default {
+    /**
+     * 申请车
+     */
+    apply: (data: any) =>
+        request({
+            url: `/admin/sysUserCar/app/create`,
+            method: "POST",
+            data,
+        }),
+    /**
+     * 车列表
+     */
+    page: (data: any) =>
+        request({
+            url: `/admin/sysUserCar/app/page`,
+            method: "POST",
+            data,
+        }),
+}
\ No newline at end of file
diff --git a/src/sheep/constant/service-enum.ts b/src/sheep/constant/service-enum.ts
index dcf874a..4bfbfaa 100644
--- a/src/sheep/constant/service-enum.ts
+++ b/src/sheep/constant/service-enum.ts
@@ -36,6 +36,13 @@ const hardwareRefundStatusEnum = {
 	30: "售后失败",
 }
 
+const carTypeEnum = {
+	1: "私家车",
+	2: "公车",
+	3: "军车",
+	4: "警车",
+}
+
 const boxesBxStatusEnum = {
 	"0": "今日空闲",
 	"1": "今日部分空闲",
@@ -49,4 +56,5 @@ export default {
 	boxesBxStatusEnum,
 	hardwareSaleStatusEnum,
 	hardwareRefundStatusEnum,
+	carTypeEnum,
 }
diff --git a/src/static/icon/service_6.png b/src/static/icon/service_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eaac1da91f8dd8f1983ed6395d5dbcc700246b3
GIT binary patch
literal 3830
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
b!&Y{f_3ZB6B;A(Cnt@pmZ3&NzNlE_$BxBF>

literal 0
HcmV?d00001