yangjie
/
high-unionPay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.新增钱包功能

Browse Source 
2.修改接口问题
master
杨杰 3 years ago
parent 8afa122693
commit 2a2f395f65
25 changed files with 4088 additions and 3000 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 34
      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. 331
      high-unionPay/pages.json
  6. 710
      high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
  7. 1110
      high-unionPay/pages/goods/refuel-details/refuel-details.vue
  8. 845
      high-unionPay/pages/goods/refuel/refuel.vue
  9. 7
      high-unionPay/pages/login/register.vue
  10. 172
      high-unionPay/pages/pay/payment/payment.vue
  11. 77
      high-unionPay/pages/tabBar/home/home.vue
  12. 95
      high-unionPay/pages/tabBar/user/user.vue
  13. 563
      high-unionPay/pages/user/bindingCard/bindingCard.vue
  14. 1416
      high-unionPay/pages/user/order_details/order_details.vue
  15. 1073
      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

34
high-unionPay/Utils/Api.js
Unescape View File

@ -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);
//绑定卡包
export const bindHuiLianTongCard = params => {
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 => {

55
high-unionPay/Utils/js/date.js
Unescape View File

@ -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
}

5
high-unionPay/main.js
Unescape View File

@ -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)

2
high-unionPay/manifest.json
Unescape View File

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

331
high-unionPay/pages.json
Unescape View File

@ -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,27 +636,27 @@
"path": "pages/unionPay/unionorder-des/unionorder-des",
"style": {
"navigationBarTitleText": "充值详情",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"app-plus": {
"titleNView": false //禁用原生导航栏
}
}
}, {
"path": "pages/tabBar/order/stagesUrl/stagesUrl",
"style": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
}
}
}
,{
"path" : "pages/tabBar/order/stagesUrl/stagesUrl",
"style" :
{
"navigationBarTextStyle": "white",
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"onReachBottomDistance": 50,
"app-plus": {
"titleNView": false, //禁用原生导航栏
"softinputNavBar": "none"
}
}
}
],
],
"subpackages": [{
"root": "subPages",
"pages": [{
@ -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",

710
high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
Unescape View File

@ -1,313 +1,399 @@
<template>
<view>
<!-- 头部 -->
<view class="width100 height120 backcorfff">
<image :src="orderList.goodsImg" class="flleft conImg mart10 margle10"></image>
<view class="conCont paddtop15">
<view class="font20 fontwig6 fcor333 text1 paddtright10">{{orderList.goodsName}}</view>
<view class="font14 fcor999 text2 paddtop5 paddtright10">{{refulAdress}}</view>
<view class="font20 fontwig6 fcoreb5 paddtop5">￥{{orderList.gasPriceVip}}
<text class="margle10 slogan font14">￥{{orderList.gasPriceGun}}</text>
</view>
</view>
</view>
<!-- //订单详情 -->
<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">订单详情</view>
<view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 font16 width100 backcorfff">
<view class="flleft width50">
油号\油枪
</view>
<view class="flright width40 fotct">
{{orderList.gasOilNo}}#/{{orderList.gasGunNo}}号
</view>
</view>
<view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 font16 width100 backcorfff">
<view class="flleft width50">
加油金额
</view>
<view class="flright width40 fotct">
{{orderList.totalPrice}}
</view>
</view>
<!-- //支付方式 -->
<!-- <view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">支付方式</view>
<view class="line1"></view>
<view class="width100 backcorfff">
<view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='weixin'">
<view class="width60 flleft fontwig6">
银联支付
</view>
<view class="flright width30 fotct">
<radio :checked="paytype=='weixin'" 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>
</view>
<view class="flright width30 fotct">
<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
</view>
</view>
</view> -->
<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>
<view class="width95 paddleft10 font14 fcor999 mart5">1.<text
class="fcor089 fontwig6">请先加油后下单</text>,即您到站后,与工作人员确认油号,抢号后再付款。</view>
<view class="width95 paddleft10 font14 fcor999 mart5">
2.请勿先付款后加油,若您已下单付款。请于24小时内到加油站完成加油;若您48小时内未完成加油,请及时发起退单;逾期退单可能会退单失败。</view>
<view class="height80 width100"></view>
<!-- 底部按钮 -->
<view class="footer">
<view class="width50 flleft fcoreb5 padleft15 font15">
合计: ￥<text class="font24">{{payprice}}</text>
</view>
<button class="reBtn flright" @click="unionPay">去支付</button>
</view>
<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle"/>
</view>
</template>
<script>
import {
getOrderById,
orderToPay,
unionPay,
orderToGoldPay,
hltUnionCardPay
} from '../../../Utils/Api.js';
import ssPaymentPassword from '../../../components/sanshui-payment-password/index.vue';
let app = getApp();
export default {
components: {
ssPaymentPassword
},
data() {
return {
orderNo: '',
couponId: '',
payprice: '',
orderList: '',
refulAdress: '',
tongCardPrice: 0,
user: '',
paytype: '',
PaymentPassword: '',
}
},
onLoad(e) {
this.payprice = e.payprice;
this.orderNo = e.orderId;
this.couponId = e.couponId;
this.refulAdress = e.adres;
this.getOrderById();
},
onShow() {
let that = this;
that.paytype = '';
that.user = app.globalData.userInfo;
},
methods: {
//密码支付完成
submitHandle(e) {
this.PaymentPassword = e.value;
if(this.PaymentPassword == ''){
uni.showToast({
title: '请勿手动关闭弹窗',
icon: 'none',
duration: 2000
})
return;
}
uni.showLoading({
title: '支付中...'
})
let params = {
"orderId": this.orderNo,
"password": this.PaymentPassword
}
orderToGoldPay(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'
})
})
},
//获取选择支付方式
changeRiado() {
if (!this.user.isSetHltCard) {
uni.showToast({
icon: 'none',
title: '当前账号还未绑定,前往绑定',
duration: 2000,
success() {
setTimeout(() => {
uni.navigateTo({
url: '../../user/bindingCard/bindingCard'
})
}, 1000)
}
});
return;
}
},
getOrderById() {
uni.showLoading({
title: '加载中...'
})
let params = {
orderId: this.orderNo,
}
getOrderById(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.orderList = res.return_data.highChildOrderList[0];
}
})
},
//获取订单数据
orderToPay() {
let that = this;
if (that.paytype == '') {
uni.showToast({
title: '请选择支付方式',
icon: 'none',
duration: 2000
})
return;
}
if (that.paytype == 'weixin') {
that.unionPay();
return;
}
if(that.paytype == 'gonghuika'){
if (!that.user.isSetPayPwd) {
uni.navigateTo({
url: '../../login/updatePas/updatePas'
})
return;
}
that.$refs.paymentPassword.modalFun('show');
}
},
//银联获取信息
unionPay() {
let goods = {
"orderId": this.orderNo
}
unionPay(goods).then(res => {
if (res.return_code == '000000') {
this.uniontopay(res.return_data.prepayid);
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
});
}
})
},
//银联支付
uniontopay(item) {
let that = this;
upsdk.pluginReady(function() {
upsdk.pay({
tn: item,
success: function(res) {
uni.showToast({
title: '支付成功'
})
uni.reLaunch({
url: '/pages/goods/refuel-succes/refuel-succes?id=' +that.orderNo
});
},
fail: function(err) {
uni.showToast({
title: err.msg,
icon: 'none',
duration: 2000
})
// 支付失败, err.msg 是失败原因描述, 比如TN号不合法, 或者用户取消了交易 等等。
}
});
});
}
}
}
</script>
<style lang="less">
page {
background-color: #f7f7f7;
}
.conImg {
width: 100px;
height: 100px;
border-radius: 8px;
}
.conCont {
margin-left: 115px;
}
.slogan {
color: #807c87;
text-decoration: line-through;
}
.footer {
position: fixed;
bottom: 0upx;
width: 100%;
height: 100rpx;
color: #FFFFFF;
border-top: solid 1upx #eee;
background-color: #FFFFFF;
z-index: 2;
display: flex;
justify-content: space-between;
align-items: center;
.reBtn {
width: 120px;
background-color: #089bf5;
color: #FFFFFF;
text-align: center;
padding: 0;
font-size: 16px;
border-radius: 0px;
height: 50px;
line-height: 50px;
position: absolute;
right: 0px;
}
}
<template>
<view>
<!-- 头部 -->
<view class="width100 height120 backcorfff">
<image :src="orderList.goodsImg" class="flleft conImg mart10 margle10"></image>
<view class="conCont paddtop15">
<view class="font20 fontwig6 fcor333 text1 paddtright10">{{orderList.goodsName}}</view>
<view class="font14 fcor999 text2 paddtop5 paddtright10">{{refulAdress}}</view>
<view class="font20 fontwig6 fcoreb5 paddtop5">￥{{orderList.gasPriceVip}}
<text class="margle10 slogan font14">￥{{orderList.gasPriceGun}}</text>
</view>
</view>
</view>
<!-- //订单详情 -->
<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">订单详情</view>
<view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 font16 width100 backcorfff">
<view class="flleft width50">
油号\油枪
</view>
<view class="flright width40 fotct">
{{orderList.gasOilNo}}#/{{orderList.gasGunNo}}号
</view>
</view>
<view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 font16 width100 backcorfff">
<view class="flleft width50">
加油金额
</view>
<view class="flright width40 fotct">
{{orderList.totalPrice}}
</view>
</view>
<!-- //支付方式 -->
<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">支付方式</view>
<view class="line1"></view>
<view class="width100 backcorfff">
<view class="line1"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='weixin'">
<view class="width60 flleft fontwig6">
银联支付
</view>
<view class="flright width30 fotct">
<radio :checked="paytype=='weixin'" color="#0083f5" />
</view>
</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>
</view>
<view class="flright width30 fotct">
<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
</view>
</view> -->
</view>
<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>
<view class="width95 paddleft10 font14 fcor999 mart5">1.<text
class="fcor089 fontwig6">请先加油后下单</text>,即您到站后,与工作人员确认油号,抢号后再付款。</view>
<view class="width95 paddleft10 font14 fcor999 mart5">
2.请勿先付款后加油,若您已下单付款。请于24小时内到加油站完成加油;若您48小时内未完成加油,请及时发起退单;逾期退单可能会退单失败。</view>
<view class="height80 width100"></view>
<!-- 底部按钮 -->
<view class="footer">
<view class="width50 flleft fcoreb5 padleft15 font15">
合计: ￥<text class="font24">{{payprice}}</text>
</view>
<button class="reBtn flright" @click="orderToPay">去支付</button>
</view>
<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
</view>
</template>
<script>
import {
getOrderById,
orderToPay,
unionPay,
orderToGoldPay,
hltUnionCardPay,
findUser,
oilCardPay
} from '../../../Utils/Api.js';
import ssPaymentPassword from '../../../components/sanshui-payment-password/index.vue';
let app = getApp();
export default {
components: {
ssPaymentPassword
},
data() {
return {
orderNo: '',
couponId: '',
payprice: '',
orderList: '',
refulAdress: '',
tongCardPrice: 0,
oilPirce: 0, //油卡余额
user: '',
paytype: '',
PaymentPassword: '',
}
},
onLoad(e) {
this.payprice = e.payprice;
this.orderNo = e.orderId;
this.couponId = e.couponId;
this.refulAdress = e.adres;
this.getOrderById();
},
onShow() {
let that = this;
that.paytype = '';
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;
if (this.PaymentPassword == '') {
uni.showToast({
title: '请勿手动关闭弹窗',
icon: 'none',
duration: 2000
})
return;
}
uni.showLoading({
title: '支付中...'
})
if (this.paytype == 'jifen') {
let params = {
"orderId": this.orderNo,
"password": this.PaymentPassword
}
orderToGoldPay(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;
}
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;
}
},
//获取选择支付方式
changeRiado() {
if (!this.user.isSetHltCard) {
uni.showToast({
icon: 'none',
title: '当前账号还未绑定,前往绑定',
duration: 2000,
success() {
setTimeout(() => {
uni.navigateTo({
url: '../../user/bindingCard/bindingCard'
})
}, 1000)
}
});
return;
}
},
getOrderById() {
uni.showLoading({
title: '加载中...'
})
let params = {
orderId: this.orderNo,
}
getOrderById(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.orderList = res.return_data.highChildOrderList[0];
}
})
},
//获取订单数据
orderToPay() {
let that = this;
if (that.paytype == '') {
uni.showToast({
title: '请选择支付方式',
icon: 'none',
duration: 2000
})
return;
}
if (that.paytype == 'weixin') {
that.unionPay();
return;
}
if (that.paytype == 'gonghuika') {
if (!that.user.isSetPayPwd) {
uni.navigateTo({
url: '../../login/updatePas/updatePas'
})
return;
}
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');
}
},
//银联获取信息
unionPay() {
let goods = {
"orderId": this.orderNo
}
unionPay(goods).then(res => {
if (res.return_code == '000000') {
this.uniontopay(res.return_data.prepayid);
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
});
}
})
},
//银联支付
uniontopay(item) {
let that = this;
upsdk.pluginReady(function() {
upsdk.pay({
tn: item,
success: function(res) {
uni.showToast({
title: '支付成功'
})
uni.reLaunch({
url: '/pages/goods/refuel-succes/refuel-succes?id=' + that
.orderNo
});
},
fail: function(err) {
uni.showToast({
title: err.msg,
icon: 'none',
duration: 2000
})
// 支付失败, err.msg 是失败原因描述, 比如TN号不合法, 或者用户取消了交易 等等。
}
});
});
}
}
}
</script>
<style lang="less">
page {
background-color: #f7f7f7;
}
.conImg {
width: 100px;
height: 100px;
border-radius: 8px;
}
.conCont {
margin-left: 115px;
}
.slogan {
color: #807c87;
text-decoration: line-through;
}
.footer {
position: fixed;
bottom: 0upx;
width: 100%;
height: 100rpx;
color: #FFFFFF;
border-top: solid 1upx #eee;
background-color: #FFFFFF;
z-index: 2;
display: flex;
justify-content: space-between;
align-items: center;
.reBtn {
width: 120px;
background-color: #089bf5;
color: #FFFFFF;
text-align: center;
padding: 0;
font-size: 16px;
border-radius: 0px;
height: 50px;
line-height: 50px;
position: absolute;
right: 0px;
}
}
</style>

1110
high-unionPay/pages/goods/refuel-details/refuel-details.vue
View File

File diff suppressed because it is too large Load Diff

845
high-unionPay/pages/goods/refuel/refuel.vue
Unescape View File

@ -1,488 +1,359 @@
<template>
<view>
<view class="width100 backcorfff">
<image mode="widthFix" class=" flleft sear mart15" :src="imagewxUrl+imgadres"></image>
<uSearchBar @confirm="search" @input="input"></uSearchBar>
</view>
<!-- <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}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view>
<view class="stuMenu flleft fotct" @click="showPopup(2)">{{distanceName}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view>
<view class="stuMenu flleft fotct" @click="showPopup(3)">{{onilName}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view>
</view>
<view v-if="refuelList == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image>
</view>
<view class="width96 height100p backcorfff border-r mart10" v-for="(item,index) in refuelList" :key="index">
<image mode="widthFix" :src="item.store_logo" class="recontleft flleft mart10 border-r"
style="max-height: 80px;" @click="goDetails(item.store_key,item.id)">
</image>
<view class="recontright">
<view class="text1 width100 font18 fontwig6 paddtop10" @click="goDetails(item.store_key,item.id)">
{{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}}
</view>
<view class="width30 flright font13 fcor666 fotct" @click="seeloaction(item)">
<image mode="widthFix" :src="imagewxUrl+imgadres1" style="width: 10px;"></image>
{{item.distance}}km
</view>
</view>
<view class="font14 width100 fcoreb5 mart5 height22" @click="goDetails(item.store_key,item.id)">
<text class="font18 fontwig6">{{item.price_vip}}</text>起<text
class="fcor999 margle">油站价￥{{item.price_gun}}</text>
</view>
</view>
</view>
<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 == 3">油号选择</view>
<view class="mart15" v-if="typeId == 1">
<view :class="item.name == distance?'activeRefuel':'refuel'" v-for="(item,index) in gunnumber"
:key="index" @click="changeValue(item)">
{{item.name}}
</view>
</view>
<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 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>
</view>
</wybPopup>
<!-- <authorize></authorize> -->
</view>
</template>
<script>
import {
getGasStoreList
} from '../../../Utils/Api.js';
import slFilter from '@/components/sl-filter/sl-filter.vue';
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
import uSearchBar from '../../../components/uni-search-bar/components/uni-search-bar/uni-search-bar.vue';
// import authorize from '../../../components/Authorize.vue'
let app = getApp();
export default {
components: {
slFilter,
// authorize,
uSearchBar,
wybPopup
},
data() {
return {
themeColor: '#089bf5',
titleColor: '#666666',
filterResult: '',
imagewxUrl: app.globalData.imageWxImg,
imgadres:'btjy.png',
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,
isNoMoreData: false,
searname: '',
gunnumber: [{
id: 1,
name: '6km内',
value: 6
},
{
id: 2,
name: '10km内',
value: 10
},
{
id: 3,
name: '15km内',
value: 15
},
{
id: 4,
name: '20km内',
value: 20
},
{
id: 5,
name: '50km内',
value: 50
}, {
id: 6,
name: '2000km内',
value: 2000
}
],
distance: '50km内',
distanceNum: '50',
distanceName: '距离最近',
detailList: [{
id: 1,
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(甲醇)#'
}
]
},
{
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'
}
]
}
],
onilName: '92#'
}
},
onLoad() {
this.getGasStoreList();
},
onReachBottom() {
this.getGasStoreList();
},
methods: {
//筛选距离
changeValue(item) {
this.distance = item.name;
this.distanceNum = item.value;
this.pageNum = 1;
this.isNoMoreData = false;
this.refuelList = [];
this.getGasStoreList();
this.$refs.popup.hide();
},
seeloaction(item) {
uni.openLocation({
latitude: Number(item.latitude), //目的地的定位
longitude: Number(item.longitude), //目的地的定位
name: item.store_name,
address: item.address
})
},
changeValue1(item) {
this.distanceName = item.name;
this.pageNum = 1;
this.isNoMoreData = false;
this.refuelList = [];
this.getGasStoreList();
this.$refs.popup.hide();
},
changeValue2(item) {
this.onilName = item.name;
this.pageNum = 1;
this.isNoMoreData = false;
this.refuelList = [];
this.getGasStoreList();
this.$refs.popup.hide();
},
//显示弹出
showPopup(item) {
this.typeId = item;
this.$refs.popup.show();
},
search(res) {
uni.showToast({
title: '搜索：' + res.value,
icon: 'none'
})
},
input(res) {
this.searname = res;
this.pageNum = 1;
this.isNoMoreData = false;
this.refuelList = [];
this.getGasStoreList();
},
//查询列表
getGasStoreList() {
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading()
return false;
}
let pagenum = this.pageNum;
let params = {
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',
pageNum: pagenum,
pageSize: this.pageSize
}
getGasStoreList(params).then(res => {
if (res.return_code == '000000') {
uni.hideLoading();
this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isNoMoreData = true;
}
this.refuelList = this.refuelList.concat(res.return_data.list);
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else {
this.refuelList = [];
uni.hideLoading()
}
})
},
//跳转详情
goDetails(items, itemId) {
uni.navigateTo({
url: '../refuel-details/refuel-details?id=' + items + '&desId=' + itemId
})
},
result(val) {
console.log('filter_result:' + JSON.stringify(val));
this.filterResult = JSON.stringify(val, null, 2)
}
}
}
</script>
<style lang="scss">
page {
background-color: #f1f3f5;
}
.refuel {
padding: 6px 5px;
border-radius: 5px;
background-color: #f6f6f6;
color: #666666;
margin-left: 10px;
margin-top: 15px;
display: inline-block;
font-size: 13px;
width: 18%;
text-align: center;
}
.activeRefuel {
padding: 6px 5px;
border-radius: 5px;
border: 1px solid #089bf5;
color: #089bf5;
margin-left: 10px;
margin-top: 15px;
display: inline-block;
font-size: 13px;
width: 18%;
text-align: center;
}
.stuMenu {
width: 33%;
height: 30px;
line-height: 30px;
font-size: 14px;
color: #333333;
.stuimg {
width: 10px;
vertical-align: middle;
}
}
.sear {
margin-left: 10px;
width: 50px;
}
.searImg {
margin-left: 55px;
}
.recontleft {
width: 80px;
margin-left: 10px;
}
.recontright {
margin-left: 95px;
}
.text {
margin-top: 50px;
margin-left: 20px;
width: 100%;
}
<template>
<view>
<view class="width100 backcorfff">
<image mode="widthFix" class=" flleft sear mart15" :src="imagewxUrl+imgadres"></image>
<uSearchBar @confirm="search" @input="input"></uSearchBar>
</view>
<!-- <slFilter :independence="true" :color="titleColor" :themeColor="themeColor" :menuList.sync="menuList"
@result="result"></slFilter> -->
<view class="width100 height40 backcorfff">
<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(1)">{{distance}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view>
<!-- <view class="stuMenu flleft fotct" @click="showPopup(2)">{{distanceName}}
<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
</view> -->
</view>
</view>
<view v-if="refuelList == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image>
</view>
<view class="width96 height100p backcorfff border-r mart10" v-for="(item,index) in refuelList" :key="index">
<image mode="widthFix" :src="item.store_logo" class="recontleft flleft mart10 border-r"
style="max-height: 80px;" @click="goDetails(item.store_key,item.id)">
</image>
<view class="recontright">
<view class="text1 width100 font18 fontwig6 paddtop10" @click="goDetails(item.store_key,item.id)">
{{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}}
</view>
<view class="width30 flright font13 fcor666 fotct" @click="seeloaction(item)">
<image mode="widthFix" :src="imagewxUrl+imgadres1" style="width: 10px;"></image>
{{item.distance}}km
</view>
</view>
<view class="font14 width100 fcoreb5 mart5 height22" @click="goDetails(item.store_key,item.id)">
<text class="font18 fontwig6">{{item.price_vip}}</text>起<text
class="fcor999 margle">油站价￥{{item.price_gun}}</text>
</view>
</view>
</view>
<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 == 3">油号选择</view>
<view class="mart15" v-if="typeId == 1">
<view :class="item.name == distance?'activeRefuel':'refuel'" v-for="(item,index) in gunnumber"
:key="index" @click="changeValue(item)">
{{item.name}}
</view>
</view>
<!-- <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 class="mart15" v-if="typeId == 3">
<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,
getDictionaryByCodeType
} from '../../../Utils/Api.js';
import slFilter from '@/components/sl-filter/sl-filter.vue';
import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
import uSearchBar from '../../../components/uni-search-bar/components/uni-search-bar/uni-search-bar.vue';
// import authorize from '../../../components/Authorize.vue'
let app = getApp();
export default {
components: {
slFilter,
// authorize,
uSearchBar,
wybPopup
},
data() {
return {
themeColor: '#089bf5',
titleColor: '#666666',
filterResult: '',
imagewxUrl: app.globalData.imageWxImg,
imgadres: 'btjy.png',
imgadres1: 'dh.png',
imgadres2: 'xiala.png',
imgadres3: 'noorder.png',
refuelList: [],
pageNum: 1,
pageSize: 10,
isNoMoreData: false,
searname: '',
gunnumber: [{
id: 1,
name: '6km内',
value: 6
},
{
id: 2,
name: '10km内',
value: 10
},
{
id: 3,
name: '15km内',
value: 15
},
{
id: 4,
name: '20km内',
value: 20
},
{
id: 5,
name: '50km内',
value: 50
}, {
id: 6,
name: '2000km内',
value: 2000
}
],
distance: '50km内',
distanceNum: '50',
distanceName: '距离最近',
detailList: [{
id: 1,
name: '距离最近'
}],
typeId: '',
oilList: [],
onilName: '0#',
latitudeful: '',
longitudeful: '',
isTyAgent: false //是否是代理商
}
},
onLoad() {
let that = this;
that.getDictionaryByCodeType();
if (app.globalData.accountId) {
that.isTyAgent = true;
}
uni.getLocation({
type: 'wgs84',
success: function(res) {
that.latitudeful = res.latitude;
that.longitudeful = res.longitude;
that.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;
this.distanceNum = item.value;
this.pageNum = 1;
this.isNoMoreData = false;
this.refuelList = [];
this.getGasStoreList();
this.$refs.popup.hide();
},
seeloaction(item) {
uni.openLocation({
latitude: Number(item.latitude), //目的地的定位
longitude: Number(item.longitude), //目的地的定位
name: item.store_name,
address: item.address
})
},
changeValue1(item) {
this.distanceName = item.name;
this.pageNum = 1;
this.isNoMoreData = false;
this.refuelList = [];
this.getGasStoreList();
this.$refs.popup.hide();
},
changeValue2(item) {
this.onilName = item.codeName;
this.pageNum = 1;
this.isNoMoreData = false;
this.refuelList = [];
this.getGasStoreList();
this.$refs.popup.hide();
},
//显示弹出
showPopup(item) {
this.typeId = item;
this.$refs.popup.show();
},
search(res) {
uni.showToast({
title: '搜索：' + res.value,
icon: 'none'
})
},
input(res) {
this.searname = res;
this.pageNum = 1;
this.isNoMoreData = false;
this.refuelList = [];
this.getGasStoreList();
},
//查询列表
getGasStoreList() {
uni.showLoading({
title: '加载中...'
})
if (this.isNoMoreData) {
uni.hideLoading()
return false;
}
let pagenum = this.pageNum;
let params = {
storeName: this.searname,
distance: this.distanceNum,
regionId: app.globalData.cityId,
oilNoName: this.onilName,
latitude: this.latitudeful,
longitude: this.longitudeful,
pageNum: pagenum,
pageSize: this.pageSize,
isTyAgent: this.isTyAgent
}
getGasStoreList(params).then(res => {
if (res.return_code == '000000') {
uni.hideLoading();
this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isNoMoreData = true;
}
this.refuelList = this.refuelList.concat(res.return_data.list);
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
} else {
this.refuelList = [];
uni.hideLoading()
}
})
},
//跳转详情
goDetails(items, itemId) {
uni.navigateTo({
url: '../refuel-details/refuel-details?id=' + items + '&desId=' + itemId
})
},
result(val) {
console.log('filter_result:' + JSON.stringify(val));
this.filterResult = JSON.stringify(val, null, 2)
}
}
}
</script>
<style lang="scss">
page {
background-color: #f1f3f5;
}
.refuel {
padding: 6px 5px;
border-radius: 5px;
background-color: #f6f6f6;
color: #666666;
margin-left: 10px;
margin-top: 15px;
display: inline-block;
font-size: 13px;
width: 18%;
text-align: center;
}
.activeRefuel {
padding: 6px 5px;
border-radius: 5px;
border: 1px solid #089bf5;
color: #089bf5;
margin-left: 10px;
margin-top: 15px;
display: inline-block;
font-size: 13px;
width: 18%;
text-align: center;
}
.stuMenu {
width: 33.3%;
height: 30px;
line-height: 30px;
font-size: 14px;
color: #333333;
.stuimg {
width: 10px;
vertical-align: middle;
}
}
.sear {
margin-left: 10px;
width: 50px;
}
.searImg {
margin-left: 55px;
}
.recontleft {
width: 80px;
margin-left: 10px;
}
.recontright {
margin-left: 95px;
}
.text {
margin-top: 50px;
margin-left: 20px;
width: 100%;
}
</style>

7
high-unionPay/pages/login/register.vue
Unescape View File

@ -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)"

172
high-unionPay/pages/pay/payment/payment.vue
Unescape View File

@ -18,7 +18,7 @@
</view>
<view class="content">
<view class="pay-list">
<view class="row" @tap="paytype='jinbi'">
<view class="row" @tap="paytype='jinbi'">
<view class="left">
<image src="../../../static/img/jfx.png"></image>
</view>
@ -40,7 +40,18 @@
<view class="right">
<radio :checked="paytype=='gonghuika'" color="#0083f5" />
</view>
</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,21 +118,61 @@
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) {
this.paytype = 'jinbi'
} 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;
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,33 +304,66 @@
})
return;
}
let params = {
"orderId": this.orderNo,
"cardNo": this.user.hltCardNo.cardNo,
"password": this.PaymentPassword
}
hltUnionCardPay(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '支付成功'
})
uni.reLaunch({
url: '../success/success?id=' + this.couponId
});
return;
if (this.paytype == 'gonghuika') {
let params = {
"orderId": this.orderNo,
"cardNo": this.user.hltCardNo.cardNo,
"password": this.PaymentPassword
}
if (res.return_code == '102130') {
uni.navigateTo({
url: '../../login/updatePas/updatePas'
hltUnionCardPay(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '支付成功'
})
uni.reLaunch({
url: '../success/success?id=' + this.couponId
});
return;
}
if (res.return_code == '102130') {
uni.navigateTo({
url: '../../login/updatePas/updatePas'
})
return;
}
uni.showToast({
title: res.return_msg,
icon: 'none'
})
return;
}
uni.showToast({
title: res.return_msg,
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;
}
}
}
}

77
high-unionPay/pages/tabBar/home/home.vue
Unescape View File

@ -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;
@ -437,12 +457,12 @@
url: '/pages/goods/goods-list/goods-list?id=3'
})
return;
}
if (item.title == '优选商品') {
uni.navigateTo({
url: '../../../subPages/preferred-goods/preferred-goods'
})
return;
}
if (item.title == '优选商品') {
uni.navigateTo({
url: '../../../subPages/preferred-goods/preferred-goods'
})
return;
}
if (item.title == '优惠券包') {
uni.navigateTo({
@ -468,6 +488,13 @@
background-color: #F5F5F5;
}
.h5xfimg {
width: 80rpx;
bottom: 140rpx;
position: fixed;
right: 40rpx;
}
.popImg {
width: 300px;
height: 440px;
@ -940,7 +967,7 @@
.orange-content .swiper-item {
height: 180rpx;
margin-left: 14rpx;
margin-top: 14rpx;
margin-top: 14rpx;
float: left;
}

95
high-unionPay/pages/tabBar/user/user.vue
Unescape View File

@ -75,13 +75,13 @@
<uni-badge text="1" type="error" />
</view> -->
<uni-badge style="width: 20px;position: absolute; right: 30%;" v-if="row.text == '我的卡券' && textnum "
:text="textnum" type="error" size="normal"></uni-badge>
<uni-badge style="width: 20px;position: absolute; right: 7%;"
v-if="row.text == '我的优惠券' && textSend " :text="textSend" type="error" size="normal"></uni-badge>
<view class="img">
<image :src="imagewxUrl+row.img"></image>
</view>
<uni-badge style="width: 20px;position: absolute; right: 30%;" v-if="row.text == '我的卡券' && textnum "
:text="textnum" type="error" size="normal"></uni-badge>
<uni-badge style="width: 20px;position: absolute; right: 7%;"
v-if="row.text == '我的优惠券' && textSend " :text="textSend" type="error" size="normal"></uni-badge>
<view class="img">
<image :src="imagewxUrl+row.img"></image>
</view>
<view class="text">{{row.text}}</view>
</view>
</view>
@ -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',
@ -341,12 +324,12 @@
this.toDeposit();
}
});
},
//跳转登录
jumplogin() {
uni.navigateTo({
url: '../../userLogin/userLogin'
})
},
//跳转登录
jumplogin() {
uni.navigateTo({
url: '../../userLogin/userLogin'
})
},
// H5获取手机号
jumpH5Bding() {
@ -420,12 +403,34 @@
url: url
})
} else {
uni.showModal({
title: '客服',
content: '4006780738'
})
// uni.showModal({
// title: '客服',
// content: '4006780738'
// })
this.playPhone();
}
},
//拨打客服电话
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);
}
})
}
}
})
}
}
}

563
high-unionPay/pages/user/bindingCard/bindingCard.vue
Unescape View File

@ -1,246 +1,323 @@
<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>
</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>
<view class="username" v-if="phoneNumber">
<view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">{{getCodeText}}</view>
<input disabled="true" v-model="phoneNumber" placeholder-style="color: #333333;" />
</view>
<view class="code" v-if="phoneNumber">
<input placeholder="请输入验证码" v-model="code" placeholder-style="color: #333333;" />
</view>
<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="fontlet font20 fcor666 fontwig6 height45l paddtop10">1元可抵扣100积分</view>
</view>
</view>
</template>
<script>
import md5 from "@/common/SDK/md5.min.js";
<template>
<view>
<view class="form re" style="top: 100rpx;">
<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 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>
<input disabled="true" v-model="phoneNumber" placeholder-style="color: #333333;" />
</view>
<view class="code" v-if="phoneNumber">
<input placeholder="请输入验证码" v-model="code" placeholder-style="color: #333333;" />
</view>
<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: 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>
</template>
<script>
import md5 from "@/common/SDK/md5.min.js";
import {
sendSmsCode,
getHuiLianTongCardByCardNo,
bindHuiLianTongCard,
getUserCardList,
getHuiLianTongCardByPhone
} from '../../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
cardNoNumber: "",
phoneNumber: "",
code: '',
getCodeText: '获取验证码',
getCodeBtnColor: "#0083f5",
getCodeisWaiting: false,
disStute: false,
UserCard:''
}
},
onLoad(options) {
this.user = app.globalData.userInfo;
this.getHuiLianTongCardByPhone();
},
methods: {
Timer() {},
//查询我的卡号列表
getHuiLianTongCardByPhone() {
let params = {
phone : this.user.phone
}
uni.showLoading();
getHuiLianTongCardByPhone(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data !='') {
this.UserCard = res.return_data;
this.cardNoNumber = res.return_data[0].cardNo;
return;
}
this.UserCard = '';
});
},
//选择卡号
bindUserCard(e) {
this.cardNoNumber = this.UserCard[e.target.value].cardNo;
},
getCode() {
uni.hideKeyboard()
if (this.getCodeisWaiting) {
return;
}
if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) {
uni.showToast({
title: '请填写正确手机号码',
icon: "none"
});
return false;
}
uni.showLoading({
title: '发送中...'
})
let params = {
phone: this.phoneNumber
}
sendSmsCode(params).then(res => {
if (res.return_code == '000000') {
this.getCodeisWaiting = true;
this.getCodeBtnColor = "#999999"
uni.showToast({
title: '验证码已发送',
icon: "none"
});
this.setTimer();
} else {
uni.hideLoading()
}
})
},
setTimer() {
let holdTime = 60;
this.getCodeText = "重新获取(60)"
this.Timer = setInterval(() => {
if (holdTime <= 0) {
this.getCodeisWaiting = false;
this.getCodeBtnColor = "#333333";
this.getCodeText = "获取验证码"
clearInterval(this.Timer);
return;
}
this.getCodeText = "重新获取(" + holdTime + ")"
holdTime--;
}, 1000)
},
//获取预留手机号
doCardNonum() {
if (!this.cardNoNumber) {
uni.showToast({
title: '请填写卡号',
icon: "none"
});
return false;
}
if (this.cardNoNumber.length != 19) {
uni.showToast({
title: '请填写正确的19位卡号',
icon: "none"
});
return false;
}
uni.showLoading({
title: '查询中...'
})
let params = {
cardNo: this.cardNoNumber
}
getHuiLianTongCardByCardNo(params).then(res => {
uni.hideLoading()
if (res.return_code == '000000') {
this.phoneNumber = res.return_data.userMobile;
// this.phoneNumber = 15583658692;
this.disStute = true
} else {
uni.showToast({
title: res.return_msg,
icon: "none"
});
}
})
},
//绑定卡号
bindHuiLianTongCard() {
uni.hideKeyboard()
//模板示例部分验证规则
if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) {
uni.showToast({
title: '请填写正确手机号码',
icon: "none"
});
return false;
}
if (!this.code) {
uni.showToast({
title: '请填写验证码',
icon: "none"
});
return false;
}
uni.showLoading({
title: '提交中...'
})
let params = {
cardNo: this.cardNoNumber,
sendSmsCodeByHw,
getHuiLianTongCardByCardNo,
getDetailByCardNo,
bindHuiLianTongCard,
getUserCardList,
getHuiLianTongCardByPhone,
getDictionaryByCodeType
} from '../../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
cardNoNumber: "",
phoneNumber: "",
code: '',
getCodeText: '获取验证码',
getCodeBtnColor: "#0083f5",
getCodeisWaiting: false,
disStute: false,
UserCard: '',
cardList: [], // 卡列表
typeName: '', // 卡名称
type: '' //区分类型
}
},
onLoad(options) {
this.user = app.globalData.userInfo;
// 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 = {
phone: this.user.phone
}
uni.showLoading();
getHuiLianTongCardByPhone(params).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data != '') {
this.UserCard = res.return_data;
this.cardNoNumber = res.return_data[0].cardNo;
return;
}
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;
},
getCode() {
uni.hideKeyboard()
if (this.getCodeisWaiting) {
return;
}
if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) {
uni.showToast({
title: '请填写正确手机号码',
icon: "none"
});
return false;
}
uni.showLoading({
title: '发送中...'
})
let params = {
phone: this.phoneNumber,
smsCode: this.code
}
bindHuiLianTongCard(params).then(res => {
uni.hideLoading()
if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data
.object
.highUser;
app.globalData.token = res.return_data.uniqueCode;
uni.setStorage({
key: "user",
data: res.return_data
.object
.highUser
})
uni.showToast({
title: '绑定成功',
icon: "success",
duration: 2000,
success() {
setTimeout(() => {
uni.navigateBack({
delta: 2
})
}, 1000)
}
});
} else {
uni.showToast({
title: res.return_msg,
icon: "none"
});
}
})
},
}
}
</script>
<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;
width: 70%;
padding-right: 25rpx;
color: #999999;
font-size: 32rpx;
}
HWMSG:1
}
sendSmsCodeByHw(params).then(res => {
if (res.return_code == '000000') {
this.getCodeisWaiting = true;
this.getCodeBtnColor = "#999999"
uni.showToast({
title: '验证码已发送',
icon: "none"
});
this.setTimer();
} else {
uni.hideLoading()
}
})
},
setTimer() {
let holdTime = 60;
this.getCodeText = "重新获取(60)"
this.Timer = setInterval(() => {
if (holdTime <= 0) {
this.getCodeisWaiting = false;
this.getCodeBtnColor = "#333333";
this.getCodeText = "获取验证码"
clearInterval(this.Timer);
return;
}
this.getCodeText = "重新获取(" + holdTime + ")"
holdTime--;
}, 1000)
},
//获取预留手机号
doCardNonum() {
if (!this.cardNoNumber) {
uni.showToast({
title: '请填写卡号',
icon: "none"
});
return;
}
if (this.cardNoNumber.length != 19 && this.type == 1) {
uni.showToast({
title: '请填写正确的19位工会卡号',
icon: "none"
});
return;
}
if (this.cardNoNumber.length != 16 && this.type == 2) {
uni.showToast({
title: '请填写正确的16位油卡号',
icon: "none"
});
return;
}
let params = {
cardNo: this.cardNoNumber
}
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;
// this.phoneNumber = 15583658692;
this.disStute = true
} else {
uni.showToast({
title: res.return_msg,
icon: "none"
});
}
})
},
//查询油卡
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()
//模板示例部分验证规则
if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) {
uni.showToast({
title: '请填写正确手机号码',
icon: "none"
});
return false;
}
if (!this.code) {
uni.showToast({
title: '请填写验证码',
icon: "none"
});
return false;
}
uni.showLoading({
title: '提交中...'
})
let params = {
type: this.type,
cardNo: this.cardNoNumber,
phone: this.phoneNumber,
smsCode: this.code
}
bindHuiLianTongCard(params).then(res => {
uni.hideLoading()
if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data
.object
.highUser;
app.globalData.token = res.return_data.uniqueCode;
uni.setStorage({
key: "user",
data: res.return_data
.object
.highUser
})
uni.showToast({
title: '绑定成功',
icon: "success",
duration: 2000,
success() {
setTimeout(() => {
uni.navigateBack({
})
}, 1000)
}
});
} else {
uni.showToast({
title: res.return_msg,
icon: "none"
});
}
})
},
}
}
</script>
<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;
width: 70%;
padding-right: 25rpx;
color: #999999;
font-size: 32rpx;
}
</style>

1416
high-unionPay/pages/user/order_details/order_details.vue
View File

File diff suppressed because it is too large Load Diff

1073
high-unionPay/pages/user/order_list/order_list.vue
View File

File diff suppressed because it is too large Load Diff

48
high-unionPay/pages/userLogin/userLogin.vue
Unescape View File

@ -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 = {

2
high-unionPay/static/css/login.scss
Unescape View File

@ -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;

BIN
high-unionPay/static/img/ghkpay.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

407
high-unionPay/subPages/cardsDetails/cardsDetails.vue
Unescape View File

@ -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>

100
high-unionPay/subPages/cardsList/cardsList.vue
Unescape View File

@ -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>

BIN
high-unionPay/subPages/static/addcards.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
high-unionPay/subPages/static/oilcard.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
high-unionPay/subPages/static/unioncard.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

2
high-unionPay/subPages/unionPay-orderList/unionPay-orderList.vue
Unescape View File

@ -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];

34
high-unionPay/uni.scss
Unescape View File

@ -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;
}

Write Preview
Loading…
Cancel
Save