Commit Graph

99 Commits (cbed37d4f03689cda447c3e93e934e61eccc9344)

Author SHA1 Message Date
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
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
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
Jruome 91b21f344d uniapp 会员申请ui 2023-05-19 11:34:07 +08:00
TianYu 381632dc9d fix: UI优化 2023-05-19 11:25:26 +08:00
TianYu 40398dab27 fix: openid动态获取 2023-05-18 19:11:31 +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
TianYu 6ff2f26c2c feat: 推广员海报生成 2023-05-18 14:56:38 +08:00
TianYu 9617169e6f feat: 增加支付宝支付 2023-05-17 16:28:31 +08:00
Jruome 91df476b68 uniapp 会员申请 2023-05-17 15:28:00 +08:00
Jruome 40dd065e30 uniapp 会员申请 2023-05-17 15:25:16 +08:00
Jruome 19dd57f4dd uview 更新 2023-05-16 18:22:32 +08:00
TianYu 24b4be91d0 feat: 功能开发 2023-05-16 18:00:52 +08:00
TianYu a32c7378d6 feat: 增加注册页面 2023-05-15 18:19:03 +08:00
TianYu eb6fc5d9c7 feat: 提交代码 2023-05-15 10:12:22 +08:00