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 |
|
wangsongsole
|
d74fd5c71d
|
fix:修复商品详情支付不验证问题
|
2022-10-18 15:12:49 +08:00 |
|
wangsongsole
|
15b481e107
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0
|
2022-10-18 15:02:19 +08:00 |
|
wangsongsole
|
c2aae41c65
|
style:调整商品详情代码
|
2022-10-18 15:02:16 +08:00 |
|
Apple
|
cb544751c3
|
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-18 14:39:30 +08:00 |
|
Apple
|
a3e7c4f333
|
fix(创建优惠券订单):修复【c端】券后价为0的，点击立即支付直接创建订单，不需要到微信或支付宝进行支付
|
2022-10-18 14:38:46 +08:00 |
|
wangsongsole
|
5610894847
|
fix:修复单词错误
|
2022-10-18 14:22:41 +08:00 |
|
wangsongsole
|
aa1d27f591
|
fix：修复订单字段错误
|
2022-10-18 14:15:00 +08:00 |
|
wangsongsole
|
16016b9248
|
fix:修复登录过期不自动退出逻辑
|
2022-10-17 16:59:52 +08:00 |
|
wangsongsole
|
67833a427e
|
fix：修复商品详情仅登录失效跳登录
|
2022-10-17 11:37:12 +08:00 |
|
wangsongsole
|
c45dce57e0
|
fix：修复优惠券商品详情 登录失效操作
|
2022-10-17 11:32:07 +08:00 |
|
wangsongsole
|
30ad2ef410
|
style:所有code===-1更改为403 为登录失效
|
2022-10-17 11:23:00 +08:00 |
|
wangsongsole
|
003414c6d1
|
style：添加注释
|
2022-10-17 10:31:26 +08:00 |
|
wangsongsole
|
06b2a44088
|
feat:订单新增查看卡密按钮
|
2022-10-14 14:20:31 +08:00 |
|
wangsongsole
|
54aaffe148
|
fix:修复【C端】【立减金】微信登录C端，无法跳转到支付去领取立减金。
|
2022-10-14 11:03:20 +08:00 |
|
wangsongsole
|
7820f932bb
|
fix:修复【C端】【订单】充值失败订单，展示退款状态。
|
2022-10-14 10:49:05 +08:00 |
|
wangsongsole
|
24ab4eb65a
|
fix:修复【C端】【商品列表】兑换码无商品，登录后商品列表应该展示暂无可兑换商品。
|
2022-10-14 10:30:43 +08:00 |
|
wangsongsole
|
f45e6a11a5
|
fix:修复订单立减金领取逻辑错误
|
2022-10-14 09:41:15 +08:00 |
|
wangsongsole
|
fb8b04f1a4
|
fix：修复订单兑换错误
|
2022-10-13 18:35:37 +08:00 |
|
wangsongsole
|
e586043429
|
fix:修复微信登录C端，无法跳转到支付去领取立减金。
|
2022-10-13 18:10:44 +08:00 |
|
wangsongsole
|
7fe284e06d
|
Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0
|
2022-10-13 16:05:56 +08:00 |
|
wangsongsole
|
91fd611c41
|
feat:我的订单、我的券 新增titile
|
2022-10-13 16:05:54 +08:00 |
|
Apple
|
31b2d94c10
|
fix:修复订单列表跳转支付宝领取时，返回按钮，页面出现空白
|
2022-10-13 15:59:09 +08:00 |
|
Apple
|
81103f4320
|
fix:调整订单列表点击兑换按钮，链接传值参数alipay_order_number
|
2022-10-13 15:53:41 +08:00 |
|
wangsongsole
|
dbc90ee741
|
style：替换css
|
2022-10-13 15:48:04 +08:00 |
|
wangsongsole
|
b44f5ca477
|
fix：修复订单无法支付
|
2022-10-13 15:47:42 +08:00 |
|
wangsongsole
|
6f189fc737
|
fix:我的订单、我的券单个多个商品时不显示返回按钮
|
2022-10-13 15:03:42 +08:00 |
|
wangsongsole
|
8ad41eb59d
|
fix:修复待领取订单无法兑换
|
2022-10-13 10:41:20 +08:00 |
|
wangsongsole
|
4c1d1b28d4
|
fix：修复部分机型不兼容下拉刷新
|
2022-10-13 09:51:50 +08:00 |
|
刘子峰运维
|
bb29a0132a
|
新建 11.txt
|
2022-10-12 16:24:59 +08:00 |
|
刘子峰运维
|
17bc2c169f
|
删除 1.txt
|
2022-10-12 06:54:38 +00:00 |
|
wangsongsole
|
60c76fbd1c
|
style：更改文件名称
|
2022-10-12 14:08:25 +08:00 |
|
wangsongsole
|
6bb8f049b6
|
feat：新增订单刷新功能
|
2022-10-12 13:50:18 +08:00 |
|
刘子峰
|
351be68efa
|
新建 1.txt
|
2022-10-12 11:16:34 +08:00 |
|
刘子峰
|
be910ef992
|
删除 1.txt
|
2022-10-12 02:59:51 +00:00 |
|
刘子峰
|
00524583ca
|
新建 1.txt
指定分支构建测试
|
2022-10-12 10:21:30 +08:00 |
|
wangsongsole
|
96113e6519
|
fix：修复【C端】商品列表，价格重叠展示。
|
2022-10-11 18:31:47 +08:00 |
|
wangsongsole
|
1b8c953fb1
|
fix:修复商品详情检测支付环境提示
|
2022-10-11 17:19:55 +08:00 |