From 6c454f58800b02f3d7c7046a845c0b902fc54e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Fri, 1 Nov 2024 22:23:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/cms/article/model/index.ts | 2 + api/shop/shopCart/model/index.ts | 4 +- api/system/company/model/index.ts | 1 + api/system/orderGoods/index.ts | 106 ++++++++++++++++++ api/system/orderGoods/model/index.ts | 55 +++++++++ components/AppFooter.vue | 2 +- components/AppHeader.vue | 31 ++--- components/CompanyList.vue | 31 +++-- components/UserCard.vue | 16 +-- composables/configState.ts | 4 +- nuxt.config.ts | 4 +- pages/ask/[userId].vue | 2 +- pages/ask/index.vue | 5 +- pages/case/components/CardList.vue | 14 +-- pages/components/Flash.vue | 4 +- pages/detail/components/PageBanner.vue | 2 +- pages/detail/index.vue | 13 +++ pages/down/index.vue | 2 +- pages/item/components/Comments.vue | 2 +- pages/item/components/PageBanner.vue | 40 ++++--- pages/item/index.vue | 105 +++++++++++------ pages/market/components/CardList.vue | 86 ++++++++++++++ pages/market/index.vue | 75 +++++++++++++ pages/passport/login.vue | 32 ++++-- .../{plug => plug11}/components/CardList.vue | 0 .../components/PageBanner.vue | 0 pages/{plug => plug11}/detail/[plugId].vue | 0 .../detail/components/Header.vue | 0 pages/{plug => plug11}/index.vue | 0 pages/product/[id].vue | 105 ----------------- pages/product/components/CardList.vue | 77 +++++++++---- pages/product/create/index.vue | 84 +++++++------- pages/product/index.vue | 39 +++---- pages/product/website.vue | 77 ------------- pages/templates/components/CardList.vue | 11 -- pages/user/components/Order.vue | 23 +++- pages/user/order.vue | 17 +-- utils/common.ts | 34 ++++-- 38 files changed, 689 insertions(+), 416 deletions(-) create mode 100644 api/system/orderGoods/index.ts create mode 100644 api/system/orderGoods/model/index.ts create mode 100644 pages/market/components/CardList.vue create mode 100644 pages/market/index.vue rename pages/{plug => plug11}/components/CardList.vue (100%) rename pages/{plug => plug11}/components/PageBanner.vue (100%) rename pages/{plug => plug11}/detail/[plugId].vue (100%) rename pages/{plug => plug11}/detail/components/Header.vue (100%) rename pages/{plug => plug11}/index.vue (100%) delete mode 100644 pages/product/[id].vue delete mode 100644 pages/product/website.vue diff --git a/api/cms/article/model/index.ts b/api/cms/article/model/index.ts index d5cff68..8f3b197 100644 --- a/api/cms/article/model/index.ts +++ b/api/cms/article/model/index.ts @@ -26,6 +26,8 @@ export interface Article { image?: string; // 附件 files?: string; + // 附件 + fileList?: string[]; // 缩列图 thumbnail?: string; // 视频地址 diff --git a/api/shop/shopCart/model/index.ts b/api/shop/shopCart/model/index.ts index 8205dc2..08ea69e 100644 --- a/api/shop/shopCart/model/index.ts +++ b/api/shop/shopCart/model/index.ts @@ -1,5 +1,6 @@ import type { PageParam } from '@/api'; import type {ShopOrderInfo} from "~/api/shop/shopOrderInfo/model"; +import type {Company} from "~/api/system/company/model"; /** * 购物车 @@ -57,10 +58,11 @@ export interface ShopCartParam extends PageParam { export interface MyCart { num?: number, + type?: number; payType?: number, payPrice?: number, month?: number, comments?: string, - orderProduct?: ShopOrderInfo[], + list?: Company[], totalPrice?: number } diff --git a/api/system/company/model/index.ts b/api/system/company/model/index.ts index b104f32..c804858 100644 --- a/api/system/company/model/index.ts +++ b/api/system/company/model/index.ts @@ -92,6 +92,7 @@ export interface Company { installed?: boolean; parameters?: CompanyParameter[]; links?: CompanyUrl[]; + accounts?: CompanyUrl[]; gits?: CompanyGit[]; } diff --git a/api/system/orderGoods/index.ts b/api/system/orderGoods/index.ts new file mode 100644 index 0000000..ce37160 --- /dev/null +++ b/api/system/orderGoods/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { OrderGoods, OrderGoodsParam } from './model'; +import {SERVER_API_URL} from '@/config/setting'; + +/** + * 分页查询订单商品 + */ +export async function pageOrderGoods(params: OrderGoodsParam) { + const res = await request.get>>( + SERVER_API_URL + '/system/order-goods/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询订单商品列表 + */ +export async function listOrderGoods(params?: OrderGoodsParam) { + const res = await request.get>( + SERVER_API_URL + '/system/order-goods', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加订单商品 + */ +export async function addOrderGoods(data: OrderGoods) { + const res = await request.post>( + SERVER_API_URL + '/system/order-goods', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改订单商品 + */ +export async function updateOrderGoods(data: OrderGoods) { + const res = await request.put>( + SERVER_API_URL + '/system/order-goods', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除订单商品 + */ +export async function removeOrderGoods(id?: number) { + const res = await request.delete>( + SERVER_API_URL + '/system/order-goods/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除订单商品 + */ +export async function removeBatchOrderGoods(data: (number | undefined)[]) { + const res = await request.delete>( + SERVER_API_URL + '/system/order-goods/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询订单商品 + */ +export async function getOrderGoods(id: number) { + const res = await request.get>( + SERVER_API_URL + '/system/order-goods/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/api/system/orderGoods/model/index.ts b/api/system/orderGoods/model/index.ts new file mode 100644 index 0000000..dddbbbe --- /dev/null +++ b/api/system/orderGoods/model/index.ts @@ -0,0 +1,55 @@ +import type { PageParam } from '@/api'; + +/** + * 订单商品 + */ +export interface OrderGoods { + // 订单号 + id?: number; + // 订单类型，0商城 1应用插件 + type?: number; + // 订单ID + orderId?: number; + // 项目ID + itemId?: number; + // 实际付款 + payPrice?: string; + // 购买数量 + totalNum?: number; + // 0未付款，1已付款 + payStatus?: string; + // 0未完成，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款 + orderStatus?: number; + // 预约详情开始时间数组 + startTime?: string; + // 是否已开具发票：0未开发票，1已开发票，2不能开具发票 + isInvoice?: string; + // 发票流水号 + invoiceNo?: string; + // 支付时间 + payTime?: string; + // 过期时间 + expirationTime?: string; + // 用户id + userId?: number; + // 备注 + comments?: string; + // 排序号 + sortNumber?: number; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 修改时间 + updateTime?: string; + // 创建时间 + createTime?: string; +} + +/** + * 订单商品搜索条件 + */ +export interface OrderGoodsParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/components/AppFooter.vue b/components/AppFooter.vue index e62f6f8..136474b 100644 --- a/components/AppFooter.vue +++ b/components/AppFooter.vue @@ -49,7 +49,7 @@ diff --git a/components/AppHeader.vue b/components/AppHeader.vue index 23bfdcc..3c28e3a 100644 --- a/components/AppHeader.vue +++ b/components/AppHeader.vue @@ -45,24 +45,24 @@

{{ item.title }}

 - - -

开发者中心

- - - - -

开发者中心

- - + + + + + + + + + + @@ -56,7 +63,7 @@ diff --git a/pages/market/index.vue b/pages/market/index.vue new file mode 100644 index 0000000..ebb87a5 --- /dev/null +++ b/pages/market/index.vue @@ -0,0 +1,75 @@ + + diff --git a/pages/passport/login.vue b/pages/passport/login.vue index e58cff5..ba252ed 100644 --- a/pages/passport/login.vue +++ b/pages/passport/login.vue @@ -325,7 +325,11 @@ const onSubmitBySms = async () => { */ const onRegister = async () => { form.isAgree = false; - const {data: response} = await useServerRequest>('/register',{baseURL: runtimeConfig.public.apiServer,method: "post",body: { + const loading = ElLoading.service({ + lock: true, + text: 'Loading' + }) + await useClientRequest>('/register',{method: "post",body: { companyName: '应用名称', username: form.phone, phone: form.phone, @@ -333,17 +337,20 @@ const onRegister = async () => { code: form.code, email: form.email, isSuperAdmin: true - }}) - // 登录成功 - if(response.value?.code == 0){ - console.log(response.value) - ElMessage.success(response.value?.message) - await doLogin(response.value.data) - } - if(response.value?.code != 0){ - ElMessage.error(response.value?.message) - await changeCaptcha() - } + }}).then(response => { + // 登录成功 + if(response?.code == 0){ + loading.close(); + ElMessage.success(response?.message) + doLogin(response.data) + } + if(response?.code != 0){ + loading.close; + ElMessage.error(response?.message) + changeCaptcha() + } + }) + } @@ -361,6 +368,7 @@ const doLogin = async (data: any) => { user.value.gradeId = data.user.gradeId; user.value.gradeName = data.user.gradeName; user.value.avatar = data.user.avatar; + user.value.balance = data.user.balance; localStorage.setItem('UserId',data.user.userId); localStorage.setItem('Avatar',data.user.avatar); localStorage.setItem('TID_ADMIN',data.user.tenantId); diff --git a/pages/plug/components/CardList.vue b/pages/plug11/components/CardList.vue similarity index 100% rename from pages/plug/components/CardList.vue rename to pages/plug11/components/CardList.vue diff --git a/pages/plug/components/PageBanner.vue b/pages/plug11/components/PageBanner.vue similarity index 100% rename from pages/plug/components/PageBanner.vue rename to pages/plug11/components/PageBanner.vue diff --git a/pages/plug/detail/[plugId].vue b/pages/plug11/detail/[plugId].vue similarity index 100% rename from pages/plug/detail/[plugId].vue rename to pages/plug11/detail/[plugId].vue diff --git a/pages/plug/detail/components/Header.vue b/pages/plug11/detail/components/Header.vue similarity index 100% rename from pages/plug/detail/components/Header.vue rename to pages/plug11/detail/components/Header.vue diff --git a/pages/plug/index.vue b/pages/plug11/index.vue similarity index 100% rename from pages/plug/index.vue rename to pages/plug11/index.vue diff --git a/pages/product/[id].vue b/pages/product/[id].vue deleted file mode 100644 index b8e6b7e..0000000 --- a/pages/product/[id].vue +++ /dev/null @@ -1,105 +0,0 @@ - - diff --git a/pages/product/components/CardList.vue b/pages/product/components/CardList.vue index ed6fad4..6941569 100644 --- a/pages/product/components/CardList.vue +++ b/pages/product/components/CardList.vue @@ -1,9 +1,10 @@ diff --git a/pages/templates/components/CardList.vue b/pages/templates/components/CardList.vue index ed6fad4..7c42a47 100644 --- a/pages/templates/components/CardList.vue +++ b/pages/templates/components/CardList.vue @@ -11,7 +11,6 @@
{{ item.shortName }} - 免费
@@ -22,16 +21,6 @@ {{ item.companyName }} - -
- ￥{{ item.price }} - /年 - /月 - /天 -
- - 立即开通 -
diff --git a/pages/user/components/Order.vue b/pages/user/components/Order.vue index 8f06163..e41eb40 100644 --- a/pages/user/components/Order.vue +++ b/pages/user/components/Order.vue @@ -1,13 +1,18 @@