diff --git a/App.vue b/App.vue index 3886872..8718b2d 100644 --- a/App.vue +++ b/App.vue @@ -5,15 +5,15 @@ // brestUrl: 'http://192.168.3.4:9302/brest', // imgUrl: 'https://192.168.3.4:9301/filesystem/', //正式 - url: 'https://hsg.dctpay.com/crest', - imgUrl: 'https://hsg.dctpay.com/filesystem/', - brestUrl : 'https://hsg.dctpay.com/brest', - imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/', + // url: 'https://hsg.dctpay.com/crest', + // imgUrl: 'https://hsg.dctpay.com/filesystem/', + // brestUrl : 'https://hsg.dctpay.com/brest', + // imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/', //测试 - // url: 'https://hsgcs.dctpay.com/crest', - // brestUrl : 'https://hsgcs.dctpay.com/brest', - // imgUrl: 'https://hsgcs.dctpay.com/filesystem/', - // imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/', + url: 'https://hsgcs.dctpay.com/crest', + brestUrl : 'https://hsgcs.dctpay.com/brest', + imgUrl: 'https://hsgcs.dctpay.com/filesystem/', + imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/', userInfo: "", brestUserInfo : '', openId: '', diff --git a/Utils/Api.js b/Utils/Api.js index daba217..02de670 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -157,6 +157,40 @@ export const getCmsContent = params => { return POST('GET', `${base}/cmsContent/getCmsContent`, params).then(res => res.data); } +/** + * 工会卡 + */ +// 获取用户卡号列表 +export const getUserCardList = params => { + return POST('GET', `${base}/highUserCard/getUserCardList`, params).then(res => res.data); +} +// 根据手机号获取汇联通工会卡列表 +export const getHuiLianTongCardByPhone = params => { + return POST('POST', `${base}/highUserCard/getHuiLianTongCardByPhone`, params).then(res => res.data); +} +// 删除用户卡号 +export const delUserCard = params => { + return POST('POST', `${base}/highUserCard/delUserCard`, params).then(res => res.data); +} +// 查询汇联通工会卡详情 +export const getHuiLianTongCardBalance = params => { + return POST('GET', `${base}/highUserCard/getHuiLianTongCardBalance?`, params).then(res => res.data); +} +// 查询汇联通工会卡消费记录 +export const getHuiLianTongCardConsume = params => { + return POST('GET', `${base}/highUserCard/getHuiLianTongCardConsume`, params).then(res => res.data); +} +// 汇联通工会卡支付 +export const hltUnionCardPay = params => { + return POST('POST', `${base}/order/hltUnionCardPay`, params).then(res => res.data); +} +export const bindHuiLianTongCard = params => { + return POST('POST', `${base}/highUserCard/bindHuiLianTongCard`, params).then(res => res.data); +} +/** + * 工会卡 + */ + /** * 肯德基地址 diff --git a/pages.json b/pages.json index ebba77e..deeaccf 100644 --- a/pages.json +++ b/pages.json @@ -489,6 +489,15 @@ } } + ,{ + "path" : "pages/user/bindingCard/bindingCard", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } ], "globalStyle": { diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue index c6aef90..794895b 100644 --- a/pages/order/confirmation.vue +++ b/pages/order/confirmation.vue @@ -78,10 +78,10 @@ - + 积分支付可用积分: {{user.gold}} - @@ -98,15 +98,15 @@ - + diff --git a/pages/user/bindingCard/bindingCard.vue b/pages/user/bindingCard/bindingCard.vue new file mode 100644 index 0000000..c51251e --- /dev/null +++ b/pages/user/bindingCard/bindingCard.vue @@ -0,0 +1,224 @@ + + + + + diff --git a/pages/user/unionCard/unionCard.vue b/pages/user/unionCard/unionCard.vue index f2831c0..fa8a7f8 100644 --- a/pages/user/unionCard/unionCard.vue +++ b/pages/user/unionCard/unionCard.vue @@ -2,6 +2,24 @@ + + 选择卡号 + + + {{carNo}} + + + + + 业务类型 + + + {{titleName}} + + + 开始时间 @@ -19,34 +37,24 @@ - 立即查询 - + 立即查询 + 添加工会卡 + 账号余额(元) - ￥444.96 - 31964698964646646646 + ￥{{tongCardPrice}} - - 个人账户规帐(2020-09-1) - +102.54元 - - - 个人账户规帐(2020-09-1) - +102.54元 - - - 个人账户规帐(2020-09-1) - +102.54元 - - - 个人账户规帐(2020-09-1) - +102.54元 - - - 个人账户规帐(2020-09-1) - +102.54元 + + + {{cardInfp.orderNo}} + -{{cardInfp.tranAmount}}元 + + + 消费时间:{{cardInfp.tranTime}} + + @@ -54,6 +62,11 @@ @@ -120,6 +243,7 @@ .leave_cont .ul .li .flex1 { flex: 1; text-align: right; + width: 70%; padding-right: 25rpx; color: #999999; font-size: 32rpx; diff --git a/uni.scss b/uni.scss index 8a4bcc6..2c69511 100644 --- a/uni.scss +++ b/uni.scss @@ -380,6 +380,11 @@ $uni-font-size-paragraph:30upx; height: 60px; } + +.height70 { + height: 70px; +} + .height80 { height: 80px; }