 vine_liutk
|
372158ed76
|
调整
|
2022-03-03 16:56:24 +08:00 |
 李静
|
ac018ea132
|
移除53KF
|
2022-03-03 13:45:14 +08:00 |
|
李静
|
24ffb90691
|
!8 1.3.0
Merge pull request !8 from 李静/1.x
|
2022-03-03 05:43:26 +00:00 |
|
李静
|
996a7211d7
|
删除文件 app/Endpoint/Api/Http/Controllers/WechatMiniController.php
|
2022-03-03 05:41:40 +00:00 |
|
vine_liutk
|
44db8dbf5d
|
添加经销商统计
|
2022-03-01 15:15:52 +08:00 |
|
vine_liutk
|
3c666e42cd
|
添加批零明细表结算时间排序
|
2022-03-01 11:16:29 +08:00 |
|
vine_liutk
|
62427335fd
|
添加老配额增减
|
2022-03-01 09:57:01 +08:00 |
|
李静
|
610080c092
|
WIP
|
2022-02-28 17:27:12 +08:00 |
|
李静
|
47526c74dc
|
53客服
|
2022-02-28 13:33:36 +08:00 |
|
李静
|
b3959d133b
|
会员等级
|
2022-02-28 11:01:22 +08:00 |
|
vine_liutk
|
25b12506d6
|
解决冲突
|
2022-02-28 10:55:14 +08:00 |
|
李静
|
8dada477a4
|
等级图标
|
2022-02-28 10:50:07 +08:00 |
|
vine_liutk
|
ccafcc5801
|
调整进货补贴报错
|
2022-02-28 09:46:45 +08:00 |
|
vine_liutk
|
eef271078f
|
添加用户列表消费值统计
|
2022-02-25 17:52:32 +08:00 |
|
vine_liutk
|
75abc0bd35
|
调整会员身份筛选方式
|
2022-02-25 17:15:29 +08:00 |
|
vine_liutk
|
7d6b80f805
|
添加批零订单支付方式筛选
|
2022-02-25 17:13:49 +08:00 |
|
vine_liutk
|
abcebe0c15
|
添加后台订单详情的物流查看
|
2022-02-25 16:55:17 +08:00 |
|
李静
|
78b56393f9
|
隐藏会员奖励配置
|
2022-02-25 16:40:49 +08:00 |
|
vine_liutk
|
8dbcb4f5fe
|
调整管理级别文字
|
2022-02-25 16:39:25 +08:00 |
|
vine_liutk
|
b8fdcde922
|
调整商城等级文字
|
2022-02-25 16:33:18 +08:00 |
|
李静
|
d706b14456
|
Update
|
2022-02-25 16:28:32 +08:00 |
|
李静
|
7185c79419
|
修复微信退款
|
2022-02-25 15:32:21 +08:00 |
|
李静
|
cecbe3970b
|
修复微信支付回调
|
2022-02-25 15:23:34 +08:00 |
|
李静
|
6f748f65a4
|
Fxi
|
2022-02-25 15:15:55 +08:00 |
|
李静
|
50233736c6
|
优化微信支付
|
2022-02-25 15:05:31 +08:00 |
|
李静
|
f5cbf6a638
|
优化支付方式枚举
|
2022-02-25 13:45:12 +08:00 |
|
李静
|
c23be217f4
|
修复微信支付
|
2022-02-25 11:39:44 +08:00 |
|
李静
|
1cd6aa6656
|
微信支付调试
|
2022-02-25 11:31:33 +08:00 |
|
vine_liutk
|
1c5ad9517b
|
调整后台数据排序
|
2022-02-25 10:57:29 +08:00 |
|
李静
|
5ebae3c035
|
Update exception handler
|
2022-02-24 16:06:02 +08:00 |
|
李静
|
01798ef6af
|
Merge branch '1.x' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-24 14:23:24 +08:00 |
|
李静
|
16c056f9bb
|
Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-24 14:23:10 +08:00 |
|
李静
|
290e8288cd
|
Fix
|
2022-02-24 14:22:31 +08:00 |
|
vine_liutk
|
251aab9205
|
添加三方解绑接口
|
2022-02-24 11:16:28 +08:00 |
|
李静
|
9a013dcb7e
|
Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-24 10:55:11 +08:00 |
|
vine_liutk
|
292f540879
|
调整三方登录解绑时的逻辑
|
2022-02-24 10:44:29 +08:00 |
|
vine_liutk
|
555d7e1c9f
|
Merge branch 'develop' into 1.x
|
2022-02-24 10:12:24 +08:00 |
|
vine_liutk
|
1f41063bd6
|
添加后台like
|
2022-02-24 10:10:37 +08:00 |
|
李静
|
f43f28ee19
|
Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-23 17:47:25 +08:00 |
|
李静
|
1b240912be
|
优化订单数据结构
|
2022-02-23 17:47:06 +08:00 |
|
李静
|
650dfe02f9
|
Merge branch '1.x' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-23 17:44:58 +08:00 |
|
李静
|
69a295645d
|
Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-23 17:44:44 +08:00 |
|
李静
|
efd94e0693
|
优化商城订单支付
|
2022-02-23 17:44:02 +08:00 |
|
vine_liutk
|
6b603e725d
|
修改微信授权登录
|
2022-02-23 16:38:16 +08:00 |
|
vine_liutk
|
2d2b843175
|
Merge branch 'develop' into 1.x
|
2022-02-23 16:29:35 +08:00 |
|
vine_liutk
|
8732ba86b5
|
调整批零订单取消订单问题
|
2022-02-23 16:28:27 +08:00 |
|
vine_liutk
|
8150e53a5b
|
调整我三方授权登录
|
2022-02-23 16:24:43 +08:00 |
|
李静
|
fcf3b2322c
|
Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-23 16:20:49 +08:00 |
|
李静
|
d29b2dc1b1
|
优化批零订单数据结构
|
2022-02-23 16:20:29 +08:00 |
|
李静
|
11fe2d1d1c
|
Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-23 16:17:38 +08:00 |
|
李静
|
f6214506ef
|
优化批零订单数据结构
|
2022-02-23 16:17:26 +08:00 |
|
李静
|
b48e88578d
|
Merge branch '1.x' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-23 16:11:28 +08:00 |
|
李静
|
2e70dec895
|
Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-23 16:11:13 +08:00 |
|
李静
|
a232275dd0
|
优化批零订单支付
|
2022-02-23 16:11:00 +08:00 |
|
vine_liutk
|
2a72d9153c
|
小程序注册用户随机密码
|
2022-02-23 16:08:02 +08:00 |
|
vine_liutk
|
df359cfb90
|
Merge branch 'develop' into 1.x
|
2022-02-23 14:53:45 +08:00 |
|
vine_liutk
|
d0ca429c4c
|
修改
|
2022-02-23 14:53:17 +08:00 |
|
vine_liutk
|
55400515e5
|
后台优化调整
|
2022-02-23 14:52:27 +08:00 |
|
vine_liutk
|
04d339c552
|
添加拒绝收款的表单提示
|
2022-02-23 13:44:48 +08:00 |
|
vine_liutk
|
292f3e82eb
|
调整后台拒绝收款
|
2022-02-23 13:44:48 +08:00 |
|
vine_liutk
|
65e3448407
|
添加拒绝收款的表单提示
|
2022-02-23 13:43:51 +08:00 |
|
vine_liutk
|
cfef324f10
|
调整后台拒绝收款
|
2022-02-23 13:43:51 +08:00 |
|
李静
|
5b1ee373c3
|
Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-23 13:27:34 +08:00 |
|
李静
|
b331b42390
|
WIP
|
2022-02-23 13:27:15 +08:00 |
|
李静
|
d2b47e3505
|
Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-23 11:47:04 +08:00 |
|
vine_liutk
|
3747375a92
|
处理N+1问题
|
2022-02-23 11:46:38 +08:00 |
|
李静
|
19a6f3da07
|
Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-23 11:42:20 +08:00 |
|
李静
|
e083de9df3
|
进货补贴日志
|
2022-02-23 11:42:03 +08:00 |
|
vine_liutk
|
56462f8530
|
调整资金列表N+1问题
|
2022-02-23 11:18:35 +08:00 |
|
李静
|
390fed8478
|
Merge branch 'develop' of gitee.com:zi-chunsheng-e-commerce/mall-server into 1.x
|
2022-02-23 11:14:20 +08:00 |
|
vine_liutk
|
2a3f6c6953
|
调整批零资金返回
|
2022-02-23 11:13:03 +08:00 |
|
vine_liutk
|
243d3700a5
|
添加后台批零订单详情字段显示
|
2022-02-23 10:39:03 +08:00 |
|
vine_liutk
|
f3bd7a5673
|
添加资金打款余额支付
|
2022-02-23 10:35:46 +08:00 |
|
vine_liutk
|
ca56e33f7d
|
Merge branch '1.3.x' into 1.x
|
2022-02-23 09:55:27 +08:00 |
|
vine_liutk
|
764efe86ad
|
优化小程序登录
|
2022-02-23 09:54:20 +08:00 |
|
vine_liutk
|
aa74028ca2
|
小程序授权登录1.0
|
2022-02-22 18:09:00 +08:00 |
|
李静
|
b5dbb1dfde
|
Fix bug
|
2022-02-22 17:44:14 +08:00 |
|
李静
|
6c4e01168c
|
优化皮零订单
|
2022-02-22 15:35:21 +08:00 |
|
李静
|
a466084488
|
批零微信支付开关
|
2022-02-22 14:34:40 +08:00 |
|
李静
|
7b7f998645
|
批零微信支付
|
2022-02-22 13:59:46 +08:00 |
|
vine_liutk
|
ce2a438f69
|
添加余额转账明细
|
2022-02-22 11:09:24 +08:00 |
|
vine_liutk
|
6fb338a443
|
批领余额转账
|
2022-02-21 17:37:46 +08:00 |
|
李静
|
4f4d6a5115
|
Update
|
2022-02-21 17:26:31 +08:00 |
|
vine_liutk
|
dd6aa228e1
|
Merge branch '1.2.x' into develop
|
2022-02-21 17:14:41 +08:00 |
|
李静
|
a34d0f9bf9
|
系统订单拒绝收款
|
2022-02-21 17:12:23 +08:00 |
|
李静
|
4b0de4d633
|
将订单标记2待付款
|
2022-02-21 17:12:23 +08:00 |
|
vine_liutk
|
e3c5ce45dc
|
添加批零提现到银行卡需要支付密码
|
2022-02-21 17:11:27 +08:00 |
|
李静
|
0e53eb73d3
|
系统订单拒绝收款
|
2022-02-21 15:41:10 +08:00 |
|
李静
|
4a3ac1cbee
|
Update
|
2022-02-21 11:11:09 +08:00 |
|
李静
|
07ac327982
|
将订单标记2待付款
|
2022-02-21 10:11:25 +08:00 |
|
李静
|
02f3422077
|
预收益日志增加变更销售值
|
2022-02-18 15:03:14 +08:00 |
|
李静
|
13302b3246
|
粉丝统计增加个人成长值
|
2022-02-18 14:01:22 +08:00 |
|
李静
|
b40263cfe0
|
Fix
|
2022-02-18 02:32:53 +00:00 |
|
李静
|
ea48eb9fd2
|
Fix
|
2022-02-17 21:18:01 +08:00 |
|
vine_liutk
|
bad1b8e080
|
添加导入特殊等级标记
|
2022-02-17 21:11:39 +08:00 |
|
vine_liutk
|
df124a8dc8
|
Merge branch 'hotfix/fix-dealer-settle' into develop
|
2022-02-17 21:10:56 +08:00 |
|
vine_liutk
|
2818c96092
|
交换时间筛选位置
|
2022-02-17 21:10:33 +08:00 |
|
vine_liutk
|
89bf5b15c4
|
添加导入订单脚本
|
2022-02-17 21:09:42 +08:00 |
|
李静
|
b5d378ffff
|
Fix
|
2022-02-17 16:17:14 +08:00 |
|
李静
|
d29afc564d
|
Fix
|
2022-02-17 15:12:03 +08:00 |