Commit Graph

4329 Commits (3b251f974515b55505cc5912fbb0c9d4eeded24e)

Author SHA1 Message Date
axzsd 3b251f9745 构建文件 2023-05-23 14:07:48 +08:00
perry eaede930cc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	yudao-ui-app/pages/member_equity/index.vue
2023-05-23 14:03:50 +08:00
perry b6de22d7a5 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-23 11:26:57 +08:00
perry 3c2eca8fba 微信支付 2023-05-23 11:26:48 +08:00
tangqian a8bfcebce4 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-23 11:23:21 +08:00
tangqian aa88423153 fix: 修改档次信息 2023-05-23 11:23:15 +08:00
perry 2adf4d610a 微信支付 2023-05-23 11:12:28 +08:00
perry 032074a119 微信支付 2023-05-23 11:05:48 +08:00
perry bbb204191a 微信公众号 2023-05-23 11:00:24 +08:00
perry 0e3b3bf667 推广员 2023-05-23 10:34:09 +08:00
perry 1098528193 推广员 2023-05-23 10:30:53 +08:00
TianYu 1f3d68faf0 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-23 09:47:36 +08:00
TianYu bb12efb278 feat: 新增功能 2023-05-23 09:47:23 +08:00
perry b45a6d49b6 短信发送频率 2023-05-23 09:22:04 +08:00
perry 57084b320c 修改测试环境地址 2023-05-23 09:19:03 +08:00
perry 071c2bf863 正式环境 2023-05-22 23:26:27 +08:00
perry 4ce908adce 正式环境 2023-05-22 22:14:17 +08:00
perry a6f614c580 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-22 22:04:07 +08:00
perry 0b928b1abc 正式环境 2023-05-22 22:03:48 +08:00
tangqian d84b6869f5 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-22 18:06:01 +08:00
tangqian 2d223030d4 feat: 根据手机号查询档次信息 2023-05-22 18:05:56 +08:00
TianYu 87fc147c02 feat: 样式调整 2023-05-22 16:01:49 +08:00
TianYu e157121924 fix: 修改接口域名 2023-05-22 15:25:27 +08:00
TianYu 336aef34b6 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-22 14:30:00 +08:00
TianYu 0746c080b4 feat: 增加图标 2023-05-22 14:29:57 +08:00
Jruome 6382219c13 uniapp 新增loding 2023-05-22 14:29:04 +08:00
TianYu e2f85963ca fix: 修改商户生成码推广链接 2023-05-22 14:00:59 +08:00
Jruome 0799a89b0e uniapp 支付宝支付复制 2023-05-22 13:29:42 +08:00
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
Jruome 5c8ddf6e44 uniapp 支付回调处理 2023-05-19 18:04:40 +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