Commit Graph

4284 Commits (263ec59f245fa62f39dc4a9f22766ef4fada6b72)

Author SHA1 Message Date
perry 263ec59f24 微信支付 2023-05-19 18:25:00 +08:00
perry 04e0f33ad3 微信支付 2023-05-19 17:49:39 +08:00
tangqian 59841c23b4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-19 17:35:37 +08:00
tangqian 797dd8cb9c feat: 支付宝相关支付 2023-05-19 17:35:32 +08:00
TianYu 7cc0e41cf6 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-19 17:35:11 +08:00
TianYu d194009324 fix: 修复bug 2023-05-19 17:34:57 +08:00
tangqian b106db5ca0 feat: 支付宝相关支付 2023-05-19 17:29:47 +08:00
tangqian 5dc3218152 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-19 16:45:43 +08:00
tangqian 3a209f056b feat: 支付宝相关支付 2023-05-19 16:45:37 +08:00
TianYu d75d571637 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-19 16:13:26 +08:00
TianYu 2925d35df8 fix: 修复bug 2023-05-19 16:10:03 +08:00
Jruome 0385010a11 uniapp 申请退款 2023-05-19 16:09:25 +08:00
tangqian 5f5497875e Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-19 13:53:51 +08:00
tangqian bde92cebdf feat: 支付宝相关支付 2023-05-19 13:53:33 +08:00
TianYu 02ff453ff1 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-19 11:42:16 +08:00
Jruome 9d95f2cae7 uniapp 会员申请ui 2023-05-19 11:40:50 +08:00
TianYu 98fc15f45e Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-19 11:35:20 +08:00
Jruome 91b21f344d uniapp 会员申请ui 2023-05-19 11:34:07 +08:00
TianYu 381632dc9d fix: UI优化 2023-05-19 11:25:26 +08:00
perry 21a020f430 微信支付 2023-05-19 10:24:44 +08:00
perry 12228e7d09 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-18 19:28:21 +08:00
perry 46563efd16 微信支付 2023-05-18 19:28:02 +08:00
TianYu 40398dab27 fix: openid动态获取 2023-05-18 19:11:31 +08:00
perry 18909d4c2c 微信支付 2023-05-18 18:49:43 +08:00
TianYu 96b8ed637e fix: 微信支付联调 2023-05-18 18:30:21 +08:00
TianYu 3a0fd70313 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-18 18:09:43 +08:00
TianYu 2b5c66acf2 feat: 微信支付联调 2023-05-18 18:07:27 +08:00
Jruome 5b89459951 uniapp 购买记录 2023-05-18 18:03:06 +08:00
tangqian cf5c4179a6 feat: 微信相关支付 2023-05-18 16:35:54 +08:00
perry 1f748070ce Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-18 15:07:21 +08:00
perry d463a122dc 打包测试 2023-05-18 15:07:11 +08:00
TianYu 9f47ce9dda Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-18 14:58:56 +08:00
TianYu abbe8ea262 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-18 14:58:37 +08:00
perry 40e61464a8 打包测试 2023-05-18 14:57:09 +08:00
perry adacc2b6fe 打包测试 2023-05-18 14:56:40 +08:00
TianYu 6ff2f26c2c feat: 推广员海报生成 2023-05-18 14:56:38 +08:00
perry e007c7f2f6 打包测试 2023-05-18 14:47:40 +08:00
perry 58f6be0108 排除租户逻辑 2023-05-18 14:01:20 +08:00
perry 4524c475f1 前缀 2023-05-18 13:46:41 +08:00
perry 6fc3ce15a1 快递公司实体 2023-05-18 13:32:52 +08:00
perry 09659b936c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-18 13:25:53 +08:00
perry 6fac2affcc 测试环境 2023-05-18 13:25:44 +08:00
js199000131 cbf8056b88 物流公司和配置信息修改 2023-05-18 11:01:34 +08:00
tangqian c4bdbb6904 feat: 商城支付退款 2023-05-18 09:49:55 +08:00
tangqian 32a452e86c feat: 商城支付退款 2023-05-18 09:48:41 +08:00
tangqian a3cca0a41c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-18 09:45:35 +08:00
tangqian d958f5d012 feat: 商城支付退款 2023-05-18 09:45:29 +08:00
perry a0c0fc8437 打包 2023-05-17 23:09:32 +08:00
perry d4bb390916 打包 2023-05-17 23:02:34 +08:00
perry e05e28ce02 打包 2023-05-17 22:44:59 +08:00