diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index d5e7ae0..c3e266b 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -170,7 +170,7 @@
油卡支付余额: {{oilPirce}}元
-
+
@@ -182,20 +182,19 @@
-
-
-
-
- 车队油卡余额: {{oilUserNoPrice}}元
-
-
-
-
+
+
+
+
+ 车队油卡余额: {{oilUserNoPrice}}元
+
+
+
+
-
+
车队油卡列表
@@ -249,7 +248,7 @@
{{items.discountName}}
- 有效期:{{items.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+ 有效期:{{items.useEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
@@ -400,6 +399,7 @@
}
this.canUseDiscount();
this.oilPriceDiscountCompute();
+ this.getHuiLianTongCardBalance();
uni.setStorage({
key: "user",
data: res.return_data
@@ -680,10 +680,21 @@
return;
}
if (this.paytype == '3' || this.paytype == '6' || this.paytype == '7') {
+ let cardNo;
+ if (this.paytype == 3) {
+ cardNo = this.user.hltCardNo.cardNo;
+ }
+ if (this.paytype == 6) {
+ cardNo = this.user.oilCard.cardNo;
+ }
+ if (this.paytype == 7) {
+ cardNo = this.oilUserno;
+ }
let params = {
"orderNo": this.orderNo,
- "cardNo": this.user.hltCardNo.cardNo,
- "password": this.PaymentPassword
+ "cardNo": cardNo,
+ "password": this.PaymentPassword,
+ "carLicensePlate": this.cardNoNumber
}
cardPay(params).then(res => {
uni.hideLoading();
@@ -743,7 +754,7 @@
},
//获取选择支付方式
changeRiado() {
- if (!this.user.isSetOilCard) {
+ if (!this.user.setHltCard) {
uni.showToast({
icon: 'none',
title: '当前账号还未绑定,前往绑定',
@@ -926,7 +937,7 @@
})
return;
}
- if (!that.user.isSetOilCard) {
+ if (!that.user.setHltCard) {
uni.showToast({
icon: 'none',
title: '当前账号还未绑定,前往绑定',
@@ -960,7 +971,7 @@
})
return;
}
- if (!that.user.isSetHltCard) {
+ if (!that.user.isSetOilCard) {
uni.showToast({
icon: 'none',
title: '当前账号还未绑定,前往绑定',
@@ -978,15 +989,6 @@
that.$refs.paymentPassword.modalFun('show');
}
- if (that.paytype == 'jifen') {
- if (!that.user.isSetPayPwd) {
- uni.navigateTo({
- url: '../../login/updatePas/updatePas'
- })
- return;
- }
- that.$refs.paymentPassword.modalFun('show');
- }
},
payRequest: function(self) {
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 9729471..96e6d8b 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -656,7 +656,13 @@
})
}
})
- } else if (that.paytype == '3') {
+ } else if (that.paytype == '3') {
+ if (!that.user.isSetPayPwd) {
+ uni.navigateTo({
+ url: '../login/updatePas/updatePas'
+ })
+ return;
+ }
if (that.tongCardPrice < that.paytheprice) {
uni.showToast({
icon: 'none',
@@ -665,12 +671,7 @@
});
return;
}
- if (!that.user.isSetPayPwd) {
- uni.navigateTo({
- url: '../login/updatePas/updatePas'
- })
- return;
- }
+
if (!that.user.isSetHltCard) {
uni.showToast({
icon: 'none',
diff --git a/pages/user/news/news.vue b/pages/user/news/news.vue
index 42492ed..40e6dd3 100644
--- a/pages/user/news/news.vue
+++ b/pages/user/news/news.vue
@@ -13,7 +13,7 @@
-
+
服务通知
@@ -36,7 +36,7 @@
{{item.title}}
-
+
¥{{item.content | msgFormat('price')}}
交易对象
@@ -47,8 +47,8 @@
交易时间
{{item.content | msgFormat('time') }}
- 查看详情
+ 查看详情
+
@@ -86,10 +86,7 @@
newsTyplist: [], //消息类型
newsList: [], // 信内容
newstypeid: 1, //类型id
- headerTop: '0px',
- pageNum: 1,
- pageSize: 10,
- isNoMoreData: false,
+ headerTop: '0px'
}
},
filters: {
@@ -102,14 +99,12 @@
onLoad() {
// #ifdef H5
this.headerTop = '44px';
- // #endif
- },
- onShow() {
+ // #endif
this.getDictionaryByCodeType();
},
- onReachBottom() {
- this.getMsgByList();
- },
+ // onShow() {
+ // this.getDictionaryByCodeType();
+ // },
methods: {
//查询类型
getDictionaryByCodeType() {
@@ -126,37 +121,49 @@
},
//切换
changeValue(item) {
- this.pageNum = 1;
- this.newsList = [];
- this.isNoMoreData = false;
+ this.newsList = [];
this.getMsgByList(item);
},
//查询列表
- getMsgByList(item) {
+ getMsgByList(item) {
this.newstypeid = item;
- if (this.isNoMoreData) {
- uni.hideLoading()
- return false;
- }
- let pagenum = this.pageNum;
let datas = {
companyId: app.globalData.companyId,
- type: item,
- pageNum: this.pageNum,
- pageSize: this.pageSize
+ type: item
}
getMsgByList(datas).then(res => {
- if (res.return_code == '000000' && res.return_data.list != '') {
- this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
- if (res.return_data.total == (this.pageNum * this.pageSize)) {
- this.isNoMoreData = true;
- }
- this.newsList = this.newsList.concat(res.return_data.list);
- this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+ if (res.return_code == '000000' && res.return_data != '') {
+ this.newsList = res.return_data;
} else {
this.newsList = [];
}
})
+ },
+ //根据类型跳转详情
+ jumpDetails(item1) {
+ let lists = JSON.parse(item1);
+ if (lists.productType == 1 || lists.productType == 2 || lists.productType == 3) {
+ uni.navigateTo({
+ url: '/qianzhu-KFC/order-details/order-details?id=' + lists.orderNo
+ })
+ } else {
+ uni.navigateTo({
+ url: '/pages/user/order_details/order_details?id=' + lists.orderNo
+ })
+ }
+ },
+ //客服信息
+ jumporther(item){
+ if(item.jumpType == 2){
+ uni.navigateTo({
+ url: '/pages/tabBar/order/webUrl/webUrl?url=' + item.content
+ })
+ }
+ if(item.jumpType == 3){
+ uni.navigateTo({
+ url:item.content
+ })
+ }
}
}
}
diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue
index ac2009a..7324a18 100644
--- a/pages/user/order_details/order_details.vue
+++ b/pages/user/order_details/order_details.vue
@@ -54,7 +54,8 @@
微信支付
积分兑换
汇联通工会卡
- 汇联通银联支付工会卡
+ 嗨森逛个人油卡
+ 嗨森逛车队油卡
地址
@@ -142,8 +143,11 @@
-
+
加油实付 ￥{{recinfo.payRealPrice}}
+
+
+ 实付 ￥{{recinfo.payRealPrice}}
diff --git a/qianzhu-KFC/confirmOrder/confirmOrder.vue b/qianzhu-KFC/confirmOrder/confirmOrder.vue
index fc73f9f..8e8f418 100644
--- a/qianzhu-KFC/confirmOrder/confirmOrder.vue
+++ b/qianzhu-KFC/confirmOrder/confirmOrder.vue
@@ -450,14 +450,15 @@
result = result1.toFixed(2);
})
- // let resul2 = 0;
+ let resul2 = 0;
let result3 = 0;
this.orderList.forEach((good) => {
- result3 += this.accMul(good.num, good.oldprice)
+ resul2 += this.accMul(good.num, good.oldprice);
+ result3 = resul2.toFixed(2);
this.disconutprice = (result3 - result).toFixed(2);
})
- this.orderPrice = result3;
+ this.orderPrice = result3;
this.totalprice = result;
this.payPrice = result;
},
@@ -807,7 +808,14 @@
})
}
})
- } else if (that.paytype == '3') {
+ } else if (that.paytype == '3') {
+ if (!that.user.isSetPayPwd) {
+ uni.navigateTo({
+ url: '../../pages/login/updatePas/updatePas'
+ })
+ that.thirdCancelOrder();
+ return;
+ }
if (that.tongCardPrice < that.payPrice) {
uni.showToast({
icon: 'none',
@@ -817,13 +825,7 @@
that.thirdCancelOrder();
return;
}
- if (!that.user.isSetPayPwd) {
- uni.navigateTo({
- url: '../../pages/login/updatePas/updatePas'
- })
- that.thirdCancelOrder();
- return;
- }
+
if (!that.user.isSetHltCard) {
uni.showToast({
icon: 'none',
diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue
index 29d1a09..6246753 100644
--- a/qianzhu-KFC/order-details/order-details.vue
+++ b/qianzhu-KFC/order-details/order-details.vue
@@ -11,10 +11,10 @@
-
-
+ -->
{{typeText[orderList.orderStatus]}}
diff --git a/qianzhu-KFC/static/imgs/desloca.png b/qianzhu-KFC/static/imgs/desloca.png
index 9cc9add..a7c4fe1 100644
Binary files a/qianzhu-KFC/static/imgs/desloca.png and b/qianzhu-KFC/static/imgs/desloca.png differ
diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue
index 3b87457..9564758 100644
--- a/subPages/unionComfirmation/unionComfirmation.vue
+++ b/subPages/unionComfirmation/unionComfirmation.vue
@@ -131,7 +131,7 @@
-
+