diff --git a/.env.dev b/.env.dev
index f970060..af2fe0a 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,7 +12,7 @@ VITE_ROUTER_BASE=/
VITE_ROUTER_HISTORY=hash
# api
-VITE_API_BASIC=https://zh.shibeitong.com
+VITE_API_BASIC=http://10.10.1.6:8070
VITE_API_HTTP=/api/v1/
# storage
VITE_STORAGE_NAMESPACE = gin-admin_local_
\ No newline at end of file
diff --git a/src/apis/modules/activity.js b/src/apis/modules/activity.js
index d098ddb..eff9327 100644
--- a/src/apis/modules/activity.js
+++ b/src/apis/modules/activity.js
@@ -12,3 +12,5 @@ export const createProject = (params) => request.basic.post('/api/v1/activities'
export const updateItem = (id, params) => request.basic.put(`/api/v1/activities/${id}`, params)
// 删除数据
export const delItem = (id) => request.basic.delete(`/api/v1/activities/${id}`)
+//获取活动报名列表
+export const getActivityList=(params)=>request.basic.get('/api/v1/activity-details',params)
\ No newline at end of file
diff --git a/src/assets/default.jpg b/src/assets/default.jpg
new file mode 100644
index 0000000..a68dc5c
Binary files /dev/null and b/src/assets/default.jpg differ
diff --git a/src/locales/lang/zh-CN/menu.js b/src/locales/lang/zh-CN/menu.js
index b151fd6..fd0d606 100644
--- a/src/locales/lang/zh-CN/menu.js
+++ b/src/locales/lang/zh-CN/menu.js
@@ -1,3 +1,5 @@
+
+
export default {
welcome: '欢迎',
home: '首页',
@@ -95,4 +97,5 @@ export default {
ycyllvs: '医疗绿色通道',
ycparentChild: '亲子权益',
ycbirth: '生日礼遇',
+ activityOrder:'活动报名列表'
}
diff --git a/src/router/routes/activity.js b/src/router/routes/activity.js
index 61c40d0..c17edfb 100644
--- a/src/router/routes/activity.js
+++ b/src/router/routes/activity.js
@@ -13,5 +13,18 @@ export default [
permission: '*',
}
+ },
+ {
+ path: 'activityOrder/index',
+ name: 'activityOrder',
+ component: 'activityOrder/index.vue',
+ meta: {
+ icon: CoffeeOutlined,
+ title: '活动报名列表',
+ isMenu: true,
+ keepAlive: true,
+ permission: '*',
+ }
+
},
]
diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
index 883c494..e12fe40 100644
--- a/src/views/activity/index.vue
+++ b/src/views/activity/index.vue
@@ -155,7 +155,7 @@ async function getPageList() {
const { success, data, total } = await apis.activity
.getProjectList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/activityOrder/index.vue b/src/views/activityOrder/index.vue
new file mode 100644
index 0000000..c78f4df
--- /dev/null
+++ b/src/views/activityOrder/index.vue
@@ -0,0 +1,217 @@
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+ {{ $t('button.reset') }}
+
+ {{ $t('button.search') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ record.createdAt && dayjs(record.createdAt).format('YYYY-MM-DD HH:mm') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无图片
+
+
+
+ {{ content }}
+
+
+
+
+
+
+
+
diff --git a/src/views/equite/aiya/index.vue b/src/views/equite/aiya/index.vue
index 3d85f21..b75cdc6 100644
--- a/src/views/equite/aiya/index.vue
+++ b/src/views/equite/aiya/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('aiya'),
...searchFormData.value,
diff --git a/src/views/equite/birth/index.vue b/src/views/equite/birth/index.vue
index 7ad3288..a7db602 100644
--- a/src/views/equite/birth/index.vue
+++ b/src/views/equite/birth/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('birth'),
...searchFormData.value,
diff --git a/src/views/equite/caizhai/index.vue b/src/views/equite/caizhai/index.vue
index 574ba0c..d2971ac 100644
--- a/src/views/equite/caizhai/index.vue
+++ b/src/views/equite/caizhai/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('menchuang'),
...searchFormData.value,
diff --git a/src/views/equite/fangchan/index.vue b/src/views/equite/fangchan/index.vue
index 33f689a..21be194 100644
--- a/src/views/equite/fangchan/index.vue
+++ b/src/views/equite/fangchan/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('jdnk'),
...searchFormData.value,
diff --git a/src/views/equite/hotel/index.vue b/src/views/equite/hotel/index.vue
index da8204d..953875e 100644
--- a/src/views/equite/hotel/index.vue
+++ b/src/views/equite/hotel/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('hotel'),
...searchFormData.value,
diff --git a/src/views/equite/jiazhuang/index.vue b/src/views/equite/jiazhuang/index.vue
index 5409763..c8fad29 100644
--- a/src/views/equite/jiazhuang/index.vue
+++ b/src/views/equite/jiazhuang/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('jiazhuang'),
...searchFormData.value,
diff --git a/src/views/equite/kangyang/index.vue b/src/views/equite/kangyang/index.vue
index 4875f00..13f3ab9 100644
--- a/src/views/equite/kangyang/index.vue
+++ b/src/views/equite/kangyang/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('kangyang'),
...searchFormData.value,
diff --git a/src/views/equite/life/index.vue b/src/views/equite/life/index.vue
index 9737ac6..88492e2 100644
--- a/src/views/equite/life/index.vue
+++ b/src/views/equite/life/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('life'),
...searchFormData.value,
diff --git a/src/views/equite/lvyou/index.vue b/src/views/equite/lvyou/index.vue
index d21a1aa..580212d 100644
--- a/src/views/equite/lvyou/index.vue
+++ b/src/views/equite/lvyou/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('lvyou'),
...searchFormData.value,
diff --git a/src/views/equite/parentChild/index.vue b/src/views/equite/parentChild/index.vue
index ec416b4..d1e6880 100644
--- a/src/views/equite/parentChild/index.vue
+++ b/src/views/equite/parentChild/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('parentchild'),
...searchFormData.value,
diff --git a/src/views/equite/quanwu/index.vue b/src/views/equite/quanwu/index.vue
index 8c2b7c9..480b0ac 100644
--- a/src/views/equite/quanwu/index.vue
+++ b/src/views/equite/quanwu/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('quanwu'),
...searchFormData.value,
diff --git a/src/views/equite/yllvs/index.vue b/src/views/equite/yllvs/index.vue
index 522e2d1..e5f132b 100644
--- a/src/views/equite/yllvs/index.vue
+++ b/src/views/equite/yllvs/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('yllvs'),
...searchFormData.value,
diff --git a/src/views/integral/ integraList/index.vue b/src/views/integral/ integraList/index.vue
index 4d4deae..348faae 100644
--- a/src/views/integral/ integraList/index.vue
+++ b/src/views/integral/ integraList/index.vue
@@ -158,7 +158,7 @@ async function getPageList() {
const { success, data, total } = await apis.role
.getRoleList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/integral/integraLevelList/index.vue b/src/views/integral/integraLevelList/index.vue
index 4d4deae..348faae 100644
--- a/src/views/integral/integraLevelList/index.vue
+++ b/src/views/integral/integraLevelList/index.vue
@@ -158,7 +158,7 @@ async function getPageList() {
const { success, data, total } = await apis.role
.getRoleList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/integral/points/index.vue b/src/views/integral/points/index.vue
index 43ffe73..89d7a7c 100644
--- a/src/views/integral/points/index.vue
+++ b/src/views/integral/points/index.vue
@@ -1,5 +1,5 @@
-
+
@@ -62,6 +62,7 @@ defineOptions({
const { t } = useI18n() // 解构出t方法
const columns = [
{ title: '客户姓名', dataIndex: 'customerName', align: 'center',width:120 },
+ { title: '客户手机', dataIndex: 'customerPhone', align: 'center',width:120 },
{ title: '变动前积分', dataIndex: 'before', align: 'center',width:100 },
{ title: '变动后积分', dataIndex: 'before', align: 'center',width:100 },
{ title: '变动积分', dataIndex: 'change', align: 'center',width:100 },
@@ -85,7 +86,7 @@ async function getPageList() {
const { success, data, total } = await apis.points
.getProjectList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/list/basic/index.vue b/src/views/list/basic/index.vue
index 6796e34..3f3f19d 100644
--- a/src/views/list/basic/index.vue
+++ b/src/views/list/basic/index.vue
@@ -143,7 +143,7 @@ async function getPageList() {
const { code, data } = await apis.common
.getPageList({
pageSize,
- page: current,
+ current: current,
})
.catch(() => {
throw new Error()
diff --git a/src/views/list/card/index.vue b/src/views/list/card/index.vue
index f2dd73c..13704af 100644
--- a/src/views/list/card/index.vue
+++ b/src/views/list/card/index.vue
@@ -115,7 +115,7 @@ async function getPageList() {
const { code, data } = await apis.common
.getPageList({
pageSize,
- page: current,
+ current: current,
})
.catch(() => {
throw new Error()
diff --git a/src/views/list/search/applications/index.vue b/src/views/list/search/applications/index.vue
index 0f1b065..77f455f 100644
--- a/src/views/list/search/applications/index.vue
+++ b/src/views/list/search/applications/index.vue
@@ -147,7 +147,7 @@ async function getPageList() {
const { code, data } = await apis.common
.getPageList({
pageSize,
- page: current,
+ current: current,
})
.catch(() => {
throw new Error()
diff --git a/src/views/list/search/articles/index.vue b/src/views/list/search/articles/index.vue
index 34f8f8d..82df802 100644
--- a/src/views/list/search/articles/index.vue
+++ b/src/views/list/search/articles/index.vue
@@ -154,7 +154,7 @@ async function getPageList() {
const { code, data } = await apis.common
.getPageList({
pageSize,
- page: current,
+ current: current,
})
.catch(() => {
throw new Error()
diff --git a/src/views/list/search/projects/index.vue b/src/views/list/search/projects/index.vue
index ed0752b..ae361e2 100644
--- a/src/views/list/search/projects/index.vue
+++ b/src/views/list/search/projects/index.vue
@@ -131,7 +131,7 @@ async function getPageList() {
const { code, data } = await apis.common
.getPageList({
pageSize,
- page: current,
+ current: current,
})
.catch(() => {
throw new Error()
diff --git a/src/views/list/table/index.vue b/src/views/list/table/index.vue
index b7ca7e8..4f57d0e 100644
--- a/src/views/list/table/index.vue
+++ b/src/views/list/table/index.vue
@@ -194,7 +194,7 @@ async function getPageList() {
const { code, data } = await apis.common
.getPageList({
pageSize,
- page: current,
+ current: current,
})
.catch(() => {
throw new Error()
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index b91d2ea..f365b8f 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -90,7 +90,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrders
.getProjectList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/prizeDraw/lotteryOrders/index.vue b/src/views/prizeDraw/lotteryOrders/index.vue
index 2123596..a43965b 100644
--- a/src/views/prizeDraw/lotteryOrders/index.vue
+++ b/src/views/prizeDraw/lotteryOrders/index.vue
@@ -82,7 +82,7 @@ async function getPageList() {
const { success, data, total } = await apis.raffleProduct
.getRaffleOrders({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/prizeDraw/lotteryProduct/index.vue b/src/views/prizeDraw/lotteryProduct/index.vue
index f6255bd..55c7a84 100644
--- a/src/views/prizeDraw/lotteryProduct/index.vue
+++ b/src/views/prizeDraw/lotteryProduct/index.vue
@@ -110,7 +110,7 @@ async function getPageList() {
const { success, data, total } = await apis.raffleProduct
.getProjectList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/prizeDraw/lotteryRules/index.vue b/src/views/prizeDraw/lotteryRules/index.vue
index 0e8cb6e..24b9852 100644
--- a/src/views/prizeDraw/lotteryRules/index.vue
+++ b/src/views/prizeDraw/lotteryRules/index.vue
@@ -117,7 +117,7 @@ async function getPageList() {
const { success, data, total } = await apis.raffles
.getProjectList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/regional/hoseBookList/index.vue b/src/views/regional/hoseBookList/index.vue
index 0013702..01c9903 100644
--- a/src/views/regional/hoseBookList/index.vue
+++ b/src/views/regional/hoseBookList/index.vue
@@ -128,7 +128,7 @@ async function getPageList() {
const { success, data, total } = await apis.houseArticles
.getProjectList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/regional/houseList/components/EditDialog.vue b/src/views/regional/houseList/components/EditDialog.vue
index 3b55967..c7efb9a 100644
--- a/src/views/regional/houseList/components/EditDialog.vue
+++ b/src/views/regional/houseList/components/EditDialog.vue
@@ -43,7 +43,8 @@
-
+
@@ -99,10 +100,9 @@
-
+
-
+
@@ -113,8 +113,8 @@
-
+
@@ -289,16 +289,14 @@
v-model:value="formData.greeningRate">
-
+
-
+
-
+
-
+
@@ -340,6 +338,10 @@
+
+
+
@@ -358,7 +360,7 @@ import { useI18n } from 'vue-i18n'
import { PlusOutlined, MinusOutlined, SettingOutlined } from '@ant-design/icons-vue';
import dayjs from 'dayjs'
import { customersEnum, areaEnum } from "@/enums/useEnum"
-import {spliceUrl} from "@/utils/util.js"
+import { spliceUrl } from "@/utils/util.js"
const emit = defineEmits(['ok'])
const { t } = useI18n() // 解构出t方法
const { modal, showModal, hideModal, showLoading, hideLoading } = useModal()
@@ -417,10 +419,10 @@ async function handleEdit(record = {}) {
}
hideSpining()
formData.value = {
- id:data.id,
+ id: data.id,
address: data.address,
areaId: data.areaId,//所属区域
- imgList: data.images?data.images.map(item => config('http.apiBasic') + item):[],
+ imgList: data.images ? data.images.map(item => config('http.apiBasic') + item) : [],
labels: data.labels,
latitude: data.latitude,
longitude: data.longitude,
@@ -429,23 +431,24 @@ async function handleEdit(record = {}) {
openAt: data.openAt,
price: data.price,
status: data.status,
- basicArea:data.area,
+ basicArea: data.area,
+ disclaimerContain: data.disclaimerContain,
title: data.title,
- videos: data.videos? data.videos.map(item => config('http.apiBasic') + item):[],
- advisers: data.advisers?data.advisers.map(item=>({adviserName:item.name,adviserPhone:item.phone,adviserImg:item.avatar?[config('http.apiBasic')+item.avatar]:[]})):[{ adviserName: '', adviserPhone: '', adviserImg: [] },
- { adviserName: '', adviserPhone: '', adviserImg: [] },
- { adviserName: '', adviserPhone: '', adviserImg: [] },],
+ videos: data.videos ? data.videos.map(item => config('http.apiBasic') + item) : [],
+ advisers: data.advisers ? data.advisers.map(item => ({ adviserName: item.name, adviserPhone: item.phone, adviserImg: item.avatar ? [config('http.apiBasic') + item.avatar] : [] })) : [{ adviserName: '', adviserPhone: '', adviserImg: [] },
+ { adviserName: '', adviserPhone: '', adviserImg: [] },
+ { adviserName: '', adviserPhone: '', adviserImg: [] },],
address: data.detail.basicInfo.address,
houseArea: data.detail.basicInfo.area,
buildingarea: data.detail.basicInfo.buildingarea,
showAddress: data.detail.basicInfo.showAddress,
- daiShowStatus:data.detail.basicInfo.status,
+ daiShowStatus: data.detail.basicInfo.status,
type: data.detail.basicInfo.type,
louPanStatus: data.detail.salesInfo.status,
duration: data.detail.salesInfo.duration,
salesType: data.detail.salesInfo.salesType,
salesPhone: data.detail.salesInfo.salesPhone,
- salesAddress:data.detail.salesInfo.salesAddress,
+ salesAddress: data.detail.salesInfo.salesAddress,
greeningRate: data.detail.communityInfo.greeningRate,
packingNum: data.detail.communityInfo.packingNum,
propertyName: data.detail.communityInfo.propertyName,
@@ -455,16 +458,16 @@ async function handleEdit(record = {}) {
r19010Ratio: data.detail.communityInfo.r19010Ratio,
r19011Ratio: data.detail.communityInfo.r19011Ratio,
roomNum: data.detail.communityInfo.roomNum,
- carRatio:data.detail.communityInfo.carRatio,
- ratio:data.detail.communityInfo.ratio,
- layOuts: data.layOuts ? data.layOuts.map(item => ({ area: item.area, direction: item.direction, layImgList: item.img?[config('http.apiBasic') + item.img]:[], price: item.price, title: item.title })):[{ area: '', price: '', direction: '', title: '', layImgList: [] },
- { area: '', price: '', direction: '', title: '', layImgList: [] },
- { area: '', price: '', direction: '', title: '', layImgList: [] },],
- busNum: data.surroundings&&data.surroundings.busNum,
- hospitalNum: data.surroundings&&data.surroundings.hospitalNum,
- lifeNum: data.surroundings&&data.surroundings.lifeNum,
- metroNum: data.surroundings&&data.surroundings.metroNum,
- schoolNum: data.surroundings&&data.surroundings.schoolNum,
+ carRatio: data.detail.communityInfo.carRatio,
+ ratio: data.detail.communityInfo.ratio,
+ layOuts: data.layOuts ? data.layOuts.map(item => ({ area: item.area, direction: item.direction, layImgList: item.img ? [config('http.apiBasic') + item.img] : [], price: item.price, title: item.title })) : [{ area: '', price: '', direction: '', title: '', layImgList: [] },
+ { area: '', price: '', direction: '', title: '', layImgList: [] },
+ { area: '', price: '', direction: '', title: '', layImgList: [] },],
+ busNum: data.surroundings && data.surroundings.busNum,
+ hospitalNum: data.surroundings && data.surroundings.hospitalNum,
+ lifeNum: data.surroundings && data.surroundings.lifeNum,
+ metroNum: data.surroundings && data.surroundings.metroNum,
+ schoolNum: data.surroundings && data.surroundings.schoolNum,
}
} catch (error) {
message.error({ content: error.message })
@@ -484,7 +487,7 @@ function handleOk() {
address: formData.value.address,
areaId: formData.value.areaId,//所属区域
cover: formData.value.imgList && spliceUrl(formData.value.imgList[0]),
- images: formData.value.imgList && formData.value.imgList.map(item=>spliceUrl(item)),
+ images: formData.value.imgList && formData.value.imgList.map(item => spliceUrl(item)),
labels: formData.value.labels,
latitude: formData.value.latitude,
longitude: formData.value.longitude,
@@ -494,9 +497,10 @@ function handleOk() {
price: formData.value.price,
status: formData.value.status,
title: formData.value.title,
- area:formData.value.basicArea,
- videos: formData.value.videos&&formData.value.videos.map(item=>spliceUrl(item)),
- advisers: formData.value.advisers&&formData.value.advisers.map(item=>({name:item.adviserName,phone:item.adviserPhone,avatar:item.adviserImg[0]&&spliceUrl(item.adviserImg[0])})),
+ area: formData.value.basicArea,
+ disclaimerContain: formData.value.disclaimerContain,
+ videos: formData.value.videos && formData.value.videos.map(item => spliceUrl(item)),
+ advisers: formData.value.advisers && formData.value.advisers.map(item => ({ name: item.adviserName, phone: item.adviserPhone, avatar: item.adviserImg[0] && spliceUrl(item.adviserImg[0]) })),
detail: {
basicInfo: {
address: formData.value.address,//楼盘地址
@@ -524,11 +528,11 @@ function handleOk() {
r19010Ratio: formData.value.r19010Ratio,
r19011Ratio: formData.value.r19011Ratio,
roomNum: formData.value.roomNum,
- carRatio:formData.value.carRatio,
- ratio:formData.value.ratio
+ carRatio: formData.value.carRatio,
+ ratio: formData.value.ratio
}
},
- layOuts: formData.value.layOuts && formData.value.layOuts.map(item => ({ area: item.area, direction: item.direction, img: item.layImgList[0]&&spliceUrl(item.layImgList[0]), price: item.price, title: item.title })),
+ layOuts: formData.value.layOuts && formData.value.layOuts.map(item => ({ area: item.area, direction: item.direction, img: item.layImgList[0] && spliceUrl(item.layImgList[0]), price: item.price, title: item.title })),
surroundings: {
busNum: formData.value.busNum,
hospitalNum: formData.value.hospitalNum,
@@ -546,7 +550,7 @@ function handleOk() {
})
break
case 'edit':
-
+
result = await apis.house.updateItem(formData.value.id, params).catch(() => {
console.log(error.message)
throw new Error(error)
@@ -580,6 +584,12 @@ const addLabel = () => {
const removeLabel = (index) => {
formData.value.labels.splice(index, 1);
};
+const uploadHandler = async (file) => {
+ const formData = new FormData();
+ formData.append('file', file);
+ const { data } = await apis.common.uploadImg(formData);
+ return config('http.apiBasic') + data
+}
/**
* 取消
*/
@@ -606,8 +616,8 @@ const addLayout = () => {
formData.value.layOuts.push(params)
}
//新增顾问
-const addAdviser=()=>{
- const params={ adviserName: '', adviserPhone: '', adviserImg: [] }
+const addAdviser = () => {
+ const params = { adviserName: '', adviserPhone: '', adviserImg: [] }
formData.value.advisers.push(params)
}
//删除户型
diff --git a/src/views/regional/houseList/index.vue b/src/views/regional/houseList/index.vue
index fc6f2c3..4c01e37 100644
--- a/src/views/regional/houseList/index.vue
+++ b/src/views/regional/houseList/index.vue
@@ -106,7 +106,7 @@ async function getPageList() {
const { success, data, total } = await apis.house
.getProjectList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/regional/houseProduct/index.vue b/src/views/regional/houseProduct/index.vue
index 20779a6..4175464 100644
--- a/src/views/regional/houseProduct/index.vue
+++ b/src/views/regional/houseProduct/index.vue
@@ -46,7 +46,7 @@
-
+
{{ dayjs(record.startAt).format('YYYY-MM-DD HH:mm:ss') }}
@@ -59,11 +59,11 @@
否
-
+
{{ $t('pages.system.user.edit') }}
-
+
{{ $t('pages.system.delete') }}
@@ -124,7 +124,7 @@ async function getPageList() {
const { success, data, total } = await apis.houseProduct
.getProjectList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/regional/productExChange/index.vue b/src/views/regional/productExChange/index.vue
index 6e0924e..3560669 100644
--- a/src/views/regional/productExChange/index.vue
+++ b/src/views/regional/productExChange/index.vue
@@ -91,7 +91,7 @@ async function getPageList() {
const { success, data, total } = await apis.companyProductOrders
.getProjectList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/regional/projectList/index.vue b/src/views/regional/projectList/index.vue
index 9016b5d..91ccc82 100644
--- a/src/views/regional/projectList/index.vue
+++ b/src/views/regional/projectList/index.vue
@@ -123,7 +123,7 @@ async function getPageList() {
const { success, data, total } = await apis.project
.getProjectList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/regional/regionalList/index.vue b/src/views/regional/regionalList/index.vue
index e503f19..d80fa8c 100644
--- a/src/views/regional/regionalList/index.vue
+++ b/src/views/regional/regionalList/index.vue
@@ -105,7 +105,7 @@ async function getPageList() {
const { success, data, total } = await apis.area
.getProjectList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index f7041a6..91bc754 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -107,7 +107,7 @@ async function getPageList() {
const { code, data } = await apis.common
.getPageList({
pageSize,
- page: current,
+ current: current,
})
.catch(() => {
throw new Error()
diff --git a/src/views/system/logger/index.vue b/src/views/system/logger/index.vue
index 53f735e..218f439 100644
--- a/src/views/system/logger/index.vue
+++ b/src/views/system/logger/index.vue
@@ -162,7 +162,7 @@ async function getPageList() {
const { success, data, total } = await apis.system
.getLoggers({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
startTime: startTime.value,
endTime: endTime.value,
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 4d4deae..348faae 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -158,7 +158,7 @@ async function getPageList() {
const { success, data, total } = await apis.role
.getRoleList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 6fbbcb0..7e0fccf 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -153,7 +153,7 @@ async function getPageList() {
const { success, data, total } = await apis.users
.getUsersList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/userManagement/allList/index.vue b/src/views/userManagement/allList/index.vue
index 2c765dd..4903ce6 100644
--- a/src/views/userManagement/allList/index.vue
+++ b/src/views/userManagement/allList/index.vue
@@ -46,7 +46,7 @@
-
+
{{ customersEnum.getName(record.type) }}
@@ -92,6 +92,7 @@ import { customersEnum, areaEnum } from "@/enums/useEnum"
import EditDialog from './components/EditDialog.vue'
import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue'
import { useI18n } from 'vue-i18n'
+import defaultAvatar from '@/assets/default.jpg'
defineOptions({
name: 'allCustomerList',
})
@@ -125,7 +126,7 @@ async function getPageList() {
const { success, data, total } = await apis.customer
.getProjectList({
pageSize,
- page: current,
+ current: current,
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/userManagement/clientList/index.vue b/src/views/userManagement/clientList/index.vue
index e3d1d06..3c1933e 100644
--- a/src/views/userManagement/clientList/index.vue
+++ b/src/views/userManagement/clientList/index.vue
@@ -46,7 +46,8 @@
-
+
+
{{ customersEnum.getName(record.type) }}
@@ -125,7 +126,7 @@ async function getPageList() {
const { success, data, total } = await apis.customer
.getProjectList({
pageSize,
- page: current,
+ current: current,
type:'owner',
...searchFormData.value,
})
diff --git a/src/views/userManagement/intermediaryAgentList/index.vue b/src/views/userManagement/intermediaryAgentList/index.vue
index a5a15a7..742cf73 100644
--- a/src/views/userManagement/intermediaryAgentList/index.vue
+++ b/src/views/userManagement/intermediaryAgentList/index.vue
@@ -44,9 +44,9 @@
-
-
+
+
{{ customersEnum.getName(record.type) }}
@@ -125,7 +125,7 @@ async function getPageList() {
const { success, data, total } = await apis.customer
.getProjectList({
pageSize,
- page: current,
+ current: current,
type:'intermediary',
...searchFormData.value,
})
diff --git a/src/views/userManagement/potentialclientsList/index.vue b/src/views/userManagement/potentialclientsList/index.vue
index a3fb565..34b4421 100644
--- a/src/views/userManagement/potentialclientsList/index.vue
+++ b/src/views/userManagement/potentialclientsList/index.vue
@@ -46,7 +46,8 @@
-
+
+
{{ customersEnum.getName(record.type) }}
@@ -125,7 +126,7 @@ async function getPageList() {
const { success, data, total } = await apis.customer
.getProjectList({
pageSize,
- page: current,
+ current: current,
type:'closer',
...searchFormData.value,
})
diff --git a/src/views/userManagement/tourList/index.vue b/src/views/userManagement/tourList/index.vue
index bb7165e..48075b5 100644
--- a/src/views/userManagement/tourList/index.vue
+++ b/src/views/userManagement/tourList/index.vue
@@ -46,7 +46,8 @@
-
+
+
{{ customersEnum.getName(record.type) }}
@@ -92,6 +93,7 @@ import { customersEnum, areaEnum } from "@/enums/useEnum"
import EditDialog from './components/EditDialog.vue'
import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue'
import { useI18n } from 'vue-i18n'
+import defaultAvatar from '@/assets/default.jpg'
defineOptions({
name: 'visitor',
})
@@ -125,7 +127,7 @@ async function getPageList() {
const { success, data, total } = await apis.customer
.getProjectList({
pageSize,
- page: current,
+ current: current,
type:'visitor',
...searchFormData.value,
})
diff --git a/src/views/ycequite/ycbirth/index.vue b/src/views/ycequite/ycbirth/index.vue
index eee0bb6..ab03bb6 100644
--- a/src/views/ycequite/ycbirth/index.vue
+++ b/src/views/ycequite/ycbirth/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('ycbirth'),
...searchFormData.value,
diff --git a/src/views/ycequite/ycfwjbj/index.vue b/src/views/ycequite/ycfwjbj/index.vue
index c3d40e5..6cc9dc9 100644
--- a/src/views/ycequite/ycfwjbj/index.vue
+++ b/src/views/ycequite/ycfwjbj/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('ycfwjbj'),
...searchFormData.value,
diff --git a/src/views/ycequite/ycjd/index.vue b/src/views/ycequite/ycjd/index.vue
index 6bf6417..d70f3e6 100644
--- a/src/views/ycequite/ycjd/index.vue
+++ b/src/views/ycequite/ycjd/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('ycjd'),
...searchFormData.value,
diff --git a/src/views/ycequite/ycjztg/index.vue b/src/views/ycequite/ycjztg/index.vue
index c86b595..06e7dd9 100644
--- a/src/views/ycequite/ycjztg/index.vue
+++ b/src/views/ycequite/ycjztg/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('ycjztg'),
...searchFormData.value,
diff --git a/src/views/ycequite/ycmcby/index.vue b/src/views/ycequite/ycmcby/index.vue
index 90e8042..71f841f 100644
--- a/src/views/ycequite/ycmcby/index.vue
+++ b/src/views/ycequite/ycmcby/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('ycmcby'),
...searchFormData.value,
diff --git a/src/views/ycequite/ycparentChild/index.vue b/src/views/ycequite/ycparentChild/index.vue
index fac6143..b807ce2 100644
--- a/src/views/ycequite/ycparentChild/index.vue
+++ b/src/views/ycequite/ycparentChild/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('ycparentchild'),
...searchFormData.value,
diff --git a/src/views/ycequite/ycqw/index.vue b/src/views/ycequite/ycqw/index.vue
index 7dbc299..efcd551 100644
--- a/src/views/ycequite/ycqw/index.vue
+++ b/src/views/ycequite/ycqw/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('ycqw'),
...searchFormData.value,
diff --git a/src/views/ycequite/ycqwsc/index.vue b/src/views/ycequite/ycqwsc/index.vue
index d66efa7..7ebd47c 100644
--- a/src/views/ycequite/ycqwsc/index.vue
+++ b/src/views/ycequite/ycqwsc/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('ycqwsc'),
...searchFormData.value,
diff --git a/src/views/ycequite/ycxwybm/index.vue b/src/views/ycequite/ycxwybm/index.vue
index d7a87e8..475c9a1 100644
--- a/src/views/ycequite/ycxwybm/index.vue
+++ b/src/views/ycequite/ycxwybm/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('ycxwybm'),
...searchFormData.value,
diff --git a/src/views/ycequite/ycyllvs/index.vue b/src/views/ycequite/ycyllvs/index.vue
index 2c2290f..37abb8f 100644
--- a/src/views/ycequite/ycyllvs/index.vue
+++ b/src/views/ycequite/ycyllvs/index.vue
@@ -96,7 +96,7 @@ async function getPageList() {
const { success, data, total } = await apis.productOrder
.getProjectList({
pageSize,
- page: current,
+ current: current,
channel: 'product',
productId: equiteEnum.getValue('ycyllvs'),
...searchFormData.value,