From 2524f558b596965e96a7a747ca310975c69fde64 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 25 Jul 2023 23:45:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=94=AF=E4=BB=98=E3=80=81?= =?UTF-8?q?=E5=BF=AB=E9=80=92=E3=80=81=E7=94=B5=E5=AD=90=E9=9D=A2=E5=8D=95?= =?UTF-8?q?=E3=80=81=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF=E7=AD=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.stage | 6 +- LICENSE | 21 - package.json | 5 +- src/api/mall/cart/storeCart/index.ts | 45 ++ src/api/mall/order/electronicsOrder/index.ts | 70 +++ src/api/mall/order/express/index.ts | 53 ++ src/api/mall/order/storeAfterSales/index.ts | 54 ++ src/api/mall/order/storeOrder/index.ts | 107 ++++ .../mall/order/storeOrderElectronics/index.ts | 44 ++ .../product/storeProductRelation/index.ts | 39 ++ .../mall/product/storeProductReply/index.ts | 47 ++ src/api/member/user/index.ts | 69 +++ src/api/member/userAddress/index.ts | 47 ++ src/api/member/userBill/index.ts | 45 ++ src/api/message/wechatTemplate/index.ts | 41 ++ src/api/pay/app/index.ts | 78 --- src/api/pay/channel/index.ts | 48 -- src/api/pay/merchant/index.ts | 78 --- src/api/pay/merchantDetails/index.ts | 51 ++ src/api/pay/order/index.ts | 114 ----- src/api/pay/refund/index.ts | 116 ----- src/components/Materials/src/Materials.vue | 22 +- src/locales/zh-CN.ts | 8 + src/main.ts | 4 + src/views/Login/components/LoginForm.vue | 8 +- src/views/Login/components/SSOLogin.vue | 4 +- src/views/infra/skywalking/index.vue | 2 +- src/views/mall/cart/storeCart/index.vue | 133 +++++ src/views/mall/member/user/UserDetail.vue | 147 ++++++ src/views/mall/member/user/UserForm.vue | 185 +++++++ src/views/mall/member/user/index.vue | 219 +++++++++ src/views/mall/member/user/yue.vue | 104 ++++ .../member/userAddress/UserAddressForm.vue | 140 ++++++ src/views/mall/member/userAddress/index.vue | 165 +++++++ .../electronicsOrder/ElectronicsOrderForm.vue | 264 ++++++++++ .../mall/order/electronicsOrder/index.vue | 260 ++++++++++ .../order/express/ExpressForm.vue} | 68 ++- src/views/mall/order/express/ExpressSet.vue | 101 ++++ src/views/mall/order/express/index.vue | 182 +++++++ .../order/storeAfterSales/OrderDetail.vue | 68 +++ .../storeAfterSales/StoreAfterSalesForm.vue | 139 ++++++ .../mall/order/storeAfterSales/index.vue | 257 ++++++++++ .../mall/order/storeOrder/OrderDetail.vue | 80 +++ .../mall/order/storeOrder/OrderRecord.vue | 30 ++ src/views/mall/order/storeOrder/OrderSend.vue | 294 +++++++++++ .../mall/order/storeOrder/OrderSendInfo.vue | 222 +++++++++ .../mall/order/storeOrder/StoreOrderForm.vue | 194 ++++++++ .../order/storeOrder/StoreOrderRemark.vue | 184 +++++++ src/views/mall/order/storeOrder/index.vue | 424 ++++++++++++++++ .../StoreOrderElectronicsForm.vue | 132 +++++ .../order/storeOrderElectronics}/index.vue | 130 ++--- .../product/storeProduct/StoreProductForm.vue | 90 +--- .../product/storeProductRelation/index.vue | 124 +++++ .../mall/product/storeProductReply/index.vue | 145 ++++++ .../wechatTemplate/WechatTemplateForm.vue | 124 +++++ src/views/message/wechatTemplate/index.vue | 185 +++++++ .../mp/components/wx-voice-play/main.vue | 2 +- src/views/mp/draft/mock.js | 26 +- src/views/mp/material/index.vue | 12 +- src/views/pay/app/AppForm.vue | 143 ------ src/views/pay/app/index.vue | 463 ------------------ .../merchantDetails/MerchantDetailsForm.vue | 179 +++++++ src/views/pay/merchantDetails/index.vue | 146 ++++++ src/views/pay/order/OrderDetail.vue | 115 ----- src/views/pay/order/index.vue | 336 ------------- src/views/pay/refund/RefundDetail.vue | 115 ----- src/views/pay/refund/index.vue | 341 ------------- 67 files changed, 5696 insertions(+), 2198 deletions(-) delete mode 100644 LICENSE create mode 100644 src/api/mall/cart/storeCart/index.ts create mode 100644 src/api/mall/order/electronicsOrder/index.ts create mode 100644 src/api/mall/order/express/index.ts create mode 100644 src/api/mall/order/storeAfterSales/index.ts create mode 100644 src/api/mall/order/storeOrder/index.ts create mode 100644 src/api/mall/order/storeOrderElectronics/index.ts create mode 100644 src/api/mall/product/storeProductRelation/index.ts create mode 100644 src/api/mall/product/storeProductReply/index.ts create mode 100644 src/api/member/user/index.ts create mode 100644 src/api/member/userAddress/index.ts create mode 100644 src/api/member/userBill/index.ts create mode 100644 src/api/message/wechatTemplate/index.ts delete mode 100644 src/api/pay/app/index.ts delete mode 100644 src/api/pay/channel/index.ts delete mode 100644 src/api/pay/merchant/index.ts create mode 100644 src/api/pay/merchantDetails/index.ts delete mode 100644 src/api/pay/order/index.ts delete mode 100644 src/api/pay/refund/index.ts create mode 100644 src/views/mall/cart/storeCart/index.vue create mode 100644 src/views/mall/member/user/UserDetail.vue create mode 100644 src/views/mall/member/user/UserForm.vue create mode 100644 src/views/mall/member/user/index.vue create mode 100644 src/views/mall/member/user/yue.vue create mode 100644 src/views/mall/member/userAddress/UserAddressForm.vue create mode 100644 src/views/mall/member/userAddress/index.vue create mode 100644 src/views/mall/order/electronicsOrder/ElectronicsOrderForm.vue create mode 100644 src/views/mall/order/electronicsOrder/index.vue rename src/views/{pay/merchant/MerchantForm.vue => mall/order/express/ExpressForm.vue} (51%) create mode 100644 src/views/mall/order/express/ExpressSet.vue create mode 100644 src/views/mall/order/express/index.vue create mode 100644 src/views/mall/order/storeAfterSales/OrderDetail.vue create mode 100644 src/views/mall/order/storeAfterSales/StoreAfterSalesForm.vue create mode 100644 src/views/mall/order/storeAfterSales/index.vue create mode 100644 src/views/mall/order/storeOrder/OrderDetail.vue create mode 100644 src/views/mall/order/storeOrder/OrderRecord.vue create mode 100644 src/views/mall/order/storeOrder/OrderSend.vue create mode 100644 src/views/mall/order/storeOrder/OrderSendInfo.vue create mode 100644 src/views/mall/order/storeOrder/StoreOrderForm.vue create mode 100644 src/views/mall/order/storeOrder/StoreOrderRemark.vue create mode 100644 src/views/mall/order/storeOrder/index.vue create mode 100644 src/views/mall/order/storeOrderElectronics/StoreOrderElectronicsForm.vue rename src/views/{pay/merchant => mall/order/storeOrderElectronics}/index.vue (51%) create mode 100644 src/views/mall/product/storeProductRelation/index.vue create mode 100644 src/views/mall/product/storeProductReply/index.vue create mode 100644 src/views/message/wechatTemplate/WechatTemplateForm.vue create mode 100644 src/views/message/wechatTemplate/index.vue delete mode 100644 src/views/pay/app/AppForm.vue delete mode 100644 src/views/pay/app/index.vue create mode 100644 src/views/pay/merchantDetails/MerchantDetailsForm.vue create mode 100644 src/views/pay/merchantDetails/index.vue delete mode 100644 src/views/pay/order/OrderDetail.vue delete mode 100644 src/views/pay/order/index.vue delete mode 100644 src/views/pay/refund/RefundDetail.vue delete mode 100644 src/views/pay/refund/index.vue diff --git a/.env.stage b/.env.stage index d7157fb..748b4d9 100644 --- a/.env.stage +++ b/.env.stage @@ -4,10 +4,10 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn' +VITE_BASE_URL='http://api-dashboard.yixiang.co' # 上传路径 -VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://api-dashboard.yixiang.co/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH= @@ -25,7 +25,7 @@ VITE_DROP_CONSOLE=true VITE_SOURCEMAP=false # 打包路径 -VITE_BASE_PATH='http://static-vue3.yudao.iocoder.cn/' +VITE_BASE_PATH='http://static-vue3.yixiang.co/' # 输出路径 VITE_OUT_DIR=dist-stage diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 9861118..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021-present Archer - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/package.json b/package.json index 088592d..4358ee0 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "yudao-ui-admin-vue3", + "name": "yshop-pro-vue3", "version": "1.7.2-snapshot", "description": "基于vue3、vite4、element-plus、typesScript", - "author": "xingyu", + "author": "yshop", "private": false, "scripts": { "i": "pnpm install", @@ -68,6 +68,7 @@ "vue-router": "^4.1.6", "vue-types": "^5.0.2", "vue-ueditor-wrap": "^3.0.8", + "vue3-print-nb": "^0.1.4", "vuedraggable": "^4.1.0", "web-storage-cache": "^1.1.1", "xe-utils": "^3.5.7", diff --git a/src/api/mall/cart/storeCart/index.ts b/src/api/mall/cart/storeCart/index.ts new file mode 100644 index 0000000..cccabfc --- /dev/null +++ b/src/api/mall/cart/storeCart/index.ts @@ -0,0 +1,45 @@ +import request from '@/config/axios' + +export interface StoreCartVO { + id: number + uid: number + type: string + productId: number + productAttrUnique: string + cartNum: number + isPay: boolean + isNew: boolean + combinationId: number + seckillId: number + bargainId: number +} + +// 查询购物车列表 +export const getStoreCartPage = async (params: StoreCartPageReqVO) => { + return await request.get({ url: `/cart/store-cart/page`, params }) +} + +// 查询购物车详情 +export const getStoreCart = async (id: number) => { + return await request.get({ url: `/cart/store-cart/get?id=` + id }) +} + +// 新增购物车 +export const createStoreCart = async (data: StoreCartVO) => { + return await request.post({ url: `/cart/store-cart/create`, data }) +} + +// 修改购物车 +export const updateStoreCart = async (data: StoreCartVO) => { + return await request.put({ url: `/cart/store-cart/update`, data }) +} + +// 删除购物车 +export const deleteStoreCart = async (id: number) => { + return await request.delete({ url: `/cart/store-cart/delete?id=` + id }) +} + +// 导出购物车 Excel +export const exportStoreCart = async (params) => { + return await request.download({ url: `/cart/store-cart/export-excel`, params }) +} diff --git a/src/api/mall/order/electronicsOrder/index.ts b/src/api/mall/order/electronicsOrder/index.ts new file mode 100644 index 0000000..0da2a41 --- /dev/null +++ b/src/api/mall/order/electronicsOrder/index.ts @@ -0,0 +1,70 @@ +import request from '@/config/axios' + +export interface ElectronicsOrderVO { + id: number + shipperId: number + paytype: boolean + customerName: string + customerPwd: string + sendSite: string + sendStaff: string + monthCode: string + isNotice: boolean + isReturnTemp: boolean + isSendMessage: boolean + templateSize: string + operateRequire: string + logisticCode: string + startDate: number + endDate: number + remark: string + expType: boolean + isReturnSignBill: boolean + company: string + provinceName: string + cityName: string + expAreaName: string + address: string + name: string + tel: string + mobile: string + postCode: string + title: string +} + + +// 查询列表 +export const getElectronicsOrderList = async () => { + return await request.get({ url: `/express/electronics-order/list` }) +} + + +// 查询电子面单列表 +export const getElectronicsOrderPage = async (params: ElectronicsOrderPageReqVO) => { + return await request.get({ url: `/express/electronics-order/page`, params }) +} + +// 查询电子面单详情 +export const getElectronicsOrder = async (id: number) => { + return await request.get({ url: `/express/electronics-order/get?id=` + id }) +} + +// 新增电子面单 +export const createElectronicsOrder = async (data: ElectronicsOrderVO) => { + return await request.post({ url: `/express/electronics-order/create`, data }) +} + +// 修改电子面单 +export const updateElectronicsOrder = async (data: ElectronicsOrderVO) => { + return await request.put({ url: `/express/electronics-order/update`, data }) +} + +// 删除电子面单 +export const deleteElectronicsOrder = async (id: number) => { + return await request.delete({ url: `/express/electronics-order/delete?id=` + id }) +} + +// 导出电子面单 Excel +export const exportElectronicsOrder = async (params) => { + return await request.download({ url: `/express/electronics-order/export-excel`, params }) +} diff --git a/src/api/mall/order/express/index.ts b/src/api/mall/order/express/index.ts new file mode 100644 index 0000000..a07e035 --- /dev/null +++ b/src/api/mall/order/express/index.ts @@ -0,0 +1,53 @@ +import request from '@/config/axios' + +export interface ExpressVO { + id: number + code: string + name: string + sort: number +} +// 查询快递公司列表 +export const getExpressList = async () => { + return await request.get({ url: `/order/express/list` }) +} + +// 查询快递公司列表 +export const getExpressPage = async (params: ExpressPageReqVO) => { + return await request.get({ url: `/order/express/page`, params }) +} + +// 查询快递公司详情 +export const getExpress = async (id: number) => { + return await request.get({ url: `/order/express/get?id=` + id }) +} + +// 查询快递鸟公司配置详情 +export const getExpressSet = async () => { + return await request.get({ url: `/order/express/set` }) +} + +export const postExpressSet = async (data) => { + return await request.post({ url: `/order/express/set`,data }) +} + + + +// 新增快递公司 +export const createExpress = async (data: ExpressVO) => { + return await request.post({ url: `/order/express/create`, data }) +} + +// 修改快递公司 +export const updateExpress = async (data: ExpressVO) => { + return await request.put({ url: `/order/express/update`, data }) +} + +// 删除快递公司 +export const deleteExpress = async (id: number) => { + return await request.delete({ url: `/order/express/delete?id=` + id }) +} + +// 导出快递公司 Excel +export const exportExpress = async (params) => { + return await request.download({ url: `/order/express/export-excel`, params }) +} diff --git a/src/api/mall/order/storeAfterSales/index.ts b/src/api/mall/order/storeAfterSales/index.ts new file mode 100644 index 0000000..c91b2db --- /dev/null +++ b/src/api/mall/order/storeAfterSales/index.ts @@ -0,0 +1,54 @@ +import request from '@/config/axios' + +export interface StoreAfterSalesVO { + id: number + orderCode: string + refundAmount: number + serviceType: boolean + reasons: string + explains: string + explainImg: string + shipperCode: string + deliverySn: string + deliveryName: string + state: boolean + salesState: boolean + userId: number + consignee: string + phoneNumber: string + address: string +} + +// 查询售后记录列表 +export const getStoreAfterSalesPage = async (params: StoreAfterSalesPageReqVO) => { + return await request.get({ url: `/order/store-after-sales/page`, params }) +} + +// 查询售后记录详情 +export const getStoreAfterSales = async (id: number) => { + return await request.get({ url: `/order/store-after-sales/get?id=` + id }) +} + +// 新增售后记录 +export const createStoreAfterSales = async (data: StoreAfterSalesVO) => { + return await request.post({ url: `/order/store-after-sales/create`, data }) +} + +// 修改售后记录 +export const updateStoreAfterSales = async (data: StoreAfterSalesVO) => { + return await request.put({ url: `/order/store-after-sales/update`, data }) +} + +// 删除售后记录 +export const deleteStoreAfterSales = async (id: number) => { + return await request.delete({ url: `/order/store-after-sales/delete?id=` + id }) +} + +export const payStoreAfterSales = async (id: number) => { + return await request.get({ url: `/order/store-after-sales/pay?id=` + id }) +} + +// 导出售后记录 Excel +export const exportStoreAfterSales = async (params) => { + return await request.download({ url: `/order/store-after-sales/export-excel`, params }) +} diff --git a/src/api/mall/order/storeOrder/index.ts b/src/api/mall/order/storeOrder/index.ts new file mode 100644 index 0000000..e8b262f --- /dev/null +++ b/src/api/mall/order/storeOrder/index.ts @@ -0,0 +1,107 @@ +import request from '@/config/axios' + +export interface StoreOrderVO { + id: number + orderId: string + extendOrderId: string + uid: number + realName: string + userPhone: string + userAddress: string + cartId: string + freightPrice: number + totalNum: number + totalPrice: number + totalPostage: number + payPrice: number + payPostage: number + deductionPrice: number + couponId: number + couponPrice: number + paid: byte + payTime: Date + payType: string + status: boolean + refundStatus: byte + refundReasonWapImg: string + refundReasonWapExplain: string + refundReasonTime: Date + refundReasonWap: string + refundReason: string + refundPrice: number + deliverySn: string + deliveryName: string + deliveryType: string + deliveryId: string + gainIntegral: number + useIntegral: number + payIntegral: number + backIntegral: number + mark: string + unique: string + remark: string + merId: number + combinationId: number + pinkId: number + cost: number + seckillId: number + bargainId: number + verifyCode: string + storeId: number + shippingType: boolean + isChannel: byte + isSystemDel: boolean +} + +// 查询订单列表 +export const getStoreOrderPage = async (params: StoreOrderPageReqVO) => { + return await request.get({ url: `/order/store-order/page`, params }) +} + +// 查询订单详情 +export const getStoreOrder = async (id: number) => { + return await request.get({ url: `/order/store-order/get?id=` + id }) +} + +// 新增订单 +export const createStoreOrder = async (data: StoreOrderVO) => { + return await request.post({ url: `/order/store-order/create`, data }) +} + +// 修改订单 +export const updateStoreOrder = async (data: StoreOrderVO) => { + return await request.put({ url: `/order/store-order/update`, data }) +} + +// 删除订单 +export const deleteStoreOrder = async (id: number) => { + return await request.delete({ url: `/order/store-order/delete?id=` + id }) +} + +export const payStoreOrder = async (id: number) => { + return await request.get({ url: `/order/store-order/pay?id=` + id }) +} + +export const takeStoreOrder = async (id: number) => { + return await request.get({ url: `/order/store-order/take?id=` + id }) +} + +export const getStoreOrderRecordList = async (id: number) => { + return await request.get({ url: `/order/store-order/record-list?id=` + id }) +} + + + +// 导出订单 Excel +export const exportStoreOrder = async (params) => { + return await request.download({ url: `/order/store-order/export-excel`, params }) +} + +export const getLogistic = async (param1,param2) => { + return await request.get({ url: `/order/express/getLogistic?shipperCode=` + param1 + `&logisticCode=` + param2}) +} + +export const getOrderHtml = async (param1,param2) => { + return await request.get({ url: `/order/store-order/printOrder?id=` + param1 + `&electId=` + param2}) +} + diff --git a/src/api/mall/order/storeOrderElectronics/index.ts b/src/api/mall/order/storeOrderElectronics/index.ts new file mode 100644 index 0000000..8f08ed5 --- /dev/null +++ b/src/api/mall/order/storeOrderElectronics/index.ts @@ -0,0 +1,44 @@ +import request from '@/config/axios' + +export interface StoreOrderElectronicsVO { + id: number + orderSn: string + printTemplate: string + kdnOrderCode: string + logisticCode: string + shipperCode: string + order: string + customerName: string + customerPwd: string + status: boolean +} + +// 查询订单电子面单记录列表 +export const getStoreOrderElectronicsPage = async (params: StoreOrderElectronicsPageReqVO) => { + return await request.get({ url: `/order/store-order-electronics/page`, params }) +} + +// 查询订单电子面单记录详情 +export const getStoreOrderElectronics = async (id: number) => { + return await request.get({ url: `/order/store-order-electronics/get?id=` + id }) +} + +// 新增订单电子面单记录 +export const createStoreOrderElectronics = async (data: StoreOrderElectronicsVO) => { + return await request.post({ url: `/order/store-order-electronics/create`, data }) +} + +// 修改订单电子面单记录 +export const updateStoreOrderElectronics = async (data: StoreOrderElectronicsVO) => { + return await request.put({ url: `/order/store-order-electronics/update`, data }) +} + +// 删除订单电子面单记录 +export const deleteStoreOrderElectronics = async (id: number) => { + return await request.delete({ url: `/order/store-order-electronics/delete?id=` + id }) +} + +// 导出订单电子面单记录 Excel +export const exportStoreOrderElectronics = async (params) => { + return await request.download({ url: `/order/store-order-electronics/export-excel`, params }) +} diff --git a/src/api/mall/product/storeProductRelation/index.ts b/src/api/mall/product/storeProductRelation/index.ts new file mode 100644 index 0000000..32ee58b --- /dev/null +++ b/src/api/mall/product/storeProductRelation/index.ts @@ -0,0 +1,39 @@ +import request from '@/config/axios' + +export interface StoreProductRelationVO { + id: number + uid: number + productId: number + type: string + category: string +} + +// 查询商品点赞和收藏列表 +export const getStoreProductRelationPage = async (params: StoreProductRelationPageReqVO) => { + return await request.get({ url: `/product/store-product-relation/page`, params }) +} + +// 查询商品点赞和收藏详情 +export const getStoreProductRelation = async (id: number) => { + return await request.get({ url: `/product/store-product-relation/get?id=` + id }) +} + +// 新增商品点赞和收藏 +export const createStoreProductRelation = async (data: StoreProductRelationVO) => { + return await request.post({ url: `/product/store-product-relation/create`, data }) +} + +// 修改商品点赞和收藏 +export const updateStoreProductRelation = async (data: StoreProductRelationVO) => { + return await request.put({ url: `/product/store-product-relation/update`, data }) +} + +// 删除商品点赞和收藏 +export const deleteStoreProductRelation = async (id: number) => { + return await request.delete({ url: `/product/store-product-relation/delete?id=` + id }) +} + +// 导出商品点赞和收藏 Excel +export const exportStoreProductRelation = async (params) => { + return await request.download({ url: `/product/store-product-relation/export-excel`, params }) +} diff --git a/src/api/mall/product/storeProductReply/index.ts b/src/api/mall/product/storeProductReply/index.ts new file mode 100644 index 0000000..65bb7a3 --- /dev/null +++ b/src/api/mall/product/storeProductReply/index.ts @@ -0,0 +1,47 @@ +import request from '@/config/axios' + +export interface StoreProductReplyVO { + id: number + uid: number + oid: number + unique: string + productId: number + replyType: string + productScore: boolean + serviceScore: boolean + comment: string + pics: string + merchantReplyContent: string + merchantReplyTime: Date + isReply: boolean +} + +// 查询评论列表 +export const getStoreProductReplyPage = async (params: StoreProductReplyPageReqVO) => { + return await request.get({ url: `/product/store-product-reply/page`, params }) +} + +// 查询评论详情 +export const getStoreProductReply = async (id: number) => { + return await request.get({ url: `/product/store-product-reply/get?id=` + id }) +} + +// 新增评论 +export const createStoreProductReply = async (data: StoreProductReplyVO) => { + return await request.post({ url: `/product/store-product-reply/create`, data }) +} + +// 修改评论 +export const updateStoreProductReply = async (data: StoreProductReplyVO) => { + return await request.put({ url: `/product/store-product-reply/update`, data }) +} + +// 删除评论 +export const deleteStoreProductReply = async (id: number) => { + return await request.delete({ url: `/product/store-product-reply/delete?id=` + id }) +} + +// 导出评论 Excel +export const exportStoreProductReply = async (params) => { + return await request.download({ url: `/product/store-product-reply/export-excel`, params }) +} diff --git a/src/api/member/user/index.ts b/src/api/member/user/index.ts new file mode 100644 index 0000000..107ea4a --- /dev/null +++ b/src/api/member/user/index.ts @@ -0,0 +1,69 @@ +import request from '@/config/axios' + +export interface UserVO { + id: number + username: string + password: string + realName: string + birthday: number + cardId: string + mark: string + partnerId: number + groupId: number + nickname: string + avatar: string + phone: string + addIp: string + lastIp: string + nowMoney: number + brokeragePrice: number + integral: number + signNum: number + status: boolean + level: byte + spreadUid: number + spreadTime: Date + userType: string + isPromoter: byte + payCount: number + spreadCount: number + addres: string + adminid: number + loginType: string + wxProfile: string +} + +// 查询用户列表 +export const getUserPage = async (params: UserPageReqVO) => { + return await request.get({ url: `/member/user/page`, params }) +} + +// 查询用户详情 +export const getUser = async (id: number) => { + return await request.get({ url: `/member/user/get?id=` + id }) +} + +// 新增用户 +export const createUser = async (data: UserVO) => { + return await request.post({ url: `/member/user/create`, data }) +} + +// 修改用户 +export const updateUser = async (data: UserVO) => { + return await request.put({ url: `/member/user/update`, data }) +} + +// 修改余额 +export const updateMony = async (data: UserVO) => { + return await request.put({ url: `/member/user/updateMony`, data }) +} + +// 删除用户 +export const deleteUser = async (id: number) => { + return await request.delete({ url: `/member/user/delete?id=` + id }) +} + +// 导出用户 Excel +export const exportUser = async (params) => { + return await request.download({ url: `/member/user/export-excel`, params }) +} diff --git a/src/api/member/userAddress/index.ts b/src/api/member/userAddress/index.ts new file mode 100644 index 0000000..9df8ee5 --- /dev/null +++ b/src/api/member/userAddress/index.ts @@ -0,0 +1,47 @@ +import request from '@/config/axios' + +export interface UserAddressVO { + id: number + uid: number + realName: string + phone: string + province: string + city: string + cityId: number + district: string + detail: string + postCode: string + longitude: string + latitude: string + isDefault: byte +} + +// 查询用户地址列表 +export const getUserAddressPage = async (params: UserAddressPageReqVO) => { + return await request.get({ url: `/member/user-address/page`, params }) +} + +// 查询用户地址详情 +export const getUserAddress = async (id: number) => { + return await request.get({ url: `/member/user-address/get?id=` + id }) +} + +// 新增用户地址 +export const createUserAddress = async (data: UserAddressVO) => { + return await request.post({ url: `/member/user-address/create`, data }) +} + +// 修改用户地址 +export const updateUserAddress = async (data: UserAddressVO) => { + return await request.put({ url: `/member/user-address/update`, data }) +} + +// 删除用户地址 +export const deleteUserAddress = async (id: number) => { + return await request.delete({ url: `/member/user-address/delete?id=` + id }) +} + +// 导出用户地址 Excel +export const exportUserAddress = async (params) => { + return await request.download({ url: `/member/user-address/export-excel`, params }) +} diff --git a/src/api/member/userBill/index.ts b/src/api/member/userBill/index.ts new file mode 100644 index 0000000..f8b583d --- /dev/null +++ b/src/api/member/userBill/index.ts @@ -0,0 +1,45 @@ +import request from '@/config/axios' + +export interface UserBillVO { + id: number + uid: number + linkId: string + pm: byte + title: string + category: string + type: string + number: number + balance: number + mark: string + status: boolean +} + +// 查询用户账单列表 +export const getUserBillPage = async (params: UserBillPageReqVO) => { + return await request.get({ url: `/member/user-bill/page`, params }) +} + +// 查询用户账单详情 +export const getUserBill = async (id: number) => { + return await request.get({ url: `/member/user-bill/get?id=` + id }) +} + +// 新增用户账单 +export const createUserBill = async (data: UserBillVO) => { + return await request.post({ url: `/member/user-bill/create`, data }) +} + +// 修改用户账单 +export const updateUserBill = async (data: UserBillVO) => { + return await request.put({ url: `/member/user-bill/update`, data }) +} + +// 删除用户账单 +export const deleteUserBill = async (id: number) => { + return await request.delete({ url: `/member/user-bill/delete?id=` + id }) +} + +// 导出用户账单 Excel +export const exportUserBill = async (params) => { + return await request.download({ url: `/member/user-bill/export-excel`, params }) +} diff --git a/src/api/message/wechatTemplate/index.ts b/src/api/message/wechatTemplate/index.ts new file mode 100644 index 0000000..64ce47b --- /dev/null +++ b/src/api/message/wechatTemplate/index.ts @@ -0,0 +1,41 @@ +import request from '@/config/axios' + +export interface WechatTemplateVO { + id: number + tempkey: string + name: string + content: string + tempid: string + status: byte + type: string +} + +// 查询微信模板列表 +export const getWechatTemplatePage = async (params: WechatTemplatePageReqVO) => { + return await request.get({ url: `/message/wechat-template/page`, params }) +} + +// 查询微信模板详情 +export const getWechatTemplate = async (id: number) => { + return await request.get({ url: `/message/wechat-template/get?id=` + id }) +} + +// 新增微信模板 +export const createWechatTemplate = async (data: WechatTemplateVO) => { + return await request.post({ url: `/message/wechat-template/create`, data }) +} + +// 修改微信模板 +export const updateWechatTemplate = async (data: WechatTemplateVO) => { + return await request.put({ url: `/message/wechat-template/update`, data }) +} + +// 删除微信模板 +export const deleteWechatTemplate = async (id: number) => { + return await request.delete({ url: `/message/wechat-template/delete?id=` + id }) +} + +// 导出微信模板 Excel +export const exportWechatTemplate = async (params) => { + return await request.download({ url: `/message/wechat-template/export-excel`, params }) +} diff --git a/src/api/pay/app/index.ts b/src/api/pay/app/index.ts deleted file mode 100644 index c19eb99..0000000 --- a/src/api/pay/app/index.ts +++ /dev/null @@ -1,78 +0,0 @@ -import request from '@/config/axios' - -export interface AppVO { - id: number - name: string - status: number - remark: string - payNotifyUrl: string - refundNotifyUrl: string - merchantId: number - merchantName: string - createTime: Date -} - -export interface AppPageReqVO extends PageParam { - name?: string - status?: number - remark?: string - payNotifyUrl?: string - refundNotifyUrl?: string - merchantName?: string - createTime?: Date[] -} - -export interface AppExportReqVO { - name?: string - status?: number - remark?: string - payNotifyUrl?: string - refundNotifyUrl?: string - merchantName?: string - createTime?: Date[] -} - -export interface AppUpdateStatusReqVO { - id: number - status: number -} - -// 查询列表支付应用 -export const getAppPage = (params: AppPageReqVO) => { - return request.get({ url: '/pay/app/page', params }) -} - -// 查询详情支付应用 -export const getApp = (id: number) => { - return request.get({ url: '/pay/app/get?id=' + id }) -} - -// 新增支付应用 -export const createApp = (data: AppVO) => { - return request.post({ url: '/pay/app/create', data }) -} - -// 修改支付应用 -export const updateApp = (data: AppVO) => { - return request.put({ url: '/pay/app/update', data }) -} - -// 支付应用信息状态修改 -export const changeAppStatus = (data: AppUpdateStatusReqVO) => { - return request.put({ url: '/pay/app/update-status', data: data }) -} - -// 删除支付应用 -export const deleteApp = (id: number) => { - return request.delete({ url: '/pay/app/delete?id=' + id }) -} - -// 导出支付应用 -export const exportApp = (params: AppExportReqVO) => { - return request.download({ url: '/pay/app/export-excel', params }) -} - -// 根据商ID称搜索应用列表 -export const getAppListByMerchantId = (merchantId: number) => { - return request.get({ url: '/pay/app/list-merchant-id', params: { merchantId: merchantId } }) -} diff --git a/src/api/pay/channel/index.ts b/src/api/pay/channel/index.ts deleted file mode 100644 index b030357..0000000 --- a/src/api/pay/channel/index.ts +++ /dev/null @@ -1,48 +0,0 @@ -import request from '@/config/axios' - -export interface ChannelVO { - id: number - code: string - config: string - status: number - remark: string - feeRate: number - merchantId: number - appId: number - createTime: Date -} - -// 查询列表支付渠道 -export const getChannelPage = (params: PageParam) => { - return request.get({ url: '/pay/channel/page', params }) -} - -// 查询详情支付渠道 -export const getChannel = (merchantId: number, appId: string, code: string) => { - const params = { - merchantId: merchantId, - appId: appId, - code: code - } - return request.get({ url: '/pay/channel/get-channel', params: params }) -} - -// 新增支付渠道 -export const createChannel = (data: ChannelVO) => { - return request.post({ url: '/pay/channel/create', data }) -} - -// 修改支付渠道 -export const updateChannel = (data: ChannelVO) => { - return request.put({ url: '/pay/channel/update', data }) -} - -// 删除支付渠道 -export const deleteChannel = (id: number) => { - return request.delete({ url: '/pay/channel/delete?id=' + id }) -} - -// 导出支付渠道 -export const exportChannel = (params) => { - return request.download({ url: '/pay/channel/export-excel', params }) -} diff --git a/src/api/pay/merchant/index.ts b/src/api/pay/merchant/index.ts deleted file mode 100644 index bb630c3..0000000 --- a/src/api/pay/merchant/index.ts +++ /dev/null @@ -1,78 +0,0 @@ -import request from '@/config/axios' - -export interface MerchantVO { - id: number - no: string - name: string - shortName: string - status: number - remark: string - createTime: Date -} - -export interface MerchantPageReqVO extends PageParam { - no?: string - name?: string - shortName?: string - status?: number - remark?: string - createTime?: Date[] -} - -export interface MerchantExportReqVO { - no?: string - name?: string - shortName?: string - status?: number - remark?: string - createTime?: Date[] -} - -// 查询列表支付商户 -export const getMerchantPage = (params: MerchantPageReqVO) => { - return request.get({ url: '/pay/merchant/page', params }) -} - -// 查询详情支付商户 -export const getMerchant = (id: number) => { - return request.get({ url: '/pay/merchant/get?id=' + id }) -} - -// 根据商户名称搜索商户列表 -export const getMerchantListByName = (name?: string) => { - return request.get({ - url: '/pay/merchant/list-by-name', - params: { - name: name - } - }) -} - -// 新增支付商户 -export const createMerchant = (data: MerchantVO) => { - return request.post({ url: '/pay/merchant/create', data }) -} - -// 修改支付商户 -export const updateMerchant = (data: MerchantVO) => { - return request.put({ url: '/pay/merchant/update', data }) -} - -// 删除支付商户 -export const deleteMerchant = (id: number) => { - return request.delete({ url: '/pay/merchant/delete?id=' + id }) -} - -// 导出支付商户 -export const exportMerchant = (params: MerchantExportReqVO) => { - return request.download({ url: '/pay/merchant/export-excel', params }) -} - -// 支付商户状态修改 -export const updateMerchantStatus = (id: number, status: number) => { - const data = { - id, - status - } - return request.put({ url: '/pay/merchant/update-status', data: data }) -} diff --git a/src/api/pay/merchantDetails/index.ts b/src/api/pay/merchantDetails/index.ts new file mode 100644 index 0000000..36c077e --- /dev/null +++ b/src/api/pay/merchantDetails/index.ts @@ -0,0 +1,51 @@ +import request from '@/config/axios' + +export interface MerchantDetailsVO { + detailsId: string + payType: string + appid: string + mchId: string + certStoreType: string + keyPrivate: string + keyPublic: string + keyCert: string + keyCertPwd: string + notifyUrl: string + returnUrl: string + signType: string + seller: string + subAppId: string + subMchId: string + inputCharset: string + isTest: boolean +} + +// 查询支付服务商配置列表 +export const getMerchantDetailsPage = async (params: MerchantDetailsPageReqVO) => { + return await request.get({ url: `/pay/merchant-details/page`, params }) +} + +// 查询支付服务商配置详情 +export const getMerchantDetails = async (id: number) => { + return await request.get({ url: `/pay/merchant-details/get?id=` + id }) +} + +// 新增支付服务商配置 +export const createMerchantDetails = async (data: MerchantDetailsVO) => { + return await request.post({ url: `/pay/merchant-details/create`, data }) +} + +// 修改支付服务商配置 +export const updateMerchantDetails = async (data: MerchantDetailsVO) => { + return await request.put({ url: `/pay/merchant-details/update`, data }) +} + +// 删除支付服务商配置 +export const deleteMerchantDetails = async (id: number) => { + return await request.delete({ url: `/pay/merchant-details/delete?id=` + id }) +} + +// 导出支付服务商配置 Excel +export const exportMerchantDetails = async (params) => { + return await request.download({ url: `/pay/merchant-details/export-excel`, params }) +} diff --git a/src/api/pay/order/index.ts b/src/api/pay/order/index.ts deleted file mode 100644 index 6621381..0000000 --- a/src/api/pay/order/index.ts +++ /dev/null @@ -1,114 +0,0 @@ -import request from '@/config/axios' - -export interface OrderVO { - id: number - merchantId: number - appId: number - channelId: number - channelCode: string - merchantOrderId: string - subject: string - body: string - notifyUrl: string - notifyStatus: number - amount: number - channelFeeRate: number - channelFeeAmount: number - status: number - userIp: string - expireTime: Date - successTime: Date - notifyTime: Date - successExtensionId: number - refundStatus: number - refundTimes: number - refundAmount: number - channelUserId: string - channelOrderNo: string - createTime: Date -} - -export interface OrderPageReqVO extends PageParam { - merchantId?: number - appId?: number - channelId?: number - channelCode?: string - merchantOrderId?: string - subject?: string - body?: string - notifyUrl?: string - notifyStatus?: number - amount?: number - channelFeeRate?: number - channelFeeAmount?: number - status?: number - expireTime?: Date[] - successTime?: Date[] - notifyTime?: Date[] - successExtensionId?: number - refundStatus?: number - refundTimes?: number - channelUserId?: string - channelOrderNo?: string - createTime?: Date[] -} - -export interface OrderExportReqVO { - merchantId?: number - appId?: number - channelId?: number - channelCode?: string - merchantOrderId?: string - subject?: string - body?: string - notifyUrl?: string - notifyStatus?: number - amount?: number - channelFeeRate?: number - channelFeeAmount?: number - status?: number - expireTime?: Date[] - successTime?: Date[] - notifyTime?: Date[] - successExtensionId?: number - refundStatus?: number - refundTimes?: number - channelUserId?: string - channelOrderNo?: string - createTime?: Date[] -} - -// 查询列表支付订单 -export const getOrderPage = async (params: OrderPageReqVO) => { - return await request.get({ url: '/pay/order/page', params }) -} - -// 查询详情支付订单 -export const getOrder = async (id: number) => { - return await request.get({ url: '/pay/order/get?id=' + id }) -} - -// 获得支付订单的明细 -export const getOrderDetail = async (id: number) => { - return await request.get({ url: '/pay/order/get-detail?id=' + id }) -} - -// 新增支付订单 -export const createOrder = async (data: OrderVO) => { - return await request.post({ url: '/pay/order/create', data }) -} - -// 修改支付订单 -export const updateOrder = async (data: OrderVO) => { - return await request.put({ url: '/pay/order/update', data }) -} - -// 删除支付订单 -export const deleteOrder = async (id: number) => { - return await request.delete({ url: '/pay/order/delete?id=' + id }) -} - -// 导出支付订单 -export const exportOrder = async (params: OrderExportReqVO) => { - return await request.download({ url: '/pay/order/export-excel', params }) -} diff --git a/src/api/pay/refund/index.ts b/src/api/pay/refund/index.ts deleted file mode 100644 index 4b587f2..0000000 --- a/src/api/pay/refund/index.ts +++ /dev/null @@ -1,116 +0,0 @@ -import request from '@/config/axios' - -export interface RefundVO { - id: number - merchantId: number - appId: number - channelId: number - channelCode: string - orderId: string - tradeNo: string - merchantOrderId: string - merchantRefundNo: string - notifyUrl: string - notifyStatus: number - status: number - type: number - payAmount: number - refundAmount: number - reason: string - userIp: string - channelOrderNo: string - channelRefundNo: string - channelErrorCode: string - channelErrorMsg: string - channelExtras: string - expireTime: Date - successTime: Date - notifyTime: Date - createTime: Date -} - -export interface RefundPageReqVO extends PageParam { - merchantId?: number - appId?: number - channelId?: number - channelCode?: string - orderId?: string - tradeNo?: string - merchantOrderId?: string - merchantRefundNo?: string - notifyUrl?: string - notifyStatus?: number - status?: number - type?: number - payAmount?: number - refundAmount?: number - reason?: string - userIp?: string - channelOrderNo?: string - channelRefundNo?: string - channelErrorCode?: string - channelErrorMsg?: string - channelExtras?: string - expireTime?: Date[] - successTime?: Date[] - notifyTime?: Date[] - createTime?: Date[] -} - -export interface PayRefundExportReqVO { - merchantId?: number - appId?: number - channelId?: number - channelCode?: string - orderId?: string - tradeNo?: string - merchantOrderId?: string - merchantRefundNo?: string - notifyUrl?: string - notifyStatus?: number - status?: number - type?: number - payAmount?: number - refundAmount?: number - reason?: string - userIp?: string - channelOrderNo?: string - channelRefundNo?: string - channelErrorCode?: string - channelErrorMsg?: string - channelExtras?: string - expireTime?: Date[] - successTime?: Date[] - notifyTime?: Date[] - createTime?: Date[] -} - -// 查询列表退款订单 -export const getRefundPage = (params: RefundPageReqVO) => { - return request.get({ url: '/pay/refund/page', params }) -} - -// 查询详情退款订单 -export const getRefund = (id: number) => { - return request.get({ url: '/pay/refund/get?id=' + id }) -} - -// 新增退款订单 -export const createRefund = (data: RefundVO) => { - return request.post({ url: '/pay/refund/create', data }) -} - -// 修改退款订单 -export const updateRefund = (data: RefundVO) => { - return request.put({ url: '/pay/refund/update', data }) -} - -// 删除退款订单 -export const deleteRefund = (id: number) => { - return request.delete({ url: '/pay/refund/delete?id=' + id }) -} - -// 导出退款订单 -export const exportRefund = (params: PayRefundExportReqVO) => { - return request.download({ url: '/pay/refund/export-excel', params }) -} diff --git a/src/components/Materials/src/Materials.vue b/src/components/Materials/src/Materials.vue index ce1bbe9..6c18e3b 100644 --- a/src/components/Materials/src/Materials.vue +++ b/src/components/Materials/src/Materials.vue @@ -18,20 +18,21 @@ class="el-upload-list__item-preview" @click="moveMaterial(index, 'up')" > - + + - + - + @@ -182,7 +183,7 @@ import { getPage, addObj, delObj } from '@/api/tools/material' import { getAccessToken } from '@/utils/auth' const props = defineProps({ - value: { + modelValue: { type: Array, default() { return [] @@ -219,7 +220,7 @@ const headers = ref({ // Authorization: getToken() Authorization: 'Bearer ' + getAccessToken(), }) -const value = ref(props.value) +//const value = ref(props.value) const dialogVisible = ref(false) const url = ref('') const listDialogVisible = ref(false) @@ -241,6 +242,16 @@ const tableLoading = ref(false) const groupId = ref(null) const urls = ref([]) +const value = computed({ + get() { + if (Array.isArray(props.modelValue)) { + return props.modelValue + } + return [props.modelValue] + + } +}) + // const store = useStore() const uploadApi = import.meta.env.VITE_UPLOAD_URL @@ -270,6 +281,7 @@ function deleteMaterial(index) { }).then(function () { value.value.splice(index, 1) urls.value = [] + emit('update:modelValue', value.value) }) } function toSeleteMaterial() { diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 42772f4..baaf714 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -278,6 +278,14 @@ export default { header: '头部' }, action: { + yue: '积分余额', + userDetail: '用户详情', + orderRecord: '订单记录', + orderDetail: '订单详情', + updateOrder: '修改订单', + orderSend: '订单发货', + remark: '备注', + sendInfo: '配送信息', create: '新增', add: '新增', del: '删除', diff --git a/src/main.ts b/src/main.ts index e9639ad..3972821 100644 --- a/src/main.ts +++ b/src/main.ts @@ -42,10 +42,14 @@ import '@/plugins/tongji' // 百度统计 import Logger from '@/utils/Logger' import VueUeditorWrap from 'vue-ueditor-wrap' + +import print from 'vue3-print-nb' + // 创建实例 const setupAll = async () => { const app = createApp(App) app.use(VueUeditorWrap) + app.use(print) await setupI18n(app) diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index 9458031..f17587e 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -111,8 +111,8 @@ - - - + + --> diff --git a/src/views/Login/components/SSOLogin.vue b/src/views/Login/components/SSOLogin.vue index acaf38a..1ac365e 100644 --- a/src/views/Login/components/SSOLogin.vue +++ b/src/views/Login/components/SSOLogin.vue @@ -71,8 +71,8 @@ const init = async () => { // 防止在没有登录的情况下循环弹窗 if (typeof route.query.client_id === 'undefined') return // 解析参数 - // 例如说【自动授权不通过】：client_id=default&redirect_uri=https%3A%2F%2Fwww.iocoder.cn&response_type=code&scope=user.read%20user.write - // 例如说【自动授权通过】：client_id=default&redirect_uri=https%3A%2F%2Fwww.iocoder.cn&response_type=code&scope=user.read + // 例如说【自动授权不通过】：client_id=default&redirect_uri=https%3A%2F%2Fwww.yixiang.co&response_type=code&scope=user.read%20user.write + // 例如说【自动授权通过】：client_id=default&redirect_uri=https%3A%2F%2Fwww.yixiang.co&response_type=code&scope=user.read queryParams.responseType = route.query.response_type as string queryParams.clientId = route.query.client_id as string queryParams.redirectUri = route.query.redirect_uri as string diff --git a/src/views/infra/skywalking/index.vue b/src/views/infra/skywalking/index.vue index cc90543..10daa08 100644 --- a/src/views/infra/skywalking/index.vue +++ b/src/views/infra/skywalking/index.vue @@ -9,7 +9,7 @@ import * as ConfigApi from '@/api/infra/config' const loading = ref(true) // 是否加载中 -const src = ref('http://skywalking.shop.iocoder.cn') +const src = ref('http://skywalking.shop.yixiang.co') /** 初始化 */ onMounted(async () => { diff --git a/src/views/mall/cart/storeCart/index.vue b/src/views/mall/cart/storeCart/index.vue new file mode 100644 index 0000000..dae672f --- /dev/null +++ b/src/views/mall/cart/storeCart/index.vue @@ -0,0 +1,133 @@ + + + diff --git a/src/views/mall/member/user/UserDetail.vue b/src/views/mall/member/user/UserDetail.vue new file mode 100644 index 0000000..d181474 --- /dev/null +++ b/src/views/mall/member/user/UserDetail.vue @@ -0,0 +1,147 @@ + + + \ No newline at end of file diff --git a/src/views/mall/member/user/UserForm.vue b/src/views/mall/member/user/UserForm.vue new file mode 100644 index 0000000..62876f0 --- /dev/null +++ b/src/views/mall/member/user/UserForm.vue @@ -0,0 +1,185 @@ + + diff --git a/src/views/mall/member/user/index.vue b/src/views/mall/member/user/index.vue new file mode 100644 index 0000000..e3b055c --- /dev/null +++ b/src/views/mall/member/user/index.vue @@ -0,0 +1,219 @@ + + + diff --git a/src/views/mall/member/user/yue.vue b/src/views/mall/member/user/yue.vue new file mode 100644 index 0000000..28858a6 --- /dev/null +++ b/src/views/mall/member/user/yue.vue @@ -0,0 +1,104 @@ + + diff --git a/src/views/mall/member/userAddress/UserAddressForm.vue b/src/views/mall/member/userAddress/UserAddressForm.vue new file mode 100644 index 0000000..9d9ba24 --- /dev/null +++ b/src/views/mall/member/userAddress/UserAddressForm.vue @@ -0,0 +1,140 @@ + + diff --git a/src/views/mall/member/userAddress/index.vue b/src/views/mall/member/userAddress/index.vue new file mode 100644 index 0000000..1b2b69c --- /dev/null +++ b/src/views/mall/member/userAddress/index.vue @@ -0,0 +1,165 @@ + + + diff --git a/src/views/mall/order/electronicsOrder/ElectronicsOrderForm.vue b/src/views/mall/order/electronicsOrder/ElectronicsOrderForm.vue new file mode 100644 index 0000000..6da02e0 --- /dev/null +++ b/src/views/mall/order/electronicsOrder/ElectronicsOrderForm.vue @@ -0,0 +1,264 @@ + + diff --git a/src/views/mall/order/electronicsOrder/index.vue b/src/views/mall/order/electronicsOrder/index.vue new file mode 100644 index 0000000..f4a5a65 --- /dev/null +++ b/src/views/mall/order/electronicsOrder/index.vue @@ -0,0 +1,260 @@ + + + diff --git a/src/views/pay/merchant/MerchantForm.vue b/src/views/mall/order/express/ExpressForm.vue similarity index 51% rename from src/views/pay/merchant/MerchantForm.vue rename to src/views/mall/order/express/ExpressForm.vue index 8d86e3f..a56d200 100644 --- a/src/views/pay/merchant/MerchantForm.vue +++ b/src/views/mall/order/express/ExpressForm.vue @@ -1,36 +1,30 @@ - diff --git a/src/views/mall/order/express/index.vue b/src/views/mall/order/express/index.vue new file mode 100644 index 0000000..344201f --- /dev/null +++ b/src/views/mall/order/express/index.vue @@ -0,0 +1,182 @@ + + + diff --git a/src/views/mall/order/storeAfterSales/OrderDetail.vue b/src/views/mall/order/storeAfterSales/OrderDetail.vue new file mode 100644 index 0000000..95056a0 --- /dev/null +++ b/src/views/mall/order/storeAfterSales/OrderDetail.vue @@ -0,0 +1,68 @@ + + + \ No newline at end of file diff --git a/src/views/mall/order/storeAfterSales/StoreAfterSalesForm.vue b/src/views/mall/order/storeAfterSales/StoreAfterSalesForm.vue new file mode 100644 index 0000000..6e2fd8e --- /dev/null +++ b/src/views/mall/order/storeAfterSales/StoreAfterSalesForm.vue @@ -0,0 +1,139 @@ + + diff --git a/src/views/mall/order/storeAfterSales/index.vue b/src/views/mall/order/storeAfterSales/index.vue new file mode 100644 index 0000000..1cae2df --- /dev/null +++ b/src/views/mall/order/storeAfterSales/index.vue @@ -0,0 +1,257 @@ + + + + diff --git a/src/views/mall/order/storeOrder/OrderDetail.vue b/src/views/mall/order/storeOrder/OrderDetail.vue new file mode 100644 index 0000000..630b13d --- /dev/null +++ b/src/views/mall/order/storeOrder/OrderDetail.vue @@ -0,0 +1,80 @@ + + + \ No newline at end of file diff --git a/src/views/mall/order/storeOrder/OrderRecord.vue b/src/views/mall/order/storeOrder/OrderRecord.vue new file mode 100644 index 0000000..32cecc2 --- /dev/null +++ b/src/views/mall/order/storeOrder/OrderRecord.vue @@ -0,0 +1,30 @@ + + + \ No newline at end of file diff --git a/src/views/mall/order/storeOrder/OrderSend.vue b/src/views/mall/order/storeOrder/OrderSend.vue new file mode 100644 index 0000000..c843bc2 --- /dev/null +++ b/src/views/mall/order/storeOrder/OrderSend.vue @@ -0,0 +1,294 @@ + + + \ No newline at end of file diff --git a/src/views/mall/order/storeOrder/OrderSendInfo.vue b/src/views/mall/order/storeOrder/OrderSendInfo.vue new file mode 100644 index 0000000..1f6926e --- /dev/null +++ b/src/views/mall/order/storeOrder/OrderSendInfo.vue @@ -0,0 +1,222 @@ + + + \ No newline at end of file diff --git a/src/views/mall/order/storeOrder/StoreOrderForm.vue b/src/views/mall/order/storeOrder/StoreOrderForm.vue new file mode 100644 index 0000000..82a5952 --- /dev/null +++ b/src/views/mall/order/storeOrder/StoreOrderForm.vue @@ -0,0 +1,194 @@ + + diff --git a/src/views/mall/order/storeOrder/StoreOrderRemark.vue b/src/views/mall/order/storeOrder/StoreOrderRemark.vue new file mode 100644 index 0000000..e18d7c7 --- /dev/null +++ b/src/views/mall/order/storeOrder/StoreOrderRemark.vue @@ -0,0 +1,184 @@ + + diff --git a/src/views/mall/order/storeOrder/index.vue b/src/views/mall/order/storeOrder/index.vue new file mode 100644 index 0000000..7db00cb --- /dev/null +++ b/src/views/mall/order/storeOrder/index.vue @@ -0,0 +1,424 @@ + + + + + \ No newline at end of file diff --git a/src/views/mall/order/storeOrderElectronics/StoreOrderElectronicsForm.vue b/src/views/mall/order/storeOrderElectronics/StoreOrderElectronicsForm.vue new file mode 100644 index 0000000..2a8aa84 --- /dev/null +++ b/src/views/mall/order/storeOrderElectronics/StoreOrderElectronicsForm.vue @@ -0,0 +1,132 @@ + + diff --git a/src/views/pay/merchant/index.vue b/src/views/mall/order/storeOrderElectronics/index.vue similarity index 51% rename from src/views/pay/merchant/index.vue rename to src/views/mall/order/storeOrderElectronics/index.vue index 806a0b6..bd0b846 100644 --- a/src/views/pay/merchant/index.vue +++ b/src/views/mall/order/storeOrderElectronics/index.vue @@ -8,61 +8,33 @@ :inline="true" label-width="68px" > - - - - + - + - - - - - - - - - - - + 搜索 重置 新增 @@ -71,7 +43,7 @@ plain @click="handleExport" :loading="exportLoading" - v-hasPermi="['pay:merchant:export']" + v-hasPermi="['order:store-order-electronics:export']" > 导出 @@ -82,27 +54,24 @@ - - - - - + + + + + + + - - diff --git a/src/views/mall/product/storeProductReply/index.vue b/src/views/mall/product/storeProductReply/index.vue new file mode 100644 index 0000000..ef34344 --- /dev/null +++ b/src/views/mall/product/storeProductReply/index.vue @@ -0,0 +1,145 @@ + + + diff --git a/src/views/message/wechatTemplate/WechatTemplateForm.vue b/src/views/message/wechatTemplate/WechatTemplateForm.vue new file mode 100644 index 0000000..6b0f852 --- /dev/null +++ b/src/views/message/wechatTemplate/WechatTemplateForm.vue @@ -0,0 +1,124 @@ + + diff --git a/src/views/message/wechatTemplate/index.vue b/src/views/message/wechatTemplate/index.vue new file mode 100644 index 0000000..bbd42c1 --- /dev/null +++ b/src/views/message/wechatTemplate/index.vue @@ -0,0 +1,185 @@ + + + diff --git a/src/views/mp/components/wx-voice-play/main.vue b/src/views/mp/components/wx-voice-play/main.vue index fef0529..400ebb0 100644 --- a/src/views/mp/components/wx-voice-play/main.vue +++ b/src/views/mp/components/wx-voice-play/main.vue @@ -29,7 +29,7 @@ import BenzAMRRecorder from 'benz-amr-recorder' const props = defineProps({ url: { - type: String, // 语音地址，例如说：https://www.iocoder.cn/xxx.amr + type: String, // 语音地址，例如说：https://www.yixiang.co/xxx.amr required: true }, content: { diff --git a/src/views/mp/draft/mock.js b/src/views/mp/draft/mock.js index e8493f6..90749b9 100644 --- a/src/views/mp/draft/mock.js +++ b/src/views/mp/draft/mock.js @@ -9,28 +9,28 @@ export default { author: '我是作者', digest: '我是摘要', content: '我是内容', - contentSourceUrl: 'https://www.iocoder.cn', + contentSourceUrl: 'https://www.yixiang.co', thumbMediaId: 'r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn', showCoverPic: 0, needOpenComment: 0, onlyFansCanComment: 0, url: 'http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&tempkey=MTIxMl9XaFphcmtJVFh3VEc4Q1MxQWwxQ3R5R0JGTXBDM1Q0N2ZFQm8zeUphOFlwNEpXSWxTYm9RQnJ6cHVuN2QxTE56SFBCYXc2RE9NcUxIeS1CQjJuUHhTWjBlN2VOeGRpRi1fZUhwN1FNQjdrQV9yRU9EU0hibHREZmZoVW5acnZrN3ZjaWsxejR3RGpKczBzTHFIM0dFNFZWVkpBc0dWWlAzUEhlVmpnfn4%3D&chksm=1f6354802814dd969ef83c0f3babe555c614270b30bc383beaf7ffd13b0257f0fe5ced9af694#rd', thumbUrl: - 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png' + 'http://test.yixiang.co/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png' }, { title: '我是标题（XXX）', author: '我是作者', digest: '我是摘要', content: '我是内容', - contentSourceUrl: 'https://www.iocoder.cn', + contentSourceUrl: 'https://www.yixiang.co', thumbMediaId: 'r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn', showCoverPic: 0, needOpenComment: 0, onlyFansCanComment: 0, url: 'http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&tempkey=MTIxMl9yTlYwOEs1clpwcE5OUEhCQWwxQ3R5R0JGTXBDM1Q0N2ZFQm8zeUphOFlwNEpXSWxTYm9RQnJ6cHVuN0NSMjFqN3N1aUZMbFNVLTZHN2ZDME9qOGp2THk2RFNlSTlKZ3Y1czFVZDdQQm5IeUg3dEppSUtpQUh5SExOOTRkT3dHNUdBdHdWSWlOendlREV3dS1jUEVQbFpiVTZmVW5iRWhZcGdkNTFRfn4%3D&chksm=1f6354802814dd96a403151cd44c7da4eecf0e475d25423e46ecd795b513bafd829a75daef9b#rd', thumbUrl: - 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png' + 'http://test.yixiang.co/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png' } ] }, @@ -45,14 +45,14 @@ export default { author: '我是作者', digest: '我是摘要', content: '我是内容', - contentSourceUrl: 'https://www.iocoder.cn', + contentSourceUrl: 'https://www.yixiang.co', thumbMediaId: 'r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn', showCoverPic: 0, needOpenComment: 0, onlyFansCanComment: 0, url: 'http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&tempkey=MTIxMl95WVFXYndIZnZJd0t5cjgvQWwxQ3R5R0JGTXBDM1Q0N2ZFQm8zeUphOFlwNEpXSWxTYm9RQnJ6cHVuN1dlNURPbWswbEF4RDd5dVJTdjQ4cm9Cc0Q1TWhpMUh6SE1hVEE3ZHljaHhlZjZYSGF5N2JNSHpDTlh6ajNZbkpGTGpTcUQ4M3NMdW41ZUpXNFZZQ1VKbVlaMVp5ekxEV1czREdsY1dOYTZnfn4%3D&chksm=1f6354be2814dda8e6238037c2ebd52b1c8e80e93249a861ad80e4d40e5ca7207233475ca689#rd', thumbUrl: - 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png' + 'http://test.yixiang.co/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png' } ] }, @@ -67,7 +67,7 @@ export default { author: '3232', digest: '1333', content: '

444

', - contentSourceUrl: 'http://www.iocoder.cn', + contentSourceUrl: 'http://www.yixiang.co', thumbMediaId: 'r6ryvl6LrxBU0miaST4Y-tlQmcl3RdC-Jcgns6IQtf7zenGy3b86WLT7GzUcrb1T', showCoverPic: 0, needOpenComment: 0, @@ -89,14 +89,14 @@ export default { author: 'haha', digest: '312', content: '

132312

', - contentSourceUrl: 'http://www.iocoder.cn', + contentSourceUrl: 'http://www.yixiang.co', thumbMediaId: 'r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG', showCoverPic: 0, needOpenComment: 0, onlyFansCanComment: 0, url: 'http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&tempkey=MTIxMl9qdkJ1ZjBoUmg2Uk9TS3RlQWwxQ3R5R0JGTXBDM1Q0N2ZFQm8zeUphOFlwNEpXSWxTYm9RQnJ6cHVuNVg2aTJsaC1fMkU2eXNacUplN3VDTTZFZkhtMjhuTUZvWkxsNDBRSXExY2tiVXRHb09TaHgtREhzY3doZ0JYeC1TSTZ5eWZldXJsOWtfbV8yMi1aYkcyZ2pOY0haM0Ntb3VSWEtxUGVFRlNBfn4%3D&chksm=1f6354ba2814ddacf0184b24d310483641ef190b1faac098c285eb416c70017e2f54decfa1af#rd', thumbUrl: - 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png' + 'http://test.yixiang.co/r6ryvl6LrxBU0miaST4Y-pgFtUNLu1foMSAMkoOsrQrTZ8EtTMssBLfTtzP0dfjG.png' } ] }, @@ -111,14 +111,14 @@ export default { author: '333', digest: '123', content: '123', - contentSourceUrl: 'https://www.iocoder.cn', + contentSourceUrl: 'https://www.yixiang.co', thumbMediaId: 'r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8', showCoverPic: 0, needOpenComment: 0, onlyFansCanComment: 0, url: 'http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&tempkey=MTIxMl9qVVhpSDZUaFJWTzBBWWRVQWwxQ3R5R0JGTXBDM1Q0N2ZFQm8zeUphOFlwNEpXSWxTYm9RQnJ6cHVuNWRnTDJWYmF2NER0clV1bThmQ0xUR3hqQnJkZ3BJSUNmNDJmc0lCZ1dadkVnZ3Z5bkN4YWtVUjhoaWZWYzZURUR4NnpMd0Y4Z3U5aUdib0lkMzI4Rjg3SG9JX2FycTMxbUctOHplaTlQVVhnfn4%3D&chksm=1f6354b62814dda076c778af33f06580165d8aa81f7798d55cfabb1886b5c74d9b2124a3535c#rd', thumbUrl: - 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8.jpg' + 'http://test.yixiang.co/r6ryvl6LrxBU0miaST4Y-jVixJGgnBnkBPRbuVptOW0CHYuQFyiOVNtamctS8xU8.jpg' } ] }, @@ -133,14 +133,14 @@ export default { author: '我是作者', digest: '我是摘要', content: '我是内容', - contentSourceUrl: 'https://www.iocoder.cn', + contentSourceUrl: 'https://www.yixiang.co', thumbMediaId: 'r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn', showCoverPic: 0, needOpenComment: 0, onlyFansCanComment: 0, url: 'http://mp.weixin.qq.com/s?__biz=MzA3NjM4MzQzOQ==&tempkey=MTIxMl9LT2dqRnpMNUpsR0hjYWtBQWwxQ3R5R0JGTXBDM1Q0N2ZFQm8zeUphOFlwNEpXSWxTYm9RQnJ6cHVuNGNmazZTdlE5WkxvU0tfX2V5cjV2WjJiR0xjQUhyREFSZWo2eWNrUW9EYVh6ZkpWRXBLR3FmTEV6YldBMno3Q2ZvVXBSdzlaVDc3aFhndEpQWUwzWmFMUWt0YVVURE1VZ1FsQTdPMlRtc3JBfn4%3D&chksm=1f6354aa2814ddbcc2637382f963a8742993ac38ebcebe6e3411df5ac82ac7bbdb391be6494a#rd', thumbUrl: - 'http://test.yudao.iocoder.cn/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png' + 'http://test.yixiang.co/r6ryvl6LrxBU0miaST4Y-pIcmK-zAAId-9TGgy-DrSLhjVuWbuT3ZBjk9K1yQ0Dn.png' } ] }, diff --git a/src/views/mp/material/index.vue b/src/views/mp/material/index.vue index ab38e16..b87d8f8 100644 --- a/src/views/mp/material/index.vue +++ b/src/views/mp/material/index.vue @@ -9,7 +9,7 @@ - + @@ -102,15 +102,15 @@ import VideoTable from './components/VideoTable.vue' import UploadFile from './components/UploadFile.vue' import UploadVideo from './components/UploadVideo.vue' -import MaterialList from '@/components/materials' + import { UploadType } from './components/upload' import * as MpMaterialApi from '@/api/mp/material' const message = useMessage() // 消息 -const form = ref({ - coverImgArr: null -}) // 遮罩层 +// const form = ref({ +// coverImgArr: null +// }) // 遮罩层 const type = ref(UploadType.Image) // 素材类型 const loading = ref(false) // 遮罩层 diff --git a/src/views/pay/app/AppForm.vue b/src/views/pay/app/AppForm.vue deleted file mode 100644 index a04ca49..0000000 --- a/src/views/pay/app/AppForm.vue +++ /dev/null @@ -1,143 +0,0 @@ - - diff --git a/src/views/pay/app/index.vue b/src/views/pay/app/index.vue deleted file mode 100644 index 4bafeed..0000000 --- a/src/views/pay/app/index.vue +++ /dev/null @@ -1,463 +0,0 @@ - - diff --git a/src/views/pay/merchantDetails/MerchantDetailsForm.vue b/src/views/pay/merchantDetails/MerchantDetailsForm.vue new file mode 100644 index 0000000..e8e9a9f --- /dev/null +++ b/src/views/pay/merchantDetails/MerchantDetailsForm.vue @@ -0,0 +1,179 @@ + + diff --git a/src/views/pay/merchantDetails/index.vue b/src/views/pay/merchantDetails/index.vue new file mode 100644 index 0000000..cf3911d --- /dev/null +++ b/src/views/pay/merchantDetails/index.vue @@ -0,0 +1,146 @@ + + + diff --git a/src/views/pay/order/OrderDetail.vue b/src/views/pay/order/OrderDetail.vue deleted file mode 100644 index ec2af78..0000000 --- a/src/views/pay/order/OrderDetail.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - diff --git a/src/views/pay/order/index.vue b/src/views/pay/order/index.vue deleted file mode 100644 index 72e5128..0000000 --- a/src/views/pay/order/index.vue +++ /dev/null @@ -1,336 +0,0 @@ - - - diff --git a/src/views/pay/refund/RefundDetail.vue b/src/views/pay/refund/RefundDetail.vue deleted file mode 100644 index 4d241d9..0000000 --- a/src/views/pay/refund/RefundDetail.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - diff --git a/src/views/pay/refund/index.vue b/src/views/pay/refund/index.vue deleted file mode 100644 index 17ca2a0..0000000 --- a/src/views/pay/refund/index.vue +++ /dev/null @@ -1,341 +0,0 @@ - - - -