diff --git a/.idea/modules.xml b/.idea/modules.xml index e75d8a6..bbbcf4d 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,6 @@ - diff --git a/.idea/mp.iml b/.idea/mp.iml index 9f9644f..24643cc 100644 --- a/.idea/mp.iml +++ b/.idea/mp.iml @@ -8,6 +8,5 @@ - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 02961c5..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/src/api/bszx/bszxBm/model/index.ts b/src/api/bszx/bszxBm/model/index.ts index 36b92cb..e0d2d8c 100644 --- a/src/api/bszx/bszxBm/model/index.ts +++ b/src/api/bszx/bszxBm/model/index.ts @@ -12,6 +12,7 @@ export interface BszxBm { name?: string; // 性别 1男 2女 sex?: number; + sexName?: string; // 手机号码 phone?: string; // 手机号码(脱敏) diff --git a/src/api/shop/shopOrder/index.ts b/src/api/shop/shopOrder/index.ts index 50c9b1f..267c0a5 100644 --- a/src/api/shop/shopOrder/index.ts +++ b/src/api/shop/shopOrder/index.ts @@ -104,3 +104,17 @@ export async function getShopOrder(id: number) { } return Promise.reject(new Error(res.data.message)); } + +/** + * 修改订单 + */ +export async function repairOrder(data: ShopOrder) { + const res = await request.put>( + MODULES_API_URL + '/shop/shop-order/repair', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/views/bszx/bszxBm/components/bszxBmEdit.vue b/src/views/bszx/bszxBm/components/bszxBmEdit.vue index 7a4ae4b..dd3d6de 100644 --- a/src/views/bszx/bszxBm/components/bszxBmEdit.vue +++ b/src/views/bszx/bszxBm/components/bszxBmEdit.vue @@ -5,7 +5,7 @@ :visible="visible" :maskClosable="false" :maxable="maxable" - :title="isUpdate ? '编辑报名记录' : '添加报名记录'" + :title="isUpdate ? '编辑报名记录' : '添加报名'" :body-style="{ paddingBottom: '28px' }" @update:visible="updateVisible" @ok="save" @@ -22,19 +22,34 @@ + + + 校友 + 单位 + 爱心人士 + + + + + + {{ form }} {{ form.sex == 1 ? '男' : '' }} {{ form.sex == 2 ? '女' : '' }} @@ -83,22 +98,22 @@ v-model:value="form.present" /> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + diff --git a/src/views/bszx/bszxBm/components/search.vue b/src/views/bszx/bszxBm/components/search.vue index a6fbf09..795cd47 100644 --- a/src/views/bszx/bszxBm/components/search.vue +++ b/src/views/bszx/bszxBm/components/search.vue @@ -1,6 +1,12 @@ diff --git a/src/views/cms/cmsMpPages/index.vue b/src/views/cms/cmsMpPages/index.vue index 14aa5c5..aad183f 100644 --- a/src/views/cms/cmsMpPages/index.vue +++ b/src/views/cms/cmsMpPages/index.vue @@ -122,7 +122,7 @@ import {createVNode, ref} from 'vue'; import {message, Modal} from 'ant-design-vue'; import {ExclamationCircleOutlined, PlusOutlined} from '@ant-design/icons-vue'; -import {EleProTable, toTreeData} from 'ele-admin-pro'; +import type {EleProTable, toTreeData} from 'ele-admin-pro'; import {toDateString} from 'ele-admin-pro'; import type { DatasourceFunction, diff --git a/src/views/cms/cmsProduct/index.vue b/src/views/cms/cmsProduct/index.vue index 6fb99da..b522a3a 100644 --- a/src/views/cms/cmsProduct/index.vue +++ b/src/views/cms/cmsProduct/index.vue @@ -87,7 +87,7 @@ import {createVNode, ref} from 'vue'; import {message, Modal} from 'ant-design-vue'; import {CheckOutlined, CloseOutlined, ExclamationCircleOutlined} from '@ant-design/icons-vue'; -import {EleProTable, toTreeData} from 'ele-admin-pro'; +import type {EleProTable, toTreeData} from 'ele-admin-pro'; import {toDateString} from 'ele-admin-pro'; import type { DatasourceFunction, diff --git a/src/views/cms/cmsProductComment/index.vue b/src/views/cms/cmsProductComment/index.vue index 0563c6d..b1c01dd 100644 --- a/src/views/cms/cmsProductComment/index.vue +++ b/src/views/cms/cmsProductComment/index.vue @@ -50,7 +50,7 @@ import { createVNode, ref } from 'vue'; import { message, Modal } from 'ant-design-vue'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; - import {EleProTable, toTreeData} from 'ele-admin-pro'; + import type {EleProTable, toTreeData} from 'ele-admin-pro'; import { toDateString } from 'ele-admin-pro'; import type { DatasourceFunction, diff --git a/src/views/cms/file/components/video-edit.vue b/src/views/cms/file/components/video-edit.vue new file mode 100644 index 0000000..255a930 --- /dev/null +++ b/src/views/cms/file/components/video-edit.vue @@ -0,0 +1,241 @@ + + + + diff --git a/src/views/cms/file/index.vue b/src/views/cms/file/index.vue new file mode 100644 index 0000000..f162e85 --- /dev/null +++ b/src/views/cms/file/index.vue @@ -0,0 +1,307 @@ + + + + + diff --git a/src/views/cms/file/player/index.vue b/src/views/cms/file/player/index.vue new file mode 100644 index 0000000..9be0669 --- /dev/null +++ b/src/views/cms/file/player/index.vue @@ -0,0 +1,131 @@ + + + + diff --git a/src/views/cms/photo/components/Extra.vue b/src/views/cms/photo/components/Extra.vue new file mode 100644 index 0000000..b34c408 --- /dev/null +++ b/src/views/cms/photo/components/Extra.vue @@ -0,0 +1,70 @@ + + + + diff --git a/src/views/cms/photo/index.vue b/src/views/cms/photo/index.vue index 5fad508..26e92e5 100644 --- a/src/views/cms/photo/index.vue +++ b/src/views/cms/photo/index.vue @@ -1,5 +1,8 @@