Commit Graph

92 Commits

Author SHA1 Message Date
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