diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java index c69471fc9..fc1531ef8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java @@ -49,8 +49,8 @@ public class Const { public static String NOTIFY_PUBLIC_KEYS="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbBAl3xSB7YeUnze4yYZmnTeT7OtXZr0sP10TsDVRH2SY/VEjgS9KPmHMmVeKZT3+6xKsUvulgVyie46GGtZPrnoh+glF1gzsYAXJ7dvR/R5nYO5VvfwK/ChPFTiKhbTtO4OKtchgBZuqCbsemG+gFIiVJo37dY0Kg0zISmFHdOQIDAQAB"; //异步通知(回调地址) - public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify"; -// public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify"; +// public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify"; + public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify"; //下单 public static String fuiou_21_url = "https://fundwx.fuiou.com/preCreate"; diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 73a76d7b8..8c9d61b35 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -3711,7 +3711,8 @@ _this.refuelMoney1.push(item) id = item.id _this.isOilStorageCard = true - if (_this.refuelMoney[i].refuelMoney >= item.liters){ + console.log(_this.refuelMoney[i].refuelMoney , item.liters,1547) + if (+_this.refuelMoney[i].refuelMoney >= +item.liters){ conRefMon = item.liters }else { conRefMon = _this.refuelMoney[i].refuelMoney @@ -4507,7 +4508,7 @@ border-radius: 8px; box-sizing: border-box; background-color: #b4d5ff; - height: 110px; + //height: 110px; padding: 10px; color: #3e4f60; }