Commit Graph

300 Commits

Author SHA1 Message Date
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 92456abf32 Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0 2022-10-13 15:47:43 +08:00
wangsongsole b44f5ca477 fix:修复订单无法支付 2022-10-13 15:47:42 +08:00
Apple 79b0bc6672 fix:调整支付回调页面文件名 2022-10-13 15:33:57 +08:00
Apple a86117afb5 fix:调整支付后回调跳转页面 2022-10-13 15:33:20 +08:00
Apple 9d72d445ca fix:支付宝立减金领取,弹出提示 2022-10-13 15:16:02 +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
wangsongsole 851bdde61d style(我的券、商品列表):根据字体长度动态调整字体大小 2022-10-11 14:54:58 +08:00
wangsongsole 0c5d0bcac5 style:编写readme 2022-10-11 12:03:24 +08:00
wangsongsole 71553d43f6 style:删除v1_3_0_C文件夹 2022-10-11 09:52:47 +08:00
wangsongsole 1cb4dcf6d4 style:删除多余文件夹 2022-10-11 09:50:41 +08:00
wangsongsole d76871df04 fix:修复多个商品显示订单得bug 2022-10-11 09:49:35 +08:00
Apple 575e9c6b14 style:调整C端兑换码与优惠券结构 2022-10-11 09:43:31 +08:00
wangsongsole fa6e5dbc07 style:调整商品详情样式引入 2022-10-10 18:44:34 +08:00
wangsongsole bce3889ad2 feat:商品详情单个商品新增订单按钮 2022-10-10 18:43:09 +08:00
Apple 026d301216 style:调整商品列表页和详情页返回按钮悬浮样式 2022-10-10 18:25:53 +08:00
wangsongsole 8dabcad8ab fix:配合后端订单接口,券接口key参数改为token 2022-10-10 18:17:12 +08:00
wangsongsole cc386166ac fix:修复登录过期不跳转问题 订单和优惠券 2022-10-10 18:13:42 +08:00
wangsongsole 504e402c97 style:调整商品列表搜索框为固定定位 2022-10-10 10:59:38 +08:00
wangsongsole 536cf4b13c fix:兑换码-立减金详情 标题只保留
兑换说明
2022-10-10 09:41:44 +08:00
wangsongsole 4809ea738e style:调整商品详情页-立减金商品文本 2022-10-09 18:15:59 +08:00
wangsongsole 40e620b85f fix:商品详情页共省字段保留2位小数 2022-10-09 18:02:52 +08:00
wangsongsole cc13914153 fix:x修复优惠卷价格显示错误 2022-10-09 17:59:10 +08:00
wangsongsole e1b6db5e0d fix:修复兑换码下的立减金报错 2022-10-09 16:23:54 +08:00
Apple 0b4073b5de 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:
  feat:新增订单状态颜色
  fix:修改支付方式默认为支付宝
  fix:修复订单状态不正确
2022-10-09 16:12:06 +08:00
Apple 755c7cf629 feat:支付回调,支付宝立减金领取接口联调 2022-10-09 16:11:58 +08:00
wangsongsole e317c8131f feat:新增订单状态颜色 2022-10-09 15:56:28 +08:00
wangsongsole 0f2d0e9532 fix:修改支付方式默认为支付宝 2022-10-09 15:48:09 +08:00
wangsongsole 57bf4a9159 fix:修复订单状态不正确 2022-10-09 15:45:38 +08:00
wangsongsole c28b7d614f fix:修复我的卷页面展示不正常 2022-10-09 14:51:05 +08:00
wangsongsole 2dcbb569f6 feat:新增订单立减金图标 2022-10-09 14:40:53 +08:00
Apple ad644230a0 refactor(兑换码):融入兑换码模块逻辑 2022-10-09 14:31:02 +08:00
Apple ba09dee5dc test:测试支付成功回调页面 2022-10-09 14:29:13 +08:00
wangsongsole 3d43b3c5a3 fix:修复商品列表登录过期跳转错误 2022-10-09 13:42:43 +08:00
wangsongsole dc6ea7175a style:调整商品详情立减金样式不对问题 2022-10-09 11:41:14 +08:00
Apple 1ba587909a 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:
  feat:新增支付成功页面
  style:删除无用代码
  style:商品列表调整结构
2022-10-09 11:22:00 +08:00
Apple 2c976acab6 feat(商品详情页):立减金类型创建优惠券订单联调 2022-10-09 11:21:52 +08:00
wangsongsole f675c4f187 feat:新增支付成功页面 2022-10-09 11:07:18 +08:00