Merge branch '20231227_change_list_id' into 'master'

20231227 change list

See merge request !3

src/components/detail/ContactInfo.vue

@@ -49,7 +49,10 @@ import { useLoginModal } from '../login/login.ts';
 const props = withDefaults(
   defineProps<{
     personName: string;
-    id: number;
+    /** 主键id */
+    id: string;
+    /** 业务id */
+    businessId: string;
     detailType: DetailType;
   }>(),
   {},

src/components/detail/DetailInfoCell.vue

@@ -91,7 +91,7 @@ export interface DetailInfoCellProps {
   /** 解锁次数 */
   secretNum?: number;
   /** 详情id */
-  detailId?: number;
+  detailId?: string;
   /** 详情类型 */
   detailType?: DetailType;
   /** 是否已解锁 */
@@ -111,7 +111,7 @@ const props = withDefaults(defineProps<DetailInfoCellProps>(), {
   infos: null,
   exampleType: undefined,
   secretNum: -1,
-  detailId: -1,
+  detailId: '-1',
   detailType: DetailType.industrial,
   isUnlocked: false,
   tabIndex: -1,

src/components/detail/DetailMain.vue

@@ -71,7 +71,8 @@
           </div>
           <div class="mt-[68px]">
             <ContactInfo
-              :id="detail.id"
+              :id="detail.businessId"
+              :businessId="detail.businessId"
               :person-name="detail.contactPerson"
               :detail-type="type"
             ></ContactInfo>
@@ -116,7 +117,10 @@ export interface HeaderDetail {
   contactPerson: string;
   /** 联系电话 */
   contactPhone: string;
-  id: number;
+  /** 主键id */
+  id: string;
+  /** 业务id */
+  businessId: string;
   /** vr列表 */
   vrUrlList?: {
     /** vr封面 */

src/components/detail/MiniListItem.vue

@@ -30,7 +30,10 @@ export interface MiniDetail {
   imgUrl: string;
   name: string;
   info: string;
-  id: number;
+  /** 主键id */
+  id: string;
+  /** 业务id */
+  businessId: string;
   isVr?: number;
 }
 withDefaults(

src/components/detail/SecretInfo.vue

@@ -73,7 +73,7 @@ const props = withDefaults(
     /** 样例类型 */
     exampleType: ExampleType;
     limitNum: number;
-    detailId: number;
+    detailId: string;
     detailType: DetailType;
   }>(),
   {},
@@ -85,7 +85,7 @@ const appStore = useAppStore();
 const { request: unlock } = useRequest<
   any,
   {
-    businessId: number;
+    businessId: string;
     type: UnlockType;
   }
 >(RequestUrl.unlockInfo, {

src/composable/useListView.ts

@@ -11,7 +11,7 @@ import { useJump } from './useJump.ts';
 
 type CurrentUrl = RequestUrl | ShallowRef<{ target: RequestUrl }>;
 export function useListView<
-  T extends { id: number; [index: string]: any },
+  T extends { id: string; [index: string]: any },
   C extends Record<any, any> & { name?: string },
 >(url: CurrentUrl, specialParams: Ref<Record<string, any>> = {} as any) {
   const { open, router } = useJump();
@@ -98,7 +98,7 @@ export function useListView<
     open({
       name,
       query: {
-        id: item.id,
+        id: item.businessId,
       },
     });
   };

src/types/api/carrierDetail.ts

@@ -23,7 +23,9 @@ export interface CarrierDetailResp {
     /** 占地面积（单位：亩） */
     coverArea: number;
     /** 主键id */
-    id: number;
+    id: string;
+    /** 业务id */
+    businessId: string;
     /** 图片 */
     imgUrl: string;
     /** 总投资额（亿元） */
@@ -66,7 +68,9 @@ export interface CarrierDetailResp {
   /** 层数 */
   floorNumber: number;
   /** 主键id */
-  id: number;
+  id: string;
+  /** 业务id */
+  businessId: string;
   /** 轮播图 */
   imgUrls: string[];
   /** 招商信息 */

src/types/api/carrierList.ts

@@ -40,8 +40,10 @@ export interface CarrierListItem {
   cityCode: string;
   /** */
   cityName: string;
-  /** */
-  id: number;
+  /** 主键id */
+  id: string;
+  /** 业务id */
+  businessId: string;
   /** 首屏图片 */
   imgUrl: string;
   /** 载体类型 */

src/types/api/developZoneDetail.ts

@@ -46,7 +46,9 @@ export interface DevelopZoneDetailResp {
   /** 供暖单价（元/m³） */
   heatingPrice: string;
   /** 主键id */
-  id: number;
+  id: string;
+  /** 业务id */
+  businessId: string;
   /** 轮播图 */
   imgUrlList: string[];
   /** 工业用电（元/㎡/天） */
@@ -72,7 +74,9 @@ export interface DevelopZoneDetailResp {
     /** */
     cityName: string;
     /** id */
-    id: number;
+    id: string;
+    /** id */
+    businessId: string;
     /** 首屏图片 */
     imgUrl: string;
     /** */

src/types/api/developZoneList.ts

@@ -31,7 +31,9 @@ export interface DevelopZoneItem {
   /**	城市 */
   cityName: string;
   /** 主键id */
-  id: number;
+  id: string;
+  /** 业务id */
+  businessId: string;
   /** 图片链接 */
   imgUrl: string;
   /** 招商方向 */

src/types/api/industrialParkDetail.ts

@@ -63,7 +63,10 @@ export interface IndustrialParkDetailResp {
     /** 载体类型 */
     type: string;
     name: string;
-    id: number;
+    /** 主键id */
+    id: string;
+    /** 业务id */
+    businessId?: string;
   }[];
   /** 产业政策 */
   parkPolicy: ListInfo<Policy>[];
@@ -104,7 +107,9 @@ export interface IndustrialParkDetailResp {
   /** 用户解锁额度剩余次数 */
   limitNum: number;
   /** id */
-  id: number;
+  id: string;
+  /** businessId */
+  businessId: string;
   /** 是否已解锁 */
   isView: boolean;
   /** 供电类型 */

src/types/api/industrialParkList.ts

@@ -54,7 +54,9 @@ export interface IndustrialParkItem {
   // coverArea: number;
   coverArea: number;
   /** 主键id */
-  id: number;
+  id: string;
+  /** 业务id */
+  businessId: string;
   /** 图片链接 */
   imgUrl: string;
   /** 招商方向 */

src/types/api/landDetail.ts

@@ -54,7 +54,10 @@ export interface LandDetailResp {
     regionName: string;
     /** 类型 */
     type: string;
-    id: number;
+    /** 主键id */
+    id: string;
+    /** 业务id */
+    businessId: string;
     /** 纬度 */
     latitude: number;
     /** 经度 */

src/types/api/landList.ts

@@ -36,8 +36,10 @@ export interface LandListItem {
   cityCode: string;
   /** */
   cityName: string;
-  /** */
-  id: number;
+  /** 主键id */
+  id: string;
+  /** 业务id */
+  businessId: string;
   /** 首屏图片 */
   imgUrl: string;
   /** */

src/types/api/myParkDevelopDetail.ts

@@ -44,7 +44,9 @@ export interface MyParkDevelopDetailResp {
   /** 供暖单价（元/m³） */
   heatingPrice: string;
   /** 主键id */
-  id: number;
+  id: string;
+  /** 业务id */
+  businessId?: string;
   /** 轮播图 */
   imgUrlList: string[];
   /** 工业用电（元/㎡/天） */
@@ -93,7 +95,9 @@ export interface MyParkDevelopDetailResp {
     /** */
     holderType: string;
     /** id */
-    id: number;
+    id: string;
+    /** id */
+    businessId: string;
     /** 首屏图片 */
     imgUrl: string;
     /** 产业方向 */

src/types/api/myParkList.ts

@@ -35,7 +35,9 @@ export interface MyParkItem {
   /** 录入时间 */
   createTime: string;
   /** 主键id */
-  id: number;
+  id: string;
+  /** 业务id */
+  businessId?: string;
   /** 来源方式code */
   isSystem: number;
   /** 来源方式 */

src/types/api/policyList.ts

@@ -2,7 +2,10 @@
 export interface PolicyListItem {
   content: string;
   publishTime: string;
-  id: number;
+  /** 主键id */
+  id: string;
+  /** 业务id */
+  businessId: string;
   industryList: string;
   publisher: string;
   title: string;

src/views/carrier/CarrierDetail.vue

@@ -152,7 +152,7 @@ const carrierInfo = computed(() => {
 const toIndustrial = () => {
   open({
     query: {
-      id: detail.value?.carrierParkVo.id,
+      id: detail.value?.carrierParkVo.businessId,
     },
     path: RouteName.industrialParkDetail,
   });

src/views/develop/DevelopZoneDetail.vue

@@ -386,20 +386,20 @@ const toLandList = () => {
   });
 };
 
-const toIndustrialDetail = ({ id }: { id: string | number }) => {
+const toIndustrialDetail = ({ businessId }: { businessId: string | number }) => {
   open({
     name: RouteName.industrialParkDetail,
     query: {
-      id,
+      id: businessId,
     },
   });
 };
 
-const toLandDetail = ({ id }: { id: string | number }) => {
+const toLandDetail = ({ businessId }: { businessId: string | number }) => {
   open({
     name: RouteName.landDetail,
     query: {
-      id,
+      id: businessId,
     },
   });
 };

src/views/home/HomeView.vue

@@ -443,7 +443,7 @@ const handleDetail = (name: RouteName, item: any) => {
   open({
     name,
     query: {
-      id: item.id,
+      id: item.businessId,
     },
   });
 };

src/views/industrial-park/IndustrialParkDetail.vue

@@ -270,13 +270,14 @@ const enterprises = computed(() => {
 const carriers = computed<MiniDetail[]>(() => {
   if (detail.value) {
     return detail.value.parkCarrier.map((item) => {
-      const { imgUrl, type, area, name, id } = item;
+      const { imgUrl, type, area, name, id, businessId } = item;
       return {
         ...item,
         imgUrl,
         name,
         info: [area ? `${area}㎡` : '', type].filter(haveValue).join(' | '),
         id,
+        businessId,
       };
     });
   } else {
@@ -298,11 +299,11 @@ const toCarrierList = () => {
 /**
  * 载体详情
  */
-const toCarrierDetail = ({ id }: { id: number }) => {
+const toCarrierDetail = ({ businessId }: { businessId: number }) => {
   open({
     name: RouteName.carrierDetail,
     query: {
-      id,
+      id: businessId,
     },
   });
 };

src/views/industry/IndustryPolicyDetail.vue

@@ -55,7 +55,8 @@ const detail = ref<PolicyListItem>({
   publishTime: '',
   publisher: '',
   content: '',
-  id: 0,
+  id: '0',
+  businessId: '0',
   industryList: '',
 });
 onMounted(async () => {

src/views/land/LandDetail.vue

@@ -153,7 +153,7 @@ const toDevelop = () => {
   open({
     name: RouteName.developZoneDetail,
     query: {
-      id: detail.value?.development.id,
+      id: detail.value?.development.businessId,
     },
   });
 };