Commit Graph

293 Commits

Author SHA1 Message Date
YunaiV
f79d31a64a code review:满减送活动 2023-11-04 10:39:39 +08:00
芋道源码
27defa7268
!291 满减页面布局
Merge pull request !291 from Bluemark/mall-backed
2023-11-04 02:30:50 +00:00
风狗
bf418653e4
update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
地区选择框placeholder 修改

Signed-off-by: 风狗 <909275705@qq.com>
2023-11-02 02:08:26 +00:00
YunaiV
539352f598 修复 banner 返回字段不对 2023-10-24 20:29:23 +08:00
YunaiV
e5d6a9dae1 code review:banner 逻辑 2023-10-24 20:07:48 +08:00
puhui999
95d7d1eb42 优惠卷模版样式调整 2023-10-24 17:39:02 +08:00
puhui999
75135e1e4f 商品 spu 脱离优惠卷模块 2023-10-24 16:57:20 +08:00
puhui999
a7439ee08b 完善 banner 管理 2023-10-24 16:10:55 +08:00
KONGDY-PC\Kongdy
7c8f7d570f 满减页面布局 2023-10-23 10:37:39 +08:00
YunaiV
2dbfa77bee code review:banner 逻辑 2023-10-21 19:59:41 +08:00
芋道源码
4709c18a6e
!284 完善 SPU,订单列表:完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
2023-10-21 11:08:44 +00:00
YunaiV
423ea319e0 code review:限时折扣 2023-10-21 18:18:40 +08:00
芋道源码
e187c55408
!283 mall模块
Merge pull request !283 from zxiaoxiu/discount
2023-10-21 06:23:04 +00:00
puhui999
491b3a5018 新增 banner 管理 2023-10-21 02:40:20 +08:00
puhui999
0730e215d8 完善文章管理 review 提到的问题 2023-10-20 22:16:18 +08:00
zhangshuai
9f77514c17 限时折扣 2023-10-20 20:51:18 +08:00
puhui999
d62bbcdd92 Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
#	package.json
#	src/views/member/user/detail/UserOrderList.vue
2023-10-20 16:40:19 +08:00
puhui999
1e8945de63 SPU: 新增完善活动优先级拖拽排序 2023-10-20 16:36:50 +08:00
puhui999
01d78429cc SPU: 完善优惠卷选择 2023-10-20 15:35:01 +08:00
puhui999
18df708b49 SPU: 完善优惠卷选择 2023-10-20 11:48:59 +08:00
YunaiV
2457665b55 code review:门店自提 2023-10-20 09:46:15 +08:00
puhui999
3464bb9c74 SPU: 新增优惠卷选择 2023-10-19 17:33:42 +08:00
puhui999
5b3bcecef2 OrderTableColumn: 商品信息列样式调整2 2023-10-19 15:54:23 +08:00
puhui999
094f8e16db OrderTableColumn: 商品信息列样式调整 2023-10-19 11:10:33 +08:00
puhui999
5270c83876 订单列表:完善表头宽度自适应 2023-10-19 10:36:52 +08:00
puhui999
04d88ce1a6 订单列表:自定义列抽离封装为组件 2023-10-18 17:20:13 +08:00
puhui999
d1a3fe5d5a 营销文章:新增表单属性移除浏览量 2023-10-18 11:33:42 +08:00
owen
ff01effd45 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 23:26:08 +08:00
owen
431fff28ce 统计卡片修改为全局组件 2023-10-17 23:25:49 +08:00
owen
61b3bdfd4c 交易:核销订单 2023-10-17 23:18:07 +08:00
芋道源码
40ec1b08ae
!275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
2023-10-17 12:52:28 +00:00
YunaiV
aa99c53729 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/statistics/member/index.vue
2023-10-17 19:02:37 +08:00
owen
57f6367596 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 16:09:55 +08:00
owen
6fc232b758 交易:订单核销 2023-10-17 16:09:36 +08:00
owen
e3a0cfe5e9 统计:修复错误 2023-10-16 22:18:51 +08:00
owen
6204ce6c1b 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 2023-10-16 22:09:20 +08:00
owen
cd4b4cd322 统计:Review修改 2023-10-16 22:03:36 +08:00
YunaiV
66ec610801 code review:文章管理 2023-10-16 21:55:11 +08:00
xingyu
1a1b70a350 style: stylelint 2023-10-16 15:04:05 +08:00
owen
edfd03903f 统计:会员终端统计,处理未知终端情况 2023-10-16 14:26:04 +08:00
owen
2bfc9c3b13 统计:处理会员性别统计,存在未知的情况 2023-10-16 13:25:15 +08:00
owen
661e72bcfd 统计:修复错误 2023-10-16 13:15:17 +08:00
owen
8dec8edc6a Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 13:01:02 +08:00
owen
e1a72779d4 统计:Review修改 2023-10-16 13:00:13 +08:00
YunaiV
99172ea088 code review:文章管理 2023-10-16 09:57:46 +08:00
owen
195309dbb6 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 09:52:35 +08:00
owen
3802fee661 商城:增加商城首页 2023-10-16 09:51:19 +08:00
puhui999
befffb3f7d 营销活动:新增文章管理。 2023-10-15 16:14:09 +08:00
puhui999
36bb90fbb8 营销活动:新增文章分类管理 2023-10-15 00:54:28 +08:00
xingyu
e04ca7aac7 fix: unocss eslint 2023-10-13 10:34:01 +08:00