43 Commits

Author SHA1 Message Date
lele0521
43159335f8 Revert "分销结构优化"
This reverts commit 63b22f4c86aae1d5509bc57295e4bb6c5cd37030.
2024-01-26 13:35:47 +08:00
pikachu1995@126.com
ff02cce191 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2024-01-22 15:24:41 +08:00
15386982806
9ce1c966eb 订单支持分包裹发货 2024-01-10 19:15:24 +08:00
pikachu1995@126.com
63b22f4c86 分销结构优化 2023-10-16 16:00:15 +08:00
pikachu1995@126.com
64c61d5365 Merge branch 'master' into Bulbasaur 2023-03-22 08:43:05 +08:00
17600048398
f4ddeaa5c5 前端问题处理 2023-03-09 18:16:10 +08:00
misworga831
8599708af3 Increase payment support and update parameters
- Improved payment system with WeChat and AliPay support
- Increased minimum recharge amount to `1`
- Added maximum of `9` characters for the recharge amount
- Added minimum withdraw amount setting
- Added real name field for AliPay
- Added third-party login field for AliPay
- Added maxlength of `9` characters for the withdraw amount
- Added a span tag to append '元' to the recharge amount
- Added a new function `with

[buyer/src/pages/home/userCenter/MoneyManagement.vue]
- Raise the minimum recharge amount to `1`
- Allow for a maximum of `9` characters for the recharge amount
- Added support for WeChat and AliPay
- Added a minimum withdraw amount setting
- Added a real name field for AliPay
- Added a third-party login field for AliPay
- Added maxlength of `9` characters for the withdraw amount
- Added a span tag to append '元' to the recharge amount
- Fixed typo
[buyer/src/api/pay.js]
- Add a new function `withdrawalSettingVO` for payment result inquiry
- Change the parameters for `payCallback` function
2023-03-08 21:58:29 +08:00
夜良king
4f243afb63 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop-ui 2023-01-10 18:27:52 +08:00
夜良king
efd3ed26df 自动发券模块(管理端加前端展示) 2023-01-10 18:27:37 +08:00
chc
830154371a 自提 2022-11-22 17:17:37 +08:00
chc
fa8aa633bf v4.2.5 2022-10-21 11:22:56 +08:00
lemon橪
23e456d265 feat: 基于 @xiaochangbai 老哥的代码进行了一点样式优化
看到老哥有引入其他的qr插件,在项目里面本身自带了一个,稍微改了一下部分样式

https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp/pulls/3
2022-09-16 16:37:38 +08:00
Chopper
a345586b25 功能测试与修改 2022-09-05 14:35:01 +08:00
Chopper
601a2e8d33 PC端分销用户绑定关系接口问题处理 2022-07-08 09:34:45 +08:00
lemon橪
1b4c05f70b 修改高德地图key更新此commit 之前请务必确认一下创建的高德key日期。修改部分方法名称 2022-05-20 16:40:09 +08:00
mhhhh
3cd57a6915 隐私协议菜单,店铺详情店铺详情非空判断,自定义logo 2022-05-17 09:19:36 +08:00
paulGao
670ba74044 修复bug 2022-05-05 09:30:42 +08:00
yeliang-king
81f4f4a742 接口更改 2022-04-25 14:49:57 +08:00
lemon橪
378ac39315 商家楼层装修 2022-03-03 11:26:50 +08:00
paulGao
44086e8bf4 修改api 2022-02-17 15:32:56 +08:00
paulGao
7376d4d890 修复api错误 2022-02-17 14:54:18 +08:00
paulGao
acff55dc65 适配修改后的api 2022-02-12 15:20:36 +08:00
paulGao
3a3e14e0a7 适配微服务 2022-02-10 18:57:36 +08:00
fengtianyangyang
e5918b041a 路径修改 2022-01-25 12:01:40 +08:00
paulGao
f46330ecf0 Merge branch 'fengtianyangyang' of gitee.com:beijing_hongye_huicheng/lilishop-ui into fengtianyangyang 2022-01-25 09:46:15 +08:00
paulGao
846e80f1fa 适配微服务版本 2022-01-25 09:46:12 +08:00
fengtianyangyang
631519d7c7 路径修改 2022-01-25 09:22:22 +08:00
fengtianyangyang
1c3d711298 路径修改 2022-01-20 17:21:30 +08:00
lemon橪
44facf549a 提交udesk方案 2021-12-20 16:48:08 +08:00
paulGao
5614414185 add logout 2021-11-11 18:45:53 +08:00
Chopper
e52ac06fb3 pc支持分销 2021-08-11 22:53:47 +08:00
mabo
1fe7c050a4 分销商品添加移除功能,删除无用接口 2021-08-06 09:40:12 +08:00
mabo
ca3cf71c6d 搜索热词,pc端注释,管理端结算单订单号字段错误 2021-07-30 15:59:14 +08:00
mabo
cd0cd14f77 代码注释添加 2021-07-28 17:07:37 +08:00
mabo
abc58298a3 logo替换为本地文件,商品搜索项折叠,售后展示平台退款订单 2021-07-22 14:25:55 +08:00
mabo
eee0258061 物流公司切换禁用无效问题,pc退货添加物流信息回填,保存发票回显错误 2021-07-20 18:00:35 +08:00
pikachu
995b0d65fb 对接会员消息 2021-06-29 08:25:02 +08:00
Chopper
d57b33cb4e Merge branch 'dev-ryan'
# Conflicts:
#	buyer/src/components/header/Header.vue
#	buyer/src/components/invoiceModal/index.vue
#	manager/src/config/index.js
2021-06-21 14:26:47 +08:00
lemon橪
d9368b7514 商品分类修改绑定规格八阿哥 2021-06-18 17:11:18 +08:00
lemon橪
0106bc7b75 合并master 2021-06-17 11:59:27 +08:00
lemon橪
d72ce4109d 解决buyer端商品详情没有发送token 2021-06-17 11:58:56 +08:00
mabo
411f36150b 积分商城,站内信 2021-05-31 18:03:48 +08:00
Chopper
ec3e958037 commit message 2021-05-13 10:56:04 +08:00