zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,885 Commits
3 Branches
0 Tags
162 MiB
Commit Graph

4885 Commits (master)

Author SHA1 Message Date
tangqian 07d23e908b Merge remote-tracking branch 'origin/test' into test 2023-06-13 14:20:17 +08:00
tangqian 88556d0805 Merge branch 'feature/mall_product' into test 2023-06-13 14:20:04 +08:00
tangqian 9bf1a14ae6 fix:修改充值订单导出(未退款但是退款金额显示有金额) 2023-06-13 14:19:16 +08:00
Jruome 12b15d9847 uniapp 电子证照中心 2023-06-13 14:19:01 +08:00
Jruome 6d1d588882 管理端 商户管理启用禁用 2023-06-12 17:18:00 +08:00
Jruome 31646ba705 管理端 会员充值增加销售金额字段 2023-06-12 17:01:51 +08:00
Jruome 802e9fcfdb 管理端 订单发货状态优化 2023-06-12 14:26:22 +08:00
Jruome e8b76f71ce 管理端 订单发货状态 2023-06-09 20:14:38 +08:00
Jruome 837098a3d2 管理端 订单发货状态 2023-06-09 20:12:20 +08:00
Jruome 2069a4cdeb Merge remote-tracking branch 'origin/test' 2023-06-09 20:11:56 +08:00
Jruome c34645d44b 管理端 推广员取消新增 2023-06-09 19:47:34 +08:00
tangqian 416f6ed7ad Merge branch 'feature/mall_product' 2023-06-09 19:41:05 +08:00
tangqian e95e90e6ad Merge branch 'feature/mall_product' into test 2023-06-09 19:08:22 +08:00
tangqian 5eec2d9820 fix: 修改 2023-06-09 19:08:08 +08:00
tangqian 844bf0b2b1 Merge branch 'feature/mall_product' into test 2023-06-09 18:24:26 +08:00
tangqian 24467a92a6 fix: 修改 2023-06-09 18:24:13 +08:00
Jruome 546e6c9fbf Merge remote-tracking branch 'origin/test' 2023-06-09 17:27:46 +08:00
Jruome 485cf588f2 管理端 账号密码取消默认 2023-06-09 17:27:24 +08:00
Jruome 3b312d05a4 管理端 所有推广员管理 2023-06-09 17:11:17 +08:00
tangqian 608b677a6b Merge branch 'master' into test 2023-06-09 17:10:45 +08:00
tangqian add7251696 Merge remote-tracking branch 'origin/test' into test 2023-06-09 17:10:40 +08:00
Jruome 1d79d2be8e 管理端 所有推广员管理 2023-06-09 17:10:39 +08:00
tangqian e1543fa85e fix: 修改 2023-06-09 17:09:49 +08:00
tangqian 998d470d40 Merge branch 'feature/mall_product' into test 2023-06-09 17:03:56 +08:00
tangqian b5a83c9f33 fix: 修改 2023-06-09 17:03:39 +08:00
Jruome 1d976c9feb Merge remote-tracking branch 'origin/master' 2023-06-09 16:51:07 +08:00
Jruome ecbfc91fec 管理端 所有推广员列表 2023-06-09 16:50:35 +08:00
tangqian fe4236d607 fix: 修改 2023-06-09 15:19:17 +08:00
tangqian 5cf0b9a8b4 Merge branch 'feature/mall_product' 2023-06-09 14:56:14 +08:00
tangqian eca405b763 fix: 修改 2023-06-09 14:55:56 +08:00
tangqian 5964eabb05 Merge branch 'feature/mall_product' 2023-06-09 14:32:52 +08:00
tangqian 89041b470f Merge branch 'feature/mall_product' into test 2023-06-09 14:32:38 +08:00
tangqian cf9be203b1 fix: 修改 2023-06-09 14:32:23 +08:00
tangqian 0d0623276b fix: 修改 2023-06-09 13:52:54 +08:00
Jruome ec67c47c66 uniapp 字数限制 2023-06-09 11:04:48 +08:00
Jruome 5536be8e23 Merge remote-tracking branch 'origin/master' 2023-06-09 10:23:43 +08:00
Jruome fd79239465 管理端推广员修改 2023-06-09 10:20:18 +08:00
TianYu 724c591d9f fix: 环境变量修改 2023-06-09 09:55:42 +08:00
TianYu e8386788ce fix: 环境变量修改 2023-06-09 09:54:52 +08:00
tianyu 9a9b6dbe39 Merge pull request 'merge_ty' (#16) from merge_ty into master 
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/16
 2023-06-08 18:04:20 +08:00
TianYu 98673dc012 Merge branch 'test' into merge_ty 2023-06-08 18:04:05 +08:00
TianYu d67b6bd8a1 fix: 修复bug 2023-06-08 17:29:04 +08:00
TianYu da123b99f5 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test 2023-06-08 16:45:08 +08:00
TianYu e760a69ff9 fix: 修复bug 2023-06-08 16:44:43 +08:00
tangqian 956f0cc445 Merge remote-tracking branch 'origin/test' into test 2023-06-08 16:44:27 +08:00
tangqian 424df4b278 Merge branch 'feature/mall_product' into test 2023-06-08 16:44:19 +08:00
tangqian c231870cad fix: 修改 2023-06-08 16:43:51 +08:00
TianYu 14d89110a4 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test 2023-06-08 16:42:32 +08:00
TianYu ff0c287110 fix: 修复bug 2023-06-08 16:42:20 +08:00
Jruome 46230f3bcb Merge remote-tracking branch 'origin/test' 2023-06-08 16:00:37 +08:00