diff --git a/.env.development b/.env.development index dbba788..625e2f4 100644 --- a/.env.development +++ b/.env.development @@ -1,11 +1,11 @@ VITE_APP_NAME=后台管理系统 VITE_SOCKET_URL=wss://server.gxwebsoft.com -#VITE_SERVER_URL=https://server.gxwebsoft.com/api +VITE_SERVER_URL=https://server.gxwebsoft.com/api VITE_THINK_URL=https://gxtyzx-api.websoft.top/api VITE_API_URL=https://modules.gxwebsoft.com/api -VITE_SERVER_URL=http://127.0.0.1:30000/api +#VITE_SERVER_URL=http://127.0.0.1:30000/api #VITE_API_URL=http://127.0.0.1:9001/api #VITE_THINK_URL=http://127.0.0.1:9099/api #/booking/bookingItem diff --git a/src/api/cms/form-record/model/index.ts b/src/api/cms/form-record/model/index.ts index c8aa781..466aaf4 100644 --- a/src/api/cms/form-record/model/index.ts +++ b/src/api/cms/form-record/model/index.ts @@ -6,7 +6,12 @@ import type { PageParam } from '@/api'; export interface FormRecord { formRecordId?: number; formId?: number; + type?: string; name?: string; + phone?: string; + age?: number; + extra?: string; + dateTime?: string; formData?: string; formObj?: Object; userId?: number; diff --git a/src/api/index.ts b/src/api/index.ts index 9077748..33d2816 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -47,9 +47,9 @@ export interface PageParam { // 搜素关键词 keywords?: string; // 起始时间 - createTimeStart?: number; + createTimeStart?: string; // 结束时间 - createTimeEnd?: number; + createTimeEnd?: string; timeStart?: number; timeEnd?: number; isExpireTime?: number; diff --git a/src/api/system/website/field/index.ts b/src/api/system/website/field/index.ts index a0e4ceb..d71b76a 100644 --- a/src/api/system/website/field/index.ts +++ b/src/api/system/website/field/index.ts @@ -5,7 +5,7 @@ import type { WebsiteField, WebsiteFieldParam } from '@/api/cms/website/field/model'; -import { SERVER_API_URL } from '@/config/setting'; +import { MODULES_API_URL, SERVER_API_URL } from "@/config/setting"; /** * 分页查询项目参数 @@ -134,7 +134,7 @@ export async function checkExistence( */ export async function configWebsiteField(params?: WebsiteFieldParam) { const res = await request.get>( - SERVER_API_URL + '/cms/cms-website-field/config', + MODULES_API_URL + '/cms/website-field/config', { params } diff --git a/src/utils/common.ts b/src/utils/common.ts index dcd8a61..4bd64c9 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -66,9 +66,15 @@ export function openUrl(url: string, params?: any): void { * @param id 128 * @param d 项目数据 * 拼接规则: {域名}{path}?spm=c.{用户ID}.{租户ID}.{栏目ID}.{商品ID}.{timestamp}&token={token} + * @param onlyUrl * @return https:///websoft.top/product/detail/128.html?spm=c.5.3057.10005.undefined&token=DDkr1PpE9DouIVMjLEMt9733QsgG7oNV */ -export function openSpmUrl(path?: string, d?: any, id = 0): void { +export function openSpmUrl( + path?: string, + d?: any, + id = 0, + onlyUrl?: boolean +): any { // const domain = getSiteDomain(); const domain = localStorage.getItem('Domain'); const spm = ref(''); @@ -104,6 +110,10 @@ export function openSpmUrl(path?: string, d?: any, id = 0): void { return; } + if (onlyUrl == true) { + return `https://${domain}${path}${spm.value}`; + } + // TODO 开发环境 if (import.meta.env.DEV) { console.log('开发环境'); diff --git a/src/views/cms/form-record/components/search.vue b/src/views/cms/form-record/components/search.vue index 3545dc3..1808b1f 100644 --- a/src/views/cms/form-record/components/search.vue +++ b/src/views/cms/form-record/components/search.vue @@ -1,6 +1,30 @@