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

• 54cc1cde59 Merge branch 'feature/mall_product' tangqian 2023-06-02 10:34:52 +0800
• e2328d8567 fix: 修改部门 tangqian 2023-06-02 10:34:38 +0800
• 1aca869225 Merge pull request 'fix: 提成设置可以输入两位小数' (#11) from feature/mall_product into master tianyu 2023-06-02 09:53:09 +0800
• d5167b3e35 fix: 提成设置可以输入两位小数 TianYu 2023-06-02 09:53:16 +0800
• a1321eaca1 fix: 修改部门 tangqian 2023-06-01 19:06:27 +0800
• cf897c2b9c fix: 修改部门 tangqian 2023-06-01 18:46:06 +0800
• 7f980191d1 Merge branch 'feature/mall_product' tangqian 2023-06-01 17:35:38 +0800
• ced99434c1 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product tangqian 2023-06-01 17:35:24 +0800
• 0512c04391 fix: 修改部门 tangqian 2023-06-01 17:35:18 +0800
• 774ba45aff Merge pull request 'fix: 修复bug' (#10) from feature/mall_product into master tianyu 2023-06-01 17:01:27 +0800
• 1fcfc530fb fix: 修复bug TianYu 2023-06-01 17:01:28 +0800
• f76bc2e3e6 Merge pull request 'feature/mall_product' (#9) from feature/mall_product into master tianyu 2023-06-01 14:22:41 +0800
• 45779d8252 fix: 修复bug TianYu 2023-06-01 14:21:31 +0800
• 8748e0dcc9 uniapp 购买记录样式修改 Jruome 2023-06-01 14:16:20 +0800
• 07d811caeb Merge branch 'feature/mall_product' tangqian 2023-06-01 14:11:37 +0800
• b168d8a899 fix: 修改部门 tangqian 2023-06-01 14:11:28 +0800
• cb280da42f Merge branch 'feature/mall_product' tangqian 2023-06-01 13:26:47 +0800
• 2fc7ef07f8 fix: 修改部门 tangqian 2023-06-01 13:26:31 +0800
• 4ec7e8d409 Merge remote-tracking branch 'origin/master' perry 2023-06-01 13:14:08 +0800
• 266f6bec1c 所有部门 perry 2023-06-01 13:13:10 +0800
• 2c4c96cfa4 Merge branch 'feature/mall_product' tangqian 2023-06-01 12:03:26 +0800
• b821587935 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product tangqian 2023-06-01 12:02:51 +0800
• 236d4b566b fix: 修改部门 tangqian 2023-06-01 12:02:45 +0800
• 1301b5d9ea Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product TianYu 2023-06-01 11:53:36 +0800
• 55abca5129 fix: 新增扫码关注公众号功能 TianYu 2023-06-01 11:53:24 +0800
• a1f6946fc4 fix: 修改部门 tangqian 2023-06-01 11:45:43 +0800
• d441005778 Merge branch 'feature/mall_product' tangqian 2023-06-01 11:43:54 +0800
• e97a387aa5 fix: 修改部门 tangqian 2023-06-01 11:43:28 +0800
• 296af91986 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new perry 2023-06-01 11:29:43 +0800
• 144e858710 部门 perry 2023-06-01 11:29:32 +0800
• bec5e56add fix: 修改部门 tangqian 2023-06-01 11:27:49 +0800
• 5a5c69421c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product tangqian 2023-06-01 11:27:17 +0800
• 06a0f96bf1 fix: 修改部门 tangqian 2023-06-01 11:27:11 +0800
• 9326a31489 uniapp 时间戳转换 Jruome 2023-06-01 11:25:11 +0800
• d6ea232b81 uniapp 时间戳转换 Jruome 2023-06-01 11:24:27 +0800
• f847c508ae Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product tangqian 2023-06-01 11:24:25 +0800
• 451747bd24 fix: 修改部门 tangqian 2023-06-01 11:24:18 +0800
• ad21968346 抽佣 perry 2023-06-01 10:52:55 +0800
• 8d3ca8ee1b Merge pull request 'feature/mall_product' (#8) from feature/mall_product into master tianyu 2023-05-31 18:15:16 +0800
• 46686e4467 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product TianYu 2023-05-31 18:15:31 +0800
• d904d0b6de fix: 调整样式 TianYu 2023-05-31 18:15:19 +0800
• d7787d3193 fix: 修改部门 tangqian 2023-05-31 18:10:48 +0800
• 45980a8c79 fix: 修改部门 tangqian 2023-05-31 18:08:01 +0800
• a37b5f0fcc fix: 修改部门 tangqian 2023-05-31 18:02:53 +0800
• 4a2765bd1b Merge branch 'feature/mall_product' tangqian 2023-05-31 17:46:31 +0800
• a4e18f6c9c fix: 修改后台相关 tangqian 2023-05-31 17:44:13 +0800
• 3ea7926767 Merge branch 'feature/mall_product' tangqian 2023-05-31 17:29:41 +0800
• b86128c836 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product tangqian 2023-05-31 17:29:30 +0800
• 9f9cb30b03 fix: 修改后台相关 tangqian 2023-05-31 17:29:24 +0800
• da15156869 Merge pull request 'feature/mall_product' (#7) from feature/mall_product into master tianyu 2023-05-31 17:22:06 +0800
• 56c643d785 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product TianYu 2023-05-31 17:21:26 +0800
• c2debf6b82 feat: 增加用户协议 TianYu 2023-05-31 17:21:08 +0800
• 4616cd7ee9 uniapp 充值规则样式 Jruome 2023-05-31 17:20:38 +0800
• 5846fe8425 uniapp 充值规则 Jruome 2023-05-31 16:25:34 +0800
• fc13565838 Merge pull request 'feature/mall_product' (#6) from feature/mall_product into master tianyu 2023-05-31 15:00:36 +0800
• fd8d47ae81 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product TianYu 2023-05-31 15:00:37 +0800
• 145c966b6e fix: 抽佣明细-会员充值增加导出功能 TianYu 2023-05-31 15:00:19 +0800
• 85adfec0db fix: 推广员提成信息查询和导出. 商城提成 tangqian 2023-05-31 14:58:00 +0800
• 2741f1cefe fix: 推广员提成信息查询和导出. 商城提成 tangqian 2023-05-31 13:56:41 +0800
• 160f9d306f Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product tangqian 2023-05-31 12:00:29 +0800
• 7619a9f220 fix: 推广员提成信息查询和导出. 商城提成 tangqian 2023-05-31 12:00:24 +0800
• 039dee4f1d fix: 修复代码报错 TianYu 2023-05-31 11:47:23 +0800
• 035dd77dd4 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product TianYu 2023-05-31 11:06:39 +0800
• 0125502394 fix: 修复bug TianYu 2023-05-31 11:06:26 +0800
• eadd9f2daa Merge branch 'master' into feature/mall_product tangqian 2023-05-31 10:30:01 +0800
• 4e56534695 fix: 商城提成 tangqian 2023-05-31 10:29:41 +0800
• cceb889154 feat: 增加销售业绩 TianYu 2023-05-31 09:37:30 +0800
• 0dfbe4a2d4 Merge remote-tracking branch 'origin/master' perry 2023-05-31 00:11:19 +0800
• 3292a07845 抽佣 perry 2023-05-31 00:10:36 +0800
• 7bfe815a90 fix: 异常加上状态码 tangqian 2023-05-30 20:51:02 +0800
• 3a9deab4a5 fix: 异常加上状态码 tangqian 2023-05-30 20:48:19 +0800
• c737582293 fix: 异常加上状态码 tangqian 2023-05-30 20:21:55 +0800
• 36956f30b8 Merge branch 'feature/mall_product' tangqian 2023-05-30 20:04:09 +0800
• e00d646c35 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product tangqian 2023-05-30 20:03:48 +0800
• ff2ef78be0 fix: 异常加上状态码 tangqian 2023-05-30 20:03:43 +0800
• 863875676d Merge pull request 'feature/mall_product' (#5) from feature/mall_product into master tianyu 2023-05-30 19:45:08 +0800
• cfc33024b8 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product TianYu 2023-05-30 19:45:28 +0800
• 2b52768408 fix: 修复bug TianYu 2023-05-30 19:44:45 +0800
• 095e70b4ab Merge remote-tracking branch 'origin/master' perry 2023-05-30 19:36:56 +0800
• 5b9b503f33 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new perry 2023-05-30 19:36:18 +0800
• e6cad45706 抽佣 perry 2023-05-30 19:36:05 +0800
• a1b65ab051 Merge pull request 'feature/mall_product' (#4) from feature/mall_product into master tianyu 2023-05-30 19:35:21 +0800
• 1351a9a075 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product TianYu 2023-05-30 19:35:31 +0800
• 0e0450e48c fix: 修复BUG TianYu 2023-05-30 19:35:18 +0800
• 82cc7cfd3e uniapp 销售业绩联调 Jruome 2023-05-30 19:03:08 +0800
• 819e2e20d2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new perry 2023-05-30 18:41:44 +0800
• fc29029540 抽佣 perry 2023-05-30 18:40:55 +0800
• 58037e0ebd fix: 异常加上状态码 tangqian 2023-05-30 18:26:41 +0800
• 696b28e2d5 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product TianYu 2023-05-30 17:18:45 +0800
• 4129741036 feat: 推广效果 TianYu 2023-05-30 17:18:42 +0800
• c25c762385 uniapp 销售业绩联调 Jruome 2023-05-30 17:15:26 +0800
• 619d6fd50b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product tangqian 2023-05-30 17:01:22 +0800
• e1920cc1ee fix: 异常加上状态码 tangqian 2023-05-30 17:01:17 +0800
• 3702a8b4ef 商铺名称 perry 2023-05-30 16:29:24 +0800
• 26c44490cb 导入 perry 2023-05-30 16:00:28 +0800
• af701360b7 Merge branch 'master' into feature/mall_product tangqian 2023-05-30 15:44:45 +0800
• ea2461db49 Merge remote-tracking branch 'origin/master' tangqian 2023-05-30 15:44:28 +0800
• ba3be8791c fix: 异常加上状态码 tangqian 2023-05-30 15:44:21 +0800
• ab29e2a09f Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product TianYu 2023-05-30 14:14:49 +0800
• 6de30daf0f fix: 修复生成推广员二维码图片异常问题 TianYu 2023-05-30 14:14:40 +0800