Commit Graph

669 Commits (0b928b1abcfd6794549868d5c71b92beaca51347)

Author SHA1 Message Date
TianYu e2f85963ca fix: 修改商户生成码推广链接 2023-05-22 14:00:59 +08:00
perry a6eb645d54 订单退款 2023-05-22 12:55:07 +08:00
TianYu 33dba0e315 fix: 修复bug 2023-05-19 19:25:50 +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 04e0f33ad3 微信支付 2023-05-19 17:49:39 +08:00
TianYu 2925d35df8 fix: 修复bug 2023-05-19 16:10:03 +08:00
perry 21a020f430 微信支付 2023-05-19 10:24:44 +08:00
perry 18909d4c2c 微信支付 2023-05-18 18:49:43 +08:00
TianYu 2b5c66acf2 feat: 微信支付联调 2023-05-18 18:07:27 +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 adacc2b6fe 打包测试 2023-05-18 14:56:40 +08:00
TianYu 6ff2f26c2c feat: 推广员海报生成 2023-05-18 14:56:38 +08:00
perry 6fac2affcc 测试环境 2023-05-18 13:25:44 +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
perry 452dd6b983 打包 2023-05-17 21:55:05 +08:00
perry d9b6b286f5 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
# Conflicts:
#	yudao-ui-admin/.env.dev
2023-05-17 21:50:55 +08:00
perry 7870f79674 打包 2023-05-17 21:50:20 +08:00
TianYu 983f098870 feat: 新增推广员功能 2023-05-17 17:58:09 +08:00
TianYu 9617169e6f feat: 增加支付宝支付 2023-05-17 16:28:31 +08:00
Jruome 04fbb93fa6 Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-17 15:27:44 +08:00
perry 42091eedca Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-17 15:09:09 +08:00
perry da28864ded 测试地址 2023-05-17 15:08:10 +08:00
axzsd efd9296275 构建文件 2023-05-17 14:49:13 +08:00
axzsd df3f811ddf 构建文件 2023-05-17 14:42:10 +08:00
axzsd fec78bc6d8 构建文件 2023-05-17 14:41:11 +08:00
axzsd 79e5fafbfe 构建文件 2023-05-17 14:41:02 +08:00
axzsd 1c26c9142b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-17 14:39:30 +08:00
axzsd b7241ecd09 构建文件 2023-05-17 14:39:25 +08:00
TianYu d1c0e148bd Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-17 14:37:30 +08:00
TianYu 907b2b7582 feat: 轮播图功能开发 2023-05-17 14:37:27 +08:00
perry 9fbee20579 推广员 2023-05-17 14:17:20 +08:00
perry 06a36c6668 环境地址 2023-05-17 09:55:53 +08:00
TianYu fd0627c470 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-17 09:53:55 +08:00
TianYu 405e61876a feat: 修改生产环境服务器地址 2023-05-17 09:53:43 +08:00
perry 8798b872e6 推广员导入 2023-05-17 09:32:13 +08:00
Jruome 19dd57f4dd uview 更新 2023-05-16 18:22:32 +08:00
Jruome b71fff7e00 Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-16 18:15:01 +08:00
TianYu 24b4be91d0 feat: 功能开发 2023-05-16 18:00:52 +08:00
Jruome 88980480cb Merge remote-tracking branch 'origin/feature/mall_product'
# Conflicts:
#	yudao-ui-admin/yarn.lock
2023-05-16 09:53:40 +08:00
perry ca7f62f924 支付 2023-05-15 23:40:57 +08:00
perry 39e87b3701 充值记录 2023-05-15 18:28:49 +08:00
Jruome 00d7d6528d Merge remote-tracking branch 'origin/feature/mall_product' 2023-05-15 10:39:07 +08:00
TianYu 927568c0d9 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server 2023-05-15 10:36:04 +08:00
Jruome f96369d3e4 物流模板 2023-05-15 10:25:36 +08:00
Jruome 89c09d32b4 物流模板 2023-05-15 10:19:45 +08:00
perry 69da62ea38 商品管理 2023-05-14 18:08:19 +08:00