From 64191373f095f68d0a13a5bbaa4c1ad8ef46fe43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=B0=91=E5=90=9B?= <476671688@qq.com> Date: Thu, 22 Feb 2024 09:58:59 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=B4=A0=E6=9D=90=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=A0=8F=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/finance/recharge/index.model.ts | 4 +- src/api/finance/withdraw/index.model.ts | 5 +- src/api/mall/cart/storeCart/index.ts | 2 +- src/api/mall/decoration/adverts.ts | 2 +- src/api/mall/decoration/canvas.ts | 2 +- src/api/mall/order/electronicsOrder/index.ts | 2 +- src/api/mall/order/express/index.ts | 2 +- src/api/mall/order/storeAfterSales/index.ts | 2 +- src/api/mall/order/storeOrder/index.ts | 8 +- .../mall/order/storeOrderElectronics/index.ts | 2 +- src/api/mall/product/discountCoupon/index.ts | 4 +- src/api/mall/product/product.ts | 12 +- .../mall/product/shippingTemplates/index.ts | 2 +- .../product/storeProductRelation/index.ts | 2 +- .../mall/product/storeProductReply/index.ts | 2 +- src/api/mall/shop/materialGroup/index.ts | 2 +- src/api/mall/shop/shop/index.ts | 2 +- src/api/mall/shop/storeProductRule/index.ts | 2 +- src/api/mall/shopAssistant/index.ts | 2 +- src/api/member/integralRule/index.ts | 2 +- src/api/member/signInRecord/index.ts | 2 +- src/api/member/user/index.ts | 6 +- src/api/member/userAddress/index.ts | 4 +- src/api/member/userBill/index.ts | 4 +- src/api/member/userInviteLog/index.ts | 2 +- src/api/member/userLevelConfig/index.ts | 2 +- src/api/member/userLevelEquity/index.ts | 2 +- src/api/member/userLevelEquityRef/index.ts | 2 +- .../userLevelGrowthValueConfig/index.ts | 2 +- src/api/member/userTag/index.ts | 2 +- src/api/member/userTagGroup/index.ts | 2 +- src/api/message/wechatTemplate/index.ts | 4 +- src/api/pay/merchantDetails/index.ts | 2 +- ...ditorMaterials.vue => EditorMaterials.vue} | 0 src/components/Materials/src/Materials.vue | 421 +----------------- .../Materials/src/MaterialsMain.vue | 421 ++++++++++++++++++ .../canvas/components/canvasEditPage.vue | 4 +- .../canvasShow/basics/group/mixin.js | 4 - src/layout/components/Logo/src/Logo.vue | 2 +- src/types/activity.ts | 10 +- src/types/configGlobal.d.ts | 5 + src/types/distributor.ts | 33 +- src/utils/formatTime.ts | 2 +- src/views/Login/components/LoginForm.vue | 4 +- src/views/distributor/commission/index.vue | 14 +- .../distributor/distributionConfig/index.vue | 3 +- .../merchant/components/AuditForm.vue | 9 +- src/views/distributor/merchant/index.vue | 17 +- .../order/components/OrderDetail.vue | 3 +- .../finance/recharge/component/TableTab.vue | 36 +- src/views/finance/withdraw/index.vue | 6 +- .../codegen/components/GenerateInfoForm.vue | 19 +- src/views/infra/fileConfig/FileConfigForm.vue | 32 +- src/views/mall/decoration/canvas/index.vue | 2 +- src/views/mall/materials/index.vue | 18 + .../order/storeAfterSales/OrderDetail.vue | 50 ++- src/views/marketing/discount/index.vue | 4 +- src/views/marketing/groupBuy/groupBuyForm.vue | 16 +- .../member/integralRule/IntegralRuleForm.vue | 2 +- .../userLevelConfig/UserLevelConfigForm.vue | 35 +- 60 files changed, 695 insertions(+), 576 deletions(-) rename src/components/Materials/src/{editorMaterials.vue => EditorMaterials.vue} (100%) create mode 100644 src/components/Materials/src/MaterialsMain.vue create mode 100644 src/views/mall/materials/index.vue diff --git a/src/api/finance/recharge/index.model.ts b/src/api/finance/recharge/index.model.ts index ef71d86..583eba9 100644 --- a/src/api/finance/recharge/index.model.ts +++ b/src/api/finance/recharge/index.model.ts @@ -7,9 +7,9 @@ * */ export interface RechargeQuery extends PageParam { status?:RechargeStatusEnum - createTime?:any[], + createTime?:any, id?:any, - username?:string + nickname?:string } export interface RechargeVO { diff --git a/src/api/finance/withdraw/index.model.ts b/src/api/finance/withdraw/index.model.ts index 89db3e4..8f1d0b0 100644 --- a/src/api/finance/withdraw/index.model.ts +++ b/src/api/finance/withdraw/index.model.ts @@ -9,7 +9,8 @@ export interface WithdrawQuery extends PageParam{ userName?:string type?:WidthType - createTime?:any[] + createTime?:any, + distributorName?: string } export interface WithdrawVO{ @@ -23,6 +24,8 @@ export interface WithdrawVO{ methodType:MethodType id:number createTime:string + accountNum: number + content: string } export enum MethodType{ diff --git a/src/api/mall/cart/storeCart/index.ts b/src/api/mall/cart/storeCart/index.ts index cccabfc..01854f1 100644 --- a/src/api/mall/cart/storeCart/index.ts +++ b/src/api/mall/cart/storeCart/index.ts @@ -15,7 +15,7 @@ export interface StoreCartVO { } // 查询购物车列表 -export const getStoreCartPage = async (params: StoreCartPageReqVO) => { +export const getStoreCartPage = async (params: PageParam) => { return await request.get({ url: `/cart/store-cart/page`, params }) } diff --git a/src/api/mall/decoration/adverts.ts b/src/api/mall/decoration/adverts.ts index 426a5a1..c784a4c 100644 --- a/src/api/mall/decoration/adverts.ts +++ b/src/api/mall/decoration/adverts.ts @@ -6,7 +6,7 @@ export interface AdvertsVO { } // 查询广告列表 -export const getAdvertsPage = async (params: AdvertsVO) => { +export const getAdvertsPage = async (params: PageParam) => { return await request.get({ url: `/shop/popup/page`, params }) } diff --git a/src/api/mall/decoration/canvas.ts b/src/api/mall/decoration/canvas.ts index 41752e7..0b433e9 100644 --- a/src/api/mall/decoration/canvas.ts +++ b/src/api/mall/decoration/canvas.ts @@ -6,7 +6,7 @@ export interface CanvasVO { } // 查询画布信息列表 -export const getCanvasPage = async (params: CanvasVO) => { +export const getCanvasPage = async (params: PageParam) => { return await request.get({ url: `/shop/canvas/page`, params }) } diff --git a/src/api/mall/order/electronicsOrder/index.ts b/src/api/mall/order/electronicsOrder/index.ts index 0da2a41..6b37d09 100644 --- a/src/api/mall/order/electronicsOrder/index.ts +++ b/src/api/mall/order/electronicsOrder/index.ts @@ -40,7 +40,7 @@ export const getElectronicsOrderList = async () => { // 查询电子面单列表 -export const getElectronicsOrderPage = async (params: ElectronicsOrderPageReqVO) => { +export const getElectronicsOrderPage = async (params: PageParam) => { return await request.get({ url: `/express/electronics-order/page`, params }) } diff --git a/src/api/mall/order/express/index.ts b/src/api/mall/order/express/index.ts index a07e035..6a09adb 100644 --- a/src/api/mall/order/express/index.ts +++ b/src/api/mall/order/express/index.ts @@ -12,7 +12,7 @@ export const getExpressList = async () => { } // 查询快递公司列表 -export const getExpressPage = async (params: ExpressPageReqVO) => { +export const getExpressPage = async (params: PageParam) => { return await request.get({ url: `/order/express/page`, params }) } diff --git a/src/api/mall/order/storeAfterSales/index.ts b/src/api/mall/order/storeAfterSales/index.ts index c91b2db..f0bd5b7 100644 --- a/src/api/mall/order/storeAfterSales/index.ts +++ b/src/api/mall/order/storeAfterSales/index.ts @@ -20,7 +20,7 @@ export interface StoreAfterSalesVO { } // 查询售后记录列表 -export const getStoreAfterSalesPage = async (params: StoreAfterSalesPageReqVO) => { +export const getStoreAfterSalesPage = async (params: PageParam) => { return await request.get({ url: `/order/store-after-sales/page`, params }) } diff --git a/src/api/mall/order/storeOrder/index.ts b/src/api/mall/order/storeOrder/index.ts index da9fc57..d74f149 100644 --- a/src/api/mall/order/storeOrder/index.ts +++ b/src/api/mall/order/storeOrder/index.ts @@ -18,11 +18,11 @@ export interface StoreOrderVO { deductionPrice: number couponId: number couponPrice: number - paid: byte + paid: number payTime: Date payType: string status: boolean - refundStatus: byte + refundStatus: number refundReasonWapImg: string refundReasonWapExplain: string refundReasonTime: Date @@ -49,12 +49,12 @@ export interface StoreOrderVO { verifyCode: string storeId: number shippingType: boolean - isChannel: byte + isChannel: boolean isSystemDel: boolean } // 查询订单列表 -export const getStoreOrderPage = async (params: StoreOrderPageReqVO) => { +export const getStoreOrderPage = async (params: PageParam) => { return await request.get({ url: `/order/store-order/page`, params }) } diff --git a/src/api/mall/order/storeOrderElectronics/index.ts b/src/api/mall/order/storeOrderElectronics/index.ts index 8f08ed5..d2fa58f 100644 --- a/src/api/mall/order/storeOrderElectronics/index.ts +++ b/src/api/mall/order/storeOrderElectronics/index.ts @@ -14,7 +14,7 @@ export interface StoreOrderElectronicsVO { } // 查询订单电子面单记录列表 -export const getStoreOrderElectronicsPage = async (params: StoreOrderElectronicsPageReqVO) => { +export const getStoreOrderElectronicsPage = async (params: PageParam) => { return await request.get({ url: `/order/store-order-electronics/page`, params }) } diff --git a/src/api/mall/product/discountCoupon/index.ts b/src/api/mall/product/discountCoupon/index.ts index 5012e2d..884d1e9 100644 --- a/src/api/mall/product/discountCoupon/index.ts +++ b/src/api/mall/product/discountCoupon/index.ts @@ -11,7 +11,7 @@ export interface DiscountCouponVO { } // 查询优惠券列表 -export const getDiscountCouponPage = async (params: DiscountCouponPageReqVO) => { +export const getDiscountCouponPage = async (params: PageParam) => { return await request.get({ url: `/product/coupon/page`, params }) } @@ -36,6 +36,6 @@ export const deleteDiscountCoupon = async (id: number) => { } // 查询可用画布优惠券列表 -export const getCanvasCouponPage = async (params: DiscountCouponPageReqVO) => { +export const getCanvasCouponPage = async (params: PageParam) => { return await request.get({ url: `/product/coupon/canvas/page`, params }) } diff --git a/src/api/mall/product/product.ts b/src/api/mall/product/product.ts index 80b606f..c794940 100644 --- a/src/api/mall/product/product.ts +++ b/src/api/mall/product/product.ts @@ -23,12 +23,12 @@ export interface StoreProductVO { isBest: boolean isNew: boolean description: string - isPostage: byte - merUse: byte + isPostage: boolean + merUse: string giveIntegral: number cost: number - isSeckill: byte - isBargain: byte + isSeckill: boolean + isBargain: boolean isGood: boolean ficti: number browse: number @@ -36,12 +36,12 @@ export interface StoreProductVO { isSub: boolean tempId: number specType: boolean - isIntegral: byte + isIntegral: boolean integral: number } // 查询商品列表 -export const getStoreProductPage = async (params: StoreProductPageReqVO) => { +export const getStoreProductPage = async (params: PageParam) => { return await request.get({ url: `/product/store-product/page`, params }) } diff --git a/src/api/mall/product/shippingTemplates/index.ts b/src/api/mall/product/shippingTemplates/index.ts index 6d65130..f82c046 100644 --- a/src/api/mall/product/shippingTemplates/index.ts +++ b/src/api/mall/product/shippingTemplates/index.ts @@ -11,7 +11,7 @@ export interface ShippingTemplatesVO { } // 查询运费模板列表 -export const getShippingTemplatesPage = async (params: ShippingTemplatesPageReqVO) => { +export const getShippingTemplatesPage = async (params: PageParam) => { return await request.get({ url: `/product/shipping-templates/page`, params }) } diff --git a/src/api/mall/product/storeProductRelation/index.ts b/src/api/mall/product/storeProductRelation/index.ts index 32ee58b..5387789 100644 --- a/src/api/mall/product/storeProductRelation/index.ts +++ b/src/api/mall/product/storeProductRelation/index.ts @@ -9,7 +9,7 @@ export interface StoreProductRelationVO { } // 查询商品点赞和收藏列表 -export const getStoreProductRelationPage = async (params: StoreProductRelationPageReqVO) => { +export const getStoreProductRelationPage = async (params: PageParam) => { return await request.get({ url: `/product/store-product-relation/page`, params }) } diff --git a/src/api/mall/product/storeProductReply/index.ts b/src/api/mall/product/storeProductReply/index.ts index dd48c08..d51c372 100644 --- a/src/api/mall/product/storeProductReply/index.ts +++ b/src/api/mall/product/storeProductReply/index.ts @@ -17,7 +17,7 @@ export interface StoreProductReplyVO { } // 查询评论列表 -export const getStoreProductReplyPage = async (params: StoreProductReplyPageReqVO) => { +export const getStoreProductReplyPage = async (params: PageParam) => { return await request.get({ url: `/product/store-product-reply/page`, params }) } diff --git a/src/api/mall/shop/materialGroup/index.ts b/src/api/mall/shop/materialGroup/index.ts index 93b4e06..43af56f 100644 --- a/src/api/mall/shop/materialGroup/index.ts +++ b/src/api/mall/shop/materialGroup/index.ts @@ -6,7 +6,7 @@ export interface MaterialGroupVO { } // 查询素材分组列表 -export const getMaterialGroupPage = async (params: MaterialGroupPageReqVO) => { +export const getMaterialGroupPage = async (params: PageParam) => { return await request.get({ url: `/shop/material-group/page`, params }) } diff --git a/src/api/mall/shop/shop/index.ts b/src/api/mall/shop/shop/index.ts index c89b08b..c32dad6 100644 --- a/src/api/mall/shop/shop/index.ts +++ b/src/api/mall/shop/shop/index.ts @@ -17,7 +17,7 @@ export interface ShopVO { } // 查询门店列表 -export const getShopPage = async (params: ShopPageReqVO) => { +export const getShopPage = async (params: PageParam) => { return await request.get({ url: `/mall/shop/page`, params }) } diff --git a/src/api/mall/shop/storeProductRule/index.ts b/src/api/mall/shop/storeProductRule/index.ts index f5fd419..2d40af3 100644 --- a/src/api/mall/shop/storeProductRule/index.ts +++ b/src/api/mall/shop/storeProductRule/index.ts @@ -7,7 +7,7 @@ export interface StoreProductRuleVO { } // 查询商品规则值(规格)列表 -export const getStoreProductRulePage = async (params: StoreProductRulePageReqVO) => { +export const getStoreProductRulePage = async (params: PageParam) => { return await request.get({ url: `/product/store-product-rule/page`, params }) } diff --git a/src/api/mall/shopAssistant/index.ts b/src/api/mall/shopAssistant/index.ts index a93fc5c..058ac04 100644 --- a/src/api/mall/shopAssistant/index.ts +++ b/src/api/mall/shopAssistant/index.ts @@ -10,7 +10,7 @@ export interface ShopAssistantVO { } // 查询门店店员列表 -export const getShopAssistantPage = async (params: ShopAssistantPageReqVO) => { +export const getShopAssistantPage = async (params: PageParam) => { return await request.get({ url: `/mall/shop-assistant/page`, params }) } diff --git a/src/api/member/integralRule/index.ts b/src/api/member/integralRule/index.ts index 7331eec..11c8356 100644 --- a/src/api/member/integralRule/index.ts +++ b/src/api/member/integralRule/index.ts @@ -9,7 +9,7 @@ export interface IntegralRuleVO { } // 查询会员积分规则列表 -export const getIntegralRulePage = async (params: IntegralRulePageReqVO) => { +export const getIntegralRulePage = async (params: PageParam) => { return await request.get({ url: `/member/integral-rule/page`, params }) } diff --git a/src/api/member/signInRecord/index.ts b/src/api/member/signInRecord/index.ts index 3637ec2..b771114 100644 --- a/src/api/member/signInRecord/index.ts +++ b/src/api/member/signInRecord/index.ts @@ -7,7 +7,7 @@ export interface SignInRecordVO { } // 查询签到记录列表 -export const getSignInRecordPage = async (params: SignInRecordPageReqVO) => { +export const getSignInRecordPage = async (params: PageParam) => { return await request.get({ url: `/member/sign-in-record/page`, params }) } diff --git a/src/api/member/user/index.ts b/src/api/member/user/index.ts index 76a15c4..ddd29f7 100644 --- a/src/api/member/user/index.ts +++ b/src/api/member/user/index.ts @@ -20,11 +20,11 @@ export interface UserVO { integral: number signNum: number status: boolean - level: byte + level: number spreadUid: number spreadTime: Date userType: string - isPromoter: byte + isPromoter: boolean payCount: number spreadCount: number addres: string @@ -34,7 +34,7 @@ export interface UserVO { } // 查询用户列表 -export const getUserPage = async (params: UserPageReqVO) => { +export const getUserPage = async (params: PageParam) => { return await request.get({ url: `/member/user/page`, params }) } diff --git a/src/api/member/userAddress/index.ts b/src/api/member/userAddress/index.ts index 9df8ee5..6f29a55 100644 --- a/src/api/member/userAddress/index.ts +++ b/src/api/member/userAddress/index.ts @@ -13,11 +13,11 @@ export interface UserAddressVO { postCode: string longitude: string latitude: string - isDefault: byte + isDefault: boolean } // 查询用户地址列表 -export const getUserAddressPage = async (params: UserAddressPageReqVO) => { +export const getUserAddressPage = async (params: PageParam) => { return await request.get({ url: `/member/user-address/page`, params }) } diff --git a/src/api/member/userBill/index.ts b/src/api/member/userBill/index.ts index f8b583d..a103134 100644 --- a/src/api/member/userBill/index.ts +++ b/src/api/member/userBill/index.ts @@ -4,7 +4,7 @@ export interface UserBillVO { id: number uid: number linkId: string - pm: byte + pm: string title: string category: string type: string @@ -15,7 +15,7 @@ export interface UserBillVO { } // 查询用户账单列表 -export const getUserBillPage = async (params: UserBillPageReqVO) => { +export const getUserBillPage = async (params: PageParam) => { return await request.get({ url: `/member/user-bill/page`, params }) } diff --git a/src/api/member/userInviteLog/index.ts b/src/api/member/userInviteLog/index.ts index a1c6d9b..bcbcfd0 100644 --- a/src/api/member/userInviteLog/index.ts +++ b/src/api/member/userInviteLog/index.ts @@ -7,7 +7,7 @@ export interface UserInviteLogVO { } // 查询邀请日志列表 -export const getUserInviteLogPage = async (params: UserInviteLogPageReqVO) => { +export const getUserInviteLogPage = async (params: PageParam) => { return await request.get({ url: `/member/user-invite-log/page`, params }) } diff --git a/src/api/member/userLevelConfig/index.ts b/src/api/member/userLevelConfig/index.ts index 108764d..6cf529b 100644 --- a/src/api/member/userLevelConfig/index.ts +++ b/src/api/member/userLevelConfig/index.ts @@ -12,7 +12,7 @@ export interface UserLevelConfigVO { } // 查询会员等级配置列表 -export const getUserLevelConfigPage = async (params: UserLevelConfigPageReqVO) => { +export const getUserLevelConfigPage = async (params: PageParam) => { return await request.get({ url: `/member/user-level-config/page`, params }) } diff --git a/src/api/member/userLevelEquity/index.ts b/src/api/member/userLevelEquity/index.ts index 570af84..4eff89d 100644 --- a/src/api/member/userLevelEquity/index.ts +++ b/src/api/member/userLevelEquity/index.ts @@ -9,7 +9,7 @@ export interface UserLevelEquityVO { } // 查询会员等级权益配置列表 -export const getUserLevelEquityPage = async (params: UserLevelEquityPageReqVO) => { +export const getUserLevelEquityPage = async (params: PageParam) => { return await request.get({ url: `/member/user-level-equity/page`, params }) } diff --git a/src/api/member/userLevelEquityRef/index.ts b/src/api/member/userLevelEquityRef/index.ts index ffd33f7..c3ed67c 100644 --- a/src/api/member/userLevelEquityRef/index.ts +++ b/src/api/member/userLevelEquityRef/index.ts @@ -7,7 +7,7 @@ export interface UserLevelEquityRefVO { } // 查询会员等级权益中间列表 -export const getUserLevelEquityRefPage = async (params: UserLevelEquityRefPageReqVO) => { +export const getUserLevelEquityRefPage = async (params: PageParam) => { return await request.get({ url: `/member/user-level-equity-ref/page`, params }) } diff --git a/src/api/member/userLevelGrowthValueConfig/index.ts b/src/api/member/userLevelGrowthValueConfig/index.ts index b30cab1..b7fdc4d 100644 --- a/src/api/member/userLevelGrowthValueConfig/index.ts +++ b/src/api/member/userLevelGrowthValueConfig/index.ts @@ -8,7 +8,7 @@ export interface UserLevelGrowthValueConfigVO { } // 查询会员成长任务配置列表 -export const getUserLevelGrowthValueConfigPage = async (params: UserLevelGrowthValueConfigPageReqVO) => { +export const getUserLevelGrowthValueConfigPage = async (params: PageParam) => { return await request.get({ url: `/member/user-level-growth-value-config/page`, params }) } diff --git a/src/api/member/userTag/index.ts b/src/api/member/userTag/index.ts index 0aa7f43..260459c 100644 --- a/src/api/member/userTag/index.ts +++ b/src/api/member/userTag/index.ts @@ -7,7 +7,7 @@ export interface UserTagVO { } // 查询会员标签列表 -export const getUserTagPage = async (params: UserTagPageReqVO) => { +export const getUserTagPage = async (params: PageParam) => { return await request.get({ url: `/member/user-tag/page`, params }) } diff --git a/src/api/member/userTagGroup/index.ts b/src/api/member/userTagGroup/index.ts index f6180fa..2f9f954 100644 --- a/src/api/member/userTagGroup/index.ts +++ b/src/api/member/userTagGroup/index.ts @@ -7,7 +7,7 @@ export interface UserTagGroupVO { } // 查询会员标签分组列表 -export const getUserTagGroupPage = async (params: UserTagGroupPageReqVO) => { +export const getUserTagGroupPage = async (params: PageParam) => { return await request.get({ url: `/member/user-tag-group/page`, params }) } diff --git a/src/api/message/wechatTemplate/index.ts b/src/api/message/wechatTemplate/index.ts index 64ce47b..374068c 100644 --- a/src/api/message/wechatTemplate/index.ts +++ b/src/api/message/wechatTemplate/index.ts @@ -6,12 +6,12 @@ export interface WechatTemplateVO { name: string content: string tempid: string - status: byte + status: number type: string } // 查询微信模板列表 -export const getWechatTemplatePage = async (params: WechatTemplatePageReqVO) => { +export const getWechatTemplatePage = async (params: PageParam) => { return await request.get({ url: `/message/wechat-template/page`, params }) } diff --git a/src/api/pay/merchantDetails/index.ts b/src/api/pay/merchantDetails/index.ts index 36c077e..bbd2df9 100644 --- a/src/api/pay/merchantDetails/index.ts +++ b/src/api/pay/merchantDetails/index.ts @@ -21,7 +21,7 @@ export interface MerchantDetailsVO { } // 查询支付服务商配置列表 -export const getMerchantDetailsPage = async (params: MerchantDetailsPageReqVO) => { +export const getMerchantDetailsPage = async (params: PageParam) => { return await request.get({ url: `/pay/merchant-details/page`, params }) } diff --git a/src/components/Materials/src/editorMaterials.vue b/src/components/Materials/src/EditorMaterials.vue similarity index 100% rename from src/components/Materials/src/editorMaterials.vue rename to src/components/Materials/src/EditorMaterials.vue diff --git a/src/components/Materials/src/Materials.vue b/src/components/Materials/src/Materials.vue index 3ee53ab..f8044f7 100644 --- a/src/components/Materials/src/Materials.vue +++ b/src/components/Materials/src/Materials.vue @@ -48,121 +48,7 @@ - - -
- - 添加分组 - -
- - - - - - - - - -
- - - - - - -
- 选择 - - - 删除 - - -
- - - - - - -
- - - + - - - - - - - - diff --git a/src/components/Materials/src/MaterialsMain.vue b/src/components/Materials/src/MaterialsMain.vue new file mode 100644 index 0000000..5c4a0b8 --- /dev/null +++ b/src/components/Materials/src/MaterialsMain.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/src/components/canvas/components/canvasEditPage.vue b/src/components/canvas/components/canvasEditPage.vue index 5d29a81..41ebe40 100644 --- a/src/components/canvas/components/canvasEditPage.vue +++ b/src/components/canvas/components/canvasEditPage.vue @@ -205,9 +205,7 @@ function checkIsNoData (dataList) { }) break case 'groupList': - if (newVal.id) { - isEmpty = false - } + isEmpty = false break case 'spikeList': if (newVal.id) { diff --git a/src/components/canvas/components/canvasShow/basics/group/mixin.js b/src/components/canvas/components/canvasShow/basics/group/mixin.js index 3c87ade..f072726 100644 --- a/src/components/canvas/components/canvasShow/basics/group/mixin.js +++ b/src/components/canvas/components/canvasShow/basics/group/mixin.js @@ -33,7 +33,6 @@ export default function (componentContent, typeId, shopId) { }) function getData () { - if (componentContent.value.id) { beforeGetData() const params = { method: 'POST', @@ -53,9 +52,6 @@ export default function (componentContent, typeId, shopId) { afterGetData() } ) - } else { - productData.value = [] - } } watch(() => diff --git a/src/layout/components/Logo/src/Logo.vue b/src/layout/components/Logo/src/Logo.vue index 17bdf1a..bc2221e 100644 --- a/src/layout/components/Logo/src/Logo.vue +++ b/src/layout/components/Logo/src/Logo.vue @@ -72,7 +72,7 @@ watch(
@@ -106,9 +106,10 @@ import {DistributorData} from "@/types/distributor"; interface QueryParams { pageNo: number pageSize: number - type?: number | null; + type?: number; userName?: string; - orderId?: number + orderId?: number | null + createTime: any } const loading = ref(true); @@ -117,9 +118,10 @@ const list = ref([]); const queryParams: QueryParams = reactive({ pageNo: 1, pageSize: 10, - type: null, + type: undefined, userName: "", - orderId: null + orderId: null, + createTime: [] }) const queryFormRef = ref() // 搜索的表单 @@ -144,7 +146,7 @@ const handleQuery: () => void = () => { const resetQuery: () => void = () => { queryFormRef.value.resetFields() queryParams.orderId = null - queryParams.type=null + queryParams.type=undefined handleQuery() } /** 初始化 **/ diff --git a/src/views/distributor/distributionConfig/index.vue b/src/views/distributor/distributionConfig/index.vue index 93f1a09..a92d73f 100644 --- a/src/views/distributor/distributionConfig/index.vue +++ b/src/views/distributor/distributionConfig/index.vue @@ -87,7 +87,6 @@ const addCustomDialog = () => { title: '上传图片', cssRules: 'width:1200px;height:650px;padding:20px;' }); - this.dialog = dialog; var btn = new window.UE.ui.Button({ name: 'dialog-button', @@ -192,7 +191,7 @@ getOptionConfig() - + 保存 diff --git a/src/views/distributor/merchant/components/AuditForm.vue b/src/views/distributor/merchant/components/AuditForm.vue index cc63ced..4767885 100644 --- a/src/views/distributor/merchant/components/AuditForm.vue +++ b/src/views/distributor/merchant/components/AuditForm.vue @@ -4,8 +4,13 @@ import {ref, reactive} from "vue"; const message = useMessage() // 消息弹窗 const dialogVisible = ref(false) -const formData = ref({ - id: null, + +interface FormData { + id?: number; + refuse: string; + status: number; +} +const formData = ref({ refuse: '', status: 1 }) diff --git a/src/views/distributor/merchant/index.vue b/src/views/distributor/merchant/index.vue index 7798b55..6577d29 100644 --- a/src/views/distributor/merchant/index.vue +++ b/src/views/distributor/merchant/index.vue @@ -32,7 +32,7 @@ @@ -209,10 +209,11 @@ const message = useMessage() // 消息弹窗 interface QueryParams { pageNo: number pageSize: number - levelId?: number | null; + levelId?: number; superiorName?: string; - createTime: Date[] - status?: string + status?: string, + realName: string, + createTime: any } const loading = ref(true); @@ -221,17 +222,17 @@ const list = ref([]); const queryParams: QueryParams = reactive({ pageNo: 1, pageSize: 10, - levelId: null, + levelId: undefined, superiorName: "", createTime: [], - status: "" - + status: "", + realName: '' }) const levelList = ref([]); const auditRef = ref() const queryFormRef = ref() // 搜索的表单 const groupVisible = ref(false) // 拼团信息显示 -const distributorDetail = ref({}) +const distributorDetail = ref({} as DistributorDetail) /** 查询列表 */ const getList: ()=> Promise = async () => { loading.value = true diff --git a/src/views/distributor/order/components/OrderDetail.vue b/src/views/distributor/order/components/OrderDetail.vue index f967cde..f690a4f 100644 --- a/src/views/distributor/order/components/OrderDetail.vue +++ b/src/views/distributor/order/components/OrderDetail.vue @@ -1,8 +1,9 @@ + diff --git a/src/views/infra/fileConfig/FileConfigForm.vue b/src/views/infra/fileConfig/FileConfigForm.vue index 42e0bba..e08e1b3 100644 --- a/src/views/infra/fileConfig/FileConfigForm.vue +++ b/src/views/infra/fileConfig/FileConfigForm.vue @@ -112,9 +112,21 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formData = ref({ id: undefined, name: '', - storage: '', + storage: 0, remark: '', - config: {} + config: { + basePath: '', + host: '', + port: 0, + username: '', + password: '', + mode: '', + endpoint: '', + bucket: '', + accessKey: '', + accessSecret: '', + domain: '' + } }) const formRules = reactive({ name: [{ required: true, message: '配置名不能为空', trigger: 'blur' }], @@ -184,9 +196,21 @@ const resetForm = () => { formData.value = { id: undefined, name: '', - storage: '', + storage: 0, remark: '', - config: {} + config: { + basePath: '', + host: '', + port: 0, + username: '', + password: '', + mode: '', + endpoint: '', + bucket: '', + accessKey: '', + accessSecret: '', + domain: '' + } } formRef.value?.resetFields() } diff --git a/src/views/mall/decoration/canvas/index.vue b/src/views/mall/decoration/canvas/index.vue index 80f172d..262938a 100644 --- a/src/views/mall/decoration/canvas/index.vue +++ b/src/views/mall/decoration/canvas/index.vue @@ -182,7 +182,7 @@ const handleDelete = async (id: number) => { /** 装修按钮操作 */ const handleDecoration = (id) =>{ - push('/page/canvasPage?id=' + id) + push('/decoration/canvasPage?id=' + id) } /** 设为首页按钮操作 */ diff --git a/src/views/mall/materials/index.vue b/src/views/mall/materials/index.vue new file mode 100644 index 0000000..52b8d37 --- /dev/null +++ b/src/views/mall/materials/index.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/src/views/mall/order/storeAfterSales/OrderDetail.vue b/src/views/mall/order/storeAfterSales/OrderDetail.vue index 6807d0b..8d18511 100644 --- a/src/views/mall/order/storeAfterSales/OrderDetail.vue +++ b/src/views/mall/order/storeAfterSales/OrderDetail.vue @@ -15,11 +15,6 @@ 用户取消 商家拒绝 - - - - - {{ DetailData.refundAmount}} {{ DetailData.reasons }} {{ DetailData.explains }} @@ -56,15 +51,6 @@ {{ item.acceptStation }} -
@@ -74,16 +60,36 @@ import { formatDate } from '@/utils/formatTime' import * as StoreOrderApi from "@/api/mall/order/storeOrder"; const { t } = useI18n() // 国际化 -// const message = useMessage() // 消息弹窗 +const message = useMessage() // 消息弹窗 const dialogTitle = ref('') // 弹窗的标题 const drawer = ref(false) const DetailData = ref({ - explainImgList: [], - returnVoucherList: [] + orderCode: 0, + serviceType: 0, + explainImg: '', + explainImgList: [''], + returnVoucher: '', + returnVoucherList: [''], + state: 0, + refundAmount: 0, + reasons: '', + explains: '', + createTime: new Date(), + consignee: '', + phoneNumber: '', + address: '', + shipperCode: '', + deliveryName: '', + deliverySn: '', + returnPolicy: '', }) -const logisticResult = ref({}) +class LogisticResultVo { + acceptTime = ''; + acceptStation = ''; +} +const logisticResult = ref([]) /** 打开弹窗 */ -const open = async (type: string, id?: number) => { +const open = async (type: string, id: number) => { drawer.value = true dialogTitle.value = t('action.' + type) DetailData.value = await StoreAfterSalesApi.getStoreAfterSales(id) @@ -103,9 +109,7 @@ const getLogistic = async(deliverySn,shipperCode) => { defineExpose({ open }) // 提供 open 方法，用于打开弹窗 diff --git a/src/views/marketing/discount/index.vue b/src/views/marketing/discount/index.vue index fc7ce3d..0d8cc9c 100644 --- a/src/views/marketing/discount/index.vue +++ b/src/views/marketing/discount/index.vue @@ -22,7 +22,7 @@ @@ -161,7 +161,7 @@ const queryParams: QueryParams = reactive({ name: "", type: 3, createTime: [], - state: null + state: undefined }) const queryFormRef = ref() // 搜索的表单 diff --git a/src/views/marketing/groupBuy/groupBuyForm.vue b/src/views/marketing/groupBuy/groupBuyForm.vue index dc2fdae..5dc246c 100644 --- a/src/views/marketing/groupBuy/groupBuyForm.vue +++ b/src/views/marketing/groupBuy/groupBuyForm.vue @@ -167,7 +167,7 @@ @@ -211,7 +211,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formType = ref('') // 表单的类型：create - 新增；update - 修改 -const timeData = ref([]) +const timeData = ref([]) const multiple = ref() const selectProductRef = ref() const setProductRef = ref() @@ -231,11 +231,11 @@ const initForm = (): CreateActivity => { startTime: null, // 活动开始时间 endTime: null, // 活动结束时间 ifLimit: 1, // 是否限购 - limitNumber: null, // 限购几件/人 + limitNumber: undefined, // 限购几件/人 ifEnable: 1, // 活动预热 1-停用 2-启用 - enableTime: null, // 预热时间 （分钟） - person: null, // 成团人数 - effectiveTime: null, // 成团有效时间几（分钟） + enableTime: undefined, // 预热时间 （分钟） + person: undefined, // 成团人数 + effectiveTime: undefined, // 成团有效时间几（分钟） remark: '', // 备注 isVirtually: 0, // 是否虚拟成团:0-否，1-是 id: null, @@ -352,13 +352,13 @@ const validateForm = () => { } // 判断限购数量 - if (ifLimit.value && formData.value.limitNumber !== null && formData.value.limitNumber <= 0) { + if (ifLimit.value && formData.value.limitNumber && formData.value.limitNumber <= 0) { message.error('限购数量必须大于0件') return false; } // 判断预热时间 - if (preheat.value && formData.value.enableTime !== null && formData.value.enableTime <= 0) { + if (preheat.value && formData.value.enableTime && formData.value.enableTime <= 0) { message.error('预热时间必须大于0分钟') return false; } diff --git a/src/views/member/integralRule/IntegralRuleForm.vue b/src/views/member/integralRule/IntegralRuleForm.vue index 4f5b3e7..cee73bc 100644 --- a/src/views/member/integralRule/IntegralRuleForm.vue +++ b/src/views/member/integralRule/IntegralRuleForm.vue @@ -144,7 +144,7 @@ onMounted(() => { :precision="0" :controls="false" /> - 积分 + {{item.type === 'consume'?'元':'积分'}}
diff --git a/src/views/member/userLevelConfig/UserLevelConfigForm.vue b/src/views/member/userLevelConfig/UserLevelConfigForm.vue index 5501d37..0c14353 100644 --- a/src/views/member/userLevelConfig/UserLevelConfigForm.vue +++ b/src/views/member/userLevelConfig/UserLevelConfigForm.vue @@ -5,6 +5,18 @@ import * as DiscountCouponApi from '@/api/mall/product/discountCoupon' import {ref} from "vue"; import {dateFormatter} from "@/utils/formatTime"; +interface EquityItem { + id: number; + typeName: string; + type: string; + selected: boolean; + equityValue: number; +} + +interface EquityArrayItem { + equityId: number; + equityValue: number; +} const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 @@ -76,36 +88,37 @@ const submitForm = async () => { if (!formRef.value) return const valid = await formRef.value.validate() if (!valid) return - let equityArray = []; + let equityArray = ref([]); let errorMessageMap = { 'integral': '积分需大于0', 'discount': '折扣需大于0', 'coupon': '请选择权益优惠券' }; - - equityList.value.forEach((item) => { + for (let i = 0; i < equityList.value.length; i++) { + let item = equityList.value[i]; if (item.selected) { if ((item.type === 'integral' || item.type === 'discount') && item.equityValue <= 0) { message.error(errorMessageMap[item.typeName]); } else if (item.type === 'coupon') { - if(tableRadio.value?.id){ + if (tableRadio.value?.id) { item.equityValue = tableRadio.value.id - equityArray.push({ + equityArray.value.push({ equityId: item.id, equityValue: item.equityValue }); } else { - message.error(errorMessageMap[item.typeName]); + message.error('请选择优惠券'); + return false } } else { - equityArray.push({ + equityArray.value.push({ equityId: item.id, equityValue: item.equityValue }); } } - }); - formData.value.levelEquityList = equityArray + } + formData.value.levelEquityList = equityArray.value console.log(formData.value, 'formData') // 提交请求 formLoading.value = true @@ -186,7 +199,7 @@ const saveIdList = () => { //获取所有权益列表 -const equityList = ref([]) +const equityList = ref([]) const getAllEquityList = async () => { loading.value = true try { @@ -425,3 +438,5 @@ const resetForm = () => { visibility: hidden; } + +