Commit Graph

4464 Commits (6ce6a7a3fa399267961e081a0ffd8a3c4265ad64)

Author SHA1 Message Date
TianYu 6ce6a7a3fa Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-26 09:33:42 +08:00
TianYu f2047883c0 fix: 修复bug 2023-05-26 09:33:30 +08:00
tangqian 38b5bfde5d fix: 充值相关 2023-05-26 09:24:36 +08:00
tangqian ec433d0134 Merge branch 'master' into feature/mall_product 2023-05-26 09:24:16 +08:00
TianYu 09bb5b0893 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-26 09:15:33 +08:00
tangqian c3a72e4245 fix: 充值相关 2023-05-25 18:46:56 +08:00
小小张 872ce8baf0 后台--运费模板:配送区域修改 2023-05-25 18:21:08 +08:00
小小张 a1143656c2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-25 18:17:30 +08:00
小小张 03e595c92b 后台--运费模板:配送区域修改 2023-05-25 18:17:16 +08:00
js199000126 5f5944b15f navbar 2023-05-25 18:12:27 +08:00
js199000126 656f0a6d50 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 18:12:11 +08:00
js199000126 64fcfc72ad navbar 2023-05-25 18:12:05 +08:00
小小张 39d922eb1b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-25 18:08:24 +08:00
小小张 dc4c7504a7 后台--运费模板:配送区域修改 2023-05-25 18:08:07 +08:00
tangqian 65a76c4efd fix: 充值相关 2023-05-25 18:05:56 +08:00
TianYu 471cc57623 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 18:02:47 +08:00
tangqian f1ac990de7 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-25 17:44:42 +08:00
tangqian 88c8c3e459 fix: 充值相关 2023-05-25 17:44:35 +08:00
js199000126 ed90876de2 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 17:26:51 +08:00
Jruome 911a5ce4c3 uniapp ui修改 2023-05-25 17:26:00 +08:00
js199000126 fb2379948f Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 17:25:58 +08:00
js199000126 89c5a86b21 index1 2023-05-25 17:25:52 +08:00
Jruome debd84a7e0 uniapp ui修改 2023-05-25 17:25:16 +08:00
js199000126 9cf17dc717 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 17:22:50 +08:00
js199000126 712c0b1580 index 2023-05-25 17:22:39 +08:00
TianYu 355f823192 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 17:00:25 +08:00
TianYu 56c8e53fa0 fix: 会员管理取消操作按钮 2023-05-25 17:00:11 +08:00
小小张 51581f66a6 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-25 16:49:44 +08:00
小小张 8873be7def 后台--运费模板:配送区域修改 2023-05-25 16:49:27 +08:00
TianYu e6c0b55c09 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 16:12:02 +08:00
TianYu 60392dd6e2 fix: 客服电话跳转 2023-05-25 16:11:49 +08:00
tangqian f77fe63d9f Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-25 15:55:33 +08:00
tangqian 877fe3d3aa fix: 充值相关 2023-05-25 15:55:27 +08:00
js199000126 f3f523f5c9 商城-购物车 2023-05-25 15:47:41 +08:00
js199000126 5641a8b566 525-购物车 2023-05-25 15:45:57 +08:00
Jruome de63f91e43 uniapp 登录正则修改 2023-05-25 15:44:52 +08:00
TianYu 503e5034d9 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 15:35:15 +08:00
TianYu a4d2fac5cd fix: 修复首页启动报错的问题 2023-05-25 15:35:02 +08:00
tangqian f1755820b6 fix: 充值相关 2023-05-25 15:30:21 +08:00
tangqian a61d46e620 Merge branch 'feature/mall_product' 2023-05-25 14:48:49 +08:00
tangqian 90fde064c8 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-25 14:48:34 +08:00
tangqian 270e45433e fix: 充值相关 2023-05-25 14:48:29 +08:00
Jruome 149ea95d48 uniapp 会员购买申请退款 2023-05-25 14:33:27 +08:00
TianYu 9a5d6cc1cc Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 13:47:32 +08:00
TianYu 4802eef97e feat: h5区分正式环境和开发环境 2023-05-25 13:47:20 +08:00
tangqian 64a66f2a3a Merge branch 'feature/mall_product' 2023-05-25 12:02:15 +08:00
tangqian fb3196dcca Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-25 11:25:38 +08:00
tangqian 01a1e11f9b fix: 充值相关 2023-05-25 11:25:33 +08:00
TianYu 99f1fb5e33 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-25 11:23:34 +08:00
TianYu 1462178e7a fix: 生成海报失败增加提示 2023-05-25 11:23:31 +08:00