1.新增钱包功能

2.修改接口问题
master
杨杰 3 years ago
parent 8afa122693
commit 2a2f395f65
  1. 32
      high-unionPay/Utils/Api.js
  2. 55
      high-unionPay/Utils/js/date.js
  3. 5
      high-unionPay/main.js
  4. 2
      high-unionPay/manifest.json
  5. 307
      high-unionPay/pages.json
  6. 100
      high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
  7. 192
      high-unionPay/pages/goods/refuel-details/refuel-details.vue
  8. 233
      high-unionPay/pages/goods/refuel/refuel.vue
  9. 7
      high-unionPay/pages/login/register.vue
  10. 118
      high-unionPay/pages/pay/payment/payment.vue
  11. 63
      high-unionPay/pages/tabBar/home/home.vue
  12. 65
      high-unionPay/pages/tabBar/user/user.vue
  13. 125
      high-unionPay/pages/user/bindingCard/bindingCard.vue
  14. 24
      high-unionPay/pages/user/order_details/order_details.vue
  15. 57
      high-unionPay/pages/user/order_list/order_list.vue
  16. 48
      high-unionPay/pages/userLogin/userLogin.vue
  17. 2
      high-unionPay/static/css/login.scss
  18. BIN
      high-unionPay/static/img/ghkpay.png
  19. 407
      high-unionPay/subPages/cardsDetails/cardsDetails.vue
  20. 100
      high-unionPay/subPages/cardsList/cardsList.vue
  21. BIN
      high-unionPay/subPages/static/addcards.png
  22. BIN
      high-unionPay/subPages/static/oilcard.png
  23. BIN
      high-unionPay/subPages/static/unioncard.png
  24. 2
      high-unionPay/subPages/unionPay-orderList/unionPay-orderList.vue
  25. 34
      high-unionPay/uni.scss

@ -171,7 +171,19 @@ export const getGasStoreList = params => {
export const getGasDetailByStoreKey = params => {
return POST('GET', `${base}/highGas/getGasDetailByStoreKey`, params).then(res => res.data);
}
//团油距离限制
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);
@ -181,10 +193,15 @@ export const getCmsContent = params => {
return POST('GET', `${base}/cmsContent/getCmsContent`, params).then(res => res.data);
}
//油卡支付
export const oilCardPay = params => {
return POST('POST', `${base}/order/oilCardPay`, params).then(res => res.data);
}
//提交订单
export const addOrderPay = params => {
return POST('POST', `${base}/outRechargeOrder/addOrder`, params).then(res => res.data);
}
//话费充值查询
export const getListOutRechargePrice = params => {
return POST('GET', `${base}/outRechargePrice/getListOutRechargePrice`, params).then(res => res.data);
@ -233,6 +250,10 @@ 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);
@ -241,6 +262,10 @@ 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);
@ -257,8 +282,9 @@ 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);
}
/**
* 工会卡
@ -319,8 +345,8 @@ export const getH5UserInfo = params => {
return POST('GET', `${base}/wechat/getH5UserInfo`, params).then(res => res.data);
}
//获取验证码
export const sendSmsCode = params => {
return POST('GET', `${base}/sms/sendSmsCode`, params).then(res => res.data);
export const sendSmsCodeByHw = params => {
return POST('GET', `${base}/SendSms/sendSmsCodeByHw`, params).then(res => res.data);
}
//绑定手机号
export const bindUserPhone = params => {

@ -0,0 +1,55 @@
const isNullOrEmpty = function(val) {
if (val == null || val == "" || typeof(val) == undefined) {
return true;
} else {
return false;
}
}
const timeFormat = (value, format) => {
let date = new Date(value);
let y = date.getFullYear();
let m = date.getMonth() + 1;
let d = date.getDate();
let h = date.getHours();
let min = date.getMinutes();
let s = date.getSeconds();
let result = "";
if (format == undefined) {
result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d} ${
h < 10 ? "0" + h : h
}:${min < 10 ? "0" + min : min}:${s < 10 ? "0" + s : s}`;
}
if (format == "yyyy-mm-dd hh:mm") {
result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d} `;
}
if (format == "yyyy-mm-dd") {
result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d}`;
}
if (format == "yyyy-mm") {
result = `${y}-${m < 10 ? "0" + m : m}`;
}
if (format == "mm-dd") {
result = ` ${mm < 10 ? "0" + mm : mm}:${ddmin < 10 ? "0" + dd : dd}`;
}
if (format == "hh:mm") {
result = ` ${h < 10 ? "0" + h : h}:${min < 10 ? "0" + min : min}`;
}
if (format == "yyyy") {
result = `${y}`;
}
return result;
};
// {{date|isNullOrEmpty}}
// {{date|timeFormat('yyyy-mm-dd')}}
// {{date|timeFormat('yyyy-mm')}}
// {{date|timeFormat('hh:mm')}}
// {{date|timeFormat('yyyy')}}
// {{date|timeFormat}}
export {
isNullOrEmpty,
timeFormat
}

@ -2,6 +2,11 @@ import Vue from 'vue'
import App from './App'
import {VueJsonp} from 'vue-jsonp'
import share from 'common/share.js'
import * as filters from './Utils/js/date.js'
Object.keys(filters).forEach(key => {
Vue.filter(key, filters[key])
})
import vueCupUi from "components/vue-cup-ui/lib/vue-cup-ui.common.js"
Vue.use(vueCupUi)

@ -80,7 +80,7 @@
}
}
},
"title" : "嗨加油",
"title" : "嗨森逛",
"router" : {
"mode" : "hash",
"base" : "/unionPay"

@ -4,7 +4,7 @@
"path": "pages/tabBar/home/home",
"style": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "嗨加油",
"navigationBarTitleText": "嗨森逛",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"onReachBottomDistance": 50,
@ -21,21 +21,27 @@
}, {
"path": "pages/unionPay/unionPay-entrance/unionPay-entrance",
"style": {
"navigationBarTitleText": "嗨加油",
"navigationBarTitleText": "嗨森逛",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/unionPay/unionPay",
"style": {
"navigationBarTitleText": "嗨加油",
"navigationBarTitleText": "嗨森逛",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
@ -45,7 +51,10 @@
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
@ -55,6 +64,7 @@
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false, //
"bounce": "none", //
"softinputNavBar": "none"
}
@ -67,7 +77,10 @@
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
@ -77,7 +90,10 @@
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
@ -86,7 +102,10 @@
"navigationBarTitleText": "订单详情",
"navigationBarBackgroundColor": "#0083f5",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
@ -97,7 +116,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
@ -107,7 +129,10 @@
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
},
@ -118,7 +143,8 @@
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"app-plus": {
"bounce": "none"
"bounce": "none",
"titleNView": false //
}
}
},
@ -129,7 +155,11 @@
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"navigationBarTitleText": "门店列表",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
},
@ -140,7 +170,6 @@
"navigationBarTitleText": "分类",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false, //
"bounce": "none"
@ -176,14 +205,14 @@
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"app-plus": {
"softinputNavBar": "none"
"softinputNavBar": "none",
"titleNView": false //
}
}
},
{
"path": "pages/goods/goods",
"style": {
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTitleText": "详情",
@ -207,6 +236,7 @@
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false, //
"bounce": "none", //
"softinputNavBar": "none"
}
@ -221,7 +251,8 @@
"navigationBarTextStyle": "white",
"app-plus": {
"bounce": "none", //
"softinputNavBar": "none"
"softinputNavBar": "none",
"titleNView": false //
}
}
}, {
@ -231,7 +262,10 @@
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"softinputNavBar": "none"
"softinputNavBar": "none",
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/user/coupon/coupon",
@ -241,6 +275,7 @@
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false, //
"bounce": "none"
}
}
@ -252,7 +287,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/pay/payment/payment",
@ -262,7 +300,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/pay/success/success",
@ -272,7 +313,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
},
{
@ -282,7 +326,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
},
@ -294,14 +341,20 @@
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/user/business/business",
"style": {
"navigationBarTitleText": "门店",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
@ -310,47 +363,68 @@
"navigationBarTitleText": "我的订单",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"backgroundColorBottom": "#ffffff"
"backgroundColorBottom": "#ffffff",
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/goods/recording/recording",
"style": {
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/user/mineCoupons/mineCoupons",
"style": {
"navigationBarTitleText": "我的卡券",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/goods/coupons-info-details/coupons-info-details",
"style": {
"navigationBarTitleText": "卡券详情",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/user/mineCouponsDestails/mineCouponsDestails",
"style": {
"navigationBarTitleText": "优惠券详情",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/goods/externalCoupon/externalCoupon",
"style": {
"navigationBarTitleText": "扫码领取优惠券",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/user/agentCoupons/agentCoupons",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
@ -360,7 +434,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
},
{
@ -371,7 +448,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
@ -380,35 +460,50 @@
"navigationBarBackgroundColor": "#ffffff",
"navigationBarTitleText": "充值",
"backgroundColorTop": "#ffffff",
"backgroundColorBottom": "#ffffff"
"backgroundColorBottom": "#ffffff",
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/user/positioning/positioning",
"style": {
"navigationBarTitleText": "地区选择",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/tabBar/order/order",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/qianZhuPay/qianZhuPay",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/tabBar/order/webUrl/webUrl",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
@ -419,7 +514,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/login/updatePas/resetPas",
@ -429,7 +527,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
@ -440,7 +541,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
@ -450,7 +554,10 @@
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}, {
@ -461,29 +568,38 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/userLogin/userLogin",
"style": {
"navigationBarTitleText": "嗨加油",
"navigationBarTitleText": "嗨森逛",
"enablePullDownRefresh": false,
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "pages/user/cardDes/cardDes",
"style": {
"enablePullDownRefresh": false,
"navigationBarTitleText": "绑定卡号",
"navigationBarTitleText": "卡包",
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
@ -493,7 +609,10 @@
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}
@ -505,7 +624,10 @@
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
}
@ -514,14 +636,15 @@
"path": "pages/unionPay/unionorder-des/unionorder-des",
"style": {
"navigationBarTitleText": "充值详情",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //
}
}
,{
}, {
"path": "pages/tabBar/order/stagesUrl/stagesUrl",
"style" :
{
"style": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#0083f5",
@ -532,7 +655,6 @@
"softinputNavBar": "none"
}
}
}
],
"subpackages": [{
@ -545,7 +667,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
@ -556,7 +681,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#e62601",
"backgroundColorTop": "#e62601",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
@ -567,7 +695,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
@ -577,7 +708,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
@ -587,7 +721,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "coupon-packge-details/coupon-packge-details",
@ -596,7 +733,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "coupon-comfirmation/coupon-comfirmation",
@ -605,7 +745,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
@ -616,7 +759,10 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
@ -627,7 +773,38 @@
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "cardsList/cardsList",
"style": {
"navigationBarTitleText": "卡包",
"enablePullDownRefresh": false,
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}, {
"path": "cardsDetails/cardsDetails",
"style": {
"navigationBarTitleText": "卡详情",
"enablePullDownRefresh": false,
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false //
}
}
}]
@ -649,7 +826,7 @@
"pagePath": "pages/tabBar/home/home",
"iconPath": "static/img/tabBar/home.png",
"selectedIconPath": "static/img/tabBar/home-on.png",
"text": "嗨加油"
"text": "嗨森逛"
},
// {
// "pagePath": "pages/tabBar/category/category",

@ -33,7 +33,7 @@
</view>
<!-- // -->
<!-- <view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">支付方式</view>
<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">支付方式</view>
<view class="line1"></view>
<view class="width100 backcorfff">
<view class="line1"></view>
@ -47,6 +47,15 @@
</view>
<view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='oilcard'">
<view class="width60 flleft fontwig6">
油卡支付<text class="font14 fcor666 margle">余额: {{oilPirce}}</text>
</view>
<view class="flright width30 fotct">
<radio :checked="paytype=='oilcard'" @click="changeRiado()" color="#0083f5" />
</view>
</view>
<!-- <view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='gonghuika'">
<view class="width60 flleft fontwig6">
积分<text class="font14 fcor666 margle">(积分:{{user.gold}})</text>
@ -54,8 +63,8 @@
<view class="flright width30 fotct">
<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
</view>
</view>
</view> -->
</view>
<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>
<view class="width95 paddleft10 font14 fcor999 mart5">1.<text
@ -68,7 +77,7 @@
<view class="width50 flleft fcoreb5 padleft15 font15">
合计: <text class="font24">{{payprice}}</text>
</view>
<button class="reBtn flright" @click="unionPay">去支付</button>
<button class="reBtn flright" @click="orderToPay">去支付</button>
</view>
<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
@ -81,7 +90,9 @@
orderToPay,
unionPay,
orderToGoldPay,
hltUnionCardPay
hltUnionCardPay,
findUser,
oilCardPay
} from '../../../Utils/Api.js';
import ssPaymentPassword from '../../../components/sanshui-payment-password/index.vue';
let app = getApp();
@ -97,6 +108,7 @@
orderList: '',
refulAdress: '',
tongCardPrice: 0,
oilPirce: 0, //
user: '',
paytype: '',
PaymentPassword: '',
@ -112,9 +124,26 @@
onShow() {
let that = this;
that.paytype = '';
that.user = app.globalData.userInfo;
that.findUser();
// that.user = app.globalData.userInfo;
},
methods: {
findUser() {
let params;
findUser(params).then(res => {
if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data;
this.user = res.return_data;
if (res.return_data.oilCard) {
this.oilPirce = res.return_data.oilCard.amount;
}
uni.setStorage({
key: "user",
data: res.return_data
})
}
});
},
//
submitHandle(e) {
this.PaymentPassword = e.value;
@ -129,6 +158,7 @@
uni.showLoading({
title: '支付中...'
})
if (this.paytype == 'jifen') {
let params = {
"orderId": this.orderNo,
"password": this.PaymentPassword
@ -155,7 +185,38 @@
icon: 'none'
})
})
return;
}
if (this.paytype == 'oilcard') {
let params = {
"orderId": this.orderNo,
"cardNo": this.user.oilCard.cardNo,
"password": this.PaymentPassword
}
oilCardPay(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '支付成功'
})
uni.reLaunch({
url: '/pages/goods/refuel-succes/refuel-succes?id=' + this.orderNo
});
return;
}
if (res.return_code == '102130') {
uni.navigateTo({
url: '../../login/updatePas/updatePas'
})
return;
}
uni.showToast({
title: res.return_msg,
icon: 'none'
})
})
return;
}
},
//
@ -215,6 +276,30 @@
}
that.$refs.paymentPassword.modalFun('show');
}
if (that.paytype == 'oilcard') {
if (!that.user.isSetPayPwd) {
uni.navigateTo({
url: '../../login/updatePas/updatePas'
})
return;
}
if (!that.user.isSetHltCard) {
uni.showToast({
icon: 'none',
title: '当前账号还未绑定,前往绑定',
duration: 2000,
success() {
setTimeout(() => {
uni.navigateTo({
url: '../../user/bindingCard/bindingCard'
})
}, 1000)
}
});
return;
}
that.$refs.paymentPassword.modalFun('show');
}
},
//
@ -245,7 +330,8 @@
title: '支付成功'
})
uni.reLaunch({
url: '/pages/goods/refuel-succes/refuel-succes?id=' +that.orderNo
url: '/pages/goods/refuel-succes/refuel-succes?id=' + that
.orderNo
});
},
fail: function(err) {

@ -2,7 +2,7 @@
<view>
<image mode="widthFix" class="width100" :src="storeList.gasLogoSmall"></image>
<view class="height100p titlecon backcorfff">
<view class="height60 paddtop25 width90">
<view class="height75 paddtop25 width90">
<view class="flleft width80p">
<view class="width100 text1 font18 fontwig6 fcor333">{{storeList.gasName}}</view>
<view class="width100 font14 fcor666 mart5">{{storeList.gasAddress}}</view>
@ -65,8 +65,8 @@
<view class="width90 mart15 font16 fcor666">加油金额</view>
<view class="width90 height40 mart10" style="border: 1px solid #f2f2f2;">
<view class="width8 flleft"></view>
<input type="digit" class="font16 width60 flleft height40" placeholder="输入金额" v-model="inputMoney"
@blur="Listeningfocus" maxlength="6" />
<input type="digit" class="font16 width60 flleft height40" placeholder="输入金额(保留2位小数)" v-model="inputMoney"
@blur="Listeningfocus" />
<view class="width30 height40 flright font14 fcor999 fotct"
style="border-left: 1px solid #f2f2f2;line-height: 40px;">
{{litre}}L
@ -82,17 +82,17 @@
<!-- 底部按钮 -->
<view class="footer">
<view class="flleft padleft15 font15 fcoreb5">
合计: <text class="font24">{{totalPrice}}</text><text
class="font12 fcor666" v-if="priceVip != priceOfficial">优惠约:{{discountPrice}}</text>
合计: <text class="font24">{{totalPrice}}</text><text class="font12 fcor666"
v-if="priceVip != priceOfficial">优惠约:{{discountPrice}}</text>
</view>
<!-- #ifdef MP -->
<button class="reBtn flright" v-if="user.phone == null" @click="jumpPhone">去支付</button>
<button class="reBtn flright" v-else @click="toPay">去支付</button>
<button class="reBtn flright" v-else @click="postionIng">去支付</button>
<!-- #endif -->
<!-- #ifdef H5 -->
<button class="reBtn flright" v-if="user.phone == null" @click="jumpH5Bding">去支付</button>
<button class="reBtn flright" v-else @click="toPay">去支付</button>
<button class="reBtn flright" v-else @click="postionIng">去支付</button>
<!-- #endif -->
</view>
@ -123,7 +123,9 @@
<script>
import {
getGasDetailByStoreKey,
addOrder
addOrder,
getDictionaryByCodeTypeOl,
oilPriceCompute
} from '../../../Utils/Api.js';
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
let app = getApp();
@ -174,13 +176,17 @@
totalPrice: '0.00',
discountPrice: '0.00',
gasGunList: [],
oilType: ''
oilType: '',
distance: 9999, //
xzMoney: '300', //
}
},
onLoad(options) {
this.store_key = options.id;
this.counId = options.desId;
this.getGasDetailByStoreKey();
this.getDictionaryByCodeTypeOl();
this.getDictionaryByCodeTypeMoney();
},
onShow() {
this.user = app.globalData.userInfo;
@ -207,8 +213,6 @@
})
let params = {
storeKey: this.store_key,
// latitude: '30.83876',
// longitude: '106.129505',
latitude: app.globalData.latitude,
longitude: app.globalData.longitude
}
@ -216,6 +220,7 @@
uni.hideLoading();
if (res.return_code == '000000') {
this.storeList = res.return_data;
if (!this.oilNo) {
this.oilNo = res.return_data.oilPriceList[0].oilNoName;
this.priceVip = res.return_data.oilPriceList[0].priceVip;
this.priceGun = res.return_data.oilPriceList[0].priceGun;
@ -230,7 +235,7 @@
this.gasOilNo = res.return_data.gasGunList[i].oilNo;
}
}
}
} else {
uni.showToast({
title: res.return_msg,
@ -245,7 +250,28 @@
}
})
},
//
getDictionaryByCodeTypeOl() {
let datas = {
codeType: 'MILEAGE_LIMIT'
}
getDictionaryByCodeTypeOl(datas).then(res => {
if (res.return_code == '000000') {
this.distance = res.return_data.codeValue;
}
})
},
//
getDictionaryByCodeTypeMoney() {
let datas = {
codeType: 'TY_PRICE_LIMIT'
}
getDictionaryByCodeTypeOl(datas).then(res => {
if (res.return_code == '000000') {
this.xzMoney = res.return_data.codeValue;
}
})
},
//
changeValue(item) {
this.gunnumber = [];
@ -262,6 +288,9 @@
this.priceVip = item.priceVip;
this.priceOfficial = item.priceOfficial;
this.priceGun = item.priceGun;
this.totalPrice = '0.00';
this.discountPrice = '0.00';
this.inputMoney = '';
this.$refs.popup.hide();
},
//
@ -269,15 +298,15 @@
this.gunNo = item.gunNo;
this.$refs.popup.hide();
},
select(amount) {
this.inputMoney = amount.price;
this.litre = parseFloat(amount.price / this.priceGun).toFixed(2);
this.totalPrice = parseFloat(amount.price / this.priceGun * this.priceVip).toFixed(2);
if (this.priceVip != this.priceGun) {
let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
}
},
// select(amount) {
// this.inputMoney = amount.price;
// this.litre = parseFloat(amount.price / this.priceGun).toFixed(2);
// this.totalPrice = parseFloat(amount.price / this.priceGun * this.priceVip).toFixed(2);
// if (this.priceVip != this.priceGun) {
// let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
// this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
// }
// },
// H5
jumpH5Bding() {
uni.navigateTo({
@ -286,12 +315,71 @@
},
//
Listeningfocus() {
var a = /^[0-9]+(\.[0-9]{1})?$/;
var b = /^[0-9]+(.[0-9]{1})?$/;
var c = /^([1-9][0-9]*)+(\.[0-9]{1,2})?$/;
if (this.inputMoney == '' || this.inputMoney < 10 || !(c.test(this.inputMoney))) {
uni.showToast({
title: '请输入正确加油金额',
icon: "none",
duration: 2000
});
this.totalPrice = '0.00';
this.discountPrice = '0.00';
this.litre = '';
this.inputMoney = '';
return;
}
// let inputs = this.inputMoney.split('.');
// if (inputs[1] != undefined && inputs[1].length > 1) {
// uni.showToast({
// title: '1',
// icon: "none",
// duration:2000
// });
// return;
// }
if (parseInt(this.inputMoney) > parseInt(this.xzMoney)) {
uni.showToast({
title: '加油金额不能超过' + this.xzMoney + '元',
icon: "none",
duration: 2000
});
this.inputMoney = this.xzMoney;
}
//
this.litre = parseFloat(this.inputMoney / this.priceOfficial).toFixed(2);
this.totalPrice = parseFloat(this.inputMoney / this.priceOfficial * this.priceVip).toFixed(2);
// var arr1 = parseFloat(this.inputMoney / this.priceOfficial * this.priceVip).toFixed(4);
// this.totalPrice = this.numFilter(arr1);
this.oilPriceCompute();
//
// this.litre = parseFloat(this.inputMoney / this.priceGun).toFixed(2);
// this.totalPrice = parseFloat(this.inputMoney / this.priceGun * this.priceVip).toFixed(2);
// if (this.priceVip != this.priceGun) {
// let gbprice = parseFloat(this.litre * this.priceGun).toFixed(2);
// this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(0);
// }
},
//
oilPriceCompute() {
let datas = {
"price": this.inputMoney,
"goodsId": this.counId,
"oilNo": this.gasOilNo,
}
oilPriceCompute(datas).then(res => {
if (res.return_code == '000000') {
this.totalPrice = res.return_data;
if (this.priceVip != this.priceOfficial) {
let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(0);
// let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
// this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(2);
this.discountPrice = parseFloat(this.inputMoney - this.totalPrice).toFixed(2);
}
}
})
},
//
jumpPhone() {
@ -299,14 +387,62 @@
url: '../../userLogin/userLogin'
})
},
//
numFilter(tempVal) {
//
// let tempVal = parseFloat(value).toFixed(3)
let realVal = tempVal.substring(0, tempVal.length - 2)
return realVal
},
/**
* 定位
*/
postionIng() {
let that = this;
if (that.inputMoney == '' || that.inputMoney < 10) {
uni.showToast({
title: '请输入正确金额',
icon: "none",
duration: 2000
});
return;
}
uni.getLocation({
type: 'wgs84',
success: function(res) {
app.globalData.latitude = res.latitude;
app.globalData.longitude = res.longitude;
that.getGasDetailByStoreKey();
setTimeout(() => {
that.toPay();
}, 500);
},
fail: (err) => {
uni.showToast({
title: '请打开设置里面的位置信息',
icon: "none",
duration: 2000
});
}
})
},
//
toPay() {
if (this.inputMoney == '' || this.inputMoney < 1) {
if (this.storeList.distance > this.distance) {
uni.showToast({
title: '请在' + this.distance + '公里内进行下单',
icon: "none",
duration: 3000
});
return;
}
if (this.inputMoney == '' || this.inputMoney < 10) {
uni.showToast({
title: '请输入正确金额',
icon: "none"
icon: "none",
duration: 2000
});
return false;
return;
}
uni.showLoading({
title: '提交订单中...'

@ -7,14 +7,17 @@
<!-- <slFilter :independence="true" :color="titleColor" :themeColor="themeColor" :menuList.sync="menuList"
@result="result"></slFilter> -->
<view class="width100 height40 backcorfff">
<view class="stuMenu flleft fotct" @click="showPopup(1)">{{distance}}
<view class="width90">
<view class="stuMenu flleft fotct" @click="showPopup(3)">{{onilName}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view>
<view class="stuMenu flleft fotct" @click="showPopup(2)">{{distanceName}}
<view class="stuMenu flleft fotct" @click="showPopup(1)">{{distance}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view>
<view class="stuMenu flleft fotct" @click="showPopup(3)">{{onilName}}
<!-- <view class="stuMenu flleft fotct" @click="showPopup(2)">{{distanceName}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view> -->
</view>
</view>
@ -27,7 +30,8 @@
</image>
<view class="recontright">
<view class="text1 width100 font18 fontwig6 paddtop10" @click="goDetails(item.store_key,item.id)">
{{item.store_name}}</view>
{{item.store_name}}
</view>
<view class="width100 mart5 height22">
<view class="width70 flleft text1 font13 fcor999" @click="goDetails(item.store_key,item.id)">
{{item.address}}
@ -46,7 +50,7 @@
<wybPopup ref="popup" type="bottom" height="800" width="500" radius="6" :showCloseIcon="false">
<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 1">筛选距离</view>
<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 2">优先条件</view>
<!-- <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 2">优先条件</view> -->
<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 3">油号选择</view>
<view class="mart15" v-if="typeId == 1">
<view :class="item.name == distance?'activeRefuel':'refuel'" v-for="(item,index) in gunnumber"
@ -55,29 +59,29 @@
</view>
</view>
<view class="mart15" v-if="typeId == 2">
<!-- <view class="mart15" v-if="typeId == 2">
<view :class="item.name == distanceName?'activeRefuel':'refuel'" v-for="(item,index) in detailList"
:key="index" @click="changeValue1(item)">
{{item.name}}
</view>
</view>
</view> -->
<view class="mart15" v-if="typeId == 3">
<view v-for="(item,index) in oilList" :key="index">
<view class="font15 fcor666 width90 mart10 height22">{{item.name}}</view>
<view :class="items.name == onilName?'activeRefuel':'refuel'"
v-for="(items,indexs) in item.nillist" :key="indexs" @click="changeValue2(items)">
{{items.name}}
</view>
<view class="font15 fcor666 width90 mart10 height22">油品</view>
<view :class="items.codeName == onilName?'activeRefuel':'refuel'" v-for="(items,indexs) in oilList"
:key="indexs" @click="changeValue2(items)">
{{items.codeName}}
</view>
</view>
</wybPopup>
<!-- <authorize></authorize> -->
</view>
</template>
<script>
import {
getGasStoreList
getGasStoreList,
getDictionaryByCodeType
} from '../../../Utils/Api.js';
import slFilter from '@/components/sl-filter/sl-filter.vue';
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
@ -101,76 +105,6 @@
imgadres1: 'dh.png',
imgadres2: 'xiala.png',
imgadres3: 'noorder.png',
menuList: [
{
'title': '油号',
'key': 'single2',
'isMutiple': false,
'detailTitle': '',
'reflexTitle': true,
'defaultSelectedIndex': 0,
'detailList': [{
'title': '90#',
'value': ''
}, {
'title': '92#',
'value': '92#'
}, {
'title': '95#',
'value': '95#'
}, {
'title': '98#',
'value': '98#'
}, {
'title': '101#',
'value': '101#'
}, ]
},
{
'title': '距离',
'key': 'single3',
'isMutiple': false,
'detailTitle': '',
'reflexTitle': true,
'defaultSelectedIndex': 0,
'detailList': [{
'title': '6km内',
'value': ''
},
{
'title': '10km内',
'value': '10km内'
},
{
'title': '15km内',
'value': '15km内'
},
{
'title': '20km内',
'value': '20km内'
},
{
'title': '50km内',
'value': '50km内'
}, {
'title': '2000km内',
'value': '2000'
}
]
}, {
'title': '距离',
'key': 'single1',
'isMutiple': false,
'detailTitle': '',
'reflexTitle': true,
'defaultSelectedIndex': 0,
'detailList': [{
'title': '距离最近',
'value': ''
}]
}
],
refuelList: [],
pageNum: 1,
pageSize: 10,
@ -214,104 +148,43 @@
name: '距离最近'
}],
typeId: '',
oilList: [{
id: 1,
name: '汽油',
nillist: [{
id: 1,
name: '90#'
},
{
id: 2,
name: '92#'
},
{
id: 3,
name: '95#'
},
{
id: 4,
name: '98#'
},
{
id: 5,
name: '101#'
},
{
id: 6,
name: '95(甲醇)#'
},
{
id: 7,
name: '92(甲醇)#'
oilList: [],
onilName: '0#',
latitudeful: '',
longitudeful: '',
isTyAgent: false //
}
]
},
{
id: 2,
name: '柴油',
nillist: [{
id: 1,
name: '-40#'
},
{
id: 2,
name: '-35#'
},
{
id: 3,
name: '-30#'
},
{
id: 4,
name: '-20#'
},
{
id: 5,
name: '-10#'
},
{
id: 6,
name: '车队0#'
},
{
id: 7,
name: '0#'
},
{
id: 8,
name: '柴油#'
},
]
},
{
id: 3,
name: '天然气',
nillist: [{
id: 1,
name: 'CNG'
},
{
id: 2,
name: 'LNG'
},
{
id: 3,
name: 'LPG'
}
]
onLoad() {
let that = this;
that.getDictionaryByCodeType();
if (app.globalData.accountId) {
that.isTyAgent = true;
}
],
onilName: '92#'
uni.getLocation({
type: 'wgs84',
success: function(res) {
that.latitudeful = res.latitude;
that.longitudeful = res.longitude;
that.getGasStoreList();
}
},
onLoad() {
this.getGasStoreList();
})
},
onReachBottom() {
this.getGasStoreList();
},
methods: {
//
getDictionaryByCodeType() {
let datas = {
codeType: 'GAS_OIL_TYPE'
}
getDictionaryByCodeType(datas).then(res => {
if (res.return_code == '000000') {
this.oilList = res.return_data;
}
})
},
//
changeValue(item) {
this.distance = item.name;
@ -341,7 +214,7 @@
},
changeValue2(item) {
this.onilName = item.name;
this.onilName = item.codeName;
this.pageNum = 1;
this.isNoMoreData = false;
this.refuelList = [];
@ -380,14 +253,12 @@
storeName: this.searname,
distance: this.distanceNum,
regionId: app.globalData.cityId,
// regionId: '510000',
oilNoName: this.onilName,
latitude: app.globalData.latitude,
longitude: app.globalData.longitude,
// latitude: '30.83876',
// longitude: '106.129505',
latitude: this.latitudeful,
longitude: this.longitudeful,
pageNum: pagenum,
pageSize: this.pageSize
pageSize: this.pageSize,
isTyAgent: this.isTyAgent
}
getGasStoreList(params).then(res => {
if (res.return_code == '000000') {
@ -450,7 +321,7 @@
}
.stuMenu {
width: 33%;
width: 33.3%;
height: 30px;
line-height: 30px;
font-size: 14px;

@ -33,7 +33,7 @@
<script>
import md5 from "@/common/SDK/md5.min.js";
import {
sendSmsCode,
sendSmsCodeByHw,
bindUserPhone,
H5login
} from "../../Utils/Api.js";
@ -73,9 +73,10 @@
title: '发送中...'
})
let params = {
phone: this.phoneNumber
phone: this.phoneNumber,
HWMSG:3
}
sendSmsCode(params).then(res => {
sendSmsCodeByHw(params).then(res => {
if (res.return_code == '000000') {
this.getCodeisWaiting = true;
this.getCodeBtnColor = "rgba(255,255,255,0.5)"

@ -41,6 +41,17 @@
<radio :checked="paytype=='gonghuika'" color="#0083f5" />
</view>
</view>
<view class="row" @tap="paytype='oilcard'" v-if="goodsType == 3">
<view class="left">
<image :src="imagewxUrl+imgadres1"></image>
</view>
<view class="center">
油卡支付(余额:{{oilPirce}})
</view>
<view class="right">
<radio :checked="paytype=='oilcard'" @click="changeRiado1()" color="#0083f5" />
</view>
</view>
<!-- <view class="width100 line1 mart5 marb5"></view>
<view class="row" @tap="paytype='unionPaystags'">
<view class="left">
@ -74,7 +85,9 @@
orderToPay,
orderToGoldPay,
hltUnionCardPay,
unionPay
unionPay,
oilCardPay,
findUser
} from '../../../Utils/Api.js'
import ssPaymentPassword from '../../../components/sanshui-payment-password'
let app = getApp();
@ -87,6 +100,7 @@
amount: 0,
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'wxpay.png',
imgadres1: 'oilcard.png',
pryType: '',
paytype: '', //
orderNo: '',
@ -94,7 +108,9 @@
couponId: '',
jumpType: '',
PaymentPassword: '',
tongCardPrice: 0
tongCardPrice: 0,
oilPirce: 0, //
goodsType: ''
};
},
onLoad(e) {
@ -102,6 +118,7 @@
this.orderNo = e.orderId;
this.couponId = e.couponId;
this.jumpType = e.typeaout;
this.goodsType = e.goodsType;
if (this.pryType == 1) {
this.paytype = 'wxpay';
} else if (this.pryType == 2) {
@ -109,14 +126,53 @@
} else {
this.paytype = ''
}
if (!app.globalData.userInfo) {
this.findUser()
}
this.amount = parseFloat(e.amount).toFixed(2);
},
onShow() {
let that = this;
that.user = app.globalData.userInfo;
if (app.globalData.userInfo) {
this.findUser();
}
},
methods: {
//
changeRiado1() {
if (!this.user.isSetOilCard) {
uni.showToast({
icon: 'none',
title: '当前账号还未绑定,前往绑定',
duration: 2000,
success() {
setTimeout(() => {
uni.navigateTo({
url: '../../user/bindingCard/bindingCard'
})
}, 1000)
}
});
return;
}
},
findUser() {
let params;
findUser(params).then(res => {
if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data;
this.user = res.return_data;
if (res.return_data.oilCard) {
this.oilPirce = res.return_data.oilCard.amount;
}
uni.setStorage({
key: "user",
data: res.return_data
})
}
});
},
//
orderToPay() {
let that = this;
@ -134,6 +190,29 @@
uni.navigateTo({
url: '../../tabBar/order/stagesUrl/stagesUrl?orderid=' + that.orderNo
})
} else if (that.paytype == 'oilcard') {
if (!that.user.isSetPayPwd) {
uni.navigateTo({
url: '../../login/updatePas/updatePas'
})
return;
}
if (!that.user.isSetOilCard) {
uni.showToast({
icon: 'none',
title: '当前账号还未绑定,前往绑定',
duration: 2000,
success() {
setTimeout(() => {
uni.navigateTo({
url: '../../user/bindingCard/bindingCard'
})
}, 1000)
}
});
return;
}
that.$refs.paymentPassword.modalFun('show');
} else {
uni.showToast({
title: '请选择支付方式',
@ -225,6 +304,7 @@
})
return;
}
if (this.paytype == 'gonghuika') {
let params = {
"orderId": this.orderNo,
"cardNo": this.user.hltCardNo.cardNo,
@ -252,6 +332,38 @@
icon: 'none'
})
})
return;
}
if (this.paytype == 'oilcard') {
let params = {
"orderId": this.orderNo,
"cardNo": this.user.oilCard.cardNo,
"password": this.PaymentPassword
}
oilCardPay(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '支付成功'
})
uni.reLaunch({
url:'../../goods/refuel-succes/refuel-succes?id=' + this.orderNo
});
return;
}
if (res.return_code == '102130') {
uni.navigateTo({
url: '../../login/updatePas/updatePas'
})
return;
}
uni.showToast({
title: res.return_msg,
icon: 'none'
})
})
return;
}
}
}
}

@ -37,8 +37,10 @@
<image class="img" :src="imageUrl+pro.couponImg" mode="aspectFit">
</image>
<view class="fotlt fcor333 font14 text1 mart10">{{pro.couponName}}</view>
<view class="subject fotct mart5"><image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image>{{pro.discountPrice *100}}</view>
<view class="subject fotct mart5">
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image>{{pro.discountPrice *100}}
</view>
</view>
</swiper-item>
</swiper>
@ -49,6 +51,7 @@
<wybPopup ref="popup" type="center" height="850" width="600" radius="6" bgColor="" :showCloseIcon="true">
<image class="popImg" :src="imageUrl+imgadres3" @click="jumpWeb"></image>
</wybPopup>
<image :src="imagewxUrl+imgadres4" mode="widthFix" class="h5xfimg" @click="playPhone"></image>
<view class="height60"></view>
</view>
</template>
@ -88,6 +91,7 @@
imgadres1: 'jbhed.png',
imgadres2: 'jt.png',
imgadres3: '',
imgadres4: 'cusservice.png',
webUrl: '',
//
swiperList: [{
@ -146,25 +150,20 @@
key: 'token',
success(e) {
app.globalData.token = e.data;
},
fail() {
uni.navigateTo({
url: '../../userLogin/userLogin'
})
}
// fail() {
// uni.navigateTo({
// url: '../../userLogin/userLogin'
// })
// }
})
if (!app.globalData.userInfo.phone) {
uni.navigateTo({
url: '../../userLogin/userLogin'
})
return;
}
// if (!app.globalData.userInfo.phone) {
// uni.navigateTo({
// url: '../../userLogin/userLogin'
// })
// return;
// }
that.getCacheParam();
},
fail: res => {
uni.navigateTo({
url: '../../userLogin/userLogin'
})
}
})
// if (app.globalData.cityName != '') {
@ -391,6 +390,27 @@
}
})
},
//
playPhone() {
uni.showModal({
title: '客服',
content: '4006780738',
success: function(res) {
if (res.confirm) {
uni.makePhoneCall({
phoneNumber: '4006780738', //
success: function(e) {
console.log(e);
},
fail: function(e) {
console.log(e);
}
})
}
}
})
},
//
swiperChange(event) {
this.currentSwiper = event.detail.current;
@ -468,6 +488,13 @@
background-color: #F5F5F5;
}
.h5xfimg {
width: 80rpx;
bottom: 140rpx;
position: fixed;
right: 40rpx;
}
.popImg {
width: 300px;
height: 440px;

@ -189,8 +189,7 @@
}
],
//
mytoolbarList: [
{
mytoolbarList: [{
url: '/pages/goods/recording/recording?id=1',
text: '充值记录',
img: 'user/mingxi.png'
@ -211,31 +210,6 @@
img: 'user/momey.png'
}
],
// 广
mytgbarList: [{
url: '',
text: '客服',
img: 'user/kefu.png'
}
// ,
// {
// url: '../../login/login?id=1',
// text: '',
// img: 'user/point.png'
// },
// {
// url: '../../login/login?id=2',
// text: '广',
// img: 'user/renw.png'
// }
// ,
// {
// url: '/pages/user/Charge/Charge',
// text: '',
// img: 'user/bank.png'
// }
],
//
czList: '',
}
@ -272,9 +246,13 @@
if (app.globalData.userInfo) {
this.findUser();
}
if (!app.globalData.userInfo.isSetPayPwd) {
this.czList = [{
url: '../../../subPages/cardsList/cardsList',
text: '卡包',
img: '../../../static/img/ghkpay.png',
type: 2
}, {
url: '',
text: '客服',
img: 'user/kefu.png',
@ -291,6 +269,11 @@
}
// '../../user/unionCard/unionCard'
this.czList = [{
url: '../../../subPages/cardsList/cardsList',
text: '卡包',
img: '../../../static/img/ghkpay.png',
type: 2
}, {
url: '',
text: '客服',
img: 'user/kefu.png',
@ -420,12 +403,34 @@
url: url
})
} else {
// uni.showModal({
// title: '',
// content: '4006780738'
// })
this.playPhone();
}
},
//
playPhone() {
uni.showModal({
title: '客服',
content: '4006780738'
content: '4006780738',
success: function(res) {
if (res.confirm) {
uni.makePhoneCall({
phoneNumber: '4006780738', //
success: function(e) {
console.log(e);
},
fail: function(e) {
console.log(e);
}
})
}
}
})
}
}
}

@ -1,16 +1,26 @@
<template>
<view>
<view class="form re" style="top: 100rpx;">
<view class="username paddtop10" v-if="UserCard">
<picker mode="selector" style="width: 90%;" :range="UserCard" range-key="cardNo"
@change="bindUserCard">
<view class="date text1">{{cardNoNumber}}</view>
<view class="username paddtop10">
<picker mode="selector" style="width: 90%;" :range="cardList" range-key="codeName"
@change="changeUserCard">
<view class="date text1" style="padding: 0 25rpx;">{{typeName}}</view>
</picker>
<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png"></image>
</view>
<view class="username" v-if="!UserCard">
<input style="width: 100%;" :disabled="disStute" maxlength="19" placeholder="请输入工会卡号" v-model="cardNoNumber"
placeholder-style="color: #333333;"/>
<!-- <view class="username paddtop10" v-if="UserCard && type == 2">
<picker mode="selector" style="width: 90%;" :range="UserCard" range-key="cardNo" @change="bindUserCard">
<view class="date text1">{{cardNoNumber}}</view>
</picker>
<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png"></image>
</view> -->
<view class="username">
<input style="width: 100%;" :disabled="disStute" maxlength="19" placeholder="请输入卡号"
v-model="cardNoNumber" placeholder-style="color: #333333;" />
</view>
<view class="username" v-if="phoneNumber">
<view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">{{getCodeText}}</view>
@ -22,8 +32,9 @@
<view class="btn mart50" @tap="bindHuiLianTongCard" v-if="phoneNumber">绑定卡号</view>
<view class="btn mart50" @tap="doCardNonum" v-else>获取预留手机号</view>
</view>
<view class="width90 mart20 height120 backcorfff fotct" style="position: absolute;top: 390px;">
<view class="fontlet font20 fcor666 fontwig6 height45l " style="border-bottom: 1px solid #F4F4F4;">温馨提示</view>
<view class="width90 mart20 height120 backcorfff fotct" style="position: absolute;top: 70%;" v-if="type == 1">
<view class="fontlet font20 fcor666 fontwig6 height45l " style="border-bottom: 1px solid #F4F4F4;">温馨提示
</view>
<view class="fontlet font20 fcor666 fontwig6 height45l paddtop10">1元可抵扣100积分</view>
</view>
</view>
@ -32,11 +43,13 @@
<script>
import md5 from "@/common/SDK/md5.min.js";
import {
sendSmsCode,
sendSmsCodeByHw,
getHuiLianTongCardByCardNo,
getDetailByCardNo,
bindHuiLianTongCard,
getUserCardList,
getHuiLianTongCardByPhone
getHuiLianTongCardByPhone,
getDictionaryByCodeType
} from '../../../Utils/Api.js';
let app = getApp();
export default {
@ -49,16 +62,32 @@
getCodeBtnColor: "#0083f5",
getCodeisWaiting: false,
disStute: false,
UserCard:''
UserCard: '',
cardList: [], //
typeName: '', //
type: '' //
}
},
onLoad(options) {
this.user = app.globalData.userInfo;
this.getHuiLianTongCardByPhone();
// this.getHuiLianTongCardByPhone();
this.getDictionaryByCodeType();
},
methods: {
Timer() {},
getDictionaryByCodeType() {
let datas = {
codeType: 'USER_CARD_TYPE'
}
getDictionaryByCodeType(datas).then(res => {
if (res.return_code == '000000') {
this.cardList = res.return_data;
this.type = res.return_data[0].codeValue;
this.typeName = res.return_data[0].codeName;
}
})
},
//
getHuiLianTongCardByPhone() {
let params = {
@ -75,6 +104,14 @@
this.UserCard = '';
});
},
//
changeUserCard(e) {
this.type = this.cardList[e.target.value].codeValue;
this.typeName = this.cardList[e.target.value].codeName;
this.cardNoNumber = '';
this.phoneNumber = '';
this.disStute = false;
},
//
bindUserCard(e) {
this.cardNoNumber = this.UserCard[e.target.value].cardNo;
@ -95,9 +132,10 @@
title: '发送中...'
})
let params = {
phone: this.phoneNumber
phone: this.phoneNumber,
HWMSG:1
}
sendSmsCode(params).then(res => {
sendSmsCodeByHw(params).then(res => {
if (res.return_code == '000000') {
this.getCodeisWaiting = true;
this.getCodeBtnColor = "#999999"
@ -134,22 +172,40 @@
title: '请填写卡号',
icon: "none"
});
return false;
return;
}
if (this.cardNoNumber.length != 19) {
if (this.cardNoNumber.length != 19 && this.type == 1) {
uni.showToast({
title: '请填写正确的19位卡号',
title: '请填写正确的19位工会卡号',
icon: "none"
});
return false;
return;
}
uni.showLoading({
title: '查询中...'
})
if (this.cardNoNumber.length != 16 && this.type == 2) {
uni.showToast({
title: '请填写正确的16位油卡号',
icon: "none"
});
return;
}
let params = {
cardNo: this.cardNoNumber
}
getHuiLianTongCardByCardNo(params).then(res => {
if (this.type == 1) {
this.getHuiLianTongCardByCardNo(params);
}
if (this.type == 2) {
this.getDetailByCardNo(params);
}
},
//
getHuiLianTongCardByCardNo(items) {
uni.showLoading({
title: '查询中...'
})
getHuiLianTongCardByCardNo(items).then(res => {
uni.hideLoading()
if (res.return_code == '000000') {
this.phoneNumber = res.return_data.userMobile;
@ -163,6 +219,25 @@
}
})
},
//
getDetailByCardNo(items) {
uni.showLoading({
title: '查询中...'
})
getDetailByCardNo(items).then(res => {
uni.hideLoading()
if (res.return_code == '000000') {
this.phoneNumber = res.return_data.contactPhone;
// this.phoneNumber = 15583658692;
this.disStute = true
} else {
uni.showToast({
title: res.return_msg,
icon: "none"
});
}
})
},
//
bindHuiLianTongCard() {
uni.hideKeyboard()
@ -185,6 +260,7 @@
title: '提交中...'
})
let params = {
type: this.type,
cardNo: this.cardNoNumber,
phone: this.phoneNumber,
smsCode: this.code
@ -209,7 +285,6 @@
success() {
setTimeout(() => {
uni.navigateBack({
delta: 2
})
}, 1000)
}
@ -229,12 +304,14 @@
<style lang="scss">
@import "../../../static/css/login.scss";
.wximg {
width: 50px;
height: 50px;
margin-left: 40%;
margin-top: 250upx;
}
.flex1 {
flex: 1;
text-align: right;

@ -14,9 +14,11 @@
<view class="row">
<view class="goods-info">
<view class="img">
<image mode="widthFix" :src="imageUrl+rec.goodsImg" v-if="rec.goodsType == 1 || rec.goodsType == 7"></image>
<image mode="widthFix" :src="imageUrl+rec.goodsImg"
v-if="rec.goodsType == 1 || rec.goodsType == 7"></image>
<image mode="widthFix" :src="imagewxUrl+imgadres1" v-if="rec.goodsType == 6"></image>
<image mode="widthFix" :src="rec.goodsImg" v-if="rec.goodsType != 1 && rec.goodsType != 6 && rec.goodsType != 7"></image>
<image mode="widthFix" :src="rec.goodsImg"
v-if="rec.goodsType != 1 && rec.goodsType != 6 && rec.goodsType != 7"></image>
</view>
<view class="info">
<view class="title">{{rec.goodsName}}</view>
@ -69,8 +71,7 @@
{{recinfo.totalPrice}}
</view>
<view class="right" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;"
src="../../../static/img/jfx.png">
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image>{{recinfo.totalPrice*100}}
</view>
</view>
@ -82,8 +83,7 @@
{{recinfo.payPrice}}
</view>
<view class="right" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;"
src="../../../static/img/jfx.png">
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image>{{recinfo.payPrice*100}}
</view>
</view>
@ -95,8 +95,7 @@
{{recinfo.payRealPrice}}
</view>
<view class="right" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;"
src="../../../static/img/jfx.png">
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image>{{recinfo.payRealPrice*100}}
</view>
</view>
@ -108,8 +107,7 @@
{{recinfo.deductionPrice}}
</view>
<view class="right" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;"
src="../../../static/img/jfx.png">
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image>{{recinfo.deductionPrice*100}}
</view>
</view>
@ -246,8 +244,7 @@
<view class="sum">合计:
<view class="money" v-if="recinfo.payType != 3">{{recinfo.payPrice}}</view>
<view class="money" v-else>
<image style="width: 15px;height: 15px;vertical-align: sub;"
src="../../../static/img/jfx.png">
<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
</image>{{recinfo.payPrice*100}}
</view>
</view>
@ -454,7 +451,8 @@
uni.redirectTo({
url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
.highChildOrderList[0].goodsId + '&typeaout='+ this.recinfo.highChildOrderList[0].ext1
.highChildOrderList[0].goodsId + '&typeaout=' + this.recinfo.highChildOrderList[0].ext1 +
'&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
})
},
}

@ -14,30 +14,47 @@
</view>
<view class="row" v-for="(row,index) in orderList" :key="index">
<view class="width96 height40" @click="jumpDetails(row.id)">
<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 1 || row.highChildOrderList[0].goodsType == 2">
<image src="../../../static/img/order2.png" style="width: 50rpx;height: 50rpx;"></image>
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 1">
<image src="../../../static/img/order2.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
卡券订单
</view>
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 2">
<image src="../../../static/img/order2.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
积分充值
</view>
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 7">
<image src="../../../static/img/order9.png" style="width: 50rpx;height: 50rpx;"></image>
<image src="../../../static/img/order9.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
优惠券包
</view>
<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 3">
<image src="../../../static/img/order4.png" style="width: 50rpx;height: 50rpx;"></image>
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 3">
<image src="../../../static/img/order4.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
团油订单
</view>
<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 5">
<image src="../../../static/img/order5.png" style="width: 50rpx;height: 50rpx;"></image>
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 5">
<image src="../../../static/img/order5.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
电影票
</view>
<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 4">
<image src="../../../static/img/order3.png" style="width: 50rpx;height: 50rpx;"></image>
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 4">
<image src="../../../static/img/order3.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
KFC
</view>
<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 6">
<image src="../../../static/img/order1.png" style="width: 50rpx;height: 50rpx;"></image>
话费充值
<view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 8">
<image src="../../../static/img/ghkpay.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image>
工会卡充值
</view>
<view class="width50 flright fotrt fcor666 font15">
{{row.createTime | formatDate('-')}}
@ -58,15 +75,17 @@
<view class="font16 fontwig6 text1 fcor333" v-if="row.payType != 3">
{{row.payPrice}}
</view>
<view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;" v-else>
<image style="width: 15px;height: 15px;"
src="../../../static/img/jfx.png">
</image>{{row.payPrice*100}}
<view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;"
v-else>
<image style="width: 15px;height: 15px;" src="../../../static/img/jfx.png">
</image>{{row.payPrice * 10 * 10}}
</view>
<view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.orderStatus]}}</view>
</view>
</view>
<view class="width96 line1 mart10 marb5" v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)"></view>
<view class="width96 line1 mart10 marb5"
v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)">
</view>
<view class="btns"
v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)">
<block>
@ -120,7 +139,7 @@
onLoad(option) {
// #ifdef H5
this.headerTop = '44px';
this.headerTop = '0px';
// #endif
let tbIndex = parseInt(option.tbIndex) + 1;
this.list = this.orderList[tbIndex];
@ -304,7 +323,7 @@
url: "/pages/pay/payment/payment?amount=" + row.payPrice +
'&paytype=' + payTypes + '&orderId=' + row.id + '&couponId=' + this.orderList[0]
.highChildOrderList[0].goodsId + '&typeaout=' + this.orderList[0].highChildOrderList[0]
.ext1
.ext1 + '&goodsType=' + row.highChildOrderList[0].goodsType
})
}
}

@ -18,7 +18,6 @@
<script>
const app = getApp();
import {
getUserInfo,
GetPhoneNumber,
unionPhoneLogin
} from "../../Utils/Api.js"
@ -44,53 +43,6 @@
this.unionPhoneLogin(result.code)
}
},
getuserinfo() {
let that = this;
uni.getUserProfile({
desc: '登录中...',
success: function(res) {
let params = {
openId: app.globalData.openId,
iv: res.iv,
encryptedData: res.encryptedData
}
getUserInfo(params).then(res => {
if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data
.object
.highUser;
that.user = res.return_data.object.highUser;
app.globalData.token = res.return_data.uniqueCode;
that.isShowAuth = false
uni.setStorage({
key: "user",
data: res.return_data
.object
.highUser
})
uni.setStorage({
key: "token",
data: res.return_data.uniqueCode
})
if (res.return_data.object.highUser.phone) {
uni.navigateBack({})
}
} else {
uni.showToast({
title: res.return_msg
})
}
});
},
fail: res => {
uni.showToast({
title: "微信登录授权失败",
icon: "none"
});
}
})
that.isShowAuth = false
},
//
unionPhoneLogin(item) {
let params = {

@ -57,7 +57,7 @@ page {
background-color: #0083f5;
width: 90%;
margin-left: 5%;
margin-top: 100rpx;
margin-top: 80rpx;
margin-bottom: 50rpx;
height: 90rpx;
display: flex;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

@ -0,0 +1,407 @@
<template>
<view>
<view class="backcorf06 height220 width100 fotct">
<image src="../static/unioncard.png" v-if="types == 1" mode="widthFix" style="width: 120rpx;"></image>
<image src="../static/oilcard.png" v-if="types == 2" mode="widthFix" style="width: 120rpx;"></image>
<view class="mart10 font18 fontwig6 fcorfff" v-if="types == 1">工会卡</view>
<view class="mart10 font18 fontwig6 fcorfff" v-if="types == 2">油卡
<text class="fcor41c font14 margle" v-if="cardList.status == 1">(正常)</text>
<text class="fcorred font14 margle" v-if="cardList.status == 2">(禁用)</text>
</view>
<view class="mart5 font18 fontwig6 fcorfff fontspec">余额: {{tongCardPrice}}</view>
<view class="mart5 font18 fontwig6 fcorfff fontspec">{{cardNo}}</view>
<view class="width40w height30 font16 fontlet fcorfff mart10 fotct border-r"
style="background-color: #b2b2b2;" @click="delUserCard()">解绑</view>
</view>
<!-- <view class="width90 mart20 fcor666 font12">
支付限额
</view>
<view class="width90 mart20 fcor666 font14 height25">
<view class="width50 font14 fcor333 flleft">单笔限额</view>
<view class="width50 font14 fcor666 flright fotrt">¥20000</view>
</view>
<view class="width90 mart20 fcor666 font14 mart5 height25">
<view class="width50 font14 fcor333 flleft">每日限额</view>
<view class="width50 font14 fcor666 flright fotrt">¥50000</view>
</view> -->
<view class="leave_cont">
<view class="ul">
<view class="li" v-if="types == 1">
<text class="font15 fcor333">业务类型</text>
<view class="flex1">
<picker mode="selector" :range="title_list" range-key="name" @change="bindtitleList">
<view class="date text1 margle10">{{titleName}}</view>
</picker>
</view>
</view>
<view class="li">
<text class="font15 fcor333">开始时间</text>
<view class="flex1">
<picker mode="date" :value="start_date" :start="startDate" :end="endDate"
@change="bindDateChange">
<view class="date">{{start_date}}</view>
</picker>
</view>
</view>
<view class="li">
<text class="font15 fcor333">结束时间</text>
<view class="flex1">
<picker mode="date" :value="end_date" :start="startDate" :end="endDate"
@change="bindDateChange2">
<view class="date">{{end_date}}</view>
</picker>
</view>
</view>
</view>
</view>
<view class="width90 mart30 fcor666 font12">
订单列表
</view>
<view class="width90 mart20 alijusstart fcor666 font12">
<view class="width40">订单号</view>
<view class="width10 fotct">类型</view>
<view class="width20 fotct">金额</view>
<view class="width30">时间</view>
</view>
<view class="width100" v-if="types == 1">
<view class="width90 mart5 alijusstart fcor666 font12" v-for="(item,index) in orderList" :key="index"
@click="popupOrderNo(item.orderNo)">
<view class="width40 fcor333 text1">{{item.orderNo}}</view>
<view class="width10 fotct">支出</view>
<view class="width20 fotct">¥{{item.tranAmount}}</view>
<view class="width30">{{item.tranTime}}</view>
<!-- {{phoneorderdes.createTimed | timeFormat('yyyy-mm-dd')}} {{phoneorderdes.createTimed | timeFormat('hh:mm')}} -->
</view>
</view>
<view class="width100" v-if="types == 2">
<view class="width90 mart5 alijusstart fcor666 font12" v-for="(item,index) in orderList" :key="index"
@click="popupOrderNo(item.sourceOrderNo)">
<view class="width40 fcor333 text1">{{item.sourceOrderNo}}</view>
<view class="width10 fotct fcor41c" v-if="item.type == 1">收入</view>
<view class="width10 fotct fcoreb5" v-if="item.type == 2">支出</view>
<view class="width20 fotct fcor41c" v-if="item.type == 1">+{{item.amount}}</view>
<view class="width20 fotct fcoreb5" v-if="item.type == 2">-{{item.amount}}</view>
<view class="width30">
<view class="width100">{{item.createTime | timeFormat('yyyy-mm-dd')}}</view>
<view class="width100">{{item.createTime | timeFormat('hh:mm')}}</view>
</view>
</view>
</view>
</view>
</template>
<script>
import {
delUserCard,
getDetailByCardNo,
getHuiLianTongCardBalance,
getOilCardRecordList,
getHuiLianTongCardConsume
} from '../../Utils/Api.js';
export default {
data() {
const currentDate = this.getDate({
format: true
})
return {
types: '', //
orderList: [], //
cardNo: '', //
tongCardPrice: 0, //
start_date: currentDate, //
end_date: currentDate, //
pageNum: 1,
pageSize: 10,
titleValue: 'sinopec_oil_code', //
titleName: '中石化加油券',
title_list: [{
name: '中石化加油券',
value: 'sinopec_oil_code'
},
{
name: '其他商品或服务',
value: 'hisen_consume'
}
],
isNoMoreData: false,
cardList: ''
}
},
onLoad(options) {
let that = this;
that.cardNo = options.cardNo;
that.types = options.des;
if (options.des == 1) {
that.getHuiLianTongCardBalance();
that.getHuiLianTongCardConsume();
}
if (options.des == 2) {
that.getDetailByCardNo();
that.getOilCardRecordList();
}
},
//
onReachBottom() {
if (this.types == 1) {
this.getHuiLianTongCardConsume();
}
if (this.types == 2) {
this.getOilCardRecordList();
}
},
computed: {
startDate() {
return this.getDate('start');
},
endDate() {
return this.getDate('end');
}
},
methods: {
//
getDate(type) {
const date = new Date();
let year = date.getFullYear();
let month = date.getMonth() + 1;
let day = date.getDate();
if (type === 'start') {
year = year - 60;
} else if (type === 'end') {
year = year + 2;
}
month = month > 9 ? month : '0' + month;
day = day > 9 ? day : '0' + day;
return `${year}-${month}-${day}`;
},
//
popupOrderNo(item) {
uni.showToast({
title: item,
icon: 'none',
duration: 2000
})
},
//
bindDateChange: function(e) {
this.start_date = e.target.value;
this.pageNum = 1;
this.isNoMoreData = false;
this.orderList = [];
if (this.types == 1) {
this.getHuiLianTongCardConsume();
}
if (this.types == 2) {
this.getOilCardRecordList();
}
},
bindDateChange2: function(e) {
this.end_date = e.target.value;
this.pageNum = 1;
this.isNoMoreData = false;
this.orderList = [];
if (this.types == 1) {
this.getHuiLianTongCardConsume();
}
if (this.types == 2) {
this.getOilCardRecordList();
}
},
//
bindtitleList(e) {
this.titleName = this.title_list[e.target.value].name;
this.titleValue = this.title_list[e.target.value].value;
this.pageNum = 1;
this.isNoMoreData = false;
this.orderList = [];
this.getHuiLianTongCardConsume();
},
//
delUserCard() {
let that = this;
uni.showModal({
content: '是否确定解除当前绑定卡号?',
success: (res) => {
if (res.confirm) {
let params = {
cardNo: that.cardNo
}
delUserCard(params).then(res => {
if (res.return_code == '000000') {
uni.showToast({
title: '解除成功',
duration: 2000,
icon: 'success',
success() {
setTimeout(() => {
uni.navigateBack({})
}, 1000)
}
})
} else {
uni.showToast({
title: res.return_msg,
duration: 2000,
icon: 'none'
})
}
});
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
},
//
getDetailByCardNo() {
uni.showLoading({
title: '查询中...'
})
let params = {
cardNo: this.cardNo
}
getDetailByCardNo(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.tongCardPrice = res.return_data.amount;
this.cardList = res.return_data;
} else {
uni.showToast({
title: res.return_msg,
icon: "none"
});
}
})
},
//
getHuiLianTongCardBalance() {
uni.showLoading({
title: '查询中...'
})
let params = {
cardNo: this.cardNo
}
getHuiLianTongCardBalance(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.tongCardPrice = res.return_data.balance;
} else {
uni.showToast({
title: res.return_msg,
icon: "none"
});
}
});
},
//
getOilCardRecordList() {
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading()
return;
}
let pagenum = this.pageNum;
let Time1 = new Date(this.start_date.split('-').join('/'));
let timestemp1 = Time1.getTime();
let Time2 = new Date(this.end_date.split('-').join('/'));
let timestemp2 = Time2.getTime() + 86399000;
let params = {
pageNum: pagenum,
createTimeS: timestemp1,
createTimeE: timestemp2,
cardNo: this.cardNo,
pageSize: this.pageSize
}
getOilCardRecordList(params).then(res => {
if (res.return_code == '000000' && res.return_data.list != '') {
uni.hideLoading();
this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
this.orderList = this.orderList.concat(res.return_data.list);
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isNoMoreData = true;
}
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else {
this.orderList = [];
uni.hideLoading()
}
})
},
//
getHuiLianTongCardConsume() {
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
return false;
}
let pagenum = this.pageNum;
let Time1 = new Date(this.start_date.split('-').join('/'));
let timestemp1 = Time1.getTime();
let Time2 = new Date(this.end_date.split('-').join('/'));
let timestemp2 = Time2.getTime() + 86399000;
let params = {
businessType: this.titleValue,
sdate: timestemp1,
edate: timestemp2,
cardNo: this.cardNo,
pageNum: pagenum,
pageSize: this.pageSize
}
getHuiLianTongCardConsume(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data.records != '') {
this.isNoMoreData = res.return_data.records.length == this.pageSize ? false : true;
this.orderList = this.orderList.concat(res.return_data.records);
this.pageNum = res.return_data.records.length == this.pageSize ? ++pagenum : pagenum;
} else {
this.orderList = [];
uni.hideLoading();
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
this.isNoMoreData = true;
}
});
},
}
}
</script>
<style lang="scss">
.leave_cont {
background: #FFFFFF;
}
.leave_cont .ul {
width: 90%;
margin-left: 5%;
}
.leave_cont .ul .li {
display: flex;
align-items: center;
border-bottom: 1px solid #efefef;
}
.leave_cont .ul .li text {
padding: 40rpx 0;
}
.leave_cont .ul .li .flex1 {
flex: 1;
text-align: right;
width: 70%;
padding-right: 25rpx;
color: #999999;
font-size: 32rpx;
}
</style>

@ -0,0 +1,100 @@
<template>
<view>
<view class="width100 mart20" v-for="(item,index) in cardList" :key="index">
<view class="width90 conts backcolorb9" v-if="item.type == 1">
<view class="width90 alijusstart">
<image src="../static/unioncard.png" mode="widthFix" style="width: 80rpx;"></image>
<text class="font18 fontwig6 fcorfff">工会卡</text>
</view>
<view class="width90 font18 fontwig6 fcorfff">
卡号:<text class="margle">{{item.cardNo}}</text>
</view>
<!-- <view class="width90 font18 fontwig6 fcorfff">
余额:<text class="margle">122</text>
</view> -->
<view class="width90 mart10 alijusstart font14">
<view class="width30 height30 backcorfff colorb9 fotct border-r"
@click="jumpDetails(item.cardNo,item.type)">查看详情</view>
</view>
</view>
<view class="width90 conts backcolor32" v-if="item.type == 2">
<view class="width90 alijusstart">
<image src="../static/oilcard.png" mode="widthFix" style="width: 80rpx;"></image>
<text class="font18 fontwig6 fcorfff">油卡</text>
</view>
<view class="width90 font18 fontwig6 fcorfff">
卡号:<text class="margle">{{item.cardNo}}</text>
</view>
<!-- <view class="width90 font18 fontwig6 fcorfff">
余额:<text class="margle">122</text>
</view> -->
<view class="width90 mart10 alijusstart font14">
<view class="width30 height30 backcorfff color32 fotct border-r"
@click="jumpDetails(item.cardNo,item.type)">查看详情</view>
</view>
</view>
</view>
<view class="width90 height70w border-r mart20 alijusstart backcorfff" @click="jumpBindCard()">
<image src="../static/addcards.png" mode="widthFix" class="margle10" style="width: 40rpx;"></image>
<text class="margle font16 fcor333">添加新卡</text>
</view>
</view>
</template>
<script>
import {
getUserCardList
} from '../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
cardList: [] //
}
},
onLoad() {
this.user = app.globalData.userInfo;
},
onShow() {
this.getUserCardList();
},
methods: {
//
getUserCardList() {
uni.showLoading({
title: '加载中...'
})
getUserCardList().then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.cardList = res.return_data;
return;
}
});
},
//
jumpDetails(item, item1) {
uni.navigateTo({
url: '../cardsDetails/cardsDetails?cardNo=' + item + '&des=' + item1
})
},
//
jumpBindCard() {
uni.navigateTo({
url: '../../pages/user/bindingCard/bindingCard'
})
}
}
}
</script>
<style lang="scss">
page {
background-color: #f8f8f8;
}
.conts {
border-radius: 12rpx;
padding: 12px 0;
}
</style>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

@ -88,7 +88,7 @@
onLoad(option) {
// #ifdef H5
this.headerTop = '44px';
this.headerTop = '0px';
// #endif
let tbIndex = parseInt(option.tbIndex) + 1;
this.list = this.orderList[tbIndex];

@ -225,11 +225,26 @@ $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);
@ -318,6 +333,11 @@ $uni-font-size-paragraph:30upx;
margin-left: 20%;
}
.width40w {
width: 40%;
margin-left: 30%;
}
.width35 {
width: 35%;
}
@ -372,6 +392,14 @@ $uni-font-size-paragraph:30upx;
height: 100%;
}
.height70w {
height: 70px;
line-height: 70px;
}
.height220{
height: 220px;
}
.height10 {
height: 10px;
@ -659,6 +687,12 @@ $uni-font-size-paragraph:30upx;
display: flex;
}
.alijusstart{
justify-content: flex-start;
align-items: center;
display: flex;
}
.font12{
font-size: 12px;
}

Loading…
Cancel
Save