Commit Graph

4705 Commits (7c79be72d2dcf072280b78584422c10228bb36ab)

Author SHA1 Message Date
Jruome 7c79be72d2 uniapp 推广员申请页面 2023-06-05 14:02:59 +08:00
perry 6d93d5ca16 推广员重复校验 2023-06-03 11:32:34 +08:00
tangqian 9bef9b0cc3 fix: 修改相关提成单位 2023-06-02 16:03:47 +08:00
tangqian 0e26bdbf4b Merge branch 'feature/mall_product' 2023-06-02 15:45:12 +08:00
tangqian e1aaf55a53 fix: 修改相关提成单位 2023-06-02 15:44:51 +08:00
TianYu 5adf5115eb fix: 取消支付宝支付 2023-06-02 15:27:23 +08:00
TianYu fbb6972846 fix: 修复提成设置 2023-06-02 11:44:37 +08:00
tianyu 6a0904cf64 Merge pull request 'fix: 修复提成设置' (#14) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/14
2023-06-02 11:44:14 +08:00
TianYu fd3c805655 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-06-02 11:27:05 +08:00
tianyu 6ce32ccb45 Merge pull request 'feature/mall_product' (#13) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/13
2023-06-02 11:27:01 +08:00
TianYu 38209dd485 fix: 修改轮播图权限标识 2023-06-02 11:26:49 +08:00
tangqian 0e5fc4e37e Merge branch 'feature/mall_product' 2023-06-02 11:05:44 +08:00
tangqian 413ded83a9 fix: 修改相关提成单位 2023-06-02 11:05:09 +08:00
TianYu 488f0166be fix: 权限设置问题 2023-06-02 10:47:43 +08:00
tianyu 102ea79177 Merge pull request 'feature/mall_product' (#12) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/12
2023-06-02 10:47:39 +08:00
TianYu a6fea11b09 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-06-02 10:46:05 +08:00
TianYu 0b8cf5ccab fix: 修复banner传参的问题 2023-06-02 10:45:52 +08:00
tangqian 6d3211e7b9 fix: 修改部门 2023-06-02 10:35:18 +08:00
tangqian 54cc1cde59 Merge branch 'feature/mall_product' 2023-06-02 10:34:52 +08:00
tangqian e2328d8567 fix: 修改部门 2023-06-02 10:34:38 +08:00
TianYu d5167b3e35 fix: 提成设置可以输入两位小数 2023-06-02 09:53:16 +08:00
tianyu 1aca869225 Merge pull request 'fix: 提成设置可以输入两位小数' (#11) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/11
2023-06-02 09:53:09 +08:00
tangqian a1321eaca1 fix: 修改部门 2023-06-01 19:06:27 +08:00
tangqian cf897c2b9c fix: 修改部门 2023-06-01 18:46:06 +08:00
tangqian 7f980191d1 Merge branch 'feature/mall_product' 2023-06-01 17:35:38 +08:00
tangqian ced99434c1 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-01 17:35:24 +08:00
tangqian 0512c04391 fix: 修改部门 2023-06-01 17:35:18 +08:00
TianYu 1fcfc530fb fix: 修复bug 2023-06-01 17:01:28 +08:00
tianyu 774ba45aff Merge pull request 'fix: 修复bug' (#10) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/10
2023-06-01 17:01:27 +08:00
tianyu f76bc2e3e6 Merge pull request 'feature/mall_product' (#9) from feature/mall_product into master
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/9
2023-06-01 14:22:41 +08:00
TianYu 45779d8252 fix: 修复bug 2023-06-01 14:21:31 +08:00
Jruome 8748e0dcc9 uniapp 购买记录样式修改 2023-06-01 14:16:20 +08:00
tangqian 07d811caeb Merge branch 'feature/mall_product' 2023-06-01 14:11:37 +08:00
tangqian b168d8a899 fix: 修改部门 2023-06-01 14:11:28 +08:00
tangqian cb280da42f Merge branch 'feature/mall_product' 2023-06-01 13:26:47 +08:00
tangqian 2fc7ef07f8 fix: 修改部门 2023-06-01 13:26:31 +08:00
perry 4ec7e8d409 Merge remote-tracking branch 'origin/master' 2023-06-01 13:14:08 +08:00
perry 266f6bec1c 所有部门 2023-06-01 13:13:10 +08:00
tangqian 2c4c96cfa4 Merge branch 'feature/mall_product' 2023-06-01 12:03:26 +08:00
tangqian b821587935 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-01 12:02:51 +08:00
tangqian 236d4b566b fix: 修改部门 2023-06-01 12:02:45 +08:00
TianYu 1301b5d9ea Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-06-01 11:53:36 +08:00
TianYu 55abca5129 fix: 新增扫码关注公众号功能 2023-06-01 11:53:24 +08:00
tangqian a1f6946fc4 fix: 修改部门 2023-06-01 11:45:43 +08:00
tangqian d441005778 Merge branch 'feature/mall_product' 2023-06-01 11:43:54 +08:00
tangqian e97a387aa5 fix: 修改部门 2023-06-01 11:43:28 +08:00
perry 296af91986 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-06-01 11:29:43 +08:00
perry 144e858710 部门 2023-06-01 11:29:32 +08:00
tangqian bec5e56add fix: 修改部门 2023-06-01 11:27:49 +08:00
tangqian 5a5c69421c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-06-01 11:27:17 +08:00