diff --git a/src/api/manage/activity/types.ts b/src/api/manage/activity/types.ts index f0afb18..36d4f61 100644 --- a/src/api/manage/activity/types.ts +++ b/src/api/manage/activity/types.ts @@ -8,7 +8,7 @@ export interface ActivityVO { * 活动名称 */ activityName: string; - + activityId: string | number; /** * 活动描述 */ @@ -83,7 +83,6 @@ export interface ActivityVO { * 操作时间 */ updateTime: string; - } export interface ActivityForm extends BaseEntity { @@ -151,16 +150,14 @@ export interface ActivityForm extends BaseEntity { * 发布状态 0-未发布 1-审核中 2-发布 */ status?: string; - } export interface ActivityQuery extends PageQuery { - /** * 活动名称 */ activityName?: string; - + activityId?: string | number; /** * 活动描述 */ @@ -216,11 +213,8 @@ export interface ActivityQuery extends PageQuery { */ status?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } - - - diff --git a/src/api/manage/dyUser/types.ts b/src/api/manage/dyUser/types.ts index f8ba73e..3c98e9f 100644 --- a/src/api/manage/dyUser/types.ts +++ b/src/api/manage/dyUser/types.ts @@ -47,7 +47,7 @@ export interface DyUserVO { /** * 会员等级 */ - leveId: string | number; + levelId: string | number; /** * 生日 @@ -154,7 +154,7 @@ export interface DyUserForm extends BaseEntity { /** * 会员等级 */ - leveId?: string | number; + levelId?: string | number; /** * 生日 @@ -251,7 +251,7 @@ export interface DyUserQuery extends PageQuery { /** * 会员等级 */ - leveId?: string | number; + levelId?: string | number; /** * 生日 diff --git a/src/components/partyList/index.vue b/src/components/partyList/index.vue index e5788e5..1bf2821 100644 --- a/src/components/partyList/index.vue +++ b/src/components/partyList/index.vue @@ -26,7 +26,7 @@ @@ -87,12 +87,46 @@ + + + + + + +
+
+
+
+
Q:{{ item.declaration }}
+
{{ item.quserName }}      {{ item.createTime }} +
+
+
A:{{ item.answer }}
+
+
+ +
+
+ +
+ + diff --git a/src/views/manage/articleManage/index.vue b/src/views/manage/articleManage/index.vue index 0cf2482..e87b4df 100644 --- a/src/views/manage/articleManage/index.vue +++ b/src/views/manage/articleManage/index.vue @@ -99,7 +99,8 @@ - + @@ -286,6 +287,11 @@ const handleUpdate = async (row?:any) => { dialog.visible = true; dialog.title = "修改文章"; } +const getTagList = async (visible: boolean) => { + if (visible) { + getTag(); //标签库 + } +} /** * * @param row 发布，撤销发布 @@ -319,6 +325,8 @@ const submitForm = () => { proxy?.$modal.msgSuccess("操作成功"); dialog.visible = false; await getList(); + }else{ + proxy?.$modal.msgError("缺少必填项"); } }); } diff --git a/src/views/manage/dyUser/index.vue b/src/views/manage/dyUser/index.vue index a9bb3ab..2ebc449 100644 --- a/src/views/manage/dyUser/index.vue +++ b/src/views/manage/dyUser/index.vue @@ -24,10 +24,10 @@ - - - + @@ -131,19 +131,24 @@ @click="openPostcardListDialog(scope.row)">{{ scope.row.postcardCount }} - + - + + + - + @@ -311,6 +316,23 @@ + + + + + + + + + + + @@ -358,7 +380,7 @@ const initFormData: DyUserForm = { loginIp: undefined, loginDate: undefined, remark: undefined, - leveId: undefined, + levelId: undefined, birthday: undefined, age: undefined, address: undefined, @@ -383,7 +405,7 @@ const data = reactive>({ status: undefined, loginIp: undefined, loginDate: undefined, - leveId: undefined, + levelId: undefined, birthday: undefined, age: undefined, address: undefined, @@ -451,6 +473,8 @@ const cancel = () => { inviteListDialog.params.pageNum = 1; orderListDialog.visible = false; orderListDialog.params.pageNum = 1; + obtainedItemsDialog.visible = false; + obtainedItemsDialog.params.pageNum = 1; }; /** 表单重置 */ @@ -554,7 +578,8 @@ const openNoteListDialog = async (row?: any) => { if (row.id) { noteListDialog.params.userId = row?.id; } - let res = await listNotebook(noteListDialog.params); + loading.value = true; + let res = await listNotebook(noteListDialog.params).finally(()=>{loading.value = false}); noteListDialog.articleList=res.rows; noteListDialog.total=res.total; noteListDialog.visible = true; @@ -577,7 +602,8 @@ const openPartyListDialog = async (row: any) => { if (row.id) { partyListDialog.params.userId = row?.id; } - let res = await listActivity(partyListDialog.params); + loading.value = true; + let res = await listActivity(partyListDialog.params).finally(()=>{loading.value = false});; partyListDialog.partyList = res.rows; partyListDialog.total = res.total; partyListDialog.visible = true; @@ -603,7 +629,8 @@ const openScenicListDialog = async (row: DyUserVO) => { if (row.id) { scenicListDialog.params.userId = row?.id; } - let res = await userSights(scenicListDialog.params); + loading.value = true; + let res = await userSights(scenicListDialog.params).finally(()=>{loading.value = false});; scenicListDialog.scenicList = res.rows; scenicListDialog.total = res.total; scenicListDialog.visible = true; @@ -629,7 +656,8 @@ const openCityListDialog = async (row: DyUserVO) => { if (row.id) { cityListDialog.params.userId = row?.id; } - let res = await userCity(cityListDialog.params); + loading.value = true; + let res = await userCity(cityListDialog.params).finally(()=>{loading.value = false});; cityListDialog.cityList = res.rows; cityListDialog.total = res.total; cityListDialog.visible = true; @@ -652,7 +680,8 @@ const openPostcardListDialog = async (row: DyUserVO) => { if (row.id) { postcardListDialog.params.userId = row?.id; } - let res = await userPostcard(postcardListDialog.params); + loading.value = true; + let res = await userPostcard(postcardListDialog.params).finally(()=>{loading.value = false});; postcardListDialog.postcardList = res.rows; postcardListDialog.total = res.total; postcardListDialog.visible = true; @@ -675,12 +704,37 @@ const openOrderListDialog = async (row: DyUserVO) => { if (row.id) { orderListDialog.params.userId = row?.id; } - let res = await userOrders(orderListDialog.params); + loading.value = true; + let res = await userOrders(orderListDialog.params).finally(()=>{loading.value = false});; orderListDialog.postcardList = res.rows; orderListDialog.total = res.total; orderListDialog.visible = true; orderListDialog.visible = true; }; +/** + * 获得的物品 + */ +const obtainedItemsDialog = reactive({ + visible: false, + total: 0, + obtainedList: [], + params: { + userId: null, + pageNum: 1, + pageSize: 10, + }, +}) +const openObtainedItemsListDialog = async (row: DyUserVO) => { + if (row.id) { + obtainedItemsDialog.params.userId = row?.id; + } + loading.value = true; + let res = await userOrders(obtainedItemsDialog.params).finally(()=>{loading.value = false});; + obtainedItemsDialog.obtainedList = res.rows; + obtainedItemsDialog.total = res.total; + obtainedItemsDialog.visible = true; + obtainedItemsDialog.visible = true; +}; /** * 用户邀请列表 */ @@ -698,7 +752,8 @@ const openInviteListDialog = async (row: DyUserVO) => { if (row.id) { inviteListDialog.params.userId = row?.id; } - let res = await userInvite(inviteListDialog.params); + loading.value = true; + let res = await userInvite(inviteListDialog.params).finally(()=>{loading.value = false});; inviteListDialog.inviteList = res.rows; inviteListDialog.total = res.total; inviteListDialog.visible = true; diff --git a/src/views/manage/scenic/index.vue b/src/views/manage/scenic/index.vue index b3104d7..6d70777 100644 --- a/src/views/manage/scenic/index.vue +++ b/src/views/manage/scenic/index.vue @@ -262,7 +262,7 @@ @@ -674,7 +674,8 @@ const performSearch = async (text) => { data.result.address_components.city + data.result.address_components.district + data.result.address_components.street + - data.result.address_components.street_number; + data.result.address_components.street_number+ + data.result.title; form.value.latitude = data.result.location.lat; form.value.longitude = data.result.location.lng; form.value.region = data.result.ad_info.adcode; //行政区划编码 @@ -950,6 +951,8 @@ const submitForm = async (type: string) => { proxy?.$modal.msgSuccess('操作成功'); dialog.visible = false; await getList(); + }else{ + proxy?.$modal.msgError("缺少必填项"); } }); };