Commit Graph

4864 Commits (bd806cc2baa16d665655f5ddc61faa909ebf73ca)

Author SHA1 Message Date
Jruome d707770dac Merge remote-tracking branch 'origin/test' 2023-06-16 11:37:35 +08:00
Jruome f3a61cb8dd 管理端 推广员导出 2023-06-16 11:37:00 +08:00
tangqian 96f0f60549 Merge branch 'feature/mall_product' into test 2023-06-16 11:29:25 +08:00
tangqian f0d3b5a72d fix:推广员导出 2023-06-16 11:29:14 +08:00
tangqian 82f9e16fe3 Merge remote-tracking branch 'origin/test' into test 2023-06-16 11:20:55 +08:00
tangqian 1f44abfe66 Merge branch 'feature/mall_product' into test 2023-06-16 11:20:45 +08:00
Jruome 5085f63772 管理端 推广员导入 2023-06-16 11:14:35 +08:00
tangqian c923cc93f0 fix:推广员导出 2023-06-16 10:53:43 +08:00
tangqian 581e6b74ae Merge branch 'feature/mall_product' into test 2023-06-16 10:37:41 +08:00
tangqian 3a9b7376f2 fix:推广员导出 2023-06-16 10:37:28 +08:00
tangqian 6f7d2767e4 Merge branch 'feature/mall_product' into test 2023-06-16 09:47:02 +08:00
tangqian b7dcf93fb3 fix:扫物业码和后台注册推广员的时候 user表的中推广员id默认为自己 2023-06-16 09:46:49 +08:00
tangqian 94bf7664ab Merge branch 'feature/mall_product' into test 2023-06-16 09:14:37 +08:00
tangqian 538daff555 fix:扫物业码和后台注册推广员的时候 user表的中推广员id默认为自己 2023-06-15 17:43:08 +08:00
tangqian 683c14137c Merge branch 'feature/mall_product' 2023-06-15 16:20:17 +08:00
tangqian 8d6bfcdcdd fix:修改用于测试跳转金额 2023-06-15 16:20:04 +08:00
tangqian 692263438c fix:修改用于测试跳转金额 2023-06-15 14:07:00 +08:00
Jruome 27d4c6b2ee Merge remote-tracking branch 'origin/test' 2023-06-15 10:34:18 +08:00
Jruome 4391cfb64a 管理端 数据统计样式修改 2023-06-15 10:33:52 +08:00
tangqian 0a3e68c0d1 Merge branch 'feature/mall_product' into test 2023-06-15 09:41:52 +08:00
tangqian 68db974170 fix:修改充值订单导出(未退款但是退款金额显示有金额) 2023-06-15 09:41:31 +08:00
tangqian d092e0c23f Merge branch 'feature/mall_product' into test 2023-06-14 18:17:33 +08:00
tangqian 72beac0b3a fix:修改充值订单导出(未退款但是退款金额显示有金额) 2023-06-14 18:17:21 +08:00
Jruome e8ab6ea67b Merge remote-tracking branch 'origin/master' 2023-06-14 17:28:32 +08:00
Jruome d415963aa3 管理端 商户数据统计 2023-06-14 17:28:10 +08:00
tangqian 1389bb9b91 fix:修改充值订单导出(未退款但是退款金额显示有金额) 2023-06-14 16:09:08 +08:00
tangqian 6065350605 Merge branch 'feature/mall_product' into test 2023-06-13 16:40:38 +08:00
tangqian 8c740295c2 fix:修改充值订单导出(未退款但是退款金额显示有金额) 2023-06-13 16:40:23 +08:00
tangqian 0390415a48 Merge branch 'feature/mall_product' 2023-06-13 14:49:27 +08:00
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