From 4925273c0b2469e1fdc4c2d0557fb644f97d9994 Mon Sep 17 00:00:00 2001 From: zqx Date: Wed, 14 Aug 2024 19:09:59 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0element-plus=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=EF=BC=8C=E4=BF=AE=E5=A4=8DBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48d16a277..8da172206 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "driver.js": "^1.3.1", "echarts": "^5.5.0", "echarts-wordcloud": "^2.1.0", - "element-plus": "2.7.0", + "element-plus": "2.8.0", "fast-xml-parser": "^4.3.2", "highlight.js": "^11.9.0", "jsencrypt": "^3.3.2", From bcfb98cb37a63166cd198b14762f200fe4e90164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=85=86=E7=90=A6?= <1361001127@qq.com> Date: Thu, 15 Aug 2024 16:28:35 +0800 Subject: [PATCH 02/12] =?UTF-8?q?feat:=20=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=AF=A6=E6=83=85-=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/user/detail/UserAftersaleList.vue | 271 ++++++++++++++++++ src/views/member/user/detail/index.vue | 5 +- 2 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 src/views/member/user/detail/UserAftersaleList.vue diff --git a/src/views/member/user/detail/UserAftersaleList.vue b/src/views/member/user/detail/UserAftersaleList.vue new file mode 100644 index 000000000..46a172df4 --- /dev/null +++ b/src/views/member/user/detail/UserAftersaleList.vue @@ -0,0 +1,271 @@ + + diff --git a/src/views/member/user/detail/index.vue b/src/views/member/user/detail/index.vue index 6237cca62..52862c3c8 100644 --- a/src/views/member/user/detail/index.vue +++ b/src/views/member/user/detail/index.vue @@ -47,7 +47,9 @@ - 售后管理(WIP) + + + @@ -79,6 +81,7 @@ import UserOrderList from './UserOrderList.vue' import UserPointList from './UserPointList.vue' import UserSignList from './UserSignList.vue' import UserFavoriteList from './UserFavoriteList.vue' +import UserAfterSaleList from './UserAftersaleList.vue' import { CardTitle } from '@/components/Card/index' import { ElMessage } from 'element-plus' From 6afcfdd50c35ec9e1d7bbd94c0a3be9bf1b3bad8 Mon Sep 17 00:00:00 2001 From: tb Date: Thu, 15 Aug 2024 21:52:32 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E6=94=AF=E6=8C=81=E9=98=BF=E9=87=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=86=85=E5=AE=B9=E5=8A=A0=E5=AF=86=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98=E5=AE=9D=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E9=85=8D=E7=BD=AE=E5=89=8D=E7=AB=AF=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98=20#IAKCU?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/channel/AlipayChannelForm.vue | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/views/pay/app/components/channel/AlipayChannelForm.vue b/src/views/pay/app/components/channel/AlipayChannelForm.vue index 169ef8ea6..579d1eed6 100644 --- a/src/views/pay/app/components/channel/AlipayChannelForm.vue +++ b/src/views/pay/app/components/channel/AlipayChannelForm.vue @@ -4,7 +4,7 @@ @@ -156,6 +156,20 @@ + + + + AES + 无加密 + + + +
+ + + +
+ @@ -195,7 +209,9 @@ const formData = ref({ alipayPublicKey: '', appCertContent: '', alipayPublicCertContent: '', - rootCertContent: '' + rootCertContent: '', + encryptType: '', + encryptKey: '', } }) const formRules = { @@ -213,7 +229,8 @@ const formRules = { 'config.alipayPublicCertContent': [ { required: true, message: '请上传支付宝公钥证书', trigger: 'blur' } ], - 'config.rootCertContent': [{ required: true, message: '请上传指定根证书', trigger: 'blur' }] + 'config.rootCertContent': [{ required: true, message: '请上传指定根证书', trigger: 'blur' }], + 'config.encryptKey': [{required: true, message: '请输入接口内容加密密钥', trigger: 'blur'}], } const fileAccept = '.crt' const formRef = ref() // 表单 Ref @@ -281,7 +298,9 @@ const resetForm = (appId, code) => { alipayPublicKey: '', appCertContent: '', alipayPublicCertContent: '', - rootCertContent: '' + rootCertContent: '', + encryptType: 'AES', + encryptKey: '', } } formRef.value?.resetFields() From 16c919ce02c82b1424b7c8c83c390da4b611db12 Mon Sep 17 00:00:00 2001 From: preschool Date: Thu, 15 Aug 2024 10:08:23 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=F0=9F=8E=88=20perf:=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=80=BC=E8=A2=AB=E5=90=8E=E7=BB=AD=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Login/SocialLogin.vue | 9 +++++---- src/views/Login/components/LoginForm.vue | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/views/Login/SocialLogin.vue b/src/views/Login/SocialLogin.vue index 00bc9fe55..9f877a959 100644 --- a/src/views/Login/SocialLogin.vue +++ b/src/views/Login/SocialLogin.vue @@ -276,10 +276,11 @@ const handleLogin = async (params) => { const code = route?.query?.code as string const state = route?.query?.state as string + const loginDataLoginForm = { ...loginData.loginForm } const res = await LoginApi.login({ // 账号密码登录 - username: loginData.loginForm.username, - password: loginData.loginForm.password, + username: loginDataLoginForm.username, + password: loginDataLoginForm.password, captchaVerification: params.captchaVerification, // 社交登录 socialCode: code, @@ -294,8 +295,8 @@ const handleLogin = async (params) => { text: '正在加载系统中...', background: 'rgba(0, 0, 0, 0.7)' }) - if (loginData.loginForm.rememberMe) { - authUtil.setLoginForm(loginData.loginForm) + if (loginDataLoginForm.rememberMe) { + authUtil.setLoginForm(loginDataLoginForm) } else { authUtil.removeLoginForm() } diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index 3dbaff3fc..0bdf55c50 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -249,8 +249,9 @@ const handleLogin = async (params) => { if (!data) { return } - loginData.loginForm.captchaVerification = params.captchaVerification - const res = await LoginApi.login(loginData.loginForm) + const loginDataLoginForm = { ...loginData.loginForm } + loginDataLoginForm.captchaVerification = params.captchaVerification + const res = await LoginApi.login(loginDataLoginForm) if (!res) { return } @@ -259,8 +260,8 @@ const handleLogin = async (params) => { text: '正在加载系统中...', background: 'rgba(0, 0, 0, 0.7)' }) - if (loginData.loginForm.rememberMe) { - authUtil.setLoginForm(loginData.loginForm) + if (loginDataLoginForm.rememberMe) { + authUtil.setLoginForm(loginDataLoginForm) } else { authUtil.removeLoginForm() } From bd88d29340267761bcf5da31748fc282f8186f98 Mon Sep 17 00:00:00 2001 From: preschooler Date: Thu, 15 Aug 2024 16:30:47 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E2=9C=A8=20feat:=E6=96=B0=E6=80=8E?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B5=E6=B2=89=E6=B5=B8=E5=BC=8F=E6=95=88?= =?UTF-8?q?=E6=9E=9C=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=9C=AA=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Setting/src/Setting.vue | 2 + .../src/components/InterfaceDisplay.vue | 12 +++++ .../components/TagsView/src/TagsView.vue | 52 ++++++++++++++++--- src/locales/zh-CN.ts | 1 + src/store/modules/app.ts | 8 +++ 5 files changed, 69 insertions(+), 6 deletions(-) diff --git a/src/layout/components/Setting/src/Setting.vue b/src/layout/components/Setting/src/Setting.vue index e1908b633..717472ac5 100644 --- a/src/layout/components/Setting/src/Setting.vue +++ b/src/layout/components/Setting/src/Setting.vue @@ -126,6 +126,8 @@ const copyConfig = async () => { message: ${appStore.getMessage}, // 标签页 tagsView: ${appStore.getTagsView}, + // 标签页 + tagsViewImmerse: ${appStore.getTagsViewImmerse}, // 标签页图标 getTagsViewIcon: ${appStore.getTagsViewIcon}, // logo diff --git a/src/layout/components/Setting/src/components/InterfaceDisplay.vue b/src/layout/components/Setting/src/components/InterfaceDisplay.vue index ebbbf4bc5..3ba5c6b07 100644 --- a/src/layout/components/Setting/src/components/InterfaceDisplay.vue +++ b/src/layout/components/Setting/src/components/InterfaceDisplay.vue @@ -73,6 +73,13 @@ const tagsViewChange = (show: boolean) => { appStore.setTagsView(show) } +// 标签页沉浸 +const tagsViewImmerse = ref(appStore.getTagsViewImmerse) + +const tagsViewImmerseChange = (immerse: boolean) => { + appStore.setTagsViewImmerse(immerse) +} + // 标签页图标 const tagsViewIcon = ref(appStore.getTagsViewIcon) @@ -181,6 +188,11 @@ watch( +
+ {{ t('setting.tagsViewImmerse') }} + +
+
{{ t('setting.tagsViewIcon') }} diff --git a/src/layout/components/TagsView/src/TagsView.vue b/src/layout/components/TagsView/src/TagsView.vue index 016109688..cdd7494d5 100644 --- a/src/layout/components/TagsView/src/TagsView.vue +++ b/src/layout/components/TagsView/src/TagsView.vue @@ -33,6 +33,8 @@ const affixTagArr = ref([]) const appStore = useAppStore() +const tagsViewImmerse = computed(() => appStore.getTagsViewImmerse) + const tagsViewIcon = computed(() => appStore.getTagsViewIcon) const isDark = computed(() => appStore.getIsDark) @@ -266,7 +268,7 @@ watch( class="relative w-full flex bg-[#fff] dark:bg-[var(--el-bg-color)]" > @@ -343,6 +345,9 @@ watch( :tag-item="item" :class="[ `${prefixCls}__item`, + tagsViewImmerse ? `${prefixCls}__item--immerse` : '', + tagsViewIcon ? `${prefixCls}__item--icon` : '', + tagsViewImmerse && tagsViewIcon ? `${prefixCls}__item--immerse--icon` : '', item?.meta?.affix ? `${prefixCls}__item--affix` : '', { 'is-active': isActive(item) @@ -354,7 +359,7 @@ watch(
@@ -395,7 +400,7 @@ watch( /> @@ -460,7 +465,7 @@ watch( ]" > Date: Fri, 16 Aug 2024 00:56:00 +0000 Subject: [PATCH 06/12] =?UTF-8?q?update=20src/views/mall/product/spu/form/?= =?UTF-8?q?ProductAttributes.vue.=20=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 口口口 <17975121@qq.com> --- src/views/mall/product/spu/form/ProductAttributes.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mall/product/spu/form/ProductAttributes.vue b/src/views/mall/product/spu/form/ProductAttributes.vue index 30b177479..d62002f97 100644 --- a/src/views/mall/product/spu/form/ProductAttributes.vue +++ b/src/views/mall/product/spu/form/ProductAttributes.vue @@ -74,7 +74,7 @@ const inputRef = ref([]) //标签输入框Ref const setInputRef = (el: any) => { if (el === null || typeof el === 'undefined') return // 如果不存在 id 相同的元素才添加 - if (!inputRef.value.some((item) => item.input?.attributes.id === el.input?.attributes.id)) { + if (!inputRef.value.some((item) => item.inputRef?.attributes.id === el.inputRef?.attributes.id)) { inputRef.value.push(el) } } From 61fb71c010dbafd437afcee011c71c56aad9a486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=85=86=E7=90=A6?= <1361001127@qq.com> Date: Fri, 16 Aug 2024 09:15:59 +0800 Subject: [PATCH 07/12] =?UTF-8?q?chore:=20=E5=A2=9E=E5=8A=A0TODO=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/member/user/detail/UserAftersaleList.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/member/user/detail/UserAftersaleList.vue b/src/views/member/user/detail/UserAftersaleList.vue index 46a172df4..d13e243b6 100644 --- a/src/views/member/user/detail/UserAftersaleList.vue +++ b/src/views/member/user/detail/UserAftersaleList.vue @@ -198,7 +198,7 @@ const queryFormRef = ref() // 搜索的表单 const queryParams = ref({ pageNo: 1, pageSize: 10, - userId: userId, + userId, no: null, status: '0', orderNo: null, @@ -217,6 +217,7 @@ const getList = async () => { delete data.status } // 执行查询 + // TODO @芋艿：接口需要通过userId进行筛选返回值 const res = (await AfterSaleApi.getAfterSalePage(data)) as AfterSaleApi.TradeAfterSaleVO[] list.value = res.list total.value = res.total From 13b630b9ce91608e555d802c45beb3ecf31e0fa0 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 16 Aug 2024 20:39:25 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E8=A3=85=E4=BF=AE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=8B=BC=E5=9B=A2=E4=BB=B7=E6=A0=BC=E5=92=8C?= =?UTF-8?q?=E7=A7=92=E6=9D=80=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/mobile/PromotionCombination/index.vue | 10 +++++----- .../components/mobile/PromotionSeckill/index.vue | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue b/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue index 7bb7176ae..41f1f9d73 100644 --- a/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue +++ b/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue @@ -66,9 +66,9 @@ import { PromotionCombinationProperty } from './config' import * as ProductSpuApi from '@/api/mall/product/spu' import * as CombinationActivityApi from '@/api/mall/promotion/combination/combinationActivity' -import {Spu} from "@/api/mall/product/spu"; -import {CombinationProductVO} from "@/api/mall/promotion/combination/combinationActivity"; -import {fenToYuan} from "@/utils"; +import { Spu } from '@/api/mall/product/spu' +import { CombinationProductVO } from '@/api/mall/promotion/combination/combinationActivity' +import { fenToYuan } from '@/utils' /** 拼团 */ defineOptions({ name: 'PromotionCombination' }) @@ -87,9 +87,9 @@ watch( activity.products.forEach((product: CombinationProductVO) => { spuList.value.forEach((spu: Spu) => { // 商品原售价和拼团价，哪个便宜就赋值哪个 - spu.combinationPrice = Math.min(spu.combinationPrice || Infinity, product.combinationPrice); // 设置 SPU 的最低价格 + spu.combinationPrice = Math.min(spu.combinationPrice || Infinity, product.combinationPrice) // 设置 SPU 的最低价格 }) - }); + }) }, { immediate: true, diff --git a/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue b/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue index 63bee8eb7..6360a0448 100644 --- a/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue +++ b/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue @@ -66,9 +66,9 @@ import { PromotionSeckillProperty } from './config' import * as ProductSpuApi from '@/api/mall/product/spu' import * as SeckillActivityApi from '@/api/mall/promotion/seckill/seckillActivity' -import {Spu} from "@/api/mall/product/spu"; -import {SeckillProductVO} from "@/api/mall/promotion/seckill/seckillActivity"; -import {fenToYuan} from "@/utils"; +import { Spu } from '@/api/mall/product/spu' +import { SeckillProductVO } from '@/api/mall/promotion/seckill/seckillActivity' +import { fenToYuan } from '@/utils' /** 秒杀 */ defineOptions({ name: 'PromotionSeckill' }) @@ -87,9 +87,9 @@ watch( // 循环活动信息，赋值秒杀最低价格 activity.products.forEach((product: SeckillProductVO) => { spuList.value.forEach((spu: Spu) => { - spu.seckillPrice = Math.min(spu.seckillPrice || Infinity, product.seckillPrice); // 设置 SPU 的最低价格 + spu.seckillPrice = Math.min(spu.seckillPrice || Infinity, product.seckillPrice) // 设置 SPU 的最低价格 }) - }); + }) }, { immediate: true, From 254d1e032246484351dc2c728319b7378756df4a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 18 Aug 2024 13:02:21 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=20userId=20=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mall/trade/afterSale/index.vue | 10 +++++++--- src/views/member/user/detail/UserAftersaleList.vue | 11 +++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/views/mall/trade/afterSale/index.vue b/src/views/mall/trade/afterSale/index.vue index 52051c35b..c34d89493 100644 --- a/src/views/mall/trade/afterSale/index.vue +++ b/src/views/mall/trade/afterSale/index.vue @@ -135,7 +135,7 @@
- + @@ -206,6 +206,7 @@ const queryParams = reactive({ way: null, type: null }) + /** 查询列表 */ const getList = async () => { loading.value = true @@ -216,23 +217,26 @@ const getList = async () => { delete data.status } // 执行查询 - const res = (await AfterSaleApi.getAfterSalePage(data)) as AfterSaleApi.TradeAfterSaleVO[] - list.value = res.list + const res = await AfterSaleApi.getAfterSalePage(data) + list.value = res.list as AfterSaleApi.TradeAfterSaleVO[] total.value = res.total } finally { loading.value = false } } + /** 搜索按钮操作 */ const handleQuery = async () => { queryParams.pageNo = 1 await getList() } + /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value?.resetFields() handleQuery() } + /** tab 切换 */ const tabClick = async (tab: TabsPaneContext) => { queryParams.status = tab.paneName diff --git a/src/views/member/user/detail/UserAftersaleList.vue b/src/views/member/user/detail/UserAftersaleList.vue index d13e243b6..faffcc18c 100644 --- a/src/views/member/user/detail/UserAftersaleList.vue +++ b/src/views/member/user/detail/UserAftersaleList.vue @@ -133,12 +133,11 @@
- + -