diff --git a/components/commonTimeSelect.vue b/components/commonTimeSelect.vue
new file mode 100644
index 0000000..6d3624f
--- /dev/null
+++ b/components/commonTimeSelect.vue
@@ -0,0 +1,132 @@
+<template>
+	<view class="date-range-selector">
+		<u-subsection :list="dateRangeList" keyName="label" :current="selected" @change="handleSubsectionChange" />
+		<uni-datetime-picker :value="internalDateRange" type="daterange" @change="handleDatePickerChange" />
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			// Vue2 中使用 value 作为 v-model 的 prop
+			value: {
+				type: Array,
+				required: true
+			},
+			dateRangeList: {
+				type: Array,
+				default: () => [{
+						label: "今日",
+						value: "day"
+					},
+					{
+						label: "本周",
+						value: "week"
+					},
+					{
+						label: "本月",
+						value: "month"
+					}
+				]
+			}
+		},
+		data() {
+			return {
+				selected: 0,
+				internalDateRange: this.value
+			};
+		},
+		watch: {
+			value(newVal) {
+				if (JSON.stringify(newVal) !== JSON.stringify(this.internalDateRange)) {
+					this.internalDateRange = newVal;
+					this.resetSelectedIndex();
+				}
+			},
+			internalDateRange(newVal) {
+				this.$emit('input', newVal); // Vue2 中使用 input 事件
+				this.$emit('subsection-change', newVal);
+			}
+		},
+		methods: {
+			// 获取日期范围
+			getDateRange(type) {
+				const now = new Date()
+				let start, end
+
+				if (type === 'week') {
+					// 获取本周的开始（周一）和结束（周日）
+					const day = now.getDay() || 7 // Sunday 为 0，设为 7
+					start = new Date(now)
+					start.setDate(now.getDate() - day + 1)
+
+					end = new Date(start)
+					end.setDate(start.getDate() + 6)
+				} else if (type === 'month') {
+					// 获取本月的开始和结束
+					start = new Date(now.getFullYear(), now.getMonth(), 1)
+					end = new Date(now.getFullYear(), now.getMonth() + 1, 0) // 本月最后一天
+				} else if (type === 'day') {
+					// 获取当天的开始和结束（00:00:00 到 23:59:59）
+					start = new Date(now)
+					start.setHours(0, 0, 0, 0)
+
+					end = new Date(now)
+					end.setHours(23, 59, 59, 999)
+				} else {
+					console.warn('不支持的类型:', type)
+					return []
+				}
+
+				return [
+					this.formatDateCus(start),
+					this.formatDateCus(end)
+				]
+			},
+
+			// 格式化日期
+			formatDateCus(date) {
+				const y = date.getFullYear()
+				const m = (date.getMonth() + 1).toString().padStart(2, '0')
+				const d = date.getDate().toString().padStart(2, '0')
+				return `${y}-${m}-${d}`
+			},
+
+			handleSubsectionChange(index) {
+				this.selected = index;
+				const {
+					value
+				} = this.dateRangeList[index];
+				this.internalDateRange = this.getDateRange(value);
+			},
+			handleDatePickerChange(newRange) {
+				this.internalDateRange = newRange;
+				this.resetSelectedIndex();
+			},
+			resetSelectedIndex() {
+				const isPreset = this.dateRangeList.some((item, index) => {
+					const range = this.getDateRange(item.value);
+					return JSON.stringify(range) === JSON.stringify(this.internalDateRange);
+				});
+
+				if (!isPreset) {
+					this.selected = -1; // 如果日期范围不匹配任何预设，取消选中状态
+				}
+			}
+		},
+		created() {
+			// 默认选择今日
+			if (!this.value || this.value.length === 0) {
+				this.internalDateRange = this.getDateRange('day');
+			} else {
+				this.resetSelectedIndex();
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	.date-range-selector {
+		/* 可以写样式 */
+	}
+</style>
\ No newline at end of file
diff --git a/pages-detail/detail/detail.vue b/pages-detail/detail/detail.vue
index 47270f6..078d2f6 100644
--- a/pages-detail/detail/detail.vue
+++ b/pages-detail/detail/detail.vue
@@ -55,11 +55,11 @@
 			</view>
 
 			<view class="finance" v-if="checkPermi(['repair:tick:profit'])">
-				<view class="fin-card receivable" @click.self="goListByPayStatus('receivable')">
+				<view class="fin-card receivable" @click="goListByPayStatus('receivable')">
 					<view class="fin-top">
 						<text class="fin-title">应收款</text>
 						<uni-icons :type="financeVisibility.receivable ? 'eye' : 'eye-slash'" color="#7aa6ff" size="20"
-							@click="toggleFinance('receivable')" />
+							@click.native.stop="toggleFinance('receivable')" />
 					</view>
 					<!-- 已收款金额 -->
 					<text
@@ -69,11 +69,11 @@
 						<image src="../images/money_one.png" mode="widthFix" class="tap_icon"></image>
 					</view>
 				</view>
-				<view class="fin-card collected" @click.self="goListByPayStatus('receivedAmount')">
+				<view class="fin-card collected" @click="goListByPayStatus('receivedAmount')">
 					<view class="fin-top">
 						<text class="fin-title">已收款</text>
 						<uni-icons :type="financeVisibility.collected ? 'eye' : 'eye-slash'" color="#a896ff" size="20"
-							@click="toggleFinance('collected')" />
+							@click.native.stop="toggleFinance('collected')" />
 					</view>
 					<text
 						class="fin-amount">{{ financeVisibility.collected ? formatCurrency(otherInfo.receivedAmount) : '*****' }}</text>
@@ -82,11 +82,11 @@
 						<image src="../images/money_two.png" mode="widthFix" class="tap_icon"></image>
 					</view>
 				</view>
-				<view class="fin-card pending" @click.self="goListByPayStatus('pendingAmount')">
+				<view class="fin-card pending" @click="goListByPayStatus('pendingAmount')">
 					<view class="fin-top">
 						<text class="fin-title">待收款</text>
 						<uni-icons :type="financeVisibility.pending ? 'eye' : 'eye-slash'" color="#ffcf7a" size="20"
-							@click="toggleFinance('pending')" />
+							@click.native.stop="toggleFinance('pending')" />
 					</view>
 					<text
 						class="fin-amount">{{ financeVisibility.pending ? formatCurrency(otherInfo.pendingAmount) : '*****' }}</text>
@@ -123,16 +123,6 @@
 				queryParams: {
 					dateRange: [],
 				},
-				sectionOrder: ['orders', 'repairing', 'completed', 'settled', 'unsettled', 'delivered', 'inFactory'],
-				sectionTitle: {
-					orders: '订单(进厂)数',
-					repairing: '维修中',
-					completed: '已竣工',
-					settled: '竣工已结算',
-					unsettled: '竣工未结算',
-					delivered: '已交车',
-					inFactory: '在厂数'
-				},
 				tapList: [{
 						label: "本日",
 						value: "day",
diff --git a/pages-order/addOrder/addOrder.vue b/pages-order/addOrder/addOrder.vue
index 1a6910c..2fff22b 100644
--- a/pages-order/addOrder/addOrder.vue
+++ b/pages-order/addOrder/addOrder.vue
@@ -877,16 +877,16 @@
 
 			getCarList(carId) {
 				const params = {
-					userId: this.userInfo.userId,
+					id: this.userInfo.id,
 					pageNo: 1,
 					pageSize: 100000
 				}
 				request({
-					url: '/admin-api/base/carMain/page',
+					url: '/admin-api/base/custom/get',
 					method: 'GET',
 					params: params
 				}).then(res => {
-					this.carList = res.data.records
+					this.carList = res.data.carList
 					for (let i = 0; i < this.carList.length; i++) {
 						if (this.carList[i].licenseNumber.toLowerCase() == this.phone.toLowerCase()) {
 							this.activeCarIndex = i
diff --git a/pages-repair/apply/applyForm.vue b/pages-repair/apply/applyForm.vue
index e2e306d..7d4e0e3 100644
--- a/pages-repair/apply/applyForm.vue
+++ b/pages-repair/apply/applyForm.vue
@@ -19,17 +19,21 @@
 			<view class="list">
 				<scroll-view style="height: 100%" scroll-y="true" class="itemContent" @scrolltolower="onReachBottomCus"
 					refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
-					<view v-for="(item, index) in repairList" :key="index" class="listItem">
+					<view v-for="(item, index) in repairList" :key="index" class="listItem"
+						@click="addNewWaresFun(item.id)">
 						<view class="repairName">{{ item.name }}</view>
 						<view class="repairBottom">
 							<text class="repairDesc">单位：
 								<text class="repairUnit">{{ item.unitText }}</text>
 							</text>
+							<text class="repairDesc">当前库存：
+								<text class="repairUnit">{{ item.stock }}</text>
+							</text>
 							<view class="repairBtns">
-								<u-icon name="minus-circle-fill" size="24" @click="delNum(item)"></u-icon>
+								<u-icon name="minus-circle-fill" size="24" @click.native.stop="delNum(item)"></u-icon>
 								<text class="repairNum">{{ item.num }}</text>
 								<u-icon color="#0174F6" name="plus-circle-fill" size="24"
-									@click="addNum(item)"></u-icon>
+									@click.native.stop="addNum(item)"></u-icon>
 							</view>
 						</view>
 					</view>
@@ -481,10 +485,16 @@
 			/**
 			 * 添加新的配件
 			 */
-			addNewWaresFun() {
-				uni.navigateTo({
-					url: '/pages-repair/apply/newWare'
-				})
+			addNewWaresFun(id) {
+				if (id) {
+					uni.navigateTo({
+						url: `/pages-repair/apply/newWare?id=${id}`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/pages-repair/apply/newWare`
+					})
+				}
 			},
 		}
 	}
diff --git a/pages-repair/apply/newWare.vue b/pages-repair/apply/newWare.vue
index 95e1d22..25186aa 100644
--- a/pages-repair/apply/newWare.vue
+++ b/pages-repair/apply/newWare.vue
@@ -1,417 +1,546 @@
 <template>
-  <view class="container">
-    <VNavigationBar background-color="#fff" title="新增配件" title-color="#333"></VNavigationBar>
-    <view class="listBox">
-      <view class="list">
-        <view class="formItem">
-          <text class="formLabel require">配件名称</text>
-          <input type="text" style="text-align: right" v-model="formData.name" placeholder="请输入配件名称"/>
-        </view>
-        <view class="formItem">
-          <text class="formLabel require">所属分类</text>
-          <picker @change="typePickerChange" :value="typeIndex" :range="allTypeNameList">
-            <view class="uni-input">{{allTypeNameList[typeIndex]}}</view>
-          </picker>
-        </view>
-        <view class="formItem">
-          <text class="formLabel require">计量单位</text>
-          <picker @change="unitPickerChange" :value="unitIndex" :range="allUnitNameList">
-            <view class="uni-input">{{allUnitNameList[unitIndex]}}</view>
-          </picker>
-        </view>
-        <view class="formItem">
-          <text class="formLabel">规格型号</text>
-          <input type="text" style="text-align: right" v-model="formData.model" placeholder="请输入规格型号"/>
-        </view>
-        <view class="formItem">
-          <text class="formLabel">来源</text>
-          <picker @change="fromPickerChange" :value="fromIndex" :range="allFromNameList">
-            <view class="uni-input">{{allFromNameList[fromIndex]}}</view>
-          </picker>
-        </view>
-        <view class="formItem">
-          <text class="formLabel">配件属性</text>
-          <picker @change="attributePickerChange" :value="attributeIndex" :range="allAttributeNameList">
-            <view class="uni-input">{{allAttributeNameList[attributeIndex]}}</view>
-          </picker>
-        </view>
-        <view class="formItem">
-          <text class="formLabel">状态</text>
-          <view>
-            <radio-group v-model="formData.status">
-              <label class="radio-label" v-for="(item, index) in radioOptions" :key="index">
-                <radio :value="item.value" :checked="item.checked">{{ item.label }}</radio>
-              </label>
-            </radio-group>
-          </view>
-        </view>
-        <view class="formItem">
-          <text class="formLabel">条形码</text>
-          <input type="text" style="text-align: right" v-model="formData.barCode" placeholder="请输入条形码"/>
-        </view>
-        <view class="formItem">
-          <text class="formLabel">商品编码</text>
-          <input type="text" style="text-align: right" v-model="formData.code" placeholder="请输入商品编码"/>
-        </view>
-        <view class="formItem">
-          <text class="formLabel">适用子公司</text>
-          <text class="formValue"></text>
-        </view>
-        <view style="padding-bottom: 60rpx;border-bottom: 1px solid #ddd;" class="formItem">
-          <checkbox-group v-model="checkedCorpIdList" @change="cs">
-            <checkbox v-for="(item, index) in allCompanyList" :key="index" :value="item.id" :checked="item.checked">{{ item.corpName }}</checkbox>
-          </checkbox-group>
-        </view>
-        <view class="formItem">
-          <text class="formLabel">适用车型</text>
-          <text class="formValue"></text>
-        </view>
-        <view style="padding-bottom: 60rpx;border-bottom: 1px solid #ddd;" class="formItem">
-          <textarea style="height: 50px" auto-height placeholder="请输入适用车型" v-model="formData.carModel" />
-        </view>
-        <view class="formItem">
-          <text class="formLabel">备注</text>
-          <text class="formValue"></text>
-        </view>
-        <view style="padding-bottom: 60rpx;border-bottom: 1px solid #ddd;" class="formItem">
-          <textarea style="height: 50px" auto-height placeholder="请输入备注" v-model="formData.remark" />
-        </view>
-      </view>
-    </view>
-    <view class="footer">
-      <text class="label"></text>
-      <text class="repairNum"></text>
-      <view class="submit" @click="submit">保存</view>
-    </view>
-  </view>
+	<view class="container">
+		<VNavigationBar background-color="#fff" :title="title" title-color="#333"></VNavigationBar>
+		<view class="listBox">
+			<view class="list">
+				<view class="formItem">
+					<text class="formLabel require">配件名称</text>
+					<input type="text" style="text-align: right" v-model="formData.name" placeholder="请输入配件名称" />
+				</view>
+				<view class="formItem">
+					<text class="formLabel require">进价</text>
+					<input type="text" style="text-align: right" v-model="formData.purPrice" placeholder="请输入配件名称" />
+				</view>
+				<view class="formItem">
+					<text class="formLabel require">销售价格</text>
+					<input type="text" style="text-align: right" v-model="formData.price" placeholder="请输入配件名称" />
+				</view>
+				<view class="formItem">
+					<text class="formLabel require">所属分类</text>
+					<picker @change="typePickerChange" :value="typeIndex" :range="allTypeNameList">
+						<view class="uni-input">{{allTypeNameList[typeIndex]}}</view>
+					</picker>
+				</view>
+				<view class="formItem">
+					<text class="formLabel require">计量单位</text>
+					<picker @change="unitPickerChange" :value="unitIndex" :range="allUnitNameList">
+						<view class="uni-input">{{allUnitNameList[unitIndex]}}</view>
+					</picker>
+				</view>
+				<view class="formItem">
+					<text class="formLabel">规格型号</text>
+					<input type="text" style="text-align: right" v-model="formData.model" placeholder="请输入规格型号" />
+				</view>
+				<view class="formItem">
+					<text class="formLabel">来源</text>
+					<picker @change="fromPickerChange" :value="fromIndex" :range="allFromNameList">
+						<view class="uni-input">{{allFromNameList[fromIndex]}}</view>
+					</picker>
+				</view>
+				<view class="formItem">
+					<text class="formLabel">配件属性</text>
+					<picker @change="attributePickerChange" :value="attributeIndex" :range="allAttributeNameList">
+						<view class="uni-input">{{allAttributeNameList[attributeIndex]}}</view>
+					</picker>
+				</view>
+				<view class="formItem">
+					<text class="formLabel">状态</text>
+					<view>
+						<radio-group v-model="formData.status">
+							<label class="radio-label" v-for="(item, index) in radioOptions" :key="index">
+								<radio :value="item.value" :checked="item.checked">{{ item.label }}</radio>
+							</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="formItem">
+					<text class="formLabel">条形码</text>
+					<input type="text" style="text-align: right" v-model="formData.barCode" placeholder="请输入条形码" />
+				</view>
+				<view class="formItem">
+					<text class="formLabel">商品编码</text>
+					<input type="text" style="text-align: right" v-model="formData.code" placeholder="请输入商品编码" />
+				</view>
+				<view class="formItem">
+					<text class="formLabel">适用子公司</text>
+					<text class="formValue"></text>
+				</view>
+				<view style="padding-bottom: 60rpx;border-bottom: 1px solid #ddd;" class="formItem">
+					<checkbox-group v-model="checkedCorpIdList" @change="cs">
+						<checkbox v-for="(item, index) in allCompanyList" :key="index" :value="item.id"
+							:checked="item.checked">{{ item.corpName }}</checkbox>
+					</checkbox-group>
+				</view>
+				<view class="formItem">
+					<text class="formLabel">适用车型</text>
+					<text class="formValue"></text>
+				</view>
+				<view style="padding-bottom: 60rpx;border-bottom: 1px solid #ddd;" class="formItem">
+					<textarea style="height: 50px" auto-height placeholder="请输入适用车型" v-model="formData.carModel" />
+				</view>
+				<view class="formItem">
+					<text class="formLabel">备注</text>
+					<text class="formValue"></text>
+				</view>
+				<view style="padding-bottom: 60rpx;border-bottom: 1px solid #ddd;" class="formItem">
+					<textarea style="height: 50px" auto-height placeholder="请输入备注" v-model="formData.remark" />
+				</view>
+			</view>
+		</view>
+		<view class="footer">
+			<text class="label"></text>
+			<text class="repairNum"></text>
+			<view class="submit" @click="submit">保存</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import VNavigationBar from "@/components/VNavigationBar.vue";
-import request from '@/utils/request';
-import {getDictTextByCodeAndValue,createUniqueCodeByHead} from "@/utils/utils";
-import {getUserInfo,getJSONData} from '@/utils/auth.js'
+	import VNavigationBar from "@/components/VNavigationBar.vue";
+	import request from '@/utils/request';
+	import {
+		getDictTextByCodeAndValue,
+		createUniqueCodeByHead
+	} from "@/utils/utils";
+	import {
+		getUserInfo,
+		getJSONData
+	} from '@/utils/auth.js'
 
-export default {
-  components: {VNavigationBar},
-  data() {
-    return {
-      //父组件传入的数据
-      formData:{
-        name:"",
-        type:"",
-        unit:"",
-        model:"",
-        dataForm:"",
-        attribute:"",
-        status:"",
-        barCode:"",
-        code:"",
-        corpId:"",
-        carModel:"",
-        remark:"",
-      },
-      // 状态单选按钮的选项数组
-      radioOptions: [
-        { label: '启用', value: '01' ,checked:true},
-        { label: '禁用', value: '02' ,checked:false}
-      ],
-      //所有可选分类
-      allTypeList:[],
-      //所有可选分类-只有名称
-      allTypeNameList:[],
-      //选中的分类下标
-      typeIndex:0,
-      //所有可选计量单位
-      allUnitList:[],
-      //所有可选计量单位-只有名称
-      allUnitNameList:[],
-      //选中的计量单位下标
-      unitIndex:0,
-      //所有可选来源
-      allFromList:[],
-      //所有可选来源-只有名称
-      allFromNameList:[],
-      //选中的来源下标
-      fromIndex:0,
-      //所有可选配件属性
-      allAttributeList:[],
-      //所有可选配件属性-只有名称
-      allAttributeNameList:[],
-      //选中的配件属性下标
-      attributeIndex:0,
-      //所有可选子公司
-      allCompanyList:[],
-      //选中的子公司id
-      checkedCorpIdList:[],
-    };
-  },
-  onLoad() {
-    this.init()
-  },
-  computed: {
+	export default {
+		components: {
+			VNavigationBar
+		},
+		data() {
+			return {
+				//父组件传入的数据
+				formData: {
+					name: "",
+					type: "",
+					unit: "",
+					model: "",
+					dataForm: "",
+					attribute: "",
+					status: "",
+					barCode: "",
+					code: "",
+					corpId: "",
+					carModel: "",
+					remark: "",
+				},
+				// 状态单选按钮的选项数组
+				radioOptions: [{
+						label: '启用',
+						value: '01',
+						checked: true
+					},
+					{
+						label: '禁用',
+						value: '02',
+						checked: false
+					}
+				],
+				//所有可选分类
+				allTypeList: [],
+				//所有可选分类-只有名称
+				allTypeNameList: [],
+				//选中的分类下标
+				typeIndex: 0,
+				//所有可选计量单位
+				allUnitList: [],
+				//所有可选计量单位-只有名称
+				allUnitNameList: [],
+				//选中的计量单位下标
+				unitIndex: 0,
+				//所有可选来源
+				allFromList: [],
+				//所有可选来源-只有名称
+				allFromNameList: [],
+				//选中的来源下标
+				fromIndex: 0,
+				//所有可选配件属性
+				allAttributeList: [],
+				//所有可选配件属性-只有名称
+				allAttributeNameList: [],
+				//选中的配件属性下标
+				attributeIndex: 0,
+				//所有可选子公司
+				allCompanyList: [],
+				//选中的子公司id
+				checkedCorpIdList: [],
+				//页面标题
+				title: '新增配件',
+			};
+		},
+		onLoad(options) {
+			if (options.id) {
+				this.title = '修改配件'
+				// 初始化完成后查询配件信息
+				this.init().then(() => {
+					this.selectWares(options.id)
+				})
+			} else {
+				this.init()
+			}
+		},
+		computed: {
 
-  },
-  methods: {
-    cs(e){
-      this.checkedCorpIdList =e.detail.value
-    },
-    /**
-     * 初始化配件数据
-     */
-    init() {
-      //查所有可选分类
-      this.selectBaseType()
-      //查所有可选计量单位
-      this.selectBaseUnit()
-      //查所有可选来源
-      this.selectDataFrom()
-      //查所有可选属性
-      this.selectAttribute()
-      //查所有可选子公司
-      this.selectCompany()
-    },
-    /**
-     * 查所有可选分类
-     */
-    selectBaseType(){
-      request({
-        url: '/admin-api/conf/baseType/list',
-        method: 'get',
-        params: {type:"02"}
-      }).then((res) => {
-        console.log(res)
-        if (res.code == 200 && res.data.length>0) {
-          this.allTypeList = res.data
-          this.allTypeNameList = res.data.map((item)=>{return item.name})
-        }
-      })
-    },
-    /**
-     * 查所有可选计量单位
-     */
-    selectBaseUnit(){
-      request({
-        url: '/admin-api/system/dict-data/type',
-        method: 'get',
-        params:{type:"repair_unit"}
-      }).then((res) => {
-        console.log(res)
-        if (res.code == 200) {
-          this.allUnitList = res.data
-          this.allUnitNameList = res.data.map((item)=>{return item.label})
-        }
-      })
-    },
-    /**
-     * 查所有可选来源
-     */
-    selectDataFrom(){
-      request({
-        url: '/admin-api/system/dict-data/type',
-        method: 'get',
-        params:{type:"wares_data_form"}
-      }).then((res) => {
-        console.log(res)
-        if (res.code == 200) {
-          this.allFromList = res.data
-          this.allFromNameList = res.data.map((item)=>{return item.label})
-        }
-      })
-    },
-    /**
-     * 查所有可选属性
-     */
-    selectAttribute(){
-      request({
-        url: '/admin-api/system/dict-data/type',
-        method: 'get',
-        params:{type:"wares_attribute"}
-      }).then((res) => {
-        console.log(res)
-        if (res.code == 200) {
-          this.allAttributeList = res.data
-          this.allAttributeNameList = res.data.map((item)=>{return item.label})
-        }
-      })
-    },
-    /**
-     * 查所有可选子公司
-     */
-    selectCompany(){
-      request({
-        url: '/admin-api/base/company/list',
-        method: 'get'
-      }).then((res) => {
-        console.log(res)
-        if (res.code == 200 && res.data.length>0) {
-          this.allCompanyList = res.data
-          this.allCompanyList.map((item)=>{
-            item.checked=false
-          })
-        }
-      })
-    },
-    /**
-     * 选分类
-     */
-    typePickerChange: function(e) {
-      console.log('picker发送选择改变，携带值为', e.detail.value)
-      this.typeIndex = e.detail.value
-    },
-    /**
-     * 选计量单位
-     */
-    unitPickerChange: function(e) {
-      console.log('picker发送选择改变，携带值为', e.detail.value)
-      this.unitIndex = e.detail.value
-    },
-    /**
-     * 选来源
-     */
-    fromPickerChange: function(e) {
-      console.log('picker发送选择改变，携带值为', e.detail.value)
-      this.fromIndex = e.detail.value
-    },
-    /**
-     * 选属性
-     */
-    attributePickerChange: function(e) {
-      console.log('picker发送选择改变，携带值为', e.detail.value)
-      this.attributeIndex = e.detail.value
-    },
-    /**
-     * 新增配件
-     */
-    submit() {
-      //校验必填
-      if(!this.formData.name){
-        uni.showToast({
-          title: '请输入配件名称！',
-          icon: 'none'
-        })
-        return
-      }
-      //组装可用的子公司
+		},
+		methods: {
+			cs(e) {
+				this.checkedCorpIdList = e.detail.value
+			},
+			/**
+			 * 初始化配件数据
+			 */
+			async init() {
+				try {
+					// 等待所有数据加载完成
+					await Promise.all([
+						this.selectBaseType(),
+						this.selectBaseUnit(),
+						this.selectDataFrom(),
+						this.selectAttribute(),
+						this.selectCompany()
+					])
+				} catch (error) {
+					console.error('初始化数据失败:', error)
+				}
+			},
+			/**
+			 * 查所有可选分类
+			 */
+			selectBaseType() {
+				request({
+					url: '/admin-api/conf/baseType/list',
+					method: 'get',
+					params: {
+						type: "02"
+					}
+				}).then((res) => {
+					console.log(res)
+					if (res.code == 200 && res.data.length > 0) {
+						this.allTypeList = res.data
+						this.allTypeNameList = res.data.map((item) => {
+							return item.name
+						})
+					}
+				})
+			},
+			/**
+			 * 查所有可选计量单位
+			 */
+			selectBaseUnit() {
+				request({
+					url: '/admin-api/system/dict-data/type',
+					method: 'get',
+					params: {
+						type: "repair_unit"
+					}
+				}).then((res) => {
+					console.log(res)
+					if (res.code == 200) {
+						this.allUnitList = res.data
+						this.allUnitNameList = res.data.map((item) => {
+							return item.label
+						})
+					}
+				})
+			},
+			/**
+			 * 查询配件信息
+			 */
+			selectWares(id) {
+				request({
+					url: `/admin-api/repair/wares/get`,
+					method: 'get',
+					params: {
+						id
+					}
+				}).then((res) => {
+					if (res.code === 200 && res.data) {
+						this.formData = res.data
 
-      console.log(this.allCompanyList,"this.checkedCorpIdList")
-      if(this.checkedCorpIdList.length>0){
-        this.formData.corpId = this.checkedCorpIdList.join()
-      }
-      //组装所属分类
-      this.formData.status = "01"
-      this.formData.type = this.allTypeList[this.typeIndex].id
-      this.formData.unit = this.allUnitList[this.unitIndex].value
-      this.formData.dataForm = this.allFromList[this.fromIndex].value
-      this.formData.attribute = this.allAttributeList[this.attributeIndex].value
-      request({
-        url: '/admin-api/repair/wares/create',
-        method: 'post',
-        data:this.formData
-      }).then((res)=>{
-        if (res.code == 200){
-          uni.showToast({
-            title: '新增成功！',
-            icon: 'none'
-          })
-          setTimeout(()=>{
-            uni.navigateBack()
-          },700)
-        }else{
-          uni.showToast({
-            title: '操作失败，请联系管理员！',
-            icon: 'none'
-          })
-        }
-      })
-    }
+						// 设置分类选中项
+						if (this.allTypeList.length > 0 && res.data.type) {
+							const typeIndex = this.allTypeList.findIndex(item => item.id === res.data.type)
+							if (typeIndex !== -1) {
+								this.typeIndex = typeIndex
+							}
+						}
 
-  }
-}
+						// 设置计量单位选中项
+						if (this.allUnitList.length > 0 && res.data.unit) {
+							const unitIndex = this.allUnitList.findIndex(item => item.value === res.data.unit)
+							if (unitIndex !== -1) {
+								this.unitIndex = unitIndex
+							}
+						}
+
+						// 设置来源选中项
+						if (this.allFromList.length > 0 && res.data.dataForm) {
+							const fromIndex = this.allFromList.findIndex(item => item.value === res.data.dataForm)
+							if (fromIndex !== -1) {
+								this.fromIndex = fromIndex
+							}
+						}
+
+						// 设置配件属性选中项
+						if (this.allAttributeList.length > 0 && res.data.attribute) {
+							const attributeIndex = this.allAttributeList.findIndex(item => item.value === res.data
+								.attribute)
+							if (attributeIndex !== -1) {
+								this.attributeIndex = attributeIndex
+							}
+						}
+
+						// 设置子公司选中项
+						if (res.data.corpIds && res.data.corpIds.length > 0) {
+							this.checkedCorpIdList = res.data.corpIds
+							// 同时更新checkbox的选中状态
+							this.allCompanyList.forEach(item => {
+								item.checked = res.data.corpIds.includes(item.id)
+							})
+						}
+
+						// 设置状态单选按钮
+						if (res.data.status) {
+							this.radioOptions.forEach(item => {
+								item.checked = item.value === res.data.status
+							})
+						}
+					}
+				})
+			},
+			/**
+			 * 查所有可选属性
+			 */
+			selectAttribute() {
+				request({
+					url: '/admin-api/system/dict-data/type',
+					method: 'get',
+					params: {
+						type: "wares_attribute"
+					}
+				}).then((res) => {
+					console.log(res)
+					if (res.code == 200) {
+						this.allAttributeList = res.data
+						this.allAttributeNameList = res.data.map((item) => {
+							return item.label
+						})
+					}
+				})
+			},
+			/**
+			 * 查所有可选子公司
+			 */
+			selectCompany() {
+				request({
+					url: '/admin-api/base/company/list',
+					method: 'get'
+				}).then((res) => {
+					console.log(res)
+					if (res.code == 200 && res.data.length > 0) {
+						this.allCompanyList = res.data
+						this.allCompanyList.map((item) => {
+							item.checked = false
+						})
+					}
+				})
+			},
+			/**
+			 * 查所有可选来源
+			 */
+			selectDataFrom() {
+				request({
+					url: '/admin-api/system/dict-data/type',
+					method: 'get',
+					params: {
+						type: "wares_data_form"
+					}
+				}).then((res) => {
+					console.log(res)
+					if (res.code == 200) {
+						this.allFromList = res.data
+						this.allFromNameList = res.data.map((item) => {
+							return item.label
+						})
+					}
+				})
+			},
+			/**
+			 * 选分类
+			 */
+			typePickerChange: function(e) {
+				console.log('picker发送选择改变，携带值为', e.detail.value)
+				this.typeIndex = e.detail.value
+			},
+			/**
+			 * 选计量单位
+			 */
+			unitPickerChange: function(e) {
+				console.log('picker发送选择改变，携带值为', e.detail.value)
+				this.unitIndex = e.detail.value
+			},
+			/**
+			 * 选来源
+			 */
+			fromPickerChange: function(e) {
+				console.log('picker发送选择改变，携带值为', e.detail.value)
+				this.fromIndex = e.detail.value
+			},
+			/**
+			 * 选属性
+			 */
+			attributePickerChange: function(e) {
+				console.log('picker发送选择改变，携带值为', e.detail.value)
+				this.attributeIndex = e.detail.value
+			},
+			/**
+			 * 新增/修改配件
+			 */
+			submit() {
+				// 校验必填
+				if (!this.formData.name) {
+					uni.showToast({
+						title: '请输入配件名称！',
+						icon: 'none'
+					})
+					return
+				}
+
+				// 组装可用的子公司
+				if (this.checkedCorpIdList.length > 0) {
+					this.formData.corpId = this.checkedCorpIdList.join()
+				}
+
+				// 组装其他字段
+				this.formData.type = this.allTypeList[this.typeIndex].id
+				this.formData.unit = this.allUnitList[this.unitIndex].value
+				this.formData.dataForm = this.allFromList[this.fromIndex].value
+				this.formData.attribute = this.allAttributeList[this.attributeIndex].value
+
+				// 判断是新增还是修改
+				const isEdit = !!this.formData.id
+				const url = isEdit ? '/admin-api/repair/wares/update' : '/admin-api/repair/wares/create'
+				const method = isEdit ? 'put' : 'post'
+				const successMsg = isEdit ? '修改成功！' : '新增成功！'
+
+				request({
+					url: url,
+					method: method,
+					data: this.formData
+				}).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: successMsg,
+							icon: 'none'
+						})
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 700)
+					} else {
+						uni.showToast({
+							title: '操作失败，请联系管理员！',
+							icon: 'none'
+						})
+					}
+				})
+			}
+
+		}
+	}
 </script>
 
 <style lang="scss">
-.container {
-  height: 100%;
-  background-color: #F3F5F7;
-  display: flex;
-  flex-direction: column;
-}
-.listBox {
-  padding: 30 rpx 32 rpx;
-  flex: 1;
-  height: 0;
-}
-.list {
-  background-color: #fff;
-  padding: 0 30rpx;
-  height: 100%;
-  overflow: auto;
-}
-.formItem {
-  box-sizing: border-box;
-  margin: 0 auto;
-  padding: 30rpx;
+	.container {
+		height: 100%;
+		background-color: #F3F5F7;
+		display: flex;
+		flex-direction: column;
+	}
 
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  column-gap: 20rpx;
+	.listBox {
+		padding: 30 rpx 32 rpx;
+		flex: 1;
+		height: 0;
+	}
 
-  border-bottom: 1rpx solid #DDDDDD;
-}
-.require::before{
-  content: "*";
-  color: red;
-}
-.formLabel {
-  font-size: 32rpx;
-  color: #333333;
-}
+	.list {
+		background-color: #fff;
+		padding: 0 30rpx;
+		height: 100%;
+		overflow: auto;
+	}
 
-.formValue {
-  flex: 1;
-  width: 0;
-  text-align: right;
-  font-size: 32rpx;
-  color: #999999;
-}
-.repairBottom {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
+	.formItem {
+		box-sizing: border-box;
+		margin: 0 auto;
+		padding: 30rpx;
 
-.repairDesc {
-  font-size: 28rpx;
-  color: #858BA0;
-}
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		column-gap: 20rpx;
 
-.repairUnit {
-  color: #333333;
-}
+		border-bottom: 1rpx solid #DDDDDD;
+	}
 
-.footer {
-  padding: 14rpx 32rpx;
-  background-color: #fff;
-  display: flex;
-  align-items: center;
+	.require::before {
+		content: "*";
+		color: red;
+	}
 
-  .repairNum {
-    flex: 1;
-    width: 0;
-    margin-right: 10rpx;
-  }
+	.formLabel {
+		font-size: 32rpx;
+		color: #333333;
+	}
 
-  .submit {
-    width: 208rpx;
-    height: 72rpx;
-    background: #0174F6;
-    border-radius: 38rpx 38rpx 38rpx 38rpx;
-    text-align: center;
-    line-height: 72rpx;
-    font-size: 32rpx;
-    color: #FFFFFF;
-  }
-}
-</style>
+	.formValue {
+		flex: 1;
+		width: 0;
+		text-align: right;
+		font-size: 32rpx;
+		color: #999999;
+	}
+
+	.repairBottom {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.repairDesc {
+		font-size: 28rpx;
+		color: #858BA0;
+	}
+
+	.repairUnit {
+		color: #333333;
+	}
+
+	.footer {
+		padding: 14rpx 32rpx;
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+
+		.repairNum {
+			flex: 1;
+			width: 0;
+			margin-right: 10rpx;
+		}
+
+		.submit {
+			width: 208rpx;
+			height: 72rpx;
+			background: #0174F6;
+			border-radius: 38rpx 38rpx 38rpx 38rpx;
+			text-align: center;
+			line-height: 72rpx;
+			font-size: 32rpx;
+			color: #FFFFFF;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/myCar/addCarUser.vue b/pages/myCar/addCarUser.vue
index 0bbc955..5bcee09 100644
--- a/pages/myCar/addCarUser.vue
+++ b/pages/myCar/addCarUser.vue
@@ -1,553 +1,513 @@
 <template>
-  <view class="container">
-    <VNavigationBar :title="pageTitle" background-color="#fff" title-color="#333"></VNavigationBar>
-    <view class="body">
-      <u-form labelPosition="top">
-        <view class="card">
-          <u-form-item borderBottom label="客户姓名" label-width="200">
-            <u-input v-model="userInfo.cusName" border="none" placeholder="请输入客户姓名"></u-input>
-          </u-form-item>
-          <u-form-item borderBottom label="客户性别" label-width="200">
-            <u-radio-group
-                v-model="userInfo.sex"
-                placement="row"
-            >
-              <u-radio key="0" label="男" name="0" style="margin-right: 100rpx"></u-radio>
-              <u-radio key="1" label="女" name="1"></u-radio>
-            </u-radio-group>
-          </u-form-item>
-          <u-form-item borderBottom label="客户联系方式" label-width="200">
-            <u-input v-model="userInfo.phoneNumber" border="none" placeholder="请输入客户手机号" type="number"></u-input>
-          </u-form-item>
-        </view>
+	<view class="container">
+		<VNavigationBar :title="pageTitle" background-color="#fff" title-color="#333"></VNavigationBar>
+		<view class="body">
+			<u-form labelPosition="top">
+				<view class="card">
+					<u-form-item borderBottom label="客户姓名" label-width="200">
+						<u-input v-model="userInfo.cusName" border="none" placeholder="请输入客户姓名"></u-input>
+					</u-form-item>
+					<u-form-item borderBottom label="客户性别" label-width="200">
+						<u-radio-group v-model="userInfo.sex" placement="row">
+							<u-radio key="0" label="男" name="0" style="margin-right: 100rpx"></u-radio>
+							<u-radio key="1" label="女" name="1"></u-radio>
+						</u-radio-group>
+					</u-form-item>
+					<u-form-item borderBottom label="客户联系方式" label-width="200">
+						<u-input v-model="userInfo.phoneNumber" border="none" placeholder="请输入客户手机号"
+							type="number"></u-input>
+					</u-form-item>
+				</view>
 
-        <view class="card">
-          <u-form-item borderBottom label="上传行驶证自动识别" labelWidth="200">
-            <u-upload
-                :fileList="fileList1"
-                @afterRead="afterRead"
-                @delete="deletePic"
-                name="1"
-                :maxCount="1"
-                multiple
-            ></u-upload>
-          </u-form-item>
-          <u-form-item borderBottom label="车牌号" labelWidth="200" @click="carInputClick();">
-            <u-input
-                @click="carInputClick();"
-                v-model="car.licenseNumber"
-                border="none"
-                disabled
-                disabledColor="#ffffff"
-                placeholder="请输入车牌号"
-            ></u-input>
-            <u-icon
-                slot="right"
-                name="arrow-right"
-            ></u-icon>
-          </u-form-item>
-          <!--          @click="brandType = true;"-->
-          <u-form-item label="车辆品牌" labelWidth="200">
-            <song-data-picker
-                ref="songpicker"
-                style=" width: 100%;"
-                :localdata="brandList"
-                popup-title="请选择品牌"
-                :openSearch="true"
-                @change="onchange"
-                @nodeclick="onnodeclick"
-            ></song-data-picker>
-<!--            <picker @change="picker($event)" :value="arrayIndex" :range="brandList" range-key="brandName" v-if="brandList">-->
-<!--              <view class="uni-input">{{ brandList && brandList[arrayIndex] ? brandList[arrayIndex].brandName : '' }}</view>-->
-<!--            </picker>-->
-          </u-form-item>
-          <u-form-item label="车辆型号" labelWidth="200">
-            <u-input
-                v-model="car.carModel"
-                border="none"
-                placeholder="请输入车辆型号"
-            ></u-input>
-          </u-form-item>
-          <u-form-item v-if="natureList.length>0" class="formItem" label="车辆性质" labelWidth="200">
-            <picker @change="natureChange" :value="natureIndex" :range="natureList" range-key="value" v-if="natureList">
-              <view class="uni-input">{{ natureList[natureIndex].value}}</view>
-            </picker>
-          </u-form-item>
-        </view>
+				<view class="card">
+					<u-form-item borderBottom label="上传行驶证自动识别" labelWidth="200">
+						<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1"
+							:maxCount="1" multiple></u-upload>
+					</u-form-item>
+					<u-form-item borderBottom label="车牌号" labelWidth="200" @click="carInputClick();">
+						<u-input @click="carInputClick();" v-model="car.licenseNumber" border="none" disabled
+							disabledColor="#ffffff" placeholder="请输入车牌号"></u-input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+					<!--          @click="brandType = true;"-->
+					<u-form-item label="车辆品牌" labelWidth="200">
+						<song-data-picker ref="songpicker" style=" width: 100%;" :localdata="brandList"
+							popup-title="请选择品牌" :openSearch="true" @change="onchange"
+							@nodeclick="onnodeclick"></song-data-picker>
+						<!--            <picker @change="picker($event)" :value="arrayIndex" :range="brandList" range-key="brandName" v-if="brandList">-->
+						<!--              <view class="uni-input">{{ brandList && brandList[arrayIndex] ? brandList[arrayIndex].brandName : '' }}</view>-->
+						<!--            </picker>-->
+					</u-form-item>
+					<u-form-item label="车辆型号" labelWidth="200">
+						<u-input v-model="car.carModel" border="none" placeholder="请输入车辆型号"></u-input>
+					</u-form-item>
+					<u-form-item v-if="natureList.length>0" class="formItem" label="车辆性质" labelWidth="200">
+						<picker @change="natureChange" :value="natureIndex" :range="natureList" range-key="value"
+							v-if="natureList">
+							<view class="uni-input">{{ natureList[natureIndex].value}}</view>
+						</picker>
+					</u-form-item>
+				</view>
 
-        <view class="card">
-          <u-form-item borderBottom label="车架号" labelWidth="200">
-            <u-input v-model="car.vin" border="none" placeholder="请输入车架号"></u-input>
-          </u-form-item>
-          <u-form-item borderBottom label="发动机号" labelWidth="200">
-            <u-input v-model="car.engineNumber" border="none" placeholder="请输入发动机号"></u-input>
-          </u-form-item>
-          <u-form-item borderBottom label="年检到期时间" labelWidth="200" @click="openDatePicker('nj'); ">
-            <u-input
-                v-model="car.nextInspectionDate"
-                border="none"
-                disabled
-                disabledColor="#ffffff"
-                placeholder="请选择年检到期时间"
-            ></u-input>
-            <u-icon
-                slot="right"
-                name="arrow-right"
-            ></u-icon>
-          </u-form-item>
-          <u-form-item borderBottom label="保险到期时间" labelWidth="200" @click="openDatePicker('bx'); hideKeyboard()">
-            <u-input
-                v-model="car.insuranceExpiryDate"
-                border="none"
-                disabled
-                disabledColor="#ffffff"
-                placeholder="请选择保险到期时间"
-            ></u-input>
-            <u-icon
-                slot="right"
-                name="arrow-right"
-            ></u-icon>
-          </u-form-item>
-          <u-form-item label="注册日期时间" labelWidth="200" @click="openDatePicker('zcrq'); hideKeyboard()">
-            <u-input
-                v-model="car.carRegisterDate"
-                border="none"
-                disabled
-                disabledColor="#ffffff"
-                placeholder="请选择注册日期时间"
-            ></u-input>
-            <u-icon
-                slot="right"
-                name="arrow-right"
-            ></u-icon>
-          </u-form-item>
-        </view>
-      </u-form>
+				<view class="card">
+					<u-form-item borderBottom label="车架号" labelWidth="200">
+						<u-input v-model="car.vin" border="none" placeholder="请输入车架号"></u-input>
+					</u-form-item>
+					<u-form-item borderBottom label="发动机号" labelWidth="200">
+						<u-input v-model="car.engineNumber" border="none" placeholder="请输入发动机号"></u-input>
+					</u-form-item>
+					<u-form-item borderBottom label="年检到期时间" labelWidth="200" @click="openDatePicker('nj'); ">
+						<u-input v-model="car.nextInspectionDate" border="none" disabled disabledColor="#ffffff"
+							placeholder="请选择年检到期时间"></u-input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+					<u-form-item borderBottom label="保险到期时间" labelWidth="200"
+						@click="openDatePicker('bx'); hideKeyboard()">
+						<u-input v-model="car.insuranceExpiryDate" border="none" disabled disabledColor="#ffffff"
+							placeholder="请选择保险到期时间"></u-input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+					<u-form-item label="注册日期时间" labelWidth="200" @click="openDatePicker('zcrq'); hideKeyboard()">
+						<u-input v-model="car.carRegisterDate" border="none" disabled disabledColor="#ffffff"
+							placeholder="请选择注册日期时间"></u-input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+				</view>
+			</u-form>
 
 
-      <keyboard-plate ref="plateNumber" :plateNum.sync='car.licenseNumber' isShow
-                      @change="getPlateNum"></keyboard-plate>
-      <u-datetime-picker
-          v-model="datePickerValue"
-          :formatter="formatter"
-          :show="datePickerShow"
-          :minDate="minDate"
-          mode="date"
-          @cancel="datePickerCancel"
-          @confirm="datePickerConfirm"
-      ></u-datetime-picker>
-    </view>
-    <view class="footer">
-      <view class="btnItem edit" @click="submit">
-        确定
-      </view>
-    </view>
-  </view>
+			<keyboard-plate ref="plateNumber" :plateNum.sync='car.licenseNumber' isShow
+				@change="getPlateNum"></keyboard-plate>
+			<u-datetime-picker v-model="datePickerValue" :formatter="formatter" :show="datePickerShow"
+				:minDate="minDate" mode="date" @cancel="datePickerCancel"
+				@confirm="datePickerConfirm"></u-datetime-picker>
+		</view>
+		<view class="footer">
+			<view class="btnItem edit" @click="submit">
+				确定
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import VNavigationBar from '@/components/VNavigationBar.vue';
-import request from "@/utils/request";
-import config from '@/config'
-import upload from "@/utils/upload";
-import {getDictByCode,formatDate} from "@/utils/utils";
+	import VNavigationBar from '@/components/VNavigationBar.vue';
+	import request from "@/utils/request";
+	import config from '@/config'
+	import upload from "@/utils/upload";
+	import {
+		getDictByCode,
+		formatDate
+	} from "@/utils/utils";
 
-export default {
-  components: {
-    VNavigationBar
-  },
-  data() {
-    return {
-      pageTitle: '',
-      car: {
-        // 车牌号
-        licenseNumber: '',
-        // 型号
-        carModelInput: '',
-        // 品牌id
-        carBrand: '',
-        // 车辆类别  字典字段
-        carCategory: '',
-        // 车辆性质  字典字段
-        carNature: '',
-        // 注册日期
-        carRegisterDate: '',
-        // 车辆品牌型号数组
-        brandAndModel: [],
-      },
-      userInfo: {
-        cusName:"",
-        sex:"0",
-        phoneNumber:"",
-        car:{}
-      },
-      bo1: false,
-      bo2: true,
+	export default {
+		components: {
+			VNavigationBar
+		},
+		data() {
+			return {
+				pageTitle: '',
+				car: {
+					// 车牌号
+					licenseNumber: '',
+					// 型号
+					carModelInput: '',
+					// 品牌id
+					carBrand: '',
+					// 车辆类别  字典字段
+					carCategory: '',
+					// 车辆性质  字典字段
+					carNature: '',
+					// 注册日期
+					carRegisterDate: '',
+					// 车辆品牌型号数组
+					brandAndModel: [],
+				},
+				userInfo: {
+					cusName: "",
+					sex: "0",
+					phoneNumber: "",
+					car: {}
+				},
+				bo1: false,
+				bo2: true,
 
-      datePickerShow: false,
-      datePickerValue: new Date().getTime(),
-      pickerConfirmField: 'njDate',
-      showType: false,
-      brandType: false,
-      typeList: [],
-      //所有可选车辆品牌
-      brandList: [],
-      //选中的车辆品牌id
-      brandId: '',
-      //选中的车辆品牌名称
-      brandName: 0,
-      fileList1: [],
-      imageUrl: '',
-      //可选车辆性质范围
-      natureList: [],
-      natureIndex: 0,
-      minDate:null,
-    };
-  },
-  onLoad(data) {
-    this.minDate = Number(new Date('1980-01-01'));
-    // 没有数据 需要赋值一下初始化
-    if(data && data.hasOwnProperty("userInfo")){
-      let thisUserInfoObj = JSON.parse(data.userInfo)
-      console.log("thisUserInfoObj",thisUserInfoObj)
-      this.userInfo.cusName = thisUserInfoObj.cusName
-      this.userInfo.sex = thisUserInfoObj.sex
-      this.userInfo.phoneNumber = thisUserInfoObj.phoneNumber
-    }
-    if(data && data.hasOwnProperty("phoneNum")){
-      this.userInfo.phoneNumber = data.phoneNum
-    }
-    this.bo1 = false;
-    this.bo2 = true;
-    this.pageTitle = '添加车辆信息'
-    this.getBrandList()
-    this.getNatureList()
-  },
-  methods: {
-    onchange(e) {
-      this.brandId = e.detail.value[0].id
-      this.brandName = e.detail.value[0].brandName
-    },
-    onnodeclick(node) {
-      console.log(node,"node")
-    },
-    typeSelect(e) {
-    },
-    // 车辆性质选择事件
-    natureChange(event) {
-      const newIndex = event.detail.value;
-      this.natureIndex = newIndex;
-      //
-      this.car.carNature = this.natureList[newIndex].value;
-    },
-    getBrandList() {
-      request({
-        url: '/admin-api/base/carBrand/page',
-        method: 'GET',
-        params: {
-          pageNo: 1,
-          pageSize: 10000
-        }
-      }).then(res => {
-        res.data.records.forEach(item => {
-                item.text = item.brandName,
-                item.value = item.id
-        })
-        this.brandList = res.data.records
-        if (this.car) {
-          for (let i = 0; i < this.brandList.length; i++) {
-            if (this.car.carBrand == this.brandList[i].id) {
-              this.setCarBrand(this.brandList[i].id,this.brandList[i].brandName)
-            }
-          }
-        }
-      })
-    },
+				datePickerShow: false,
+				datePickerValue: new Date().getTime(),
+				pickerConfirmField: 'njDate',
+				showType: false,
+				brandType: false,
+				typeList: [],
+				//所有可选车辆品牌
+				brandList: [],
+				//选中的车辆品牌id
+				brandId: '',
+				//选中的车辆品牌名称
+				brandName: 0,
+				fileList1: [],
+				imageUrl: '',
+				//可选车辆性质范围
+				natureList: [],
+				natureIndex: 0,
+				minDate: null,
+			};
+		},
+		onLoad(data) {
+			this.minDate = Number(new Date('1980-01-01'));
+			// 没有数据 需要赋值一下初始化
+			if (data && data.hasOwnProperty("userInfo")) {
+				let thisUserInfoObj = JSON.parse(data.userInfo)
+				console.log("thisUserInfoObj", thisUserInfoObj)
+				this.userInfo.cusName = thisUserInfoObj.cusName
+				this.userInfo.sex = thisUserInfoObj.sex
+				this.userInfo.phoneNumber = thisUserInfoObj.phoneNumber
+			}
+			if (data && data.hasOwnProperty("phoneNum")) {
+				this.userInfo.phoneNumber = data.phoneNum
+			}
+			this.bo1 = false;
+			this.bo2 = true;
+			this.pageTitle = '添加车辆信息'
+			this.getBrandList()
+			this.getNatureList()
+		},
+		methods: {
+			onchange(e) {
+				this.brandId = e.detail.value[0].id
+				this.brandName = e.detail.value[0].brandName
+			},
+			onnodeclick(node) {
+				console.log(node, "node")
+			},
+			typeSelect(e) {},
+			// 车辆性质选择事件
+			natureChange(event) {
+				const newIndex = event.detail.value;
+				this.natureIndex = newIndex;
+				//
+				this.car.carNature = this.natureList[newIndex].value;
+			},
+			getBrandList() {
+				request({
+					url: '/admin-api/base/carBrand/page',
+					method: 'GET',
+					params: {
+						pageNo: 1,
+						pageSize: 10000
+					}
+				}).then(res => {
+					res.data.records.forEach(item => {
+						item.text = item.brandName,
+							item.value = item.id
+					})
+					this.brandList = res.data.records
+					if (this.car) {
+						for (let i = 0; i < this.brandList.length; i++) {
+							if (this.car.carBrand == this.brandList[i].id) {
+								this.setCarBrand(this.brandList[i].id, this.brandList[i].brandName)
+							}
+						}
+					}
+				})
+			},
 
-    // 打开车牌选择器
-    carInputClick() {
-      this.$refs.plateNumber.open();
-    },
-    getPlateNum(e) {
+			// 打开车牌选择器
+			carInputClick() {
+				this.$refs.plateNumber.open();
+			},
+			getPlateNum(e) {
 
-    },
+			},
 
-    openDatePicker(picker) {
-      if (picker === 'nj') {
-        this.pickerConfirmField = 'nextInspectionDate'
-      } else if (picker === 'bx') {
-        this.pickerConfirmField = 'insuranceExpiryDate'
-      } else if (picker === 'zcrq') {
-        this.pickerConfirmField = 'carRegisterDate'
-      }
-      this.datePickerShow = true
-    },
-    datePickerConfirm({value}, field, picker) {
-      let date;
+			openDatePicker(picker) {
+				if (picker === 'nj') {
+					this.pickerConfirmField = 'nextInspectionDate'
+				} else if (picker === 'bx') {
+					this.pickerConfirmField = 'insuranceExpiryDate'
+				} else if (picker === 'zcrq') {
+					this.pickerConfirmField = 'carRegisterDate'
+				}
+				this.datePickerShow = true
+			},
+			datePickerConfirm({
+				value
+			}, field, picker) {
+				let date;
 
-      // 检查 value 是否为时间戳
-      if (typeof value === 'number') {
-        // 如果是时间戳，确保是毫秒单位
-        date = new Date(value);
-      } else if (typeof value === 'string') {
-        // 如果是日期字符串，尝试解析
-        date = new Date(value);
-      }
+				// 检查 value 是否为时间戳
+				if (typeof value === 'number') {
+					// 如果是时间戳，确保是毫秒单位
+					date = new Date(value);
+				} else if (typeof value === 'string') {
+					// 如果是日期字符串，尝试解析
+					date = new Date(value);
+				}
 
-      // 检查日期是否有效
-      if (isNaN(date.getTime())) {
-        console.error('Invalid date:', value);
-        return;
-      }
-      this.car[this.pickerConfirmField] = date.getFullYear() + '-' + (Number(date.getMonth()) + 1 + '').padStart(2, '0') + '-' + (date.getDate() + '').padStart(2, '0')
-      this.datePickerCancel(picker)
-    },
-    datePickerCancel(picker) {
-      this.datePickerValue = new Date().getTime()
-      this.datePickerShow = false
-    },
-    formatter(type, value) {
-      if (type === 'year') {
-        return `${value}年`
-      }
-      if (type === 'month') {
-        return `${value}月`
-      }
-      if (type === 'day') {
-        return `${value}日`
-      }
-      return value
-    },
-    // 新增
-    async submit() {
-      let jsonData = {}
-      if(!this.userInfo.cusName){
-        uni.showToast({
-          title: '请输入客户名称',
-          icon: 'none'
-        })
-      }
-      if(!this.userInfo.phoneNumber){
-        uni.showToast({
-          title: '请输入客户手机号',
-          icon: 'none'
-        })
-      }
-      if(!this.car.licenseNumber){
-        uni.showToast({
-          title: '请输入车牌号',
-          icon: 'none'
-        })
-      }
-      this.car.carBrand = this.brandId
-      // bus.$emit('updateCarInfo', this.car)
-      this.car.brandAndModel = [this.brandId, this.car.carModel]
-      //将日期转为时间戳
-      if (this.car.nextInspectionDate) {
-        this.car.nextInspectionDate = new Date(this.car.nextInspectionDate).getTime()
-      }else {
-        this.car.nextInspectionDate = undefined
-      }
-      if (this.car.insuranceExpiryDate) {
-        this.car.insuranceExpiryDate = new Date(this.car.insuranceExpiryDate).getTime()
-      }else {
-        this.car.insuranceExpiryDate = undefined
-      }
-      if (this.car.carRegisterDate) {
-        this.car.carRegisterDate = new Date(this.car.carRegisterDate).getTime()
-      }else {
-        this.car.carRegisterDate = undefined
-      }
-      this.userInfo.car = this.car
-      //提交保存数据
-      request({
-        url: '/admin-api/base/custom/saveCustomerAndCar',
-        method: 'POST',
-        data: this.userInfo,
-      }).then(res => {
-        if(res.code==200){
-          //保存成功
-          uni.showToast({
-            title: "新增成功",
-            icon: 'none'
-          })
-          setTimeout(()=>{
-            uni.navigateTo({
-              url: `/pages-order/addOrder/addOrder?phone=${this.userInfo.phoneNumber}&carId=${res.data.carId}`
-            });
-          },700)
-        }else{
-          uni.showToast({
-            title: res.msg,
-            icon: 'none'
-          })
-        }
-      })
-    },
-    // 查询下拉 车辆性质
-    async getNatureList() {
-      request({
-        url: '/admin-api/system/dict-data/type',
-        method: 'get',
-        params:{type:"car_nature"}
-      }).then((res) => {
-        console.log(res)
-        if (res.code == 200) {
-         this.natureList = res.data
-          if (this.bo2 == true) {
-            // setTimeout(() => {
-            //   this.car.carNature = this.natureList[0].value;
-            // }, 15000)
-          } else {
-            // 如果是修改 遍历当前集合 将index 同步
-            this.natureList.forEach((item, index) => {
-              if (item.value == this.car.carNature) {
-                this.natureIndex = index;
-              }
-            })
-          }
-        }
-      })
-    },
-    // 删除图片
-    deletePic(event) {
-      this[`fileList${event.name}`].splice(event.index, 1)
-    },
-    // 新增图片
-    async afterRead(event) {
-      // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
-      let lists = [].concat(event.file)
-      let fileListLen = this[`fileList${event.name}`].length
-      lists.map((item) => {
-        this[`fileList${event.name}`].push({
-          ...item,
-          status: 'uploading',
-          message: '上传中'
-        })
-      })
-      // uni.showLoading({
-      //   title: '正在识别中...'
-      // });
-      try {
-        for (let i = 0; i < lists.length; i++) {
-          const result = await this.uploadFilePromise(lists[i].url)
-          let item = this[`fileList${event.name}`][fileListLen]
-          this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
-            status: 'success',
-            message: '',
-            url: result
-          }))
-          fileListLen++
-        }
-      }catch (e){
-        uni.hideLoading()
-        uni.showToast({
-          title: '无法识别该行驶证',
-          icon: 'success'
-        })
-      }
-    },
-    uploadFilePromise(url) {
-      return new Promise((resolve, reject) => {
-        upload({
-          url: '/admin-api/infra/file/upload',
-          filePath: url
-        }).then(res => {
-          resolve(config.baseImageUrl +res.data)
-          this.car.carLicenseImg = res.data
-          this.imageUrl = config.baseImageUrl + res.data
-          request({
-            url: '/admin-api/base/carMain/vehicleLicenseOCR',
-            method: 'POST',
-            data: this.imageUrl,
-            tenantIdFlag: false
-          }).then((res) => {
-            this.car.vin = res.data.vin
-            this.car.licenseNumber = res.data.plateNo
-            this.car.carRegisterDate = res.data.issueDate
-            this.car.engineNumber = res.data.engineNo
-            if(this.car.insuranceExpiryDate){
-              this.car.insuranceExpiryDate= formatDate(this.car.insuranceExpiryDate)
-            }
-            if(this.car.nextInspectionDate){
-              this.car.nextInspectionDate= formatDate(this.car.nextInspectionDate)
-            }
-            //车辆品牌自动定位
-            this.brandList.forEach((item, index) => {
-              if (item.brandName == res.data.brand) {
-                this.setCarBrand(item.id,item.brandName)
-              }
-            })
-            //车辆性质自动定位
-            this.natureList.forEach((item, index) => {
-              if (item.label == res.data.useCharacter) {
-                this.natureIndex = index;
-                this.car.carNature = this.natureList[index].value;
-              }
-            })
-            uni.hideLoading()
-          })
-        })
-      })
-    },
-    /**
-     * 设置选中的车辆品牌
-     * @param id
-     * @param name
-     */
-    setCarBrand(id,name){
-      this.$nextTick(()=>{
-        this.brandId = id
-        this.brandName = name
-        this.$refs.songpicker.inputSelected=[{text:name,value:id}]
-      })
-    }
-  }
-}
+				// 检查日期是否有效
+				if (isNaN(date.getTime())) {
+					console.error('Invalid date:', value);
+					return;
+				}
+				this.car[this.pickerConfirmField] = date.getFullYear() + '-' + (Number(date.getMonth()) + 1 + '').padStart(
+					2, '0') + '-' + (date.getDate() + '').padStart(2, '0')
+				this.datePickerCancel(picker)
+			},
+			datePickerCancel(picker) {
+				this.datePickerValue = new Date().getTime()
+				this.datePickerShow = false
+			},
+			formatter(type, value) {
+				if (type === 'year') {
+					return `${value}年`
+				}
+				if (type === 'month') {
+					return `${value}月`
+				}
+				if (type === 'day') {
+					return `${value}日`
+				}
+				return value
+			},
+			// 新增
+			async submit() {
+				let jsonData = {}
+				if (!this.userInfo.cusName) {
+					uni.showToast({
+						title: '请输入客户名称',
+						icon: 'none'
+					})
+				}
+				if (!this.userInfo.phoneNumber) {
+					uni.showToast({
+						title: '请输入客户手机号',
+						icon: 'none'
+					})
+				}
+				if (!this.car.licenseNumber) {
+					uni.showToast({
+						title: '请输入车牌号',
+						icon: 'none'
+					})
+				}
+				this.car.carBrand = this.brandId
+				// bus.$emit('updateCarInfo', this.car)
+				this.car.brandAndModel = [this.brandId, this.car.carModel]
+				//将日期转为时间戳
+				if (this.car.nextInspectionDate) {
+					this.car.nextInspectionDate = new Date(this.car.nextInspectionDate).getTime()
+				} else {
+					this.car.nextInspectionDate = undefined
+				}
+				if (this.car.insuranceExpiryDate) {
+					this.car.insuranceExpiryDate = new Date(this.car.insuranceExpiryDate).getTime()
+				} else {
+					this.car.insuranceExpiryDate = undefined
+				}
+				if (this.car.carRegisterDate) {
+					this.car.carRegisterDate = new Date(this.car.carRegisterDate).getTime()
+				} else {
+					this.car.carRegisterDate = undefined
+				}
+				this.userInfo.car = this.car
+				//提交保存数据
+				request({
+					url: '/admin-api/base/custom/saveCustomerAndCar',
+					method: 'POST',
+					data: this.userInfo,
+				}).then(res => {
+					if (res.code == 200) {
+						//保存成功
+						uni.showToast({
+							title: "新增成功",
+							icon: 'none'
+						})
+						setTimeout(() => {
+							uni.navigateTo({
+								url: `/pages-order/addOrder/addOrder?phone=${this.userInfo.phoneNumber}&carId=${res.data.carId}`
+							});
+						}, 700)
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			// 查询下拉 车辆性质
+			async getNatureList() {
+				request({
+					url: '/admin-api/system/dict-data/type',
+					method: 'get',
+					params: {
+						type: "car_nature"
+					}
+				}).then((res) => {
+					console.log(res)
+					if (res.code == 200) {
+						this.natureList = res.data
+						if (this.bo2 == true) {
+							// setTimeout(() => {
+							//   this.car.carNature = this.natureList[0].value;
+							// }, 15000)
+						} else {
+							// 如果是修改 遍历当前集合 将index 同步
+							this.natureList.forEach((item, index) => {
+								if (item.value == this.car.carNature) {
+									this.natureIndex = index;
+								}
+							})
+						}
+					}
+				})
+			},
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				// uni.showLoading({
+				//   title: '正在识别中...'
+				// });
+				try {
+					for (let i = 0; i < lists.length; i++) {
+						const result = await this.uploadFilePromise(lists[i].url)
+						let item = this[`fileList${event.name}`][fileListLen]
+						this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+							status: 'success',
+							message: '',
+							url: result
+						}))
+						fileListLen++
+					}
+				} catch (e) {
+					uni.hideLoading()
+					uni.showToast({
+						title: '无法识别该行驶证',
+						icon: 'success'
+					})
+				}
+			},
+			uploadFilePromise(url) {
+				return new Promise((resolve, reject) => {
+					upload({
+						url: '/admin-api/infra/file/upload',
+						filePath: url
+					}).then(res => {
+						resolve(config.baseImageUrl + res.data)
+						this.car.carLicenseImg = res.data
+						this.imageUrl = config.baseImageUrl + res.data
+						request({
+							url: '/admin-api/base/carMain/vehicleLicenseOCR',
+							method: 'POST',
+							data: this.imageUrl,
+							tenantIdFlag: false
+						}).then((res) => {
+							// 如果客户名称为空 赋值
+							if (this.userInfo.cusName == '' || this.userInfo.cusName ==
+								undefined) {
+								this.userInfo.cusName = res.data.owner
+							}
+							this.car.vin = res.data.vin
+							this.car.licenseNumber = res.data.plateNo
+							this.car.carRegisterDate = res.data.issueDate
+							this.car.engineNumber = res.data.engineNo
+							if (this.car.insuranceExpiryDate) {
+								this.car.insuranceExpiryDate = formatDate(this.car
+									.insuranceExpiryDate)
+							}
+							if (this.car.nextInspectionDate) {
+								this.car.nextInspectionDate = formatDate(this.car
+									.nextInspectionDate)
+							}
+							//车辆品牌自动定位
+							this.brandList.forEach((item, index) => {
+								if (item.brandName == res.data.brand) {
+									this.setCarBrand(item.id, item.brandName)
+								}
+							})
+							//车辆性质自动定位
+							this.natureList.forEach((item, index) => {
+								if (item.label == res.data.useCharacter) {
+									this.natureIndex = index;
+									this.car.carNature = this.natureList[index].value;
+								}
+							})
+							uni.hideLoading()
+						})
+					})
+				})
+			},
+			/**
+			 * 设置选中的车辆品牌
+			 * @param id
+			 * @param name
+			 */
+			setCarBrand(id, name) {
+				this.$nextTick(() => {
+					this.brandId = id
+					this.brandName = name
+					this.$refs.songpicker.inputSelected = [{
+						text: name,
+						value: id
+					}]
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="less" scoped>
+	.container {
+		box-sizing: border-box;
+		height: 100%;
+		background-color: #f3f5f7;
+		display: flex;
+		flex-direction: column;
 
+		.body {
+			flex: 1;
+			height: 0;
+			overflow: auto;
 
-.container {
-  box-sizing: border-box;
-  height: 100%;
-  background-color: #f3f5f7;
-  display: flex;
-  flex-direction: column;
+			.card {
+				margin: 20rpx 30rpx;
+				padding: 0 30rpx;
+				background-color: #fff;
+			}
+		}
 
-  .body {
-    flex: 1;
-    height: 0;
-    overflow: auto;
+		.footer {
+			background: #ffffff;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 
-    .card {
-      margin: 20rpx 30rpx;
-      padding: 0 30rpx;
-      background-color: #fff;
-    }
-  }
+			padding: 30rpx 0;
 
-  .footer {
-    background: #ffffff;
-    display: flex;
-    align-items: center;
-    justify-content: center;
+			.btnItem {
+				width: 510rpx;
+				height: 76rpx;
+				background: #0174F6;
+				border-radius: 38rpx 38rpx 38rpx 38rpx;
 
-    padding: 30rpx 0;
+				font-size: 32rpx;
+				color: #FFFFFF;
 
-    .btnItem {
-      width: 510rpx;
-      height: 76rpx;
-      background: #0174F6;
-      border-radius: 38rpx 38rpx 38rpx 38rpx;
-
-      font-size: 32rpx;
-      color: #FFFFFF;
-
-      line-height: 76rpx;
-      text-align: center;
-    }
-  }
-}
-</style>
+				line-height: 76rpx;
+				text-align: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/myCar/carDetail.vue b/pages/myCar/carDetail.vue
index 1a7819e..e26fc9b 100644
--- a/pages/myCar/carDetail.vue
+++ b/pages/myCar/carDetail.vue
@@ -1,534 +1,498 @@
 <template>
-  <view class="container">
-    <VNavigationBar :title="pageTitle" background-color="#fff" title-color="#333"></VNavigationBar>
-    <view class="body">
-      <u-form labelPosition="top">
-        <view class="card">
-          <u-form-item borderBottom label="上传图片" labelWidth="200">
-            <u-upload
-                :fileList="fileList1"
-                @afterRead="afterRead"
-                @delete="deletePic"
-                name="1"
-                :maxCount="1"
-                multiple
-            ></u-upload>
-          </u-form-item>
-          <u-form-item borderBottom label="车牌号" labelWidth="200" @click="carInputClick();">
-            <u-input
-                @click="carInputClick();"
-                v-model="car.licenseNumber"
-                border="none"
-                disabled
-                disabledColor="#ffffff"
-                placeholder="请输入车牌号"
-            ></u-input>
-            <u-icon
-                slot="right"
-                name="arrow-right"
-            ></u-icon>
-          </u-form-item>
-          <!--          @click="brandType = true;"-->
-          <u-form-item label="车辆品牌" labelWidth="200">
-            <song-data-picker
-                ref="songpicker"
-                style=" width: 100%;"
-                :localdata="brandList"
-                popup-title="请选择品牌"
-                :openSearch="true"
-                @change="onchange"
-                @nodeclick="onnodeclick"
-            ></song-data-picker>
-<!--            <picker @change="picker($event)" :value="arrayIndex" :range="brandList" range-key="brandName" v-if="brandList">-->
-<!--              <view class="uni-input">{{ brandList && brandList[arrayIndex] ? brandList[arrayIndex].brandName : '' }}</view>-->
-<!--            </picker>-->
-          </u-form-item>
-          <u-form-item label="车辆型号" labelWidth="200">
-            <u-input
-                v-model="car.carModel"
-                border="none"
-                placeholder="请输入车辆型号"
-            ></u-input>
-          </u-form-item>
-          <u-form-item class="formItem" label="车辆性质" labelWidth="200">
-            <picker @change="natureChange" :value="natureIndex" :range="natureList" range-key="value" v-if="natureList">
-              <view class="uni-input">{{ natureList[natureIndex].value}}</view>
-            </picker>
-          </u-form-item>
-        </view>
+	<view class="container">
+		<VNavigationBar :title="pageTitle" background-color="#fff" title-color="#333"></VNavigationBar>
+		<view class="body">
+			<u-form labelPosition="top">
+				<view class="card">
+					<u-form-item borderBottom label="上传图片" labelWidth="200">
+						<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1"
+							:maxCount="1" multiple></u-upload>
+					</u-form-item>
+					<u-form-item borderBottom label="车牌号" labelWidth="200" @click="carInputClick();">
+						<u-input @click="carInputClick();" v-model="car.licenseNumber" border="none" disabled
+							disabledColor="#ffffff" placeholder="请输入车牌号"></u-input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+					<!--          @click="brandType = true;"-->
+					<u-form-item label="车辆品牌" labelWidth="200">
+						<song-data-picker ref="songpicker" style=" width: 100%;" :localdata="brandList"
+							popup-title="请选择品牌" :openSearch="true" @change="onchange"
+							@nodeclick="onnodeclick"></song-data-picker>
+						<!--            <picker @change="picker($event)" :value="arrayIndex" :range="brandList" range-key="brandName" v-if="brandList">-->
+						<!--              <view class="uni-input">{{ brandList && brandList[arrayIndex] ? brandList[arrayIndex].brandName : '' }}</view>-->
+						<!--            </picker>-->
+					</u-form-item>
+					<u-form-item label="车辆型号" labelWidth="200">
+						<u-input v-model="car.carModel" border="none" placeholder="请输入车辆型号"></u-input>
+					</u-form-item>
+					<u-form-item class="formItem" label="车辆性质" labelWidth="200">
+						<picker @change="natureChange" :value="natureIndex" :range="natureList" range-key="value"
+							v-if="natureList">
+							<view class="uni-input">{{ natureList[natureIndex].value}}</view>
+						</picker>
+					</u-form-item>
+				</view>
 
-        <view class="card">
-          <u-form-item borderBottom label="车架号" labelWidth="200">
-            <u-input v-model="car.vin" border="none" placeholder="请输入车架号"></u-input>
-          </u-form-item>
-          <u-form-item borderBottom label="发动机号" labelWidth="200">
-            <u-input v-model="car.engineNumber" border="none" placeholder="请输入发动机号"></u-input>
-          </u-form-item>
-          <u-form-item borderBottom label="年检到期时间" labelWidth="200" @click="openDatePicker('nj'); ">
-            <u-input
-                v-model="car.nextInspectionDate"
-                border="none"
-                disabled
-                disabledColor="#ffffff"
-                placeholder="请选择年检到期时间"
-            ></u-input>
-            <u-icon
-                slot="right"
-                name="arrow-right"
-            ></u-icon>
-          </u-form-item>
-          <u-form-item borderBottom label="保险到期时间" labelWidth="200" @click="openDatePicker('bx'); hideKeyboard()">
-            <u-input
-                v-model="car.insuranceExpiryDate"
-                border="none"
-                disabled
-                disabledColor="#ffffff"
-                placeholder="请选择保险到期时间"
-            ></u-input>
-            <u-icon
-                slot="right"
-                name="arrow-right"
-            ></u-icon>
-          </u-form-item>
-          <u-form-item label="注册日期时间" labelWidth="200" @click="openDatePicker('zcrq'); hideKeyboard()">
-            <u-input
-                v-model="car.carRegisterDate"
-                border="none"
-                disabled
-                disabledColor="#ffffff"
-                placeholder="请选择注册日期时间"
-            ></u-input>
-            <u-icon
-                slot="right"
-                name="arrow-right"
-            ></u-icon>
-          </u-form-item>
-        </view>
-      </u-form>
+				<view class="card">
+					<u-form-item borderBottom label="车架号" labelWidth="200">
+						<u-input v-model="car.vin" border="none" placeholder="请输入车架号"></u-input>
+					</u-form-item>
+					<u-form-item borderBottom label="发动机号" labelWidth="200">
+						<u-input v-model="car.engineNumber" border="none" placeholder="请输入发动机号"></u-input>
+					</u-form-item>
+					<u-form-item borderBottom label="年检到期时间" labelWidth="200" @click="openDatePicker('nj'); ">
+						<u-input v-model="car.nextInspectionDate" border="none" disabled disabledColor="#ffffff"
+							placeholder="请选择年检到期时间"></u-input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+					<u-form-item borderBottom label="保险到期时间" labelWidth="200"
+						@click="openDatePicker('bx'); hideKeyboard()">
+						<u-input v-model="car.insuranceExpiryDate" border="none" disabled disabledColor="#ffffff"
+							placeholder="请选择保险到期时间"></u-input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+					<u-form-item label="注册日期时间" labelWidth="200" @click="openDatePicker('zcrq'); hideKeyboard()">
+						<u-input v-model="car.carRegisterDate" border="none" disabled disabledColor="#ffffff"
+							placeholder="请选择注册日期时间"></u-input>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</u-form-item>
+				</view>
+			</u-form>
 
 
-      <keyboard-plate ref="plateNumber" :plateNum.sync='car.licenseNumber' isShow
-                      @change="getPlateNum"></keyboard-plate>
-      <u-datetime-picker
-          v-model="datePickerValue"
-          :formatter="formatter"
-          :show="datePickerShow"
-          mode="date"
-          :minDate="minDate"
-          @cancel="datePickerCancel"
-          @confirm="datePickerConfirm"
-      ></u-datetime-picker>
-    </view>
-    <view class="footer">
-      <view class="btnItem edit" @click="submit">
-        确定
-      </view>
-    </view>
-  </view>
+			<keyboard-plate ref="plateNumber" :plateNum.sync='car.licenseNumber' isShow
+				@change="getPlateNum"></keyboard-plate>
+			<u-datetime-picker v-model="datePickerValue" :formatter="formatter" :show="datePickerShow" mode="date"
+				:minDate="minDate" @cancel="datePickerCancel" @confirm="datePickerConfirm"></u-datetime-picker>
+		</view>
+		<view class="footer">
+			<view class="btnItem edit" @click="submit">
+				确定
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-import VNavigationBar from '@/components/VNavigationBar.vue';
-import request from "@/utils/request";
-import config from '@/config'
-import {bus} from "@/utils/eventBus";
-import upload from "@/utils/upload";
-import {getDictByCode,formatDate} from "@/utils/utils";
+	import VNavigationBar from '@/components/VNavigationBar.vue';
+	import request from "@/utils/request";
+	import config from '@/config'
+	import {
+		bus
+	} from "@/utils/eventBus";
+	import upload from "@/utils/upload";
+	import {
+		getDictByCode,
+		formatDate
+	} from "@/utils/utils";
 
-export default {
-  components: {
-    VNavigationBar
-  },
-  data() {
-    return {
-      pageTitle: '',
-      car: {
-        // 车牌号
-        licenseNumber: '',
-        // 型号
-        carModelInput: '',
-        // 品牌id
-        carBrand: '',
-        // 车辆类别  字典字段
-        carCategory: '',
-        // 车辆性质  字典字段
-        carNature: '',
-        // 注册日期
-        carRegisterDate: '',
-        // 车辆品牌型号数组
-        brandAndModel: [],
-      },
-      userInfo: {},
-      bo1: false,
-      bo2: true,
+	export default {
+		components: {
+			VNavigationBar
+		},
+		data() {
+			return {
+				pageTitle: '',
+				car: {
+					// 车牌号
+					licenseNumber: '',
+					// 型号
+					carModelInput: '',
+					// 品牌id
+					carBrand: '',
+					// 车辆类别  字典字段
+					carCategory: '',
+					// 车辆性质  字典字段
+					carNature: '',
+					// 注册日期
+					carRegisterDate: '',
+					// 车辆品牌型号数组
+					brandAndModel: [],
+				},
+				userInfo: {},
+				bo1: false,
+				bo2: true,
 
-      datePickerShow: false,
-      datePickerValue: new Date().getTime(),
-      pickerConfirmField: 'njDate',
-      showType: false,
-      brandType: false,
-      typeList: [],
-      //所有可选车辆品牌
-      brandList: [],
-      //选中的车辆品牌id
-      brandId: '',
-      //选中的车辆品牌名称
-      brandName: 0,
-      fileList1: [],
-      imageUrl: '',
-      //可选车辆性质范围
-      natureList: [],
-      natureIndex: 0,
-      index:null,
-      minDate:null,
-    };
-  },
-  onLoad(options) {
-    this.minDate = Number(new Date('1980-01-01'));
-    // 如果是修改
-    if (options.car) {
-      // 有数据为编辑 或 删除
-      this.car = JSON.parse(decodeURIComponent(options.car));
-      //处理几个时间
-      this.dealDateTime()
-      this.brandId = this.car.carBrand
-      console.log('初始化页面数据', this.car)
-      this.bo1 = true;
-      this.bo2 = false;
-      this.pageTitle = '修改车辆信息'
-      if (this.car.carLicenseImg) {
-        this.fileList1.push({
-          url: config.baseImageUrl + this.car.carLicenseImg
-        })
-      }
-      this.index = options.index
-    } else {
-      // 没有数据 需要赋值一下初始化
-      this.bo1 = false;
-      this.bo2 = true;
-      this.pageTitle = '添加车辆信息'
-    }
-    this.getBrandList()
-    this.getNatureList()
-    this.car.userId = JSON.parse(decodeURIComponent(options.userInfo)).userId;
-    this.userInfo = JSON.parse(decodeURIComponent(options.userInfo))
-    console.log(this.car)
-  },
-  methods: {
-    dealDateTime(){
-      if(this.car.carRegisterDate){
-        this.car.carRegisterDate = formatDate(this.car.carRegisterDate)
-      }
-      if(this.car.nextInspectionDate){
-        this.car.nextInspectionDate = formatDate(this.car.nextInspectionDate)
-      }
-      if(this.car.insuranceExpiryDate){
-        this.car.insuranceExpiryDate = formatDate(this.car.insuranceExpiryDate)
-      }
-    },
-    onchange(e) {
-      this.brandId = e.detail.value[0].id
-      this.brandName = e.detail.value[0].brandName
-    },
-    onnodeclick(node) {
-      console.log(node,"node")
-    },
-    typeSelect(e) {
-    },
-    // 车辆性质选择事件
-    natureChange(event) {
-      const newIndex = event.detail.value;
-      this.natureIndex = newIndex;
-      //
-      this.car.carNature = this.natureList[newIndex].value;
-    },
-    getBrandList() {
-      request({
-        url: '/admin-api/base/carBrand/page',
-        method: 'GET',
-        params: {
-          pageNo: 1,
-          pageSize: 10000
-        }
-      }).then(res => {
-        res.data.records.forEach(item => {
-                item.text = item.brandName,
-                item.value = item.id
-        })
-        this.brandList = res.data.records
-        if (this.car) {
-          for (let i = 0; i < this.brandList.length; i++) {
-            if (this.car.carBrand == this.brandList[i].id) {
-              this.setCarBrand(this.brandList[i].id,this.brandList[i].brandName)
-            }
-          }
-        }
-      })
-    },
+				datePickerShow: false,
+				datePickerValue: new Date().getTime(),
+				pickerConfirmField: 'njDate',
+				showType: false,
+				brandType: false,
+				typeList: [],
+				//所有可选车辆品牌
+				brandList: [],
+				//选中的车辆品牌id
+				brandId: '',
+				//选中的车辆品牌名称
+				brandName: 0,
+				fileList1: [],
+				imageUrl: '',
+				//可选车辆性质范围
+				natureList: [],
+				natureIndex: 0,
+				index: null,
+				minDate: null,
+			};
+		},
+		onLoad(options) {
+			this.minDate = Number(new Date('1980-01-01'));
+			// 如果是修改
+			if (options.car) {
+				// 有数据为编辑 或 删除
+				this.car = JSON.parse(decodeURIComponent(options.car));
+				//处理几个时间
+				this.dealDateTime()
+				this.brandId = this.car.carBrand
+				console.log('初始化页面数据', this.car)
+				this.bo1 = true;
+				this.bo2 = false;
+				this.pageTitle = '修改车辆信息'
+				if (this.car.carLicenseImg) {
+					this.fileList1.push({
+						url: config.baseImageUrl + this.car.carLicenseImg
+					})
+				}
+				this.index = options.index
+			} else {
+				// 没有数据 需要赋值一下初始化
+				this.bo1 = false;
+				this.bo2 = true;
+				this.pageTitle = '添加车辆信息'
+			}
+			this.getBrandList()
+			this.getNatureList()
+			this.car.userId = JSON.parse(decodeURIComponent(options.userInfo)).userId;
+			this.userInfo = JSON.parse(decodeURIComponent(options.userInfo))
+			console.log(this.car)
+		},
+		methods: {
+			dealDateTime() {
+				if (this.car.carRegisterDate) {
+					this.car.carRegisterDate = formatDate(this.car.carRegisterDate)
+				}
+				if (this.car.nextInspectionDate) {
+					this.car.nextInspectionDate = formatDate(this.car.nextInspectionDate)
+				}
+				if (this.car.insuranceExpiryDate) {
+					this.car.insuranceExpiryDate = formatDate(this.car.insuranceExpiryDate)
+				}
+			},
+			onchange(e) {
+				this.brandId = e.detail.value[0].id
+				this.brandName = e.detail.value[0].brandName
+			},
+			onnodeclick(node) {
+				console.log(node, "node")
+			},
+			typeSelect(e) {},
+			// 车辆性质选择事件
+			natureChange(event) {
+				const newIndex = event.detail.value;
+				this.natureIndex = newIndex;
+				//
+				this.car.carNature = this.natureList[newIndex].value;
+			},
+			getBrandList() {
+				request({
+					url: '/admin-api/base/carBrand/page',
+					method: 'GET',
+					params: {
+						pageNo: 1,
+						pageSize: 10000
+					}
+				}).then(res => {
+					res.data.records.forEach(item => {
+						item.text = item.brandName,
+							item.value = item.id
+					})
+					this.brandList = res.data.records
+					if (this.car) {
+						for (let i = 0; i < this.brandList.length; i++) {
+							if (this.car.carBrand == this.brandList[i].id) {
+								this.setCarBrand(this.brandList[i].id, this.brandList[i].brandName)
+							}
+						}
+					}
+				})
+			},
 
-    // 打开车牌选择器
-    carInputClick() {
-      this.$refs.plateNumber.open();
-    },
-    getPlateNum(e) {
+			// 打开车牌选择器
+			carInputClick() {
+				this.$refs.plateNumber.open();
+			},
+			getPlateNum(e) {
 
-    },
+			},
 
-    openDatePicker(picker) {
-      if (picker === 'nj') {
-        this.pickerConfirmField = 'nextInspectionDate'
-      } else if (picker === 'bx') {
-        this.pickerConfirmField = 'insuranceExpiryDate'
-      } else if (picker === 'zcrq') {
-        this.pickerConfirmField = 'carRegisterDate'
-      }
-      this.datePickerShow = true
-    },
-    datePickerConfirm({value}, field, picker) {
-      let date;
+			openDatePicker(picker) {
+				if (picker === 'nj') {
+					this.pickerConfirmField = 'nextInspectionDate'
+				} else if (picker === 'bx') {
+					this.pickerConfirmField = 'insuranceExpiryDate'
+				} else if (picker === 'zcrq') {
+					this.pickerConfirmField = 'carRegisterDate'
+				}
+				this.datePickerShow = true
+			},
+			datePickerConfirm({
+				value
+			}, field, picker) {
+				let date;
 
-      // 检查 value 是否为时间戳
-      if (typeof value === 'number') {
-        // 如果是时间戳，确保是毫秒单位
-        date = new Date(value);
-      } else if (typeof value === 'string') {
-        // 如果是日期字符串，尝试解析
-        date = new Date(value);
-      }
+				// 检查 value 是否为时间戳
+				if (typeof value === 'number') {
+					// 如果是时间戳，确保是毫秒单位
+					date = new Date(value);
+				} else if (typeof value === 'string') {
+					// 如果是日期字符串，尝试解析
+					date = new Date(value);
+				}
 
-      // 检查日期是否有效
-      if (isNaN(date.getTime())) {
-        console.error('Invalid date:', value);
-        return;
-      }
-      this.car[this.pickerConfirmField] = date.getFullYear() + '-' + (Number(date.getMonth()) + 1 + '').padStart(2, '0') + '-' + (date.getDate() + '').padStart(2, '0')
-      this.datePickerCancel(picker)
-    },
-    datePickerCancel(picker) {
-      this.datePickerValue = new Date().getTime()
-      this.datePickerShow = false
-    },
-    formatter(type, value) {
-      if (type === 'year') {
-        return `${value}年`
-      }
-      if (type === 'month') {
-        return `${value}月`
-      }
-      if (type === 'day') {
-        return `${value}日`
-      }
-      return value
-    },
-    // 新增
-    async submit() {
-      this.car.brandAndModel = [this.brandId, this.car.carModel]
-      //将日期转为时间戳
-      if (this.car.nextInspectionDate) {
-        this.car.nextInspectionDate = new Date(this.car.nextInspectionDate).getTime()
-      }else {
-        this.car.nextInspectionDate = undefined
-      }
-      if (this.car.insuranceExpiryDate) {
-        this.car.insuranceExpiryDate = new Date(this.car.insuranceExpiryDate).getTime()
-      }else {
-        this.car.insuranceExpiryDate = undefined
-      }
-      if (this.car.carRegisterDate) {
-        this.car.carRegisterDate = new Date(this.car.carRegisterDate).getTime()
-      }else {
-        this.car.carRegisterDate = undefined
-      }
-      console.log(this.car,"car")
-      if (this.car.id != null) {
-        request({
-          url: '/admin-api/base/carMain/update',
-          method: 'PUT',
-          data: this.car,
-        }).then(res => {
-          bus.$emit('updateCarInfo',this.car.id)
-          uni.navigateBack();
-        })
-      } else {
-        request({
-          url: '/admin-api/base/carMain/create',
-          method: 'POST',
-          data: this.car,
-        }).then(res => {
-          request({
-            url: '/admin-api/base/carMain/page',
-            method: 'GET',
-            params: {
-              licenseNumber: this.car.licenseNumber
-            }
-          }).then(res => {
-            this.car = res.data.records[0]
-            request({
-              url: '/admin-api/base/custom/bindCustomerCar',
-              method: 'post',
-              data: {
-                carList: [this.car],
-                id: this.userInfo.id
-              }
-            }).then(res => {
-              uni.navigateBack();
-            })
-          })
+				// 检查日期是否有效
+				if (isNaN(date.getTime())) {
+					console.error('Invalid date:', value);
+					return;
+				}
+				this.car[this.pickerConfirmField] = date.getFullYear() + '-' + (Number(date.getMonth()) + 1 + '').padStart(
+					2, '0') + '-' + (date.getDate() + '').padStart(2, '0')
+				this.datePickerCancel(picker)
+			},
+			datePickerCancel(picker) {
+				this.datePickerValue = new Date().getTime()
+				this.datePickerShow = false
+			},
+			formatter(type, value) {
+				if (type === 'year') {
+					return `${value}年`
+				}
+				if (type === 'month') {
+					return `${value}月`
+				}
+				if (type === 'day') {
+					return `${value}日`
+				}
+				return value
+			},
+			// 新增
+			async submit() {
+				this.car.brandAndModel = [this.brandId, this.car.carModel]
+				this.car.carBrand = this.brandId
+				this.car.carModel = this.carModel
+				//将日期转为时间戳
+				if (this.car.nextInspectionDate) {
+					this.car.nextInspectionDate = new Date(this.car.nextInspectionDate).getTime()
+				} else {
+					this.car.nextInspectionDate = undefined
+				}
+				if (this.car.insuranceExpiryDate) {
+					this.car.insuranceExpiryDate = new Date(this.car.insuranceExpiryDate).getTime()
+				} else {
+					this.car.insuranceExpiryDate = undefined
+				}
+				if (this.car.carRegisterDate) {
+					this.car.carRegisterDate = new Date(this.car.carRegisterDate).getTime()
+				} else {
+					this.car.carRegisterDate = undefined
+				}
+				this.userInfo.car = this.car
+				request({
+					url: '/admin-api/base/custom/saveCustomerAndCar',
+					method: 'post',
+					data: this.userInfo
+				}).then(res => {
+					bus.$emit('updateCarInfo', this.car.id)
+					uni.navigateBack();
+				})
+				// if (this.car.id != null) {
+				// 	request({
+				// 		url: '/admin-api/base/carMain/update',
+				// 		method: 'PUT',
+				// 		data: this.car,
+				// 	}).then(res => {
+				// 		bus.$emit('updateCarInfo', this.car.id)
+				// 		uni.navigateBack();
+				// 	})
+				// } else {
+				// 	request({
+				// 		url: '/admin-api/base/custom/saveCustomerAndCar',
+				// 		method: 'POST',
+				// 		data: this.car,
+				// 	}).then(res => {
+				// 		request({
+				// 			url: '/admin-api/base/carMain/page',
+				// 			method: 'GET',
+				// 			params: {
+				// 				licenseNumber: this.car.licenseNumber
+				// 			}
+				// 		}).then(res => {
+				// 			this.car = res.data.records[0]
+				// 			request({
+				// 				url: '/admin-api/base/custom/bindCustomerCar',
+				// 				method: 'post',
+				// 				data: {
+				// 					carList: [this.car],
+				// 					id: this.userInfo.id
+				// 				}
+				// 			}).then(res => {
+				// 				uni.navigateBack();
+				// 			})
+				// 		})
 
-        })
-      }
-    },
-    // 查询下拉 车辆性质
-    async getNatureList() {
-      this.natureList= getDictByCode('car_nature')
-      if (this.bo2 == true) {
-        // setTimeout(() => {
-        //   this.car.carNature = this.natureList[0].value;
-        // }, 15000)
-      } else {
-        // 如果是修改 遍历当前集合 将index 同步
-        this.natureList.forEach((item, index) => {
-          if (item.value == this.car.carNature) {
-            this.natureIndex = index;
-          }
-        })
-      }
+				// 	})
+				// }
+			},
+			// 查询下拉 车辆性质
+			async getNatureList() {
+				this.natureList = getDictByCode('car_nature')
+				if (this.bo2 == true) {
+					// setTimeout(() => {
+					//   this.car.carNature = this.natureList[0].value;
+					// }, 15000)
+				} else {
+					// 如果是修改 遍历当前集合 将index 同步
+					this.natureList.forEach((item, index) => {
+						if (item.value == this.car.carNature) {
+							this.natureIndex = index;
+						}
+					})
+				}
 
-    },
-    // 删除图片
-    deletePic(event) {
-      this[`fileList${event.name}`].splice(event.index, 1)
-    },
-    // 新增图片
-    async afterRead(event) {
-      // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
-      let lists = [].concat(event.file)
-      let fileListLen = this[`fileList${event.name}`].length
-      lists.map((item) => {
-        this[`fileList${event.name}`].push({
-          ...item,
-          status: 'uploading',
-          message: '上传中'
-        })
-      })
-      // uni.showLoading({
-      //   title: '正在识别中...'
-      // });
-      try {
-        for (let i = 0; i < lists.length; i++) {
-          let result = await this.uploadFilePromise(lists[i].url)
-          let item = this[`fileList${event.name}`][fileListLen]
-          this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
-            status: 'success',
-            message: '',
-            url: result
-          }))
-          fileListLen++
-        }
-      } catch (e) {
-        //识别报错
-        uni.hideLoading()
-        uni.showToast({
-          title: '无法识别该行驶证',
-          icon: 'success'
-        })
-      }
-    },
-    uploadFilePromise(url) {
-      return new Promise((resolve, reject) => {
-        upload({
-          url: '/admin-api/infra/file/upload',
-          filePath: url
-        }).then(res => {
-          resolve(config.baseImageUrl +res.data)
-          this.car.carLicenseImg = res.data
-          this.imageUrl = config.baseImageUrl + res.data
-          request({
-            url: '/admin-api/base/carMain/vehicleLicenseOCR',
-            method: 'POST',
-            data: this.imageUrl,
-            tenantIdFlag: false
-          }).then((res) => {
-            this.car.vin = res.data.vin
-            this.car.licenseNumber = res.data.plateNo
-            this.car.carRegisterDate = res.data.issueDate
-            this.car.engineNumber = res.data.engineNo
-            //车辆品牌自动定位
-            this.brandList.forEach((item, index) => {
-              if (item.brandName == res.data.brand) {
-                this.setCarBrand(item.id,item.brandName)
-              }
-            })
-            //车辆性质自动定位
-            this.natureList.forEach((item, index) => {
-              if (item.label == res.data.useCharacter) {
-                this.natureIndex = index;
-                this.car.carNature = this.natureList[index].value;
-              }
-            })
-            uni.hideLoading()
-          })
-        })
-      })
-    },
-    /**
-     * 设置选中的车辆品牌
-     * @param id
-     * @param name
-     */
-    setCarBrand(id,name){
-      this.$nextTick(()=>{
-        this.brandId = id
-        this.brandName = name
-        this.$refs.songpicker.inputSelected=[{text:name,value:id}]
-      })
-    }
-  }
-}
+			},
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				// uni.showLoading({
+				//   title: '正在识别中...'
+				// });
+				try {
+					for (let i = 0; i < lists.length; i++) {
+						let result = await this.uploadFilePromise(lists[i].url)
+						let item = this[`fileList${event.name}`][fileListLen]
+						this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+							status: 'success',
+							message: '',
+							url: result
+						}))
+						fileListLen++
+					}
+				} catch (e) {
+					//识别报错
+					uni.hideLoading()
+					uni.showToast({
+						title: '无法识别该行驶证',
+						icon: 'success'
+					})
+				}
+			},
+			uploadFilePromise(url) {
+				return new Promise((resolve, reject) => {
+					upload({
+						url: '/admin-api/infra/file/upload',
+						filePath: url
+					}).then(res => {
+						resolve(config.baseImageUrl + res.data)
+						this.car.carLicenseImg = res.data
+						this.imageUrl = config.baseImageUrl + res.data
+						request({
+							url: '/admin-api/base/carMain/vehicleLicenseOCR',
+							method: 'POST',
+							data: this.imageUrl,
+							tenantIdFlag: false
+						}).then((res) => {
+							this.car.vin = res.data.vin
+							this.car.licenseNumber = res.data.plateNo
+							this.car.carRegisterDate = res.data.issueDate
+							this.car.engineNumber = res.data.engineNo
+							//车辆品牌自动定位
+							this.brandList.forEach((item, index) => {
+								if (item.brandName == res.data.brand) {
+									this.setCarBrand(item.id, item.brandName)
+								}
+							})
+							//车辆性质自动定位
+							this.natureList.forEach((item, index) => {
+								if (item.label == res.data.useCharacter) {
+									this.natureIndex = index;
+									this.car.carNature = this.natureList[index].value;
+								}
+							})
+							uni.hideLoading()
+						})
+					})
+				})
+			},
+			/**
+			 * 设置选中的车辆品牌
+			 * @param id
+			 * @param name
+			 */
+			setCarBrand(id, name) {
+				this.$nextTick(() => {
+					this.brandId = id
+					this.brandName = name
+					this.$refs.songpicker.inputSelected = [{
+						text: name,
+						value: id
+					}]
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="less" scoped>
+	.container {
+		box-sizing: border-box;
+		height: 100%;
+		background-color: #f3f5f7;
+		display: flex;
+		flex-direction: column;
 
+		.body {
+			flex: 1;
+			height: 0;
+			overflow: auto;
 
-.container {
-  box-sizing: border-box;
-  height: 100%;
-  background-color: #f3f5f7;
-  display: flex;
-  flex-direction: column;
+			.card {
+				margin: 20rpx 30rpx;
+				padding: 0 30rpx;
+				background-color: #fff;
+			}
+		}
 
-  .body {
-    flex: 1;
-    height: 0;
-    overflow: auto;
+		.footer {
+			background: #ffffff;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 
-    .card {
-      margin: 20rpx 30rpx;
-      padding: 0 30rpx;
-      background-color: #fff;
-    }
-  }
+			padding: 30rpx 0;
 
-  .footer {
-    background: #ffffff;
-    display: flex;
-    align-items: center;
-    justify-content: center;
+			.btnItem {
+				width: 510rpx;
+				height: 76rpx;
+				background: #0174F6;
+				border-radius: 38rpx 38rpx 38rpx 38rpx;
 
-    padding: 30rpx 0;
+				font-size: 32rpx;
+				color: #FFFFFF;
 
-    .btnItem {
-      width: 510rpx;
-      height: 76rpx;
-      background: #0174F6;
-      border-radius: 38rpx 38rpx 38rpx 38rpx;
-
-      font-size: 32rpx;
-      color: #FFFFFF;
-
-      line-height: 76rpx;
-      text-align: center;
-    }
-  }
-}
-</style>
+				line-height: 76rpx;
+				text-align: center;
+			}
+		}
+	}
+</style>
\ No newline at end of file