puhui999
|
491b3a5018
|
新增 banner 管理
|
2 years ago |
|
puhui999
|
d62bbcdd92
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# package.json
# src/views/member/user/detail/UserOrderList.vue
|
2 years ago |
|
puhui999
|
01d78429cc
|
SPU: 完善优惠卷选择
|
2 years ago |
|
puhui999
|
18df708b49
|
SPU: 完善优惠卷选择
|
2 years ago |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
2 years ago |
|
puhui999
|
04d88ce1a6
|
订单列表：自定义列抽离封装为组件
|
2 years ago |
owen
|
ff01effd45
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
61b3bdfd4c
|
交易：核销订单
|
2 years ago |
芋道源码
|
40ec1b08ae
|
!275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
|
2 years ago |
|
YunaiV
|
63fd52828c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
YunaiV
|
aa99c53729
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/views/mall/statistics/member/index.vue
|
2 years ago |
|
芋道源码
|
0242c84196
|
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
|
2 years ago |
|
owen
|
57f6367596
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
6fc232b758
|
交易：订单核销
|
2 years ago |
jason
|
8626bccc4c
|
钱包 - 钱包余额流水
|
2 years ago |
|
jason
|
ae2c3f2ad5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
6204ce6c1b
|
统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
|
2 years ago |
|
owen
|
cd4b4cd322
|
统计：Review修改
|
2 years ago |
|
owen
|
8dec8edc6a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
e1a72779d4
|
统计：Review修改
|
2 years ago |
|
YunaiV
|
99172ea088
|
code review：文章管理
|
2 years ago |
|
owen
|
195309dbb6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
owen
|
3802fee661
|
商城：增加商城首页
|
2 years ago |
|
jason
|
90d6f4da9f
|
钱包- 钱包余额查询
|
2 years ago |
|
puhui999
|
50e43e4028
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2 years ago |
|
puhui999
|
befffb3f7d
|
营销活动：新增文章管理。
|
2 years ago |
dhb52
|
4d77d7e136
|
feat: 社交平台登录
|
2 years ago |
|
puhui999
|
36bb90fbb8
|
营销活动：新增文章分类管理
|
2 years ago |
|
jason
|
f9d0c1aa1c
|
钱包-充值套餐
|
2 years ago |
|
芋道源码
|
532b237712
|
!268 统计：会员统计
Merge pull request !268 from 疯狂的世界/dev
|
2 years ago |
|
puhui999
|
3500a20630
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
2 years ago |
youkehai
|
62a953815d
|
fix: 减签按钮显示和api地址修改
|
2 years ago |
|
owen
|
6b7040404e
|
统计：会员统计
|
2 years ago |
|
owen
|
d4a521eff1
|
统计：交易统计Review修改
|
2 years ago |
kehaiyou
|
683e319c72
|
fix: 【工作流】--加签减签
|
2 years ago |
|
YunaiV
|
86323f970b
|
code review：拼团记录列表
|
2 years ago |
|
puhui999
|
e86dfa30fd
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2 years ago |
|
puhui999
|
c445173855
|
拼团记录：接口对接
|
2 years ago |
|
YunaiV
|
78062dd474
|
promotion：调整拼团活动的界面
|
2 years ago |
|
puhui999
|
869bac2501
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
YunaiV
|
cf7ac2cb10
|
promotion：新增记录记录列表
|
3 years ago |
|
YunaiV
|
860872a890
|
promotion：新增砍价记录列表
|
3 years ago |
|
owen
|
58b6b1ba57
|
交易：核销
|
3 years ago |
|
YunaiV
|
7c491ff62a
|
promotion：优化秒杀活动的界面
|
3 years ago |
|
YunaiV
|
a9bbbc7b0a
|
trade：优化运费模版的实现
|
3 years ago |
|
YunaiV
|
4fddbccea1
|
trade：完善订单详情
|
3 years ago |
|
YunaiV
|
588ce1c9ae
|
trade：微调 order 列表界面
|
3 years ago |
|
owen
|
3a96812d47
|
会员：会员配置的积分相关字段加上point前缀
|
3 years ago |
|
owen
|
3ab1ed707f
|
会员：积分配置改为会员配置
|
3 years ago |
|
owen
|
0066d79876
|
签到：签到后增加用户积分、经验
|
3 years ago |