feat: 土地详情信息展示

src/composable/useJoinRequired.ts

@@ -11,7 +11,7 @@ export interface JoinRequiredParams {
   /** 环评要求 */
   environmentalEquirements?: string;
   /** 总投资额 */
-  investmentAmountTotal: number;
+  investmentAmountTotal: number | string;
   /** 亩均投资强度 */
   investmentStrength: string;
   /** 亩均税收 */
@@ -21,7 +21,7 @@ export interface JoinRequiredParams {
   /** 亩均年产值 */
   averageOutputValue: string;
   /** 建设周期 */
-  buildingPeriod: number;
+  buildingPeriod: number | string;
 }
 
 /**

src/types/api/landDetail.ts

@@ -6,7 +6,7 @@ export interface LandDetailResp {
   address: string;
   /** */
   addressDetails: string;
-  /** */
+  /** 出让年限 */
   ageLimit: string;
   /** 面积（亩） */
   area: number;
@@ -14,7 +14,7 @@ export interface LandDetailResp {
   cityCode: string;
   /** */
   cityName: string;
-  /** */
+  /** 建设周期 */
   constructionCycle: string;
   /** */
   contactInformation: string;
@@ -22,7 +22,7 @@ export interface LandDetailResp {
   contacterName: string;
   /** 联系电话 */
   contacterPhone: string;
-  /** */
+  /** 开发程度 */
   developLevel: string;
   /** 土地开发区信息 */
   development: {
@@ -54,9 +54,9 @@ export interface LandDetailResp {
     type: string;
     id: number;
   };
-  /** */
+  /** 能评要求 */
   energyRequire: string;
-  /** */
+  /** 持有方类别 */
   holderType: string;
   /** 首屏图片 */
   imgUrl: string;
@@ -64,11 +64,11 @@ export interface LandDetailResp {
   imgUrls: string[];
   /** 产业方向 */
   industryDirection: string;
-  /** */
+  /** 亩均投资强度 */
   investNum: string;
   /** 招商方向 */
   investmentDetails: string;
-  /** */
+  /** 土地证价格 */
   landDeed: string;
   /** 土地现状 */
   landStatus: string;
@@ -76,7 +76,7 @@ export interface LandDetailResp {
   landType: number;
   /** 地块名称 */
   name: string;
-  /** */
+  /** 亩均年产值 */
   outputValue: string;
   /** 价格 */
   price: number;
@@ -84,17 +84,17 @@ export interface LandDetailResp {
   provinceCode: string;
   /** */
   provinceName: string;
-  /** */
+  /** 容积率 */
   ratio: string;
   /** */
   regionCode: string;
   /** */
   regionName: string;
-  /** */
+  /** 出让状态 */
   shellState: string;
-  /** */
+  /** 亩均税收 */
   taxRevenue: string;
-  /** */
+  /** 总投资额 */
   totalInvestment: string;
   /** 土地类型名称 */
   typeName: string;

src/views/carrier/CarrierDetail.vue

@@ -51,6 +51,7 @@ const { joinRequired } = useJoinRequired(
       return null;
     }
   }),
+  true,
 );
 
 const { open } = useJump();

src/views/industrial-park/IndustrialParkDetail.vue

@@ -258,7 +258,6 @@ const toCarrierList = () => {
 
 /**
  * 载体详情
- * todo id属性？
  */
 const toCarrierDetail = ({ id }: { id: string }) => {
   open({

src/views/land/LandDetail.vue

@@ -11,7 +11,9 @@
           {{ detail.landStatus }}
         </div>
       </DetailInfoCell>
-      <DetailInfoCell title="地块信息"></DetailInfoCell>
+      <DetailInfoCell title="地块信息">
+        <DetailInfo :infos="landInfo"></DetailInfo>
+      </DetailInfoCell>
       <DetailInfoCell title="入驻要求">
         <DetailInfo :infos="joinRequired"></DetailInfo>
       </DetailInfoCell>
@@ -32,7 +34,7 @@ import DetailInfoCell from '@/components/detail/DetailInfoCell.vue';
 import DetailInfo from '@/components/detail/DetailInfo.vue';
 import DetailMain from '@/components/detail/DetailMain.vue';
 import { useDetail } from '@/composable/useDetail.ts';
-import { useJoinRequired } from '@/composable/useJoinRequired.ts';
+import { useJoinRequired, type JoinRequiredParams } from '@/composable/useJoinRequired.ts';
 import { RequestUrl } from '@/types/api.ts';
 import type { LandDetailResp } from '@/types/api/landDetail';
 import { computed } from 'vue';
@@ -45,21 +47,76 @@ const { detail, initDetail } = useDetail<LandDetailResp>(RequestUrl.landDetail);
 const { joinRequired } = useJoinRequired(
   computed(() => {
     if (detail.value) {
-      return {
+      const {
+        energyRequire,
+        totalInvestment,
+        investNum,
+        outputValue,
+        taxRevenue,
+        constructionCycle,
+      } = detail.value;
+      const result: JoinRequiredParams = {
         ...detail.value,
-        ...detail.value.development,
-      } as any;
+        valueAddedEnergy: energyRequire,
+        investmentAmountTotal: totalInvestment,
+        investmentStrength: investNum,
+        averageOutputValue: outputValue,
+        taxationStrength: taxRevenue,
+        buildingPeriod: constructionCycle,
+      };
+      return result;
     } else {
       return null;
     }
   }),
+  true,
 );
 
 const { open } = useJump();
 
+/** 地块信息 */
+const landInfo = computed(() => {
+  if (detail.value) {
+    const { ratio, landDeed, ageLimit, developLevel, shellState, holderType } = detail.value;
+    return [
+      [
+        {
+          name: '容积率',
+          value: ratio,
+        },
+        {
+          name: '土地证',
+          value: landDeed,
+        },
+      ],
+      [
+        {
+          name: '出让年限',
+          value: ageLimit,
+        },
+        {
+          name: '开发程度',
+          value: developLevel,
+        },
+      ],
+      [
+        {
+          name: '出让状态',
+          value: shellState,
+        },
+        {
+          name: '持有方类别',
+          value: holderType,
+        },
+      ],
+    ];
+  } else {
+    return [];
+  }
+});
+
 /**
  * 开发区
- * todo id?
  */
 const toDevelop = () => {
   open({