diff --git a/sub-operation-service/components.d.ts b/sub-operation-service/components.d.ts index 1e52722..8dca9c7 100644 --- a/sub-operation-service/components.d.ts +++ b/sub-operation-service/components.d.ts @@ -12,6 +12,7 @@ declare module 'vue' { BreadComp: typeof import('./src/components/breadComp.vue')['default'] CenterMap: typeof import('./src/components/centerMap.vue')['default'] CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default'] + copy: typeof import('./src/components/custom-scroll-title copy/index.vue')['default'] CostomImg: typeof import('./src/components/costomImg.vue')['default'] CustomBack: typeof import('./src/components/customBack.vue')['default'] CustomCarouselPicture: typeof import('./src/components/custom-carousel-picture/index.vue')['default'] diff --git a/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalMachinery.vue b/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalMachinery.vue index 9f1db58..3d64c43 100644 --- a/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalMachinery.vue +++ b/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalMachinery.vue @@ -18,7 +18,7 @@
地理位置
- +
@@ -38,47 +38,45 @@
-
~
-
+
~
+
- - -
-
-
- + +
+
+
+ +
+
+
+
{{ item.title }}
+
+ {{ item.subtext }} +
+
+
+ {{ item.price }}元/天 +
+
可用时间：{{ item.time }}
+
-
-
-
{{ item.title }}
-
- {{ item.subtext }} -
-
-
- {{ item.price }}元/天 -
-
可用时间：{{ item.time }}
-
-
-
-
- -
{{ item.name }}
-
- 立即预约 +
+
+ +
{{ item.name }}
+ 立即预约
- +
@@ -93,6 +91,8 @@ import { useRouter } from 'vue-router'; import { informationList } from '@/apis/farmingService.js'; import options from '../../../assets/address.json'; import { ElMessage } from 'element-plus'; +import { getRegion } from '@/apis/common'; + const router = useRouter(); let postArea = ref(''); let address = ref(''); @@ -101,8 +101,22 @@ let value3 = ref(''); let price1 = ref(''); let price2 = ref(''); const props = ref({ - value: 'label', + label: 'areaName', // 选项标签字段名 + value: 'areaCode', // 选项值字段名 + children: 'areaChildVOS', // 子选项字段名 + emitPath: true, + expandTrigger: 'hover', }); +// 省市区数据（示例） +const addressOptions = ref([]); +const getArea = async () => { + const res = await getRegion(); + if (res.code === 200) { + addressOptions.value = res.data; + } else { + ElMessage.error(res.message); + } +}; /* --------------- data --------------- */ // #region @@ -163,6 +177,7 @@ const pagination = ref({ // #region onMounted(() => { // queryList(); + getArea(); }); const extractText = (htmlText, maxChars = 80) => { diff --git a/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalTechnologyDel.vue b/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalTechnologyDel.vue index 0b280da..083364c 100644 --- a/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalTechnologyDel.vue +++ b/sub-operation-service/src/views/farmingService/farmingConsult/agriculturalTechnologyDel.vue @@ -2,7 +2,7 @@