HandOver-liuwu
/
mobileclient
mirror of https://codeup.aliyun.com/lsxd/marketing/mobileclient.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,177 Commits 13 Branches 0 Tags 14 MiB
Commit Graph

1177 Commits

Author SHA1 Message Date
wangsongsole 276c54eeac Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0 2022-10-27 10:56:52 +08:00
wangsongsole 51b4602d0c fix:修复兑换码立减金商品使用规则展示和后台配置不一致。 2022-10-27 10:56:50 +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 5f90def608 fix:修复【C端】【订单】立减金订单支付成功页面点击返回，没有返回到正确的订单列表。 2022-10-26 10:06:14 +08:00
Apple a7f8b199f5 feat(创建优惠券订单支付)：接口新增token，便于回调返回token值 2022-10-26 09:59:02 +08:00
Apple 5fe4cf5df6 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：落地页清除localStorage
 2022-10-25 18:03:40 +08:00
Apple 0cdeee8fff fix：修改商品状态为22，提示 您有未支付的订单！ 2022-10-25 18:03:09 +08:00
wangsongsole 147941d0c5 fix：落地页清除localStorage 2022-10-25 17:51:29 +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 e18c148c2d Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0 2022-10-25 17:14:36 +08:00
Apple ff429da996 fix(落地页)：修改落地页类型跳转 2022-10-25 17:14:34 +08:00
wangsongsole 7b6be068b6 fix:微信立减金 钉钉环境直接跳转 2022-10-25 17:14:34 +08:00
Apple 7945cc82f8 fix(落地页):修复【落地页】白名单落地页后台预览和C端展示不正确。 2022-10-25 15:56:13 +08:00
wangsongsole 118bf792ab feat：新增商品详情接口 并联调 2022-10-25 10:42:57 +08:00
Apple 0c13c96674 fix(微信立减金)：解除微信立减金弹窗 2022-10-25 10:22:00 +08:00
Apple 011d25b0bd fix:修复【C端】【订单】立减金订单支付成功页面点击去兑换，没有跳转到微信/支付宝兑换。 2022-10-24 18:14:13 +08:00
Apple e15f5f1ae4 feat：登录接口增加theme_type，便于后端区分优惠券/兑换码链接 2022-10-24 17:49:06 +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
Apple 860a9b0f98 fix ：【C端】【订单】立减金订单支付成功页面点击去兑换，没有跳转到微信/支付宝兑换。 2022-10-24 10:53:11 +08:00
wangsongsole 1b03d40eda fix:配合后端修复【C端】立减金商品详情展示和后台配置不一致。 2022-10-24 10:09:09 +08:00
wangsongsole 17f8643fee Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0 2022-10-21 17:57:17 +08:00
wangsongsole 7a9ef0f09f fix：【C端】【订单】订单列表点击去兑换，没有跳转到微信/支付宝兑换。 2022-10-21 17:57:15 +08:00
Apple 5f041dc1f8 fix(支付回调后页面):修复支付回调点击去兑换，没有跳转到微信/支付宝兑换 2022-10-21 17:56:10 +08:00
wangsongsole 4cbc118cbb fix:修复订单数据解析报错 2022-10-21 15:27:42 +08:00
Apple 08b5313fae fix(落地页)：【c端】登录页面，输入框的placeholder颜色与后台配置动态生成 2022-10-21 09:48:07 +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 6a0bc5d40a style:修改路径跳转方式 2022-10-19 11:01:56 +08:00
Apple f37db8af77 fix:【C端】链接样式的优惠券，浏览器打开提示【无效的兑换码】 2022-10-19 10:14:32 +08:00
Apple 7a5fb8d5a0 fix(首页)：修复【C端】链接样式和二维码的优惠券，浏览器打开提示【无效的兑换码】 2022-10-19 10:12:14 +08:00
Apple 3fd1cd2d7e feat(支付完成回调页面):【c端】前端支付成功后，页面跳转调整 2022-10-19 10:09:27 +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