wangsongsole
|
1c67cbea46
|
Merge branch 'master' into through-card
|
2023-11-24 09:50:55 +08:00 |
|
wangsongsole
|
18908f8a7d
|
🐛 fix: 修复bug
|
2023-11-24 09:37:39 +08:00 |
|
wangsongsole
|
78d3c71705
|
Merge branch 'master' into through-card
|
2023-11-23 18:12:05 +08:00 |
|
wangsongsole
|
b5ab3f8148
|
♻️ refactor: 优惠券、兑换码输入框提示对微博做出特殊处理
|
2023-11-23 18:07:49 +08:00 |
|
wangsongsole
|
55c2ee0d1f
|
🎈 per: 优化
|
2023-11-23 16:46:28 +08:00 |
|
wangsongsole
|
d8c97426a2
|
✨ feat: 卡密商品兑换成功直接跳转卡密查看页面
|
2023-11-23 15:32:01 +08:00 |
|
wangsongsole
|
deaf8c7539
|
🗑️ delete: 删除昵称校验
|
2023-11-09 16:02:02 +08:00 |
|
wangsongsole
|
f9a40cf6f0
|
💊 fix: 修复banner图链接跳转bug
|
2023-08-31 16:46:21 +08:00 |
|
wangsongsole
|
c0cf51f6b5
|
✨ feat: banner支持外链
|
2023-08-30 16:41:53 +08:00 |
|
wangsongsole
|
35b292dea1
|
✨ feat: 兼容卡密短信发放类型
|
2023-08-18 09:08:13 +08:00 |
|
wangsongsole
|
ea41765adf
|
💪 optimize: 优化代码和更新readme
|
2023-06-16 09:30:39 +08:00 |
|
wangsongsole
|
dad9067559
|
✨ feat: 根据后端新增兑换状态 9
|
2023-04-07 11:00:27 +08:00 |
Apple
|
197f9db5d3
|
fix:[卡密有效期]-》【卡密有效期至】
|
2022-11-22 10:52:39 +08:00 |
|
Apple
|
3de6493440
|
feat:正式环境V2.0锁定版本
|
2022-11-21 17:09:00 +08:00 |
|
Apple
|
9ace186a24
|
fix:修复微信环境创建订单，支付宝环境支付，未重新设置支付方式
|
2022-11-21 16:53:00 +08:00 |
|
Apple
|
53b3e449ce
|
feat:营销系统C端镜像环境
|
2022-11-18 18:16:12 +08:00 |
|
wangsongsole
|
eb97354313
|
style:删除vConsole
|
2022-11-18 18:05:01 +08:00 |
|
wangsongsole
|
bb19b29702
|
fix:修复支付宝环境 支付方式没有默认选中bug
|
2022-11-17 14:12:25 +08:00 |
|
wangsongsole
|
52fc033ce0
|
fix：修复活路浏览器无法出发拉起条件
|
2022-11-14 18:29:12 +08:00 |
|
wangsongsole
|
05c0a1d46b
|
fix:新增立减金兑换拉起条件
|
2022-11-14 14:38:05 +08:00 |
|
Apple
|
85e36ae2a2
|
style:商品列表页商品状态不可点击，按钮置灰
|
2022-11-14 14:28:41 +08:00 |
|
wangsongsole
|
e8741cfb7d
|
fix:修复【C端】【兼容】百度浏览器，无法跳转支付宝去领取立减金。
|
2022-11-11 15:15:35 +08:00 |
|
Apple
|
ffd6e2c5cc
|
fix(商品详情页)：点击账号判断有无订单
|
2022-11-10 14:29:51 +08:00 |
|
Apple
|
324ab3129b
|
feat(商品详情页）：增加wait_pay_order，判断有无订单
|
2022-11-10 14:27:54 +08:00 |
|
Apple
|
571b867d7e
|
feat：订单列表页跳转结算页支付，取消接口查询
|
2022-11-07 18:00:32 +08:00 |
|
Apple
|
8745270973
|
fix：调整商品详情页接口，增加code_batch_id,修复搜索栏bug
|
2022-11-07 17:34:11 +08:00 |
|
Apple
|
41733c2564
|
fix:修复搜索页点击商品跳转详情页，携带参数有误
|
2022-11-07 11:06:10 +08:00 |
|
wangsongsole
|
0922f1484b
|
fix:修复样式引入错误
|
2022-11-04 16:16:00 +08:00 |
|
wangsongsole
|
5a4d2f9324
|
feat;商品列表搜索框新增icon
|
2022-11-04 15:23:45 +08:00 |
|
wangsongsole
|
429f67c4c4
|
style:调整商品页 轮播展示
|
2022-11-04 10:53:09 +08:00 |
|
wangsongsole
|
da3f008997
|
fix:重新调整商品列表搜索栏布局
|
2022-11-04 10:29:20 +08:00 |
|
wangsongsole
|
70bf73f486
|
fix:回退商品列表部分代码
|
2022-11-04 10:00:51 +08:00 |
|
wangsongsole
|
b6eadf67ba
|
fix:修复【C端】商品列表，搜索框没有展示返回按钮且没有居中。
|
2022-11-04 09:50:15 +08:00 |
|
Apple
|
e81070ae13
|
fix:修复订单列表跳转携带参数判断
|
2022-11-03 18:08:42 +08:00 |
|
wangsongsole
|
adea6ccee2
|
style:调整代码
|
2022-11-03 18:01:54 +08:00 |
|
wangsongsole
|
2bb71b1c3a
|
fix:修复微信支付默认选择
|
2022-11-03 18:00:29 +08:00 |
|
wangsongsole
|
c240de4096
|
style：删除结算页代码
|
2022-11-03 17:46:11 +08:00 |
|
wangsongsole
|
f2c8a34a95
|
fix:删除订单多余代码
|
2022-11-03 17:40:26 +08:00 |
|
wangsongsole
|
25a729d1ef
|
fix:修复结算页支付弹窗不能反选
|
2022-11-03 17:12:54 +08:00 |
|
wangsongsole
|
a8c4fab17b
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0
|
2022-11-03 17:03:32 +08:00 |
|
wangsongsole
|
143c75e1e5
|
feat:订单列表对接支付结算页
|
2022-11-03 17:03:30 +08:00 |
|
Apple
|
9be7913484
|
fix:优惠券白名单判断有订单未支付状态排序
|
2022-11-03 16:34:47 +08:00 |
|
wangsongsole
|
3c4037a40c
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0
|
2022-11-03 15:38:51 +08:00 |
|
wangsongsole
|
1a42004e1f
|
style：调整优惠券样式
|
2022-11-03 15:38:49 +08:00 |
|
Apple
|
83dbee4b2d
|
fix:浏览器选择微信支付使用H5支付
|
2022-11-03 15:24:48 +08:00 |
|
Apple
|
29c60aa443
|
feat:新增订单结算页，统一支付处理
|
2022-11-03 15:19:00 +08:00 |
|
Apple
|
4957058d52
|
fix:修复【c端】微信中打开链接，在商品详情页面中点击立即支付按钮，微信支付应该默认选中
|
2022-11-03 10:52:16 +08:00 |
|
Apple
|
f2da835f39
|
fix:修复【c端】兑换有效期，应该展示后台给卡密商品单独设置的有效期时间
|
2022-11-03 10:38:32 +08:00 |
|
Apple
|
1b41899583
|
test:打印链接跳转路由
|
2022-11-03 10:21:24 +08:00 |
|
Apple
|
7f3ea431b7
|
test:测试order_number
|
2022-11-02 19:26:32 +08:00 |
|
Apple
|
7a6988269f
|
test:打印order_number
|
2022-11-02 19:20:57 +08:00 |
|
Apple
|
5e09f2f55e
|
fix:微信支付JSPAI支付成功跳转中转页
|
2022-11-02 19:00:37 +08:00 |
|
Apple
|
ee85ae59e8
|
test:微信JSAPI联调测试，加密openid
|
2022-11-02 17:45:27 +08:00 |
|
Apple
|
14d3bce616
|
test:联调测试微信支付功能
|
2022-11-02 17:13:15 +08:00 |
|
wangsongsole
|
406c49fc96
|
style:更换组件oss路径
|
2022-11-02 15:07:29 +08:00 |
|
wangsongsole
|
704cc5b5bf
|
style:调整卡密商品，查看卡密页面，“兑换有效期”修改为“卡密有效期”
|
2022-11-02 14:11:12 +08:00 |
|
wangsongsole
|
f994cf76c5
|
fix:预留位置支付后续代码
|
2022-11-02 14:06:23 +08:00 |
|
wangsongsole
|
7cb2a43f6d
|
fix:修复【C端】微信浏览器无法领取支付宝立减金。
|
2022-11-01 17:30:50 +08:00 |
|
Apple
|
d3457a430b
|
fix:修复【C端】微信浏览器无法领取支付宝立减金。
|
2022-11-01 16:42:06 +08:00 |
|
wangsongsole
|
4632930025
|
style：根据不同浏览器环境 判断对应支付方式
|
2022-11-01 13:42:14 +08:00 |
|
wangsongsole
|
cfb13dae85
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0
|
2022-11-01 11:32:21 +08:00 |
|
wangsongsole
|
6b931dd77e
|
fix：修复轮播商品图标大小未限制
|
2022-11-01 11:32:19 +08:00 |
|
Apple
|
d25691464e
|
fix:修复【c端】购买商品“营销系统卡密”，显示的支付金额是0.1，但是跳转到支付时，显示的是1
|
2022-11-01 11:28:11 +08:00 |
|
Apple
|
4a076feeb9
|
fix:修复【C端】【优惠券】0元订单支付成功页面，点击去兑换，提示支付结算中，无法去兑换；点击返回，提示重新登录。
|
2022-10-31 16:08:37 +08:00 |
|
wangsongsole
|
93fd9e848e
|
feat:订单新增分页
|
2022-10-31 15:46:22 +08:00 |
|
Apple
|
b390f37bfc
|
fix:修复支付完成跳转支付成功中转页路径
|
2022-10-31 14:46:03 +08:00 |
|
wangsongsole
|
661403c5ee
|
style:调整查看卡密样式
|
2022-10-28 15:05:33 +08:00 |
|
wangsongsole
|
2b8fde4bf7
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0
|
2022-10-28 11:28:32 +08:00 |
|
wangsongsole
|
7578db7ac1
|
feat：新增卡密商品类型支付
|
2022-10-28 11:28:30 +08:00 |
|
wangsongsole
|
7b45f7ec2b
|
style:调整商品列表banner展示
|
2022-10-28 11:28:04 +08:00 |
|
Apple
|
0f201fba7d
|
fix：商品优惠券商品列表页增加列表形式状态标签
|
2022-10-28 11:19:57 +08:00 |
|
Apple
|
07437fbd1d
|
fix:【C端】【订单】用户有待领取的订单，再次下单购买该立减金商品提示不是有效路由
|
2022-10-27 16:04:08 +08:00 |
|
Apple
|
0b72be4ca6
|
fix:修复【C端】【订单】购买商品应该先判断商品是否有未完成的订单，再判断其他领取限制
|
2022-10-27 14:57:26 +08:00 |
|
wangsongsole
|
6ee889a3cc
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0
|
2022-10-27 11:26:41 +08:00 |
|
wangsongsole
|
c1c1586f73
|
feat:新增取消订单确认提示框
|
2022-10-27 11:26:39 +08:00 |
|
Apple
|
f9b792ce2d
|
fix:修正商品有待支付订单，商品高亮显示
|
2022-10-27 11:25:07 +08:00 |
|
Apple
|
12e1f8a60b
|
fix:【C端】【订单】购买商品应该先判断商品是否有未完成的订单，再判断其他领取限制,增加判断商品状态22，可进入详情页
|
2022-10-27 10:54:13 +08:00 |
|
wangsongsole
|
e212e4c2fd
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0
|
2022-10-26 16:11:50 +08:00 |
|
wangsongsole
|
90d19d0d74
|
feat:订单列表新增取消订单按钮和逻辑
|
2022-10-26 16:11:48 +08:00 |
|
Apple
|
a7f8b199f5
|
feat(创建优惠券订单支付)：接口新增token，便于回调返回token值
|
2022-10-26 09:59:02 +08:00 |
|
Apple
|
0cdeee8fff
|
fix：修改商品状态为22，提示 您有未支付的订单！
|
2022-10-25 18:03:09 +08:00 |
|
Apple
|
2200a87200
|
Merge branch 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0
* 'couponV2.0' of https://codeup.aliyun.com/5f9118049cffa29cfdd3be1c/marketing/mobileclient:
fix:微信立减金 钉钉环境直接跳转
|
2022-10-25 17:24:08 +08:00 |
|
Apple
|
ca0482f777
|
feat:创建优惠券订单增加【pay_amount】，便于后端比价
|
2022-10-25 17:23:48 +08:00 |
|
wangsongsole
|
7b6be068b6
|
fix:微信立减金 钉钉环境直接跳转
|
2022-10-25 17:14:34 +08:00 |
|
wangsongsole
|
118bf792ab
|
feat：新增商品详情接口 并联调
|
2022-10-25 10:42:57 +08:00 |
|
wangsongsole
|
bd75bbe66e
|
style:调整兑换有限期显示
|
2022-10-24 16:34:44 +08:00 |
|
wangsongsole
|
31ddf152de
|
feat:查看卡密新增兑换有限时间
|
2022-10-24 15:49:28 +08:00 |
|
wangsongsole
|
b81e4a169d
|
feat：新增查看卡密
|
2022-10-24 11:59:56 +08:00 |
|
wangsongsole
|
1b03d40eda
|
fix:配合后端修复【C端】立减金商品详情展示和后台配置不一致。
|
2022-10-24 10:09:09 +08:00 |
|
wangsongsole
|
7a9ef0f09f
|
fix：【C端】【订单】订单列表点击去兑换，没有跳转到微信/支付宝兑换。
|
2022-10-21 17:57:15 +08:00 |
|
wangsongsole
|
4cbc118cbb
|
fix:修复订单数据解析报错
|
2022-10-21 15:27:42 +08:00 |
|
wangsongsole
|
850f77666e
|
style：调整样式
|
2022-10-20 18:29:56 +08:00 |
|
wangsongsole
|
16a43bbcab
|
fix：修复商品列表样式应用错误
|
2022-10-20 18:28:41 +08:00 |
|
wangsongsole
|
d043af8e8d
|
style：调整商品列表样式
|
2022-10-20 18:27:43 +08:00 |
|
wangsongsole
|
867c38a49e
|
fix:修复商品样式布置灰色
|
2022-10-20 17:47:23 +08:00 |
刘子峰运维
|
9712bbf7d5
|
删除 11.txt
|
2022-10-20 08:52:54 +00:00 |
|
wangsongsole
|
2b6a2d4248
|
style：删除无用代码
|
2022-10-20 16:12:27 +08:00 |
|
wangsongsole
|
02d234bec9
|
feat：新增vConsole
|
2022-10-19 16:39:25 +08:00 |
|
wangsongsole
|
6592754d8a
|
fix:修复我的券商品使用范围商品渲染错误
|
2022-10-18 18:00:02 +08:00 |
|
Apple
|
5d94b9c6ba
|
fix：券后价为0的，点击立即支付直接创建订单，不需要到微信或支付宝进行支付
|
2022-10-18 16:09:44 +08:00 |