zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,870 Commits
3 Branches
0 Tags
162 MiB
Commit Graph

214 Commits (877e40d7a00eeb951abf099419ea4a1a36d682e7)

Author SHA1 Message Date
TianYu 28b5ecba88 fix: 修复ubg 2023-05-29 18:29:13 +08:00
TianYu 74d67d9968 fix: 修改bug 2023-05-29 17:49:01 +08:00
TianYu 585a25e4f0 fix: 修改bug 2023-05-29 17:46:22 +08:00
TianYu 04042caf41 fix: 功能调整 2023-05-29 17:31:52 +08:00
Jruome 53d55cc6e9 uniapp 首页商品隐藏 2023-05-29 17:15:13 +08:00
TianYu 3d34feb481 fix: 修复bug 2023-05-29 17:01:10 +08:00
TianYu 950a9c2b62 feat: 增加会员换绑推广员功能 2023-05-29 15:37:57 +08:00
TianYu eab653230d feat: 订单下单支付跳转 2023-05-29 14:43:03 +08:00
TianYu b979f77097 fix: 修复bug 2023-05-29 09:51:19 +08:00
Jruome db940da972 uniapp 发展会员业绩 2023-05-26 18:23:34 +08:00
js199000126 8af70137b9 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-26 17:58:37 +08:00
js199000126 532b9f1d47 订单 2023-05-26 17:58:32 +08:00
TianYu d14191e8dc fix: 修复bug 2023-05-26 17:06:03 +08:00
TianYu fa341e5e18 fix: 修复bug 2023-05-26 16:35:25 +08:00
TianYu f07e115e5d fix: 修复BUG 2023-05-26 16:28:53 +08:00
js199000126 f7667b9361 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-26 15:37:37 +08:00
js199000126 bac7430d16 拉去 2023-05-26 15:37:31 +08:00
TianYu f628b07126 fix: 修复bug 2023-05-26 15:35:43 +08:00
TianYu d547326d27 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-26 15:23:21 +08:00
TianYu c4fc7ec96e fix: 修复bug 2023-05-26 15:21:36 +08:00
js199000126 1bd8b84439 订单 2023-05-26 15:20:44 +08:00
js199000126 8938ee67c7 订单 2023-05-26 15:11:55 +08:00
js199000126 4f9bb936b4 商城-首页 2023-05-26 13:49:39 +08:00
js199000126 f386fced2f Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-26 13:49:08 +08:00
js199000126 b10de0ca81 商城-首页 2023-05-26 13:48:55 +08:00
TianYu 906a5cbd80 fix: 修改代码注释 2023-05-26 11:53:18 +08:00
js199000126 dd3c95971d Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-26 11:39:50 +08:00
js199000126 15a30885a7 navbar 2023-05-26 11:39:43 +08:00
TianYu 89c2d93a42 fix: 支付方法统一处理 2023-05-26 11:32:01 +08:00
js199000126 5f5944b15f navbar 2023-05-25 18:12:27 +08:00
js199000126 64fcfc72ad navbar 2023-05-25 18:12:05 +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 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
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 a61d46e620 Merge branch 'feature/mall_product' 2023-05-25 14:48:49 +08:00
Jruome 149ea95d48 uniapp 会员购买申请退款 2023-05-25 14:33:27 +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
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
Jruome b11b71be2e uniapp 手机号正则修改 2023-05-25 11:08:25 +08:00
perry 7569be214a Merge branch 'feature/mall_product_new' 2023-05-24 22:19:32 +08:00
Jruome 6fadb15d27 uniapp 话费返回详情 2023-05-24 19:59:44 +08:00
perry 0aafa2fd7c Merge branch 'feature/mall_product_new' 2023-05-24 19:06:33 +08:00
TianYu 7a2b8e64a3 fix: 调整海报文案 2023-05-24 19:01:59 +08:00
perry 82692fecaf Merge branch 'feature/mall_product_new' 2023-05-24 19:01:23 +08:00
TianYu 4aed73b1d5 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-24 18:34:46 +08:00
TianYu 66e4d6ee54 fix: 调整充值页面生命周期 2023-05-24 18:34:43 +08:00
perry 328864388b Merge branch 'feature/mall_product_new' 2023-05-24 18:11:23 +08:00
Jruome cd68bf0be8 uniapp 会员权益 2023-05-24 17:51:37 +08:00
js199000126 fee16f8471 商城-购物车 2023-05-24 17:11:30 +08:00
js199000126 4f1d28feac 商城-购物车 2023-05-24 17:08:06 +08:00
perry cbed37d4f0 Merge branch 'feature/mall_product_new' 2023-05-24 17:04:28 +08:00
Jruome b18ed2551c uniapp 会员权益 2023-05-24 17:00:39 +08:00
TianYu 989fec4ebc fix: 修复IOS无法生成海报的问题 2023-05-24 16:54:06 +08:00
perry 9e28c0b616 Merge branch 'feature/mall_product_new' 2023-05-24 16:36:38 +08:00
TianYu 51e3506baf fix: 海报文案修改 2023-05-24 16:03:59 +08:00
TianYu be58048ce7 fix: 海报文案修改 2023-05-24 16:00:06 +08:00
TianYu e5ea2d52f7 feat: 分销海报生成 2023-05-24 15:56:32 +08:00
js199000126 a1295f5943 商城 2023-05-24 09:46:03 +08:00
TianYu 1c4fb81f08 fix: git排除mainifest.json文件 2023-05-23 18:09:58 +08:00
Jruome f9c4d2b102 uniapp 会员权益判断 2023-05-23 18:08:01 +08:00
js199000126 2e99714330 zhy 2023-05-23 17:37:49 +08:00
TianYu 9ad7196292 feat: 增加导航条图标 2023-05-23 16:48:56 +08:00
TianYu 9ce77c4782 Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product 2023-05-23 16:23:33 +08:00
TianYu 0c1eb5e969 feat: 新增支付页面 2023-05-23 16:23:09 +08:00
perry 4d0cf5dca3 Merge branch 'feature/mall_product_new' 2023-05-23 14:07:59 +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
Jruome 2d459bd679 uniapp 为他人支付 2023-05-23 12:03:27 +08:00
TianYu 56c888e295 fix: 修复IOS下无法复制支付宝链接问题 2023-05-23 11:27:13 +08:00
TianYu bb12efb278 feat: 新增功能 2023-05-23 09:47:23 +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
Jruome 9ba8a8a827 uniapp 支付回调处理 2023-05-19 18:05:20 +08:00
Jruome 5c8ddf6e44 uniapp 支付回调处理 2023-05-19 18:04:40 +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
TianYu d194009324 fix: 修复bug 2023-05-19 17:34:57 +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
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