diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/pay/service/impl/PayCenterServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/pay/service/impl/PayCenterServiceImpl.java index 3d98dde3e..a209bc8ea 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/pay/service/impl/PayCenterServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/pay/service/impl/PayCenterServiceImpl.java @@ -865,7 +865,7 @@ public class PayCenterServiceImpl implements PayCenterService { m2.put("storeId", userBalance.getStoreId()); MtInvitation invitation = mtInvitationService.getOneByMap(m2); // 当推荐人 不为null时 再去判断推荐人是否有资格参与活动 - if (invitation != null) { + if (invitation != null && ObjectUtil.isNotEmpty(invitation.getInviterId())) { // 根据店铺id 和 邀请人id 查询出 邀请人会员信息 UserBalance invitationBalance = userBalanceService.selectUserBalanceByStorId(invitation.getInviterId(), Integer.parseInt(map.get("storeId"))); diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue index b48b8bff7..4953c4caf 100644 --- a/gasStation-uni/pages/refuel/refuel.vue +++ b/gasStation-uni/pages/refuel/refuel.vue @@ -107,11 +107,18 @@ 积分 - +289 + +{{consumeInfo.points || 0}} + - 洗车券 - +3 + 成长值 + +{{consumeInfo.growthValue || 0}} + + + + {{item.type}} + +{{item.num || 0}} + @@ -332,18 +339,25 @@ 优惠信息 优惠券 - -10.00 + -{{oilOrder.discountAmount}} 消费有礼 积分 - +567 + +{{consumeInfo.points || 0}} - 洗车券 - +6 + 成长值 + +{{consumeInfo.growthValue || 0}} + + + {{item.type}} + +{{item.num || 0}} + + + 合计待支付 @@ -450,7 +464,8 @@ oilCardList: [], fleetList: [], chooseCard: null, - cardPayType: 'card_value' + cardPayType: 'card_value', + consumeInfo: {} } }, components: { @@ -518,6 +533,25 @@ }, methods: { + // 获取消费有礼信息 + getConsumeInfo() { + request({ + url: "pay/paycenter/cashRegisterSpendWiselyApp", + method: 'post', + data: { + userId: uni.getStorageSync("userId"), + storeId: uni.getStorageSync("storeId"), + liters: this.oilOrder.oilNum, + goodsMoney: this.oilOrder.orderAmount, + payMoney: this.oilOrder.payAmount, + payType: this.oilOrder.payType, + oils: this.oilOrder.oils + } + }).then(res => { + console.log(res, 531); + this.consumeInfo = res.data + }) + }, // 选择会员卡 chooseUserCard(payType, data) { this.oilOrder.payType = payType @@ -543,13 +577,13 @@ }) }, // 获取消费有礼信息 - getConsume(){ + getConsume() { request({ url: "pay/paycenter/cashRegisterSpendWisely", method: 'post', - data:{ - storeId:this.storeId, - userId:uni.getStorageSync("userId"), + data: { + storeId: this.storeId, + userId: uni.getStorageSync("userId"), } }).then(res => { console.log(res, 555); @@ -707,6 +741,7 @@ this.oilOrder.payAmount = this.oilOrder.orderAmount - this.oilOrder.discountAmount this.oilOrder.oilNum = (this.oilOrder.orderAmount / this.oilPrice).toFixed(2) this.getCouponList() + this.getConsumeInfo() } }, getCouponList() { @@ -719,7 +754,7 @@ oilAmount: this.oilOrder.orderAmount, oilLiter: this.oilOrder.oilNum, payWay: this.oilOrder.payType, - oilId:this.oilOrder.oils + oilId: this.oilOrder.oils }, }).then((res) => { console.log(res, 701); @@ -727,7 +762,7 @@ }) }, // 选择优惠券 - chooseCoupon(data){ + chooseCoupon(data) { this.oilOrder.discountAmount = data.disAmount this.oilOrder.couponId = data.id }, diff --git a/gasStation-uni/pagesMy/invite/list.vue b/gasStation-uni/pagesMy/invite/list.vue index 29be710c9..06ad80c0a 100644 --- a/gasStation-uni/pagesMy/invite/list.vue +++ b/gasStation-uni/pagesMy/invite/list.vue @@ -16,9 +16,9 @@ @click="setIndex(index)">{{item.name}} - - 券名称 - 2024-8-7 + + {{item.name}} + {{item.time}} @@ -93,10 +93,30 @@ }, onShow() { this.getList() + this.getList1() }, methods: { + getList1(){ + request({ + url: 'business/marketingActivity/activeRecommendRecords/selectRecord', + method: 'get', + params: { + storeId: uni.getStorageSync("storeId") + } + }).then(res => { + console.log(res, 106) + if (res.code == 200) { + this.rewardList = res.data + } + }) + }, setIndex(num) { this.tindex = num + if (num==1){ + this.getList1() + }else{ + this.getList() + } }, //滞空方法 resetting() { diff --git a/gasStation-uni/static/icon/card.png b/gasStation-uni/static/icon/card.png index 03501480d..518df3384 100644 Binary files a/gasStation-uni/static/icon/card.png and b/gasStation-uni/static/icon/card.png differ diff --git a/gasStation-uni/static/icon/daohang.png b/gasStation-uni/static/icon/daohang.png index 5e98ed9a5..a1b3a2f24 100644 Binary files a/gasStation-uni/static/icon/daohang.png and b/gasStation-uni/static/icon/daohang.png differ diff --git a/gasStation-uni/static/icon/erwm.png b/gasStation-uni/static/icon/erwm.png index 373a1f619..f9e97e690 100644 Binary files a/gasStation-uni/static/icon/erwm.png and b/gasStation-uni/static/icon/erwm.png differ diff --git a/gasStation-uni/static/icon/home.png b/gasStation-uni/static/icon/home.png index 6394f8c6a..8222c5a7e 100644 Binary files a/gasStation-uni/static/icon/home.png and b/gasStation-uni/static/icon/home.png differ diff --git a/gasStation-uni/static/icon/homex.png b/gasStation-uni/static/icon/homex.png index ecad4ca9b..1f4a0cd97 100644 Binary files a/gasStation-uni/static/icon/homex.png and b/gasStation-uni/static/icon/homex.png differ diff --git a/gasStation-uni/static/icon/hycz.png b/gasStation-uni/static/icon/hycz.png index 37f94b1d6..f58681971 100644 Binary files a/gasStation-uni/static/icon/hycz.png and b/gasStation-uni/static/icon/hycz.png differ diff --git a/gasStation-uni/static/icon/hyk.png b/gasStation-uni/static/icon/hyk.png index 778fe9bae..598a48cf5 100644 Binary files a/gasStation-uni/static/icon/hyk.png and b/gasStation-uni/static/icon/hyk.png differ diff --git a/gasStation-uni/static/icon/hyxf.png b/gasStation-uni/static/icon/hyxf.png index adea97fee..29c899440 100644 Binary files a/gasStation-uni/static/icon/hyxf.png and b/gasStation-uni/static/icon/hyxf.png differ diff --git a/gasStation-uni/static/icon/icon/newmy.png b/gasStation-uni/static/icon/icon/newmy.png index 9e57902b8..985346c0d 100644 Binary files a/gasStation-uni/static/icon/icon/newmy.png and b/gasStation-uni/static/icon/icon/newmy.png differ diff --git a/gasStation-uni/static/icon/icon/newmy1.png b/gasStation-uni/static/icon/icon/newmy1.png index 7909561b5..ceeef9d93 100644 Binary files a/gasStation-uni/static/icon/icon/newmy1.png and b/gasStation-uni/static/icon/icon/newmy1.png differ diff --git a/gasStation-uni/static/icon/icon/newmy10.png b/gasStation-uni/static/icon/icon/newmy10.png index 9b66d448e..41af9e80f 100644 Binary files a/gasStation-uni/static/icon/icon/newmy10.png and b/gasStation-uni/static/icon/icon/newmy10.png differ diff --git a/gasStation-uni/static/icon/icon/newmy11.png b/gasStation-uni/static/icon/icon/newmy11.png index dce201c3f..e3cdb620d 100644 Binary files a/gasStation-uni/static/icon/icon/newmy11.png and b/gasStation-uni/static/icon/icon/newmy11.png differ diff --git a/gasStation-uni/static/icon/icon/newmy12.png b/gasStation-uni/static/icon/icon/newmy12.png index 5ebf14039..7315dd0ff 100644 Binary files a/gasStation-uni/static/icon/icon/newmy12.png and b/gasStation-uni/static/icon/icon/newmy12.png differ diff --git a/gasStation-uni/static/icon/icon/newmy2.png b/gasStation-uni/static/icon/icon/newmy2.png index a790a0414..140cbfbd2 100644 Binary files a/gasStation-uni/static/icon/icon/newmy2.png and b/gasStation-uni/static/icon/icon/newmy2.png differ diff --git a/gasStation-uni/static/icon/icon/newmy3.png b/gasStation-uni/static/icon/icon/newmy3.png index 3c9efcd2e..56bf5f23d 100644 Binary files a/gasStation-uni/static/icon/icon/newmy3.png and b/gasStation-uni/static/icon/icon/newmy3.png differ diff --git a/gasStation-uni/static/icon/icon/newmy4.png b/gasStation-uni/static/icon/icon/newmy4.png index 19e07436e..f39d33a16 100644 Binary files a/gasStation-uni/static/icon/icon/newmy4.png and b/gasStation-uni/static/icon/icon/newmy4.png differ diff --git a/gasStation-uni/static/icon/icon/newmy5.png b/gasStation-uni/static/icon/icon/newmy5.png index 32a0ec5af..53ce71ac6 100644 Binary files a/gasStation-uni/static/icon/icon/newmy5.png and b/gasStation-uni/static/icon/icon/newmy5.png differ diff --git a/gasStation-uni/static/icon/icon/newmy6.png b/gasStation-uni/static/icon/icon/newmy6.png index 6510fcb4a..6cd2ae26e 100644 Binary files a/gasStation-uni/static/icon/icon/newmy6.png and b/gasStation-uni/static/icon/icon/newmy6.png differ diff --git a/gasStation-uni/static/icon/icon/newmy7.png b/gasStation-uni/static/icon/icon/newmy7.png index 2deb477b9..7516cd870 100644 Binary files a/gasStation-uni/static/icon/icon/newmy7.png and b/gasStation-uni/static/icon/icon/newmy7.png differ diff --git a/gasStation-uni/static/icon/icon/newmy8.png b/gasStation-uni/static/icon/icon/newmy8.png index 92bbd176b..5092d36f8 100644 Binary files a/gasStation-uni/static/icon/icon/newmy8.png and b/gasStation-uni/static/icon/icon/newmy8.png differ diff --git a/gasStation-uni/static/icon/icon/newmy9.png b/gasStation-uni/static/icon/icon/newmy9.png index 36f27669e..9c7c15c6e 100644 Binary files a/gasStation-uni/static/icon/icon/newmy9.png and b/gasStation-uni/static/icon/icon/newmy9.png differ diff --git a/gasStation-uni/static/icon/icon/newmyc.png b/gasStation-uni/static/icon/icon/newmyc.png index fed5398ca..65ba69958 100644 Binary files a/gasStation-uni/static/icon/icon/newmyc.png and b/gasStation-uni/static/icon/icon/newmyc.png differ diff --git a/gasStation-uni/static/icon/jfdh.png b/gasStation-uni/static/icon/jfdh.png index 9f95f3589..433da6826 100644 Binary files a/gasStation-uni/static/icon/jfdh.png and b/gasStation-uni/static/icon/jfdh.png differ diff --git a/gasStation-uni/static/icon/jiayou.png b/gasStation-uni/static/icon/jiayou.png index c7a06a6a7..2f2007b83 100644 Binary files a/gasStation-uni/static/icon/jiayou.png and b/gasStation-uni/static/icon/jiayou.png differ diff --git a/gasStation-uni/static/icon/jy.png b/gasStation-uni/static/icon/jy.png index 4a95ee96c..c22f85797 100644 Binary files a/gasStation-uni/static/icon/jy.png and b/gasStation-uni/static/icon/jy.png differ diff --git a/gasStation-uni/static/icon/jyx.png b/gasStation-uni/static/icon/jyx.png index 589b310d1..b3370c238 100644 Binary files a/gasStation-uni/static/icon/jyx.png and b/gasStation-uni/static/icon/jyx.png differ diff --git a/gasStation-uni/static/icon/my.png b/gasStation-uni/static/icon/my.png index 820e61d2b..9b1707a06 100644 Binary files a/gasStation-uni/static/icon/my.png and b/gasStation-uni/static/icon/my.png differ diff --git a/gasStation-uni/static/icon/myx.png b/gasStation-uni/static/icon/myx.png index fc95f73d5..3fc2a398f 100644 Binary files a/gasStation-uni/static/icon/myx.png and b/gasStation-uni/static/icon/myx.png differ diff --git a/gasStation-uni/static/icon/qdcg.png b/gasStation-uni/static/icon/qdcg.png index de7e4586a..a9311540a 100644 Binary files a/gasStation-uni/static/icon/qdcg.png and b/gasStation-uni/static/icon/qdcg.png differ diff --git a/gasStation-uni/static/icon/reddh.png b/gasStation-uni/static/icon/reddh.png index 6fd7f71fc..9a4d677f6 100644 Binary files a/gasStation-uni/static/icon/reddh.png and b/gasStation-uni/static/icon/reddh.png differ diff --git a/gasStation-uni/static/icon/wz.png b/gasStation-uni/static/icon/wz.png index eb6a6b8d2..29608881d 100644 Binary files a/gasStation-uni/static/icon/wz.png and b/gasStation-uni/static/icon/wz.png differ diff --git a/gasStation-uni/static/icon/yp.png b/gasStation-uni/static/icon/yp.png index 3e84498de..136d0ded9 100644 Binary files a/gasStation-uni/static/icon/yp.png and b/gasStation-uni/static/icon/yp.png differ diff --git a/gasStation-uni/static/icon/zfcg.png b/gasStation-uni/static/icon/zfcg.png index 3082c2247..9b65380e4 100644 Binary files a/gasStation-uni/static/icon/zfcg.png and b/gasStation-uni/static/icon/zfcg.png differ diff --git a/gasStation-uni/static/imgs/Frame 25@2x.png b/gasStation-uni/static/imgs/Frame 25@2x.png index 07c7c97b3..4b33e4fb2 100644 Binary files a/gasStation-uni/static/imgs/Frame 25@2x.png and b/gasStation-uni/static/imgs/Frame 25@2x.png differ diff --git a/gasStation-uni/static/imgs/alipay.jpg b/gasStation-uni/static/imgs/alipay.jpg index 5baacae00..964cdf450 100644 Binary files a/gasStation-uni/static/imgs/alipay.jpg and b/gasStation-uni/static/imgs/alipay.jpg differ diff --git a/gasStation-uni/static/imgs/bzhd.png b/gasStation-uni/static/imgs/bzhd.png index f49119d4c..54725bf6f 100644 Binary files a/gasStation-uni/static/imgs/bzhd.png and b/gasStation-uni/static/imgs/bzhd.png differ diff --git a/gasStation-uni/static/imgs/centerbj.png b/gasStation-uni/static/imgs/centerbj.png index e8b483e51..318d36819 100644 Binary files a/gasStation-uni/static/imgs/centerbj.png and b/gasStation-uni/static/imgs/centerbj.png differ diff --git a/gasStation-uni/static/imgs/chongzhi.png b/gasStation-uni/static/imgs/chongzhi.png index a9737ac32..7850a9354 100644 Binary files a/gasStation-uni/static/imgs/chongzhi.png and b/gasStation-uni/static/imgs/chongzhi.png differ diff --git a/gasStation-uni/static/imgs/czjf.png b/gasStation-uni/static/imgs/czjf.png index 3b486365c..2f7e7c25c 100644 Binary files a/gasStation-uni/static/imgs/czjf.png and b/gasStation-uni/static/imgs/czjf.png differ diff --git a/gasStation-uni/static/imgs/czktc.png b/gasStation-uni/static/imgs/czktc.png index bb7437864..09c5d134a 100644 Binary files a/gasStation-uni/static/imgs/czktc.png and b/gasStation-uni/static/imgs/czktc.png differ diff --git a/gasStation-uni/static/imgs/czz.png b/gasStation-uni/static/imgs/czz.png index 7b72b6d3c..9d840d1be 100644 Binary files a/gasStation-uni/static/imgs/czz.png and b/gasStation-uni/static/imgs/czz.png differ diff --git a/gasStation-uni/static/imgs/diesel_oil.png b/gasStation-uni/static/imgs/diesel_oil.png index 2668abb6d..c2d29fcff 100644 Binary files a/gasStation-uni/static/imgs/diesel_oil.png and b/gasStation-uni/static/imgs/diesel_oil.png differ diff --git a/gasStation-uni/static/imgs/dljf.png b/gasStation-uni/static/imgs/dljf.png index 401384572..5b35307e6 100644 Binary files a/gasStation-uni/static/imgs/dljf.png and b/gasStation-uni/static/imgs/dljf.png differ diff --git a/gasStation-uni/static/imgs/dui.png b/gasStation-uni/static/imgs/dui.png index 84ba79d7f..c69675768 100644 Binary files a/gasStation-uni/static/imgs/dui.png and b/gasStation-uni/static/imgs/dui.png differ diff --git a/gasStation-uni/static/imgs/fmbj.png b/gasStation-uni/static/imgs/fmbj.png index d56379e2f..6f0d22f4c 100644 Binary files a/gasStation-uni/static/imgs/fmbj.png and b/gasStation-uni/static/imgs/fmbj.png differ diff --git a/gasStation-uni/static/imgs/gasoline.png b/gasStation-uni/static/imgs/gasoline.png index 0a60445ee..8d08e68c3 100644 Binary files a/gasStation-uni/static/imgs/gasoline.png and b/gasStation-uni/static/imgs/gasoline.png differ diff --git a/gasStation-uni/static/imgs/haabbj.png b/gasStation-uni/static/imgs/haabbj.png index e83419426..4aaf6d705 100644 Binary files a/gasStation-uni/static/imgs/haabbj.png and b/gasStation-uni/static/imgs/haabbj.png differ diff --git a/gasStation-uni/static/imgs/hbao.png b/gasStation-uni/static/imgs/hbao.png index 5b5706fe3..e7e384430 100644 Binary files a/gasStation-uni/static/imgs/hbao.png and b/gasStation-uni/static/imgs/hbao.png differ diff --git a/gasStation-uni/static/imgs/hby.png b/gasStation-uni/static/imgs/hby.png index f08cd12de..f7e179cc3 100644 Binary files a/gasStation-uni/static/imgs/hby.png and b/gasStation-uni/static/imgs/hby.png differ diff --git a/gasStation-uni/static/imgs/hd.png b/gasStation-uni/static/imgs/hd.png index d08f7e396..24df0daeb 100644 Binary files a/gasStation-uni/static/imgs/hd.png and b/gasStation-uni/static/imgs/hd.png differ diff --git a/gasStation-uni/static/imgs/hdjf.png b/gasStation-uni/static/imgs/hdjf.png index c25bd3591..d185e35b0 100644 Binary files a/gasStation-uni/static/imgs/hdjf.png and b/gasStation-uni/static/imgs/hdjf.png differ diff --git a/gasStation-uni/static/imgs/home.png b/gasStation-uni/static/imgs/home.png index 28064b21c..92b75d2ea 100644 Binary files a/gasStation-uni/static/imgs/home.png and b/gasStation-uni/static/imgs/home.png differ diff --git a/gasStation-uni/static/imgs/homex.png b/gasStation-uni/static/imgs/homex.png index 2d0a2e6b8..2d4c48dda 100644 Binary files a/gasStation-uni/static/imgs/homex.png and b/gasStation-uni/static/imgs/homex.png differ diff --git a/gasStation-uni/static/imgs/iconcar.png b/gasStation-uni/static/imgs/iconcar.png index 169d29c7b..3d732a2d6 100644 Binary files a/gasStation-uni/static/imgs/iconcar.png and b/gasStation-uni/static/imgs/iconcar.png differ diff --git a/gasStation-uni/static/imgs/jb.png b/gasStation-uni/static/imgs/jb.png index 62be6a325..e4572fb5c 100644 Binary files a/gasStation-uni/static/imgs/jb.png and b/gasStation-uni/static/imgs/jb.png differ diff --git a/gasStation-uni/static/imgs/jf.png b/gasStation-uni/static/imgs/jf.png index a3d3b080b..1438e244c 100644 Binary files a/gasStation-uni/static/imgs/jf.png and b/gasStation-uni/static/imgs/jf.png differ diff --git a/gasStation-uni/static/imgs/jfsc.png b/gasStation-uni/static/imgs/jfsc.png index 22def6278..0d162bb33 100644 Binary files a/gasStation-uni/static/imgs/jfsc.png and b/gasStation-uni/static/imgs/jfsc.png differ diff --git a/gasStation-uni/static/imgs/jinbi.png b/gasStation-uni/static/imgs/jinbi.png index 3049e2fe8..e4d480288 100644 Binary files a/gasStation-uni/static/imgs/jinbi.png and b/gasStation-uni/static/imgs/jinbi.png differ diff --git a/gasStation-uni/static/imgs/jy.png b/gasStation-uni/static/imgs/jy.png index 16fc94d5f..ca424658a 100644 Binary files a/gasStation-uni/static/imgs/jy.png and b/gasStation-uni/static/imgs/jy.png differ diff --git a/gasStation-uni/static/imgs/jyz.png b/gasStation-uni/static/imgs/jyz.png index 4a19150b4..cf1d85ec3 100644 Binary files a/gasStation-uni/static/imgs/jyz.png and b/gasStation-uni/static/imgs/jyz.png differ diff --git a/gasStation-uni/static/imgs/jyzb.png b/gasStation-uni/static/imgs/jyzb.png index 2cec0b6ab..850df0262 100644 Binary files a/gasStation-uni/static/imgs/jyzb.png and b/gasStation-uni/static/imgs/jyzb.png differ diff --git a/gasStation-uni/static/imgs/lpk.png b/gasStation-uni/static/imgs/lpk.png index 52192eaa5..8838e1acd 100644 Binary files a/gasStation-uni/static/imgs/lpk.png and b/gasStation-uni/static/imgs/lpk.png differ diff --git a/gasStation-uni/static/imgs/mjyh.png b/gasStation-uni/static/imgs/mjyh.png index 3e9fba350..367c52bdb 100644 Binary files a/gasStation-uni/static/imgs/mjyh.png and b/gasStation-uni/static/imgs/mjyh.png differ diff --git a/gasStation-uni/static/imgs/my.png b/gasStation-uni/static/imgs/my.png index c85b622ed..693dce7f0 100644 Binary files a/gasStation-uni/static/imgs/my.png and b/gasStation-uni/static/imgs/my.png differ diff --git a/gasStation-uni/static/imgs/myx.png b/gasStation-uni/static/imgs/myx.png index 2b6a672a6..d5a22d320 100644 Binary files a/gasStation-uni/static/imgs/myx.png and b/gasStation-uni/static/imgs/myx.png differ diff --git a/gasStation-uni/static/imgs/natural_gas.png b/gasStation-uni/static/imgs/natural_gas.png index f6a5d12f6..8f7981ae9 100644 Binary files a/gasStation-uni/static/imgs/natural_gas.png and b/gasStation-uni/static/imgs/natural_gas.png differ diff --git a/gasStation-uni/static/imgs/paymentSuccess.png b/gasStation-uni/static/imgs/paymentSuccess.png index 34c742bfb..01bf7c0df 100644 Binary files a/gasStation-uni/static/imgs/paymentSuccess.png and b/gasStation-uni/static/imgs/paymentSuccess.png differ diff --git a/gasStation-uni/static/imgs/qdmr.png b/gasStation-uni/static/imgs/qdmr.png index 5804c91c8..de2421c59 100644 Binary files a/gasStation-uni/static/imgs/qdmr.png and b/gasStation-uni/static/imgs/qdmr.png differ diff --git a/gasStation-uni/static/imgs/telicon.png b/gasStation-uni/static/imgs/telicon.png index afd91c041..259cba30d 100644 Binary files a/gasStation-uni/static/imgs/telicon.png and b/gasStation-uni/static/imgs/telicon.png differ diff --git a/gasStation-uni/static/imgs/topback.png b/gasStation-uni/static/imgs/topback.png index e27e5e158..805b10bcf 100644 Binary files a/gasStation-uni/static/imgs/topback.png and b/gasStation-uni/static/imgs/topback.png differ diff --git a/gasStation-uni/static/imgs/topbj.png b/gasStation-uni/static/imgs/topbj.png index 1a4d8ea96..d7c92098e 100644 Binary files a/gasStation-uni/static/imgs/topbj.png and b/gasStation-uni/static/imgs/topbj.png differ diff --git a/gasStation-uni/static/imgs/tyktc.png b/gasStation-uni/static/imgs/tyktc.png index cf86bce0a..3fd9562fb 100644 Binary files a/gasStation-uni/static/imgs/tyktc.png and b/gasStation-uni/static/imgs/tyktc.png differ diff --git a/gasStation-uni/static/imgs/viprwm.png b/gasStation-uni/static/imgs/viprwm.png index 1c82bb2fe..8bbf6d5d7 100644 Binary files a/gasStation-uni/static/imgs/viprwm.png and b/gasStation-uni/static/imgs/viprwm.png differ diff --git a/gasStation-uni/static/imgs/vipxz.png b/gasStation-uni/static/imgs/vipxz.png index 58ae94fc2..020d606d5 100644 Binary files a/gasStation-uni/static/imgs/vipxz.png and b/gasStation-uni/static/imgs/vipxz.png differ diff --git a/gasStation-uni/static/imgs/wechat.png b/gasStation-uni/static/imgs/wechat.png index 3a642d473..ce5544231 100644 Binary files a/gasStation-uni/static/imgs/wechat.png and b/gasStation-uni/static/imgs/wechat.png differ diff --git a/gasStation-uni/static/imgs/xfyl.png b/gasStation-uni/static/imgs/xfyl.png index f6d71b2e1..f792289cc 100644 Binary files a/gasStation-uni/static/imgs/xfyl.png and b/gasStation-uni/static/imgs/xfyl.png differ diff --git a/gasStation-uni/static/imgs/xryl.png b/gasStation-uni/static/imgs/xryl.png index fcab2af78..e9ab32a59 100644 Binary files a/gasStation-uni/static/imgs/xryl.png and b/gasStation-uni/static/imgs/xryl.png differ diff --git a/gasStation-uni/static/imgs/ydh.png b/gasStation-uni/static/imgs/ydh.png index 799346040..44136a1dc 100644 Binary files a/gasStation-uni/static/imgs/ydh.png and b/gasStation-uni/static/imgs/ydh.png differ diff --git a/gasStation-uni/static/imgs/yhqbj.png b/gasStation-uni/static/imgs/yhqbj.png index 29c0b353f..3fbf75a53 100644 Binary files a/gasStation-uni/static/imgs/yhqbj.png and b/gasStation-uni/static/imgs/yhqbj.png differ diff --git a/gasStation-uni/static/imgs/ykcz.png b/gasStation-uni/static/imgs/ykcz.png index 75efad152..8c7414cd6 100644 Binary files a/gasStation-uni/static/imgs/ykcz.png and b/gasStation-uni/static/imgs/ykcz.png differ diff --git a/gasStation-uni/static/imgs/yqyl.png b/gasStation-uni/static/imgs/yqyl.png index cf3a06524..ab443c8ff 100644 Binary files a/gasStation-uni/static/imgs/yqyl.png and b/gasStation-uni/static/imgs/yqyl.png differ diff --git a/gasStation-uni/static/imgs/zc.png b/gasStation-uni/static/imgs/zc.png index 2ef71e320..2959e154a 100644 Binary files a/gasStation-uni/static/imgs/zc.png and b/gasStation-uni/static/imgs/zc.png differ diff --git a/gasStation-uni/static/imgs/zficon.png b/gasStation-uni/static/imgs/zficon.png index d14930621..50200ab87 100644 Binary files a/gasStation-uni/static/imgs/zficon.png and b/gasStation-uni/static/imgs/zficon.png differ diff --git a/gasStation-uni/static/imgs/zj.png b/gasStation-uni/static/imgs/zj.png index bd97a6a7a..36b619392 100644 Binary files a/gasStation-uni/static/imgs/zj.png and b/gasStation-uni/static/imgs/zj.png differ diff --git a/gasStation-uni/static/imgs/zzxryl.png b/gasStation-uni/static/imgs/zzxryl.png index 56fd9f865..3234ef126 100644 Binary files a/gasStation-uni/static/imgs/zzxryl.png and b/gasStation-uni/static/imgs/zzxryl.png differ diff --git a/gasStation-uni/static/logo.png b/gasStation-uni/static/logo.png index b5771e209..f13765be9 100644 Binary files a/gasStation-uni/static/logo.png and b/gasStation-uni/static/logo.png differ diff --git a/gasStation-uni/static/my/car.png b/gasStation-uni/static/my/car.png index b084540f8..3ee566717 100644 Binary files a/gasStation-uni/static/my/car.png and b/gasStation-uni/static/my/car.png differ diff --git a/gasStation-uni/static/my/chongzhi.png b/gasStation-uni/static/my/chongzhi.png index c516fbc13..33a1209d4 100644 Binary files a/gasStation-uni/static/my/chongzhi.png and b/gasStation-uni/static/my/chongzhi.png differ diff --git a/gasStation-uni/static/my/dingdan.png b/gasStation-uni/static/my/dingdan.png index e7c2b24a0..f63c6a816 100644 Binary files a/gasStation-uni/static/my/dingdan.png and b/gasStation-uni/static/my/dingdan.png differ diff --git a/gasStation-uni/static/my/dpj.png b/gasStation-uni/static/my/dpj.png index 5988e8012..e9fdff763 100644 Binary files a/gasStation-uni/static/my/dpj.png and b/gasStation-uni/static/my/dpj.png differ diff --git a/gasStation-uni/static/my/dsy.png b/gasStation-uni/static/my/dsy.png index 7fc16e870..b33c482c5 100644 Binary files a/gasStation-uni/static/my/dsy.png and b/gasStation-uni/static/my/dsy.png differ diff --git a/gasStation-uni/static/my/fleetAdd.png b/gasStation-uni/static/my/fleetAdd.png index a8c81d299..41c6717b6 100644 Binary files a/gasStation-uni/static/my/fleetAdd.png and b/gasStation-uni/static/my/fleetAdd.png differ diff --git a/gasStation-uni/static/my/fleetAmount.png b/gasStation-uni/static/my/fleetAmount.png index 2dcde4ae3..42742c98a 100644 Binary files a/gasStation-uni/static/my/fleetAmount.png and b/gasStation-uni/static/my/fleetAmount.png differ diff --git a/gasStation-uni/static/my/fleetCar.png b/gasStation-uni/static/my/fleetCar.png index fec5d3e45..27923b0a3 100644 Binary files a/gasStation-uni/static/my/fleetCar.png and b/gasStation-uni/static/my/fleetCar.png differ diff --git a/gasStation-uni/static/my/fleetMember.png b/gasStation-uni/static/my/fleetMember.png index fefbbc03a..1db331de9 100644 Binary files a/gasStation-uni/static/my/fleetMember.png and b/gasStation-uni/static/my/fleetMember.png differ diff --git a/gasStation-uni/static/my/fleetRemove.png b/gasStation-uni/static/my/fleetRemove.png index 24f97b5e2..3bd99e4bd 100644 Binary files a/gasStation-uni/static/my/fleetRemove.png and b/gasStation-uni/static/my/fleetRemove.png differ diff --git a/gasStation-uni/static/my/fzlj.png b/gasStation-uni/static/my/fzlj.png index a0f3ed1a0..7980d58ea 100644 Binary files a/gasStation-uni/static/my/fzlj.png and b/gasStation-uni/static/my/fzlj.png differ diff --git a/gasStation-uni/static/my/fztp.png b/gasStation-uni/static/my/fztp.png index 3f48c9ef5..99535d246 100644 Binary files a/gasStation-uni/static/my/fztp.png and b/gasStation-uni/static/my/fztp.png differ diff --git a/gasStation-uni/static/my/jfsc.png b/gasStation-uni/static/my/jfsc.png index 8254b426e..79044b422 100644 Binary files a/gasStation-uni/static/my/jfsc.png and b/gasStation-uni/static/my/jfsc.png differ diff --git a/gasStation-uni/static/my/jl.png b/gasStation-uni/static/my/jl.png index bc30181e3..7076e96e3 100644 Binary files a/gasStation-uni/static/my/jl.png and b/gasStation-uni/static/my/jl.png differ diff --git a/gasStation-uni/static/my/jryj.png b/gasStation-uni/static/my/jryj.png index 80edf3677..d1be0711b 100644 Binary files a/gasStation-uni/static/my/jryj.png and b/gasStation-uni/static/my/jryj.png differ diff --git a/gasStation-uni/static/my/kb.png b/gasStation-uni/static/my/kb.png index ddb44a075..e44393005 100644 Binary files a/gasStation-uni/static/my/kb.png and b/gasStation-uni/static/my/kb.png differ diff --git a/gasStation-uni/static/my/lp.png b/gasStation-uni/static/my/lp.png index c0f634c23..236181f82 100644 Binary files a/gasStation-uni/static/my/lp.png and b/gasStation-uni/static/my/lp.png differ diff --git a/gasStation-uni/static/my/lpk.png b/gasStation-uni/static/my/lpk.png index 11bda2346..1225d8208 100644 Binary files a/gasStation-uni/static/my/lpk.png and b/gasStation-uni/static/my/lpk.png differ diff --git a/gasStation-uni/static/my/yj.png b/gasStation-uni/static/my/yj.png index cac80327c..091e30a4b 100644 Binary files a/gasStation-uni/static/my/yj.png and b/gasStation-uni/static/my/yj.png differ diff --git a/gasStation-uni/static/my/ywc.png b/gasStation-uni/static/my/ywc.png index 7a736f9b9..87ad41b0a 100644 Binary files a/gasStation-uni/static/my/ywc.png and b/gasStation-uni/static/my/ywc.png differ diff --git a/gasStation-uni/static/new/banners.png b/gasStation-uni/static/new/banners.png index 5e9c121e9..b6db4a493 100644 Binary files a/gasStation-uni/static/new/banners.png and b/gasStation-uni/static/new/banners.png differ diff --git a/gasStation-uni/static/new/czk.png b/gasStation-uni/static/new/czk.png index 51931c543..873758304 100644 Binary files a/gasStation-uni/static/new/czk.png and b/gasStation-uni/static/new/czk.png differ diff --git a/gasStation-uni/static/new/fxrwm.png b/gasStation-uni/static/new/fxrwm.png index a225a113a..c36330e22 100644 Binary files a/gasStation-uni/static/new/fxrwm.png and b/gasStation-uni/static/new/fxrwm.png differ diff --git a/gasStation-uni/static/new/hykb.png b/gasStation-uni/static/new/hykb.png index d304b7883..05f958a5a 100644 Binary files a/gasStation-uni/static/new/hykb.png and b/gasStation-uni/static/new/hykb.png differ diff --git a/gasStation-uni/static/new/jljl.png b/gasStation-uni/static/new/jljl.png index fec615a23..7ccb29ff4 100644 Binary files a/gasStation-uni/static/new/jljl.png and b/gasStation-uni/static/new/jljl.png differ diff --git a/gasStation-uni/static/new/k1.png b/gasStation-uni/static/new/k1.png index a7c0c2488..b2174743c 100644 Binary files a/gasStation-uni/static/new/k1.png and b/gasStation-uni/static/new/k1.png differ diff --git a/gasStation-uni/static/new/k2.png b/gasStation-uni/static/new/k2.png index ff9636390..3577462c3 100644 Binary files a/gasStation-uni/static/new/k2.png and b/gasStation-uni/static/new/k2.png differ diff --git a/gasStation-uni/static/new/k3.png b/gasStation-uni/static/new/k3.png index 830593219..ccfdc2581 100644 Binary files a/gasStation-uni/static/new/k3.png and b/gasStation-uni/static/new/k3.png differ diff --git a/gasStation-uni/static/new/lpk.png b/gasStation-uni/static/new/lpk.png index bf02aae81..a98a05789 100644 Binary files a/gasStation-uni/static/new/lpk.png and b/gasStation-uni/static/new/lpk.png differ diff --git a/gasStation-uni/static/new/n1.png b/gasStation-uni/static/new/n1.png index 91cd4aa0d..a2e3ffdd0 100644 Binary files a/gasStation-uni/static/new/n1.png and b/gasStation-uni/static/new/n1.png differ diff --git a/gasStation-uni/static/new/n2.png b/gasStation-uni/static/new/n2.png index 124843a62..5beaa3c5d 100644 Binary files a/gasStation-uni/static/new/n2.png and b/gasStation-uni/static/new/n2.png differ diff --git a/gasStation-uni/static/new/n3.png b/gasStation-uni/static/new/n3.png index 013aba1a4..afa4baf6e 100644 Binary files a/gasStation-uni/static/new/n3.png and b/gasStation-uni/static/new/n3.png differ diff --git a/gasStation-uni/static/new/n4.png b/gasStation-uni/static/new/n4.png index 19e07436e..f39d33a16 100644 Binary files a/gasStation-uni/static/new/n4.png and b/gasStation-uni/static/new/n4.png differ diff --git a/gasStation-uni/static/new/n5.png b/gasStation-uni/static/new/n5.png index d34fc2e92..f345ff3f5 100644 Binary files a/gasStation-uni/static/new/n5.png and b/gasStation-uni/static/new/n5.png differ diff --git a/gasStation-uni/static/new/n6.png b/gasStation-uni/static/new/n6.png index 30a0a7e23..6cd2ae26e 100644 Binary files a/gasStation-uni/static/new/n6.png and b/gasStation-uni/static/new/n6.png differ diff --git a/gasStation-uni/static/new/n7.png b/gasStation-uni/static/new/n7.png index 4baa60f6d..118aaa99b 100644 Binary files a/gasStation-uni/static/new/n7.png and b/gasStation-uni/static/new/n7.png differ diff --git a/gasStation-uni/static/new/n8.png b/gasStation-uni/static/new/n8.png index 7909561b5..ceeef9d93 100644 Binary files a/gasStation-uni/static/new/n8.png and b/gasStation-uni/static/new/n8.png differ diff --git a/gasStation-uni/static/new/qh.png b/gasStation-uni/static/new/qh.png index 3f2187998..81c37f1b1 100644 Binary files a/gasStation-uni/static/new/qh.png and b/gasStation-uni/static/new/qh.png differ diff --git a/gasStation-uni/static/new/queshengye.png b/gasStation-uni/static/new/queshengye.png index d18111da2..2f3a9977f 100644 Binary files a/gasStation-uni/static/new/queshengye.png and b/gasStation-uni/static/new/queshengye.png differ diff --git a/gasStation-uni/static/new/rwm.png b/gasStation-uni/static/new/rwm.png index ed9d7a23e..d6a898c88 100644 Binary files a/gasStation-uni/static/new/rwm.png and b/gasStation-uni/static/new/rwm.png differ diff --git a/gasStation-uni/static/new/t1.png b/gasStation-uni/static/new/t1.png index ef8f1f3f5..f8468b083 100644 Binary files a/gasStation-uni/static/new/t1.png and b/gasStation-uni/static/new/t1.png differ diff --git a/gasStation-uni/static/new/top_.png b/gasStation-uni/static/new/top_.png index de5187b89..76121ef1b 100644 Binary files a/gasStation-uni/static/new/top_.png and b/gasStation-uni/static/new/top_.png differ diff --git a/gasStation-uni/static/new/tyk.png b/gasStation-uni/static/new/tyk.png index cb072abd6..822127ea2 100644 Binary files a/gasStation-uni/static/new/tyk.png and b/gasStation-uni/static/new/tyk.png differ