Commit Graph

4300 Commits (a6eb645d547a6ff89baf1fb3ef132cffaf9f0150)

Author SHA1 Message Date
perry a6eb645d54 订单退款 2023-05-22 12:55:07 +08:00
perry fc9c6e759a Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-19 19:30:13 +08:00
perry 05c49b78ce 微信支付 2023-05-19 19:30:04 +08:00
TianYu adb9190868 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-19 19:25:52 +08:00
TianYu 33dba0e315 fix: 修复bug 2023-05-19 19:25:50 +08:00
tangqian 9764afb6bd feat: 支付宝相关支付 2023-05-19 19:10:18 +08:00
tangqian 6eaa2f70b5 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-19 19:09:05 +08:00
tangqian cab967d639 feat: 支付宝相关支付 2023-05-19 19:08:59 +08:00
TianYu d8f9dd9479 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-19 19:03:40 +08:00
TianYu 87a50fa476 fix: 修复bug 2023-05-19 19:03:24 +08:00
perry ea288188e8 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-19 18:25:08 +08:00
perry 263ec59f24 微信支付 2023-05-19 18:25:00 +08:00
Jruome d0af0912fb Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-19 18:10:47 +08:00
Jruome 9ba8a8a827 uniapp 支付回调处理 2023-05-19 18:05:20 +08:00
tangqian 89122e9487 feat: 支付宝相关支付 2023-05-19 18:03:33 +08:00
Jruome 496ffbe2f9 Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-19 17:57:50 +08:00
Jruome c4a02b30ba uniapp 支付回调处理 2023-05-19 17:56:58 +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