diff --git a/App.vue b/App.vue index 751aaba..c85253e 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 1431920..380dd70 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -185,6 +185,14 @@ export const getGasDetailByStoreKey = params => { export const getDictionaryByCodeTypeOl = params => { return POST('GET', `${base}/common/getDictionaryByCodeTypeOl`, params).then(res => res.data); } +//团油计算价格 +export const oilPriceCompute = params => { + return POST('GET', `${base}/highGas/oilPriceCompute`, params).then(res => res.data); +} +//查询卡数据字典 +export const getDictionaryByCodeType = params => { + return POST('GET', `${base}/common/getDictionaryByCodeType`, params).then(res => res.data); +} //获取已开通的省份 export const getDredgeProvince = params => { return POST('GET', `${base}/common/getDredgeProvince`, params).then(res => res.data); @@ -217,7 +225,12 @@ export const getDiscountPackageDetail = params => { //根据卡号查询 export const getHuiLianTongCardByCardNo = params => { return POST('GET', `${base}/highUserCard/getHuiLianTongCardByCardNo`, params).then(res => res.data); -} +} +//查询油卡详情 +export const getDetailByCardNo = params => { + return POST('GET', `${base}/oilCard/getDetailByCardNo`, params).then(res => res.data); +} + // 获取用户卡号列表 export const getUserCardList = params => { return POST('GET', `${base}/highUserCard/getUserCardList`, params).then(res => res.data); @@ -225,7 +238,11 @@ export const getUserCardList = params => { // 根据手机号获取汇联通工会卡列表 export const getHuiLianTongCardByPhone = params => { return POST('GET', `${base}/highUserCard/getHuiLianTongCardByPhone`, params).then(res => res.data); -} +} +//查询油卡消费 +export const getOilCardRecordList = params => { + return POST('GET', `${base}/oilCard/getOilCardRecordList`, params).then(res => res.data); +} // 删除用户卡号 export const delUserCard = params => { return POST('POST', `${base}/highUserCard/delUserCard`, params).then(res => res.data); @@ -241,9 +258,10 @@ export const getHuiLianTongCardConsume = params => { // 汇联通工会卡支付 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); + return POST('POST', `${base}/highUserCard/bindCard`, params).then(res => res.data); } //手机短信登录 export const loginByTel = params => { @@ -388,6 +406,10 @@ export const orderToGoldPayunion = params => { //提交订单 export const addOrderPay = params => { return POST('POST', `${base}/outRechargeOrder/addOrder`, params).then(res => res.data); +} +//油卡支付 +export const oilCardPay = params => { + return POST('POST', `${base}/order/oilCardPay`, params).then(res => res.data); } //话费充值查询 export const getListOutRechargePrice = params => { diff --git a/pages.json b/pages.json index 4bf1fd6..8185efe 100644 --- a/pages.json +++ b/pages.json @@ -472,6 +472,7 @@ "navigationBarTextStyle": "white" } } + ], "subpackages": [{ "root": "subPages", @@ -649,6 +650,28 @@ "navigationBarTextStyle": "white" } + }, { + "path": "cardsList/cardsList", + "style": { + "navigationBarTitleText": "卡包", + "enablePullDownRefresh": false, + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + + }, { + "path": "cardsDetails/cardsDetails", + "style": { + "navigationBarTitleText": "卡详情", + "enablePullDownRefresh": false, + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#0083f5", + "backgroundColorTop": "#0083f5", + "navigationBarTextStyle": "white" + } + } ] }], diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue index 7f871e4..cd6ad5e 100644 --- a/pages/goods/refuel-confirm/refuel-confirm.vue +++ b/pages/goods/refuel-confirm/refuel-confirm.vue @@ -46,16 +46,16 @@ --> - - - - - 积分支付 - - - - - + + + + + 积分支付 + + + + + @@ -67,6 +67,16 @@ + + + + 油卡支付余额: {{oilPirce}}元 + + + + + + + + + + + + + {{getCodeText}} + + + + + + 绑定卡号 + 获取预留手机号 + + + 【温馨提示】 + + 1元可抵扣100积分 + + + + + + + diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue index b381d52..eb4d0c6 100644 --- a/pages/user/order_details/order_details.vue +++ b/pages/user/order_details/order_details.vue @@ -73,6 +73,9 @@ 混合 + + + 油卡 @@ -94,6 +97,9 @@ 银联支付 + + + 嗨森逛油卡 diff --git a/static/img/ghkpay.png b/static/img/ghkpay.png index 76f4606..7455380 100644 Binary files a/static/img/ghkpay.png and b/static/img/ghkpay.png differ diff --git a/subPages/cardsDetails/cardsDetails.vue b/subPages/cardsDetails/cardsDetails.vue new file mode 100644 index 0000000..8650ba3 --- /dev/null +++ b/subPages/cardsDetails/cardsDetails.vue @@ -0,0 +1,407 @@ + + + + + diff --git a/subPages/cardsList/cardsList.vue b/subPages/cardsList/cardsList.vue new file mode 100644 index 0000000..d5aa7f9 --- /dev/null +++ b/subPages/cardsList/cardsList.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/subPages/static/addcards.png b/subPages/static/addcards.png new file mode 100644 index 0000000..3f06686 Binary files /dev/null and b/subPages/static/addcards.png differ diff --git a/subPages/static/oilcard.png b/subPages/static/oilcard.png new file mode 100644 index 0000000..f2520a4 Binary files /dev/null and b/subPages/static/oilcard.png differ diff --git a/subPages/static/unioncard.png b/subPages/static/unioncard.png new file mode 100644 index 0000000..cbcc5fd Binary files /dev/null and b/subPages/static/unioncard.png differ diff --git a/uni.scss b/uni.scss index ba764cc..726ed35 100644 --- a/uni.scss +++ b/uni.scss @@ -230,11 +230,25 @@ $uni-font-size-paragraph:30upx; color: #41cda2; } +.colorb9 { + color: #b95859; +} + +.color32 { + color: #32649d; +} /* 背景颜色 */ .backcor9 { background-color: #f6f6f6; } + +.backcolorb9 { + background-color: #b85958; +} +.backcolor32 { + background-color: #32649d; +} //渐变 .backcorlr{ background: linear-gradient(to right, #fe1a1a, #ff722e); @@ -328,6 +342,11 @@ $uni-font-size-paragraph:30upx; margin-left: 30%; } +.width30w { + width: 30%; + margin-left: 3%; +} + .width20w { width: 20%; margin-left: 40%; @@ -351,7 +370,10 @@ $uni-font-size-paragraph:30upx; .width15 { width: 15%; -} +} +.width10 { + width: 10%; +} .width8 { width: 8%; } @@ -395,6 +417,10 @@ $uni-font-size-paragraph:30upx; height: 60px; } +.height70w { + height: 70px; + line-height: 70px; +} .height70 { height: 70px; @@ -438,6 +464,14 @@ $uni-font-size-paragraph:30upx; .height180{ height: 180px; } + +.height200{ + height: 200px; +} + +.height220{ + height: 220px; +} .height30 { height: 30px;