diff --git a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue index a6dce5e34..5a1eb701f 100644 --- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue @@ -278,6 +278,9 @@ export default { isonline:[ { required: true, message: '不能为空', trigger: 'change' } ], + activeDiscountChildList:[ + { required: true, message: '不能为空', trigger: 'change' } + ], } }; }, diff --git a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue index d39de6699..70239e74e 100644 --- a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue @@ -281,6 +281,9 @@ export default { isonline:[ { required: true, message: '不能为空', trigger: 'change' } ], + activeDiscountChildList:[ + { required: true, message: '不能为空', trigger: 'change' } + ], } }; }, diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue index 9ef4a8c21..84b628326 100644 --- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue +++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue @@ -144,8 +144,10 @@ + + @@ -165,15 +167,28 @@ {{item.oilType}}{{item.oilName}} - - - - - - - - - +
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+ @@ -711,5 +726,9 @@ export default { align-items: center; } + ._k{ + box-sizing: border-box; + width: 300px; + } diff --git a/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue index 9a282f24d..b65e0c6d8 100644 --- a/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue +++ b/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue @@ -34,7 +34,8 @@ export default { } }, created() { - this.userId = this.pUserId; + // this.userId = this.pUserId; + this.userId = this.$route.query.id; }, methods:{ getList(){ diff --git a/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue index 1b87e17cf..d976112ec 100644 --- a/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue +++ b/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue @@ -35,7 +35,8 @@ export default { } }, created() { - this.userId = this.pUserId; + // this.userId = this.pUserId; + this.userId = this.$route.query.id; }, methods:{ getList(){ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java index 779383f55..14f15b3ae 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java @@ -485,7 +485,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { } //折扣+优惠券 for (ActiveDiscountPayVO activeDiscountPayVO : activeDiscountVOList) { - if (activeDiscountPayVO.getParticipationCondition().equals("1")){ + if (!activeDiscountPayVO.getParticipationCondition().equals("1")){ for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { if(cardFavorableRecordVO.getExclusiveFunction().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO(); @@ -525,7 +525,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { } //满减+优惠券 for (ActiveDiscountPayVO activeDiscountPayVO : activeFuletVOList) { - if (activeDiscountPayVO.getParticipationCondition().equals("1")){ + if (!activeDiscountPayVO.getParticipationCondition().equals("1")){ for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { if(cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO(); @@ -637,7 +637,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { BigDecimal bigDecimal1 = BigDecimal.valueOf(oilPriceById); String oilTypebyId = oilNameMapper.getOilTypebyId(oilId); - String gradeId = ljUserGradeMapper.selectByUserId(paymentActiveDTO.getStoreId(), userId); + String gradeId = paymentActiveDTO.getMtUserLevel().toString(); if (StringUtils.isNotEmpty(gradeId)){ LJUserGrade ljUserGrade = ljUserGradeMapper.selectAllByGradeId(gradeId); if (ObjectUtils.isNotEmpty(ljUserGrade)){ @@ -647,31 +647,26 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { }else if (ljUserGrade.getGasolineDiscount().equals("每升优惠")){ String gasolineRule = ljUserGrade.getGasolineRule(); List jsonObjects = JSONArray.parseArray(gasolineRule, JSONObject.class); - for (JSONObject jsonObject : jsonObjects) { - Integer gasolineRule1 = jsonObject.getInteger("gasolineRule1"); - BigDecimal bigDecimal = BigDecimal.valueOf(gasolineRule1); + JSONObject jsonObject = jsonObjects.stream().max(Comparator.comparingDouble(o -> o.getDouble("gasolineRule3"))).get(); + BigDecimal bigDecimal = jsonObject.getBigDecimal("gasolineRule1"); if (paymentActiveDTO.getAmount().compareTo(bigDecimal)>=0){ //升数 BigDecimal divide = paymentActiveDTO.getAmount().divide(bigDecimal1,2,RoundingMode.HALF_UP); - Integer gasolineRule3 = jsonObject.getInteger("gasolineRule3"); - BigDecimal bigDecimal2 = BigDecimal.valueOf(gasolineRule3); - BigDecimal multiply = divide.multiply(bigDecimal2); + BigDecimal gasolineRule3 = jsonObject.getBigDecimal("gasolineRule3"); + BigDecimal multiply = divide.multiply(gasolineRule3); paymentActiveVO.setMemberFavorableAmount(multiply); } - } }else { String gasolineRule = ljUserGrade.getGasolineRule(); List jsonObjects = JSONArray.parseArray(gasolineRule, JSONObject.class); - for (JSONObject jsonObject : jsonObjects) { - Integer gasolineRule1 = jsonObject.getInteger("gasolineRule1"); - BigDecimal bigDecimal = BigDecimal.valueOf(gasolineRule1); - if (paymentActiveDTO.getAmount().compareTo(bigDecimal)>=0){ + JSONObject jsonObject = jsonObjects.stream().max(Comparator.comparingDouble(o -> o.getDouble("gasolineRule2"))).get(); + BigDecimal gasolineRule1 = jsonObject.getBigDecimal("gasolineRule1"); + if (paymentActiveDTO.getAmount().compareTo(gasolineRule1)>=0){ //升数 Integer gasolineRule3 = jsonObject.getInteger("gasolineRule2"); BigDecimal bigDecimal2 = BigDecimal.valueOf(gasolineRule3); paymentActiveVO.setMemberFavorableAmount(bigDecimal2); } - } } } if (oilTypebyId.equals("柴油")){ @@ -680,31 +675,26 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { }else if (ljUserGrade.getGasolineDiscount().equals("每升优惠")){ String gasolineRule = ljUserGrade.getDieselRule(); List jsonObjects = JSONArray.parseArray(gasolineRule, JSONObject.class); - for (JSONObject jsonObject : jsonObjects) { - Integer gasolineRule1 = jsonObject.getInteger("dieselRule1"); - BigDecimal bigDecimal = BigDecimal.valueOf(gasolineRule1); + JSONObject jsonObject = jsonObjects.stream().max(Comparator.comparingDouble(o -> o.getDouble("gasolineRule3"))).get(); + BigDecimal bigDecimal =jsonObject.getBigDecimal("dieselRule1"); if (paymentActiveDTO.getAmount().compareTo(bigDecimal)>=0){ //升数 BigDecimal divide = paymentActiveDTO.getAmount().divide(bigDecimal1,2,RoundingMode.HALF_UP); - Integer gasolineRule3 = jsonObject.getInteger("dieselRule3"); - BigDecimal bigDecimal2 = BigDecimal.valueOf(gasolineRule3); + BigDecimal bigDecimal2 = jsonObject.getBigDecimal("dieselRule3"); BigDecimal multiply = divide.multiply(bigDecimal2); paymentActiveVO.setMemberFavorableAmount(multiply); } - } }else { String gasolineRule = ljUserGrade.getDieselRule(); List jsonObjects = JSONArray.parseArray(gasolineRule, JSONObject.class); - for (JSONObject jsonObject : jsonObjects) { - Integer gasolineRule1 = jsonObject.getInteger("dieselRule1"); - BigDecimal bigDecimal = BigDecimal.valueOf(gasolineRule1); + JSONObject jsonObject = jsonObjects.stream().max(Comparator.comparingDouble(o -> o.getDouble("gasolineRule2"))).get(); + BigDecimal bigDecimal = jsonObject.getBigDecimal("dieselRule1"); if (paymentActiveDTO.getAmount().compareTo(bigDecimal)>=0){ //升数 Integer gasolineRule3 = jsonObject.getInteger("dieselRule2"); BigDecimal bigDecimal2 = BigDecimal.valueOf(gasolineRule3); paymentActiveVO.setMemberFavorableAmount(bigDecimal2); } - } } } @@ -714,35 +704,28 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { }else if (ljUserGrade.getGasolineDiscount().equals("每升优惠")){ String gasolineRule = ljUserGrade.getNaturalGasRule(); List jsonObjects = JSONArray.parseArray(gasolineRule, JSONObject.class); - for (JSONObject jsonObject : jsonObjects) { - Integer gasolineRule1 = jsonObject.getInteger("naturalGas1"); - BigDecimal bigDecimal = BigDecimal.valueOf(gasolineRule1); + JSONObject jsonObject = jsonObjects.stream().max(Comparator.comparingDouble(o -> o.getDouble("gasolineRule3"))).get(); + BigDecimal bigDecimal = jsonObject.getBigDecimal("naturalGas1"); if (paymentActiveDTO.getAmount().compareTo(bigDecimal)>=0){ //升数 BigDecimal divide = paymentActiveDTO.getAmount().divide(bigDecimal1,2,RoundingMode.HALF_UP); - Integer gasolineRule3 = jsonObject.getInteger("naturalGas3"); - BigDecimal bigDecimal2 = BigDecimal.valueOf(gasolineRule3); + BigDecimal bigDecimal2 = jsonObject.getBigDecimal("naturalGas3"); BigDecimal multiply = divide.multiply(bigDecimal2); paymentActiveVO.setMemberFavorableAmount(multiply); } - } }else { String gasolineRule = ljUserGrade.getGasolineRule(); List jsonObjects = JSONArray.parseArray(gasolineRule, JSONObject.class); - for (JSONObject jsonObject : jsonObjects) { - Integer gasolineRule1 = jsonObject.getInteger("naturalGas1"); - BigDecimal bigDecimal = BigDecimal.valueOf(gasolineRule1); + JSONObject jsonObject = jsonObjects.stream().max(Comparator.comparingDouble(o -> o.getDouble("gasolineRule2"))).get(); + BigDecimal bigDecimal = jsonObject.getBigDecimal("naturalGas1"); if (paymentActiveDTO.getAmount().compareTo(bigDecimal)>=0){ //升数 Integer gasolineRule3 = jsonObject.getInteger("naturalGas2"); BigDecimal bigDecimal2 = BigDecimal.valueOf(gasolineRule3); paymentActiveVO.setMemberFavorableAmount(bigDecimal2); } - } } - } - } } return paymentActiveVO; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java index 88c4011b0..a8a3f11df 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java @@ -57,7 +57,7 @@ public class CardFavorableRecordController extends BaseController { @GetMapping("getCardFavorableList") public ResponseObject getCardFavorableList(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, - @Param("cardFuelDiesel") CardFavorableRecord cardFavorableRecord) { + @Param("cardFavorableRecord") CardFavorableRecord cardFavorableRecord) { Page page = new Page(pageNo, pageSize); return getSuccessResult(this.cardFavorableRecordService.getCardFavorableList(page,cardFavorableRecord)); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml index 407ec9bec..8764d558e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml @@ -43,7 +43,7 @@ left join mt_store ms on ms.id = cfr.store_id - and cfr.store_id = #{cardFavorableRecord.storeId} + and cf.store_id = #{cardFavorableRecord.storeId} and cfr.mt_user_id = #{cardFavorableRecord.mtUserId} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java index 3631e9017..72b2f1dfc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java @@ -218,15 +218,15 @@ public class LJUserGradeServiceImpl extends ServiceImpl ljUserGrades = this.selectUserGradeByChainStoreId(store.getChainStoreId()); for (LJUserGrade ljUserGrade : ljUserGrades) { - if (ljUserGrade.getGrade().equals(userGrade.getGrade()) && ljUserGrade.getId()!=userGrade.getId()){ + if (ljUserGrade.getGrade().equals(userGrade.getGrade()) && !ljUserGrade.getId().equals(userGrade.getId())){ row = 2; flag = true; } - if (ljUserGrade.getName().equals(userGrade.getName()) && ljUserGrade.getId()!=userGrade.getId()){ + if (ljUserGrade.getName().equals(userGrade.getName()) && !ljUserGrade.getId().equals(userGrade.getId())){ row = 3; flag = true; } - if (ljUserGrade.getGrowthValue().equals(userGrade.getGrowthValue()) && ljUserGrade.getId()!=userGrade.getId()){ + if (ljUserGrade.getGrowthValue().equals(userGrade.getGrowthValue()) && !ljUserGrade.getId().equals(userGrade.getId())){ row = 4; flag = true; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/service/impl/AlipayServiceImpl1.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/service/impl/AlipayServiceImpl1.java index 6dfa53e59..31e10c78d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/service/impl/AlipayServiceImpl1.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/service/impl/AlipayServiceImpl1.java @@ -73,8 +73,7 @@ public class AlipayServiceImpl1 implements AlipayService1 { //1. 获取验签和解密所需要的参数 Map openapiResult = JSON.parseObject(encryptedData, - new TypeReference>() { - }, Feature.OrderedField); + new TypeReference>() {}, Feature.OrderedField); String signType = "RSA2"; String charset = "UTF-8"; String encryptType = "AES"; @@ -90,8 +89,7 @@ public class AlipayServiceImpl1 implements AlipayService1 { // String signVeriKey = "你的小程序对应的支付宝公钥（为扩展考虑建议用appId+signType做密钥存储隔离）"; String signVeriKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnwDxxSNpBKL8xjtU3leNBy9mIOMYOr0WgxGbCxTMfhUPka9nr8Hbt0GN+7ylNBmxCYvW8kmge4dCOLUPqseM9+HyF9R1NrWBB3zQPVqnD0mKCYr9cEgtx6/eU7oIK1FqAl0G+jNIT3IKWMSXEX09yPKJWS6zk7+FRzOzn11vShTFjmrqWdrisJgRsQ54PHhPkQz7xFojDRqIunlpICWUVA8GwUg02hm5ZEhxpMHEWoJZ6Dj1wPH2Vh4CpIT/mjtD+SvssCpT0/XOEDPajcMRfgoV8fyyN0JNQDVZdMZgSO4aRHQqhC3X5CBXSuv40hHnwjcDjsPcbVav5BtaPp3wPQIDAQAB"; // String decryptKey = "你的小程序对应的加解密密钥（为扩展考虑建议用appId+encryptType做密钥存储隔离）" - String decryptKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJJM2nlUCidns6anNtGUiCL+J83kNL1nrr6hNktHkrX9bhR8LiBU3qBX+MkGDY4snlbdz+anGWu8YkcMlfBlAr82AsdIS9UTHh3lgsIAZTBZHgzZrxn7vwHfHI6Kw7uGZJbZ320JEG3s0KyvGiW0eqGuWI4BW+sD7b6JoLtNfBq+yF9ObOcs76rNCWz+04BmhCH7i6d8arK8NKgEiI9EjBThGjLRDFK1ryacKpz4UVvIXgxEW5w0MTjo/Q7gp2VLpwE/4jc8QfDFwmGU75L+nhK0rr1l0wwSo7svWFAXvberzMCGyuuLomuh2ldDfERJbIjg/qU66gx0EML1tgpVtFAgMBAAECggEARTArDJuwswXBH3Rq7SRvPza3NbXQD6eR9gjuZcTiyG4ecyMH/40bhK/nbFu+cEzh/HxTnIrI6Xmr+eBoxybhNXsgDu1ttjELUF8i7oftiN7rfJVd0P58CySgQXKYybw65lqF8enA8M1gdkxyYS1Z10igelBKyBwUak9LwBIpM0wrPIFrLhoxIEJC6QJ8EDnm6lKbytvcCa2mMZmtWs8oFxNA/SLRWtdEgHk4hslQVqq4R8B/xUy9Cu4kjdnVMHG2MqFXOiTas3gyKZLGN1ACBfpxxtyw0RAfX294ChV4SIvp10s1VqBFudcQeXeV5ph0NXP1eNt/8o3HIu0vjc0jAQKBgQD5ZtOR19M5vAcxJykh5u01CPdfz2LztqdinCpkBIpFviceW/k1euQFaWbOKdYFUrPnuLgX7Ds6dhSrkoL1+1RiVKUR6AtqIMa4fZJIMJWEPNNYWl8s6u6j11Dkd0B10g5+KV/kKLSlwFuBQnDyHw1ND+WKHqj9vkkzimzfcwedBQKBgQCMxao2IKX8CNjXDuryGkmXac0wxql0nN8AFHjCQGm16GPwlp805nAwsHKfJK45ACeixnWH9Cn6sje3yOUpCw6KG4OougRkrQEkQpoPVrZuXEcZ4j4Wg64VgW9tUAVH/WOV0VDnOBpsM8mbKsLLglb1H9Bx7813IX1pmhm93a0ZQQKBgD6U48/75T/eg7t8xSCBrtIZDuHWy1C2a6gd4bE5Rm0buvsuPwmBbchB248uBktNpmEmA+PU3kPcL3GiEQSibVlDPiyRGpQl51eSAuvkbRBCpxHLk4hU507rj5vUpLMr44Ea5rn80N+qtgtoXakTy6WjsIiJCwSpA/tP5+PmHGn1AoGASY/VhZmEA3OAFMnX3pH8GOKR9kYqMST0p28LN78/Pm7lIskjAxrUT601CJK7dE/vZnE848Gk2judQC38CnmbrHH6WAZ020NI0HD5XsCabotMIGuItG01YEmWN9JUIC16h8Ss+Vbo/9gEJ1CuIHjJBikM3S1J+lIG3lNH1l7r4MECgYEA2eAV0x55cmjC6VIMk3EAVUFbJ1LY1U9irmI6B5e7k/OVcdRksJfMRJwcquYVSfAk4hDrl7x0Qy36XELGvMe/hx07HxeAOXON8gL1b3UHP1zxvXb90YLHseHn9lssABsXS6Enyv3nrzqUi/uzBvpdDE2SRVS6nUr7Yyui6Yl+UPA=" - ; + String decryptKey = "5k9tQMrXq1JEpVucLwvO7A=="; //如果是加密的报文则需要在密文的前后添加双引号 if (isDataEncrypted) { signContent = "\"" + signContent + "\""; diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue index 8f835bba4..bdd54c268 100644 --- a/fuintCashierWeb/src/views/details/index.vue +++ b/fuintCashierWeb/src/views/details/index.vue @@ -119,8 +119,8 @@ - - + @@ -1690,7 +1690,10 @@ export default { height: 100%; background: #f6f8f9; } +._l{ + +} .left { width: 20%; display: table-cell; diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue b/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue index 35ee17d52..1961508ee 100644 --- a/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue +++ b/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue @@ -76,9 +76,9 @@ export default { } }, created() { - // this.userId = this.pUserId; - this.userId = this.$route.query.id; - + this.userId = this.pUserId; + // this.userId = this.$route.query.id; + console.log( "111111",this.userId) this.getList() this.getOilName() }, @@ -86,14 +86,18 @@ export default { getOilNames(list,oilIds){ let name = ""; let oilNames = [] - let oilId = oilIds.split(",") - list.forEach(item => { - oilId.forEach(i => { - if (item.oilName == i){ - oilNames.push(item.oilNames) - } + if(oilIds){ + let oilId = oilIds.split(",") + list.forEach(item => { + oilId.forEach(i => { + if (item.oilName == i){ + oilNames.push(item.oilNames) + } + }) }) - }) + } + + let arr = [] for (let i = 0;i{ if (res.code == 200) { + this.list = res.data.records this.total = res.data.total this.loading = false + } }) }, diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/pointsRecord.vue b/fuintCashierWeb/src/views/details/userInfoOrder/pointsRecord.vue index dc046061d..1797b6490 100644 --- a/fuintCashierWeb/src/views/details/userInfoOrder/pointsRecord.vue +++ b/fuintCashierWeb/src/views/details/userInfoOrder/pointsRecord.vue @@ -45,7 +45,7 @@ export default { created() { // this.userId = this.pUserId; this.userId = this.$route.query.id; - + console.log('1212',this.userId) this.getList() }, methods:{ diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue index 916607285..bbeabde1e 100644 --- a/gasStation-uni/pages/refuel/refuel.vue +++ b/gasStation-uni/pages/refuel/refuel.vue @@ -121,7 +121,7 @@ return { appltType:uni.getStorageSync("appltType"), value: '', - liters:"", + liters:0, show: false, pic: 0, hindex: 0,