Commit Graph

Select branches

Hide Pull Requests

feature/mall_product

master

test

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 8c740295c2 fix:修改充值订单导出(未退款但是退款金额显示有金额) tangqian 2023-06-13 16:40:23 +0800
• 0390415a48 Merge branch 'feature/mall_product' tangqian 2023-06-13 14:49:27 +0800
• 07d23e908b Merge remote-tracking branch 'origin/test' into test tangqian 2023-06-13 14:20:17 +0800
• 88556d0805 Merge branch 'feature/mall_product' into test tangqian 2023-06-13 14:20:04 +0800
• 9bf1a14ae6 fix:修改充值订单导出(未退款但是退款金额显示有金额) tangqian 2023-06-13 14:19:16 +0800
• 12b15d9847 uniapp 电子证照中心 Jruome 2023-06-13 14:19:01 +0800
• 6d1d588882 管理端 商户管理启用禁用 Jruome 2023-06-12 17:18:00 +0800
• 31646ba705 管理端 会员充值增加销售金额字段 Jruome 2023-06-12 17:01:51 +0800
• 802e9fcfdb 管理端 订单发货状态优化 Jruome 2023-06-12 14:26:22 +0800
• e8b76f71ce 管理端 订单发货状态 Jruome 2023-06-09 20:14:38 +0800
• 837098a3d2 管理端 订单发货状态 Jruome 2023-06-09 20:12:20 +0800
• 2069a4cdeb Merge remote-tracking branch 'origin/test' Jruome 2023-06-09 20:11:56 +0800
• c34645d44b 管理端 推广员取消新增 Jruome 2023-06-09 19:47:34 +0800
• 416f6ed7ad Merge branch 'feature/mall_product' tangqian 2023-06-09 19:41:05 +0800
• e95e90e6ad Merge branch 'feature/mall_product' into test tangqian 2023-06-09 19:08:22 +0800
• 5eec2d9820 fix: 修改 tangqian 2023-06-09 19:08:08 +0800
• 844bf0b2b1 Merge branch 'feature/mall_product' into test tangqian 2023-06-09 18:24:26 +0800
• 24467a92a6 fix: 修改 tangqian 2023-06-09 18:24:13 +0800
• 546e6c9fbf Merge remote-tracking branch 'origin/test' Jruome 2023-06-09 17:27:46 +0800
• 485cf588f2 管理端 账号密码取消默认 Jruome 2023-06-09 17:11:00 +0800
• 3b312d05a4 管理端 所有推广员管理 Jruome 2023-06-09 17:11:00 +0800
• 608b677a6b Merge branch 'master' into test tangqian 2023-06-09 17:10:45 +0800
• add7251696 Merge remote-tracking branch 'origin/test' into test tangqian 2023-06-09 17:10:40 +0800
• 1d79d2be8e 管理端 所有推广员管理 Jruome 2023-06-09 17:10:39 +0800
• e1543fa85e fix: 修改 tangqian 2023-06-09 17:09:49 +0800
• 998d470d40 Merge branch 'feature/mall_product' into test tangqian 2023-06-09 17:03:56 +0800
• b5a83c9f33 fix: 修改 tangqian 2023-06-09 17:03:39 +0800
• 1d976c9feb Merge remote-tracking branch 'origin/master' Jruome 2023-06-09 16:51:07 +0800
• ecbfc91fec 管理端 所有推广员列表 Jruome 2023-06-09 16:50:35 +0800
• fe4236d607 fix: 修改 tangqian 2023-06-09 15:19:17 +0800
• 5cf0b9a8b4 Merge branch 'feature/mall_product' tangqian 2023-06-09 14:56:14 +0800
• eca405b763 fix: 修改 tangqian 2023-06-09 14:55:56 +0800
• 5964eabb05 Merge branch 'feature/mall_product' tangqian 2023-06-09 14:32:52 +0800
• 89041b470f Merge branch 'feature/mall_product' into test tangqian 2023-06-09 14:32:38 +0800
• cf9be203b1 fix: 修改 tangqian 2023-06-09 14:32:23 +0800
• 0d0623276b fix: 修改 tangqian 2023-06-09 13:52:54 +0800
• ec67c47c66 uniapp 字数限制 Jruome 2023-06-09 11:04:48 +0800
• 5536be8e23 Merge remote-tracking branch 'origin/master' Jruome 2023-06-09 10:23:43 +0800
• fd79239465 管理端推广员修改 Jruome 2023-06-09 10:20:18 +0800
• 724c591d9f fix: 环境变量修改 TianYu 2023-06-09 09:54:35 +0800
• e8386788ce fix: 环境变量修改 TianYu 2023-06-09 09:54:35 +0800
• 9a9b6dbe39 Merge pull request 'merge_ty' (#16) from merge_ty into master tianyu 2023-06-08 18:04:20 +0800
• 98673dc012 Merge branch 'test' into merge_ty TianYu 2023-06-08 18:04:05 +0800
• d67b6bd8a1 fix: 修复bug TianYu 2023-06-08 17:29:04 +0800
• da123b99f5 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test TianYu 2023-06-08 16:45:08 +0800
• e760a69ff9 fix: 修复bug TianYu 2023-06-08 16:44:43 +0800
• 956f0cc445 Merge remote-tracking branch 'origin/test' into test tangqian 2023-06-08 16:44:27 +0800
• 424df4b278 Merge branch 'feature/mall_product' into test tangqian 2023-06-08 16:44:19 +0800
• c231870cad fix: 修改 tangqian 2023-06-08 16:43:51 +0800
• 14d89110a4 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test TianYu 2023-06-08 16:42:32 +0800
• ff0c287110 fix: 修复bug TianYu 2023-06-08 16:42:20 +0800
• 46230f3bcb Merge remote-tracking branch 'origin/test' Jruome 2023-06-08 16:00:37 +0800
• c3b0862735 管理端推广员新增注册来源筛选 Jruome 2023-06-08 16:00:06 +0800
• cedb9985ad Merge branch 'feature/mall_product' into test tangqian 2023-06-08 15:59:13 +0800
• acbce105f1 fix: 修改推广员 新增一个注册来源 tangqian 2023-06-08 15:58:57 +0800
• 4529afd72c Merge remote-tracking branch 'origin/test' into test tangqian 2023-06-08 15:54:41 +0800
• a0028953bd Merge branch 'feature/mall_product' into test tangqian 2023-06-08 15:52:20 +0800
• 0ff7ebece8 fix: 修改推广员 新增一个注册来源 tangqian 2023-06-08 15:51:57 +0800
• 1692521b77 fix: 修复无法跳转到注册推广员页面问题 TianYu 2023-06-08 15:45:38 +0800
• c60367ffc0 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test TianYu 2023-06-08 15:27:39 +0800
• dac91acc10 fix: 微信公众号APPID区分运行环境 TianYu 2023-06-08 15:26:48 +0800
• 8b773d5366 查询链接地址 perry 2023-06-08 15:26:43 +0800
• ef6684b366 Merge remote-tracking branch 'origin/test' into test perry 2023-06-08 15:21:44 +0800
• 34ef8b1ed8 修改支付回调 perry 2023-06-08 15:21:35 +0800
• 903d23b2f6 Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test TianYu 2023-06-08 15:16:27 +0800
• 9b0f586317 feat: 新增推广员注册功能 TianYu 2023-06-08 15:15:08 +0800
• 0b32343112 配置文件 axzsd 2023-06-08 14:19:58 +0800
• 29347ab0ad fix: 修复测试环境变量 TianYu 2023-06-08 12:35:05 +0800
• a9284a9842 fix: 修复测试环境变量 TianYu 2023-06-08 12:35:05 +0800
• 1c9287d2da Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product TianYu 2023-06-08 12:26:51 +0800
• 346e4036fd feat: 运行环境区分 TianYu 2023-06-08 12:26:38 +0800
• 77dd2e37a8 Merge remote-tracking branch 'origin/master' tangqian 2023-06-08 11:49:59 +0800
• 81f1fb70b9 fix: 只查询已付款的订单 tangqian 2023-06-08 11:48:56 +0800
• a5eb88e029 Merge remote-tracking branch 'origin/master' axzsd 2023-06-08 11:05:05 +0800
• 135c183e76 配置文件 axzsd 2023-06-08 11:04:51 +0800
• d471605d9b fix: 新增推广员注册来源 tangqian 2023-06-07 14:48:47 +0800
• d82c357910 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product tangqian 2023-06-07 09:45:08 +0800
• d357ce42ea fix: 新增推广员注册来源 tangqian 2023-06-07 09:45:02 +0800
• bc1ff1422e fix: 下架推广员注册功能 TianYu 2023-06-07 09:17:13 +0800
• 793e2a4a5e fix: 话费返回时间前端不做处理 TianYu 2023-06-06 14:21:06 +0800
• 20eea0fb02 fix: 修复bug TianYu 2023-06-05 16:22:59 +0800
• ba7e34e82a feat: 新增推广员申请注册功能 TianYu 2023-06-05 15:56:27 +0800
• 7c79be72d2 uniapp 推广员申请页面 Jruome 2023-06-05 14:02:59 +0800
• 6d93d5ca16 推广员重复校验 perry 2023-06-03 11:32:34 +0800
• 9bef9b0cc3 fix: 修改相关提成单位 tangqian 2023-06-02 16:03:47 +0800
• 0e26bdbf4b Merge branch 'feature/mall_product' tangqian 2023-06-02 15:45:12 +0800
• e1aaf55a53 fix: 修改相关提成单位 tangqian 2023-06-02 15:44:51 +0800
• 5adf5115eb fix: 取消支付宝支付 TianYu 2023-06-02 15:27:23 +0800
• 6a0904cf64 Merge pull request 'fix: 修复提成设置' (#14) from feature/mall_product into master tianyu 2023-06-02 11:44:14 +0800
• fbb6972846 fix: 修复提成设置 TianYu 2023-06-02 11:44:37 +0800
• 6ce32ccb45 Merge pull request 'feature/mall_product' (#13) from feature/mall_product into master tianyu 2023-06-02 11:27:01 +0800
• fd3c805655 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product TianYu 2023-06-02 11:27:05 +0800
• 38209dd485 fix: 修改轮播图权限标识 TianYu 2023-06-02 11:26:49 +0800
• 0e5fc4e37e Merge branch 'feature/mall_product' tangqian 2023-06-02 11:05:44 +0800
• 413ded83a9 fix: 修改相关提成单位 tangqian 2023-06-02 11:05:09 +0800
• 102ea79177 Merge pull request 'feature/mall_product' (#12) from feature/mall_product into master tianyu 2023-06-02 10:47:39 +0800
• 488f0166be fix: 权限设置问题 TianYu 2023-06-02 10:47:43 +0800
• a6fea11b09 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product TianYu 2023-06-02 10:46:05 +0800
• 0b8cf5ccab fix: 修复banner传参的问题 TianYu 2023-06-02 10:45:52 +0800
• 6d3211e7b9 fix: 修改部门 tangqian 2023-06-02 10:35:18 +0800