@@ -133,6 +146,8 @@ export default {
},
loading: false,
dateRange: [new Date(),new Date()],
+ beginTime:new Date(),
+ endTime:new Date(),
defaultSort: {prop: 'createTime', order: 'descending'},
total: 0,
@@ -153,6 +168,11 @@ export default {
},
methods: {
getList(){
+ this.dateRange = []
+ if (this.beginTime && this.endTime) {
+ this.dateRange.push(this.beginTime.toLocaleDateString())
+ this.dateRange.push(this.endTime.toLocaleDateString())
+ }
getHandoverListApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
this.dataList = res.data.records
this.total = res.data.total
@@ -201,6 +221,8 @@ export default {
pageSize:10
},
this.dateRange = []
+ this.beginTime = ""
+ this.endTime = ""
this.getList();
},
printLocally(data) {
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index e4fbff1b7..529fd8d6a 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -247,7 +247,7 @@
@click="refuel(item)">
{{ getName(oilNameList,getOilNames(oilNumberList,item.numberId)) }}
-
+
{{item.gunName}}
@@ -2873,12 +2873,12 @@
this.oilPreferentialData = []
},
// 根据会员等级信息获取等级优惠信息
- getGrade(userId,gradeId){
+ async getGrade(userId,gradeId){
this.isFixingLevel = false
let _this = this;
this.oilDiscount = 0;
this.gradeDiscount = [];
- userGradeInfo({userId:userId,gradeId:gradeId,storeId:""}).then(response => {
+ await userGradeInfo({userId:userId,gradeId:gradeId,storeId:""}).then(response => {
let gasolineDiscount = 0;
let dieselDiscount = 0;
let naturalGasDiscount = 0;
@@ -3086,22 +3086,12 @@
this.map.payUser = data.mobile;
this.map.userId = data.id;
this.balance = this.member.cardBalance;
+ await this.getGrade(this.member.id,this.member.gradeId)
if (data.refuelMoney){
// 使用囤油卡
this.refuelMoney = JSON.parse(data.refuelMoney)
await this.changeRefuelMoney();
}
- // await this.getGrade(data.id,data.gradeId)
- // if (!this.isFixingLevel){
- // this.preferentialData.storeId = this.storeId;
- // this.preferentialData.userId = data.id;
- // this.preferentialData.gradeId = data.gradeId;
- // if (this.oilOrder.length>0){
- // this.preferential();
- // this.getCoupon();
- // }
- // }
- await this.getGrade(this.member.id,this.member.gradeId)
if (this.balance>0 && this.oilAmount>0 && !this.isOilStorageCard){
this.checkAll4 = true
if (this.goodsOrder.length==0){
@@ -3302,15 +3292,16 @@
this.checkAll4 = true
if (this.balance!=0 && this.balance >= this.hoardAmount){
this.oilActualPay = 0
- this.consumeAmount = this.hoardAmount
+ this.consumeAmount = 0
}else {
- this.oilActualPay = (this.hoardAmount -this.balance).toFixed(2)
+ this.oilActualPay = (this.hoardAmount - this.balance).toFixed(2)
this.consumeAmount = this.balance
}
}else {
this.oilActualPay = 0
this.consumeAmount = 0
}
+ console.log("使用囤油卡",this.hoardAmount)
},
// 不使用囤油卡
countAmountFull(){
@@ -3649,13 +3640,8 @@
this.oilTotal = this.oilOrder.length;
this.select = "元";
if (this.isMember){
- // this.getGrade(this.member.id,this.member.gradeId)
- // this.changeRefuelMoney();
- // if (this.oilOrder.length>0){
- // this.preferential();
- // this.getCoupon();
- // }
+ await this.getGrade(this.member.id,this.member.gradeId)
if (this.refuelMoney){
// 使用囤油卡
await this.changeRefuelMoney();
@@ -3667,7 +3653,6 @@
}
this.countAmountFull()
}
- await this.getGrade(this.member.id,this.member.gradeId)
if (!this.isFixingLevel && !this.isOilStorageCard){
await this.getOilCoupon()
}
@@ -3686,10 +3671,10 @@
_this.hoardAmount = 0;
_this.oilAmount = 0;
_this.refuelMoney1 = []
+ let hoardAmount1 = 0;
_this.oilOrder.forEach(item => {
let conRefMon = 0;
let hoardAmount = 0;
- let hoardAmount1 = 0;
let amount = 0;
let amount1 = 0;
let id = ""
@@ -3714,9 +3699,10 @@
}
}
_this.consumeRefuelMoney += +conRefMon
+ console.log(hoardAmount,1254)
hoardAmount1 += +hoardAmount
amount1 += +amount
- _this.hoardAmount = hoardAmount1 + amount1
+ _this.hoardAmount = hoardAmount1
_this.oilAmount += +item.amount
// _this.changeBalance(_this.hoardAmount,id)
// if (_this.consumeRefuelMoney!=0){
@@ -3724,8 +3710,8 @@
// _this.checkAll3 = true;
// _this.consumeAmount = 0;
// }
- _this.isDefaultUseCard();
})
+ _this.isDefaultUseCard();
},
changeBalance(hoardAmount,id){
if (this.balance>0 && id != ""){
diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue
index 49bd00f00..ab98ec4cb 100644
--- a/gasStation-uni/pages/refuel/refuel.vue
+++ b/gasStation-uni/pages/refuel/refuel.vue
@@ -547,17 +547,17 @@
// if (!this.AppToken) {
// return;
// }
- // await request({
- // url: 'chainStoreInfo/theJudgmentIsTheSame',
- // method: 'get',
- // data: {
- // "chainStoreId": uni.getStorageSync("chainStoreId")
- // }
- // }).then(res => {
- // if (!res.data) {
- // uni.removeStorageSync("App-Token");
- // }
- // })
+ await request({
+ url: 'chainStoreInfo/theJudgmentIsTheSame',
+ method: 'get',
+ data: {
+ "chainStoreId": uni.getStorageSync("chainStoreId")
+ }
+ }).then(res => {
+ if (!res.data) {
+ uni.removeStorageSync("App-Token");
+ }
+ })
if (uni.getStorageSync("appltType")== "WECHAT") {
// 判断当前登录的code是否相同
diff --git a/gasStation-uni/pagesLogin/login/login.vue b/gasStation-uni/pagesLogin/login/login.vue
index 04aabc091..02d53b176 100644
--- a/gasStation-uni/pagesLogin/login/login.vue
+++ b/gasStation-uni/pagesLogin/login/login.vue
@@ -55,14 +55,14 @@
},
// 获取支付宝userid
getUserLogin(e) {
- // if (this.qindex == false) {
- // uni.showToast({
- // icon: "none",
- // title: "请阅读并勾选用户协议",
- // duration: 2000
- // })
- // return;
- // }
+ if (this.qindex == false) {
+ uni.showToast({
+ icon: "none",
+ title: "请先阅读并勾选用户协议",
+ duration: 2000
+ })
+ return;
+ }
console.log(e)
let _this = this;
@@ -124,14 +124,14 @@
wxlogin() {},
getPhone(e) {
let that = this
- // if (this.privacyPolicyChecked == false) {
- // uni.showToast({
- // icon: "none",
- // title: "请阅读并勾选用户协议",
- // duration: 2000
- // })
- // return;
- // }
+ if (this.privacyPolicyChecked == false) {
+ uni.showToast({
+ icon: "none",
+ title: "请先阅读并勾选用户协议",
+ duration: 2000
+ })
+ return;
+ }
console.log(e)
uni.login({
provider: 'weixin',
diff --git a/gasStation-uni/pagesRefuel/orderDetail/index.vue b/gasStation-uni/pagesRefuel/orderDetail/index.vue
index 5545052d2..a9ec90900 100644
--- a/gasStation-uni/pagesRefuel/orderDetail/index.vue
+++ b/gasStation-uni/pagesRefuel/orderDetail/index.vue
@@ -345,6 +345,19 @@
// _this.goBack()
return;
}
+ if(res.data.code=="error"){
+ request({
+ url: "/business/allOrderInfo/orderStatus",
+ method: 'post',
+ data: {"orderNo":_this.orderNo,"status":"payFail"},
+ }).then((ress)=>{})
+ uni.showToast({
+ title:res.data.msg,
+ icon:"none"
+ })
+ // _this.goBack()
+ return;
+ }
if(res.data.success == "ok"){
// _this.preferentialData.storeId = _this.oilOrder.storeId
// _this.preferentialData.orderAmount = _this.oilOrder.orderAmount