zs 1 năm trước cách đây
mục cha
commit
1e3bd9564f

+ 1 - 1
pages/home/index.vue

@@ -13,7 +13,7 @@
 								</image>
 							</view>
 							<view class="right">
-								<view class="name textOver">{{item.series||'暂无'}} {{item.year||'暂无'}}
+								<view class="name textOver">{{item.series||'暂无'}} {{item.year||'暂无'}}
 									{{item.style||'暂无'}}
 								</view>
 								<view class="money">

+ 1 - 1
pages/select/index.vue

@@ -44,7 +44,7 @@
 								</view>
 								<view class="other">
 									<text v-if="item.year">{{item.year||'暂无'}}年 | </text>
-									<text v-if="item.mileage">{{item.mileage||'暂无'}}公里 | </text>
+									<text v-if="item.mileage">{{item.mileage||'暂无'}}公里 | </text>
 									<text v-if="item.place">{{item.place||'暂无'}}</text>
 								</view>
 								<view class="money">

+ 2 - 2
pagesHome/car/index.vue

@@ -32,7 +32,7 @@
 							</view>
 						</view>
 						<view class="two">
-							<view class="two_1 textOver">{{info.series||'暂无'}} {{info.year||'暂无'}}
+							<view class="two_1 textOver">{{info.series||'暂无'}} {{info.year||'暂无'}}
 								{{info.style||'暂无'}}
 							</view>
 							<view class="two_2">
@@ -61,7 +61,7 @@
 								<text>档案</text>
 								<view class="info">
 									<view class="list">
-										<view class="info_1">{{moment(info.f_time).format('MM-DD')||'暂无日期'}}</view>
+										<view class="info_1">{{moment(info.f_time).format('YYYY-MM')||'暂无日期'}}</view>
 										<view class="info_2">上牌时间</view>
 									</view>
 									<view class="list">

+ 7 - 1
pagesHome/condition/index.vue

@@ -51,7 +51,7 @@
 		<view class="foot">
 			<view class="left">重置</view>
 			<view class="right">
-				<view class="button">共{{total}}辆车符合条件</view>
+				<view class="button" @tap="toSearch">共{{total}}辆车符合条件</view>
 			</view>
 		</view>
 	</view>
@@ -228,6 +228,12 @@
 			return item
 		})
 	};
+	// 查找
+	const toSearch = () => {
+		uni.navigateTo({
+			url: `/pagesHome/search/index`
+		})
+	};
 </script>
 <style lang="scss" scoped>
 	.content {

+ 5 - 11
pagesHome/record/index.vue

@@ -27,7 +27,7 @@
 						车辆识别号(VIN)
 					</view>
 					<view class="right">
-						{{info.vin||'暂无'}}
+						{{info.vin? '已上传' : '未上传'}}
 					</view>
 				</view>
 			</view>
@@ -38,7 +38,7 @@
 						表显里程
 					</view>
 					<view class="right">
-						{{info.mileage||'暂无'}}
+						{{info.mileage||'暂无'}}万公里
 					</view>
 				</view>
 				<view class="table_column">
@@ -54,7 +54,7 @@
 						首次上牌
 					</view>
 					<view class="right">
-						{{info.f_time||'暂无'}}
+						{{moment(info.f_time).format('YYYY-MM')||'暂无日期'}}
 					</view>
 				</view>
 				<view class="table_column">
@@ -121,7 +121,7 @@
 						排量
 					</view>
 					<view class="right">
-						{{getDict(info.displacement, 'displacement')}}
+						{{info.displacement||'暂无'}}
 					</view>
 				</view>
 				<view class="table_column">
@@ -163,6 +163,7 @@
 </template>
 
 <script setup lang="ts">
+	import moment from 'moment';
 	import { getCurrentInstance, computed, ref } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onLoad } from "@dcloudio/uni-app";
@@ -183,7 +184,6 @@
 	const structureList = ref([]);
 	const emissionList = ref([]);
 	const energyList = ref([]);
-	const displacementList = ref([]);
 	const setList = ref([]);
 	const levelList = ref([]);
 	const driveList = ref([]);
@@ -211,9 +211,6 @@
 		// 能源类型
 		res = await $api(`dictData`, 'GET', { code: 'energy', is_use: '0' });
 		if (res.errcode === 0) energyList.value = res.data;
-		// 排量
-		res = await $api(`dictData`, 'GET', { code: 'displacement', is_use: '0' });
-		if (res.errcode === 0) displacementList.value = res.data;
 		// 座椅
 		res = await $api(`dictData`, 'GET', { code: 'set', is_use: '0' });
 		if (res.errcode === 0) setList.value = res.data;
@@ -261,9 +258,6 @@
 			case 'energy':
 				list = energyList.value;
 				break;
-			case 'displacement':
-				list = displacementList.value;
-				break;
 			case 'set':
 				list = setList.value;
 				break;

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/home/index.wxml


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/select/index.wxml


+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/car/index.js

@@ -188,7 +188,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
           name: "arrow-right",
           size: "16"
         }),
-        r: common_vendor.t(common_vendor.unref(common_vendor.hooks)(info.value.f_time).format("MM-DD") || "暂无日期"),
+        r: common_vendor.t(common_vendor.unref(common_vendor.hooks)(info.value.f_time).format("YYYY-MM") || "暂无日期"),
         s: common_vendor.t(info.value.mileage || "暂无"),
         t: common_vendor.t(getDict(info.value.emission, "emission")),
         v: common_vendor.t(info.value.place || "暂无"),

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/car/index.wxml


+ 7 - 1
unpackage/dist/dev/mp-weixin/pagesHome/condition/index.js

@@ -165,6 +165,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         return item;
       });
     };
+    const toSearch = () => {
+      common_vendor.index.navigateTo({
+        url: `/pagesHome/search/index`
+      });
+    };
     return (_ctx, _cache) => {
       return {
         a: common_vendor.f(tabbar.value, (item, index, i0) => {
@@ -226,7 +231,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         d: scrollRightTop.value,
         e: itemId.value,
         f: common_vendor.o(rightScroll),
-        g: common_vendor.t(total.value)
+        g: common_vendor.t(total.value),
+        h: common_vendor.o(toSearch)
       };
     };
   }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/condition/index.wxml


+ 3 - 10
unpackage/dist/dev/mp-weixin/pagesHome/record/index.js

@@ -27,7 +27,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     const structureList = common_vendor.ref([]);
     const emissionList = common_vendor.ref([]);
     const energyList = common_vendor.ref([]);
-    const displacementList = common_vendor.ref([]);
     const setList = common_vendor.ref([]);
     const levelList = common_vendor.ref([]);
     const driveList = common_vendor.ref([]);
@@ -54,9 +53,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       res = await $api(`dictData`, "GET", { code: "energy", is_use: "0" });
       if (res.errcode === 0)
         energyList.value = res.data;
-      res = await $api(`dictData`, "GET", { code: "displacement", is_use: "0" });
-      if (res.errcode === 0)
-        displacementList.value = res.data;
       res = await $api(`dictData`, "GET", { code: "set", is_use: "0" });
       if (res.errcode === 0)
         setList.value = res.data;
@@ -101,9 +97,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         case "energy":
           list = energyList.value;
           break;
-        case "displacement":
-          list = displacementList.value;
-          break;
         case "set":
           list = setList.value;
           break;
@@ -128,10 +121,10 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         c: common_vendor.t(info.value.series || "暂无"),
         d: common_vendor.t(info.value.year || "暂无"),
         e: common_vendor.t(info.value.style || "暂无"),
-        f: common_vendor.t(info.value.vin || "暂无"),
+        f: common_vendor.t(info.value.vin ? "已上传" : "未上传"),
         g: common_vendor.t(info.value.mileage || "暂无"),
         h: common_vendor.t(getDict(info.value.emission, "emission")),
-        i: common_vendor.t(info.value.f_time || "暂无"),
+        i: common_vendor.t(common_vendor.unref(common_vendor.hooks)(info.value.f_time).format("YYYY-MM") || "暂无日期"),
         j: common_vendor.t(info.value.number || "0"),
         k: common_vendor.t(info.value.place || "暂无"),
         l: common_vendor.t(info.value.license || "暂无"),
@@ -139,7 +132,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         n: common_vendor.t(info.value.in_color || "暂无"),
         o: common_vendor.t(getDict(info.value.use_type, "use_type")),
         p: common_vendor.t(getDict(info.value.energy, "energy")),
-        q: common_vendor.t(getDict(info.value.displacement, "displacement")),
+        q: common_vendor.t(info.value.displacement || "暂无"),
         r: common_vendor.t(getDict(info.value.level, "level")),
         s: common_vendor.t(getDict(info.value.type, "type")),
         t: common_vendor.t(getDict(info.value.drive, "drive")),

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/record/index.wxml