Commit Graph

4633 Commits (9f9cb30b03044c5e687f3adba4621056acc8a232)

Author SHA1 Message Date
TianYu eab653230d feat: 订单下单支付跳转 2023-05-29 14:43:03 +08:00
perry d699437155 Merge branch 'feature/mall_product_new' 2023-05-29 12:55:27 +08:00
perry 524d0fc077 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-29 12:55:12 +08:00
perry 478c21b7fb 分销数据统计 2023-05-29 12:54:51 +08:00
perry e79abc1405 分销数据统计 2023-05-29 12:54:00 +08:00
Jruome bd53fae597 管理端 按钮路由标识 2023-05-29 10:19:13 +08:00
TianYu 49c9611182 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-29 09:54:24 +08:00
TianYu b979f77097 fix: 修复bug 2023-05-29 09:51:19 +08:00
perry 9b5f694e1b Merge remote-tracking branch 'origin/master' 2023-05-29 09:46:53 +08:00
perry 36a744a6ef Merge branch 'feature/mall_product_new' 2023-05-29 09:46:38 +08:00
perry 21790ab31d 分销数据统计 2023-05-29 09:46:14 +08:00
perry 4aadcef501 推广员导出 2023-05-28 11:36:55 +08:00
perry 5641f8d322 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-27 12:22:03 +08:00
perry 2d5c8236c7 会员管理充值订单数据权限 2023-05-27 12:21:55 +08:00
Jruome db940da972 uniapp 发展会员业绩 2023-05-26 18:23:34 +08:00
tangqian 0736bd8e20 fix: 商城支付相关 2023-05-26 18:19:56 +08:00
tangqian e379bff378 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-26 18:18:59 +08:00
tangqian fe3648013c fix: 商城支付相关 2023-05-26 18:18:52 +08:00
js199000126 8af70137b9 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-26 17:58:37 +08:00
js199000126 532b9f1d47 订单 2023-05-26 17:58:32 +08:00
perry c5a16c07f9 手机验证码登录即注册 2023-05-26 17:56:58 +08:00
TianYu d14191e8dc fix: 修复bug 2023-05-26 17:06:03 +08:00
TianYu fa341e5e18 fix: 修复bug 2023-05-26 16:35:25 +08:00
TianYu f07e115e5d fix: 修复BUG 2023-05-26 16:28:53 +08:00
js199000126 f7667b9361 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-26 15:37:37 +08:00
js199000126 bac7430d16 拉去 2023-05-26 15:37:31 +08:00
TianYu f628b07126 fix: 修复bug 2023-05-26 15:35:43 +08:00
TianYu d547326d27 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-26 15:23:21 +08:00
TianYu c4fc7ec96e fix: 修复bug 2023-05-26 15:21:36 +08:00
js199000126 1bd8b84439 订单 2023-05-26 15:20:44 +08:00
js199000126 c7b67f2aae Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-26 15:12:09 +08:00
js199000126 8938ee67c7 订单 2023-05-26 15:11:55 +08:00
perry ed48e31645 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-26 15:01:56 +08:00
perry 74a33ecb85 配置文件修改 2023-05-26 15:01:46 +08:00
tangqian 9894119ba8 Merge branch 'feature/mall_product' 2023-05-26 14:39:17 +08:00
tangqian 43dc44f495 fix: 商城支付微信返回jsapi 2023-05-26 14:39:02 +08:00
tangqian be59002235 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-26 14:37:57 +08:00
tangqian 76c248f865 fix: 商城支付微信返回jsapi 2023-05-26 14:37:52 +08:00
js199000131 c1f6ac1c2c 商品自定义权限 2023-05-26 14:26:15 +08:00
perry 664b5c9b4c Merge branch 'feature/mall_product_new' 2023-05-26 13:50:29 +08:00
perry 540caf9cc1 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-26 13:50:17 +08:00
perry 64158be570 配置文件修改 2023-05-26 13:50:09 +08:00
js199000126 4f9bb936b4 商城-首页 2023-05-26 13:49:39 +08:00
js199000126 f386fced2f Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-26 13:49:08 +08:00
js199000126 b10de0ca81 商城-首页 2023-05-26 13:48:55 +08:00
perry 5fd0973bf3 Merge branch 'feature/mall_product_new' 2023-05-26 13:47:54 +08:00
perry 93d9715984 后台报错 2023-05-26 13:47:23 +08:00
perry f4751d6057 Merge branch 'feature/mall_product_new' 2023-05-26 13:46:04 +08:00
perry e14b6608ef 后台报错 2023-05-26 13:45:46 +08:00
perry b59f558cb6 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-26 13:19:25 +08:00