From a5f16c5433d9ecb4850ab2ec4c31f0e881a1704f Mon Sep 17 00:00:00 2001
From: xvv <cccccc420590@163.com>
Date: Thu, 19 Sep 2024 11:18:34 +0800
Subject: [PATCH] 9.19

---
 gasStation-uni/pages.json                     |  25 ++-
 gasStation-uni/pages/index/index.vue          |  40 ++++-
 gasStation-uni/pages/refuel/refuel.vue        |  51 ++----
 .../pagesHome/PointsRedemption/index.vue      |   3 +-
 .../pagesHome/certificate/details.vue         | 158 ++++++++++++++++++
 .../pagesHome/certificate/index.vue           | 144 ++++++++++++++++
 gasStation-uni/pagesHome/check/index.vue      | 119 +++++++++++++
 gasStation-uni/static/icon/hyk.png            | Bin 0 -> 752 bytes
 gasStation-uni/static/icon/wz.png             | Bin 0 -> 1588 bytes
 gasStation-uni/static/new/hykb.png            | Bin 0 -> 1555 bytes
 10 files changed, 495 insertions(+), 45 deletions(-)
 create mode 100644 gasStation-uni/pagesHome/certificate/details.vue
 create mode 100644 gasStation-uni/pagesHome/certificate/index.vue
 create mode 100644 gasStation-uni/pagesHome/check/index.vue
 create mode 100644 gasStation-uni/static/icon/hyk.png
 create mode 100644 gasStation-uni/static/icon/wz.png
 create mode 100644 gasStation-uni/static/new/hykb.png

diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json
index a5901f450..c0eb7f31b 100644
--- a/gasStation-uni/pages.json
+++ b/gasStation-uni/pages.json
@@ -50,6 +50,13 @@
 						"navigationStyle": "custom"
 					}
 				},
+				{
+					"path": "check/index",
+					"style": {
+						"navigationBarTitleText": "扫码买单"
+
+					}
+				},
 				{
 					"path": "PointsRedemption/index",
 					"style": {
@@ -62,6 +69,18 @@
 						"navigationBarTitleText": "卡券详情"
 					}
 				},
+				{
+					"path": "certificate/index",
+					"style": {
+						"navigationBarTitleText": "领券中心"
+					}
+				},
+				{
+					"path": "certificate/details",
+					"style": {
+						"navigationBarTitleText": "卡券详情"
+					}
+				},
 				{
 					"path": "cardDetails/index",
 					"style": {
@@ -348,8 +367,8 @@
 		{
 			"path": "pages/refuel/refuel",
 			"style": {
-				"navigationBarTitleText": "一键加油",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "一键加油"
+
 			}
 		},
 		{
@@ -367,4 +386,4 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"uniIdRouter": {}
-}
\ No newline at end of file
+}
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index dc32e833c..836eb2a98 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -15,13 +15,10 @@
 			<!-- 顶部结束 -->
 			<view class="_jgbox">
 				<view class="_bgox">
-					<image src="../../static/new/n1.png" mode=""></image>
+					<image src="../../static/new/n1.png" mode="" @click="getCode()"></image>
 					<view class="">扫码买单</view>
 				</view>
-				<view class="_bgox">
-					<image src="../../static/new/n2.png" mode=""></image>
-					<view class="">一键加油</view>
-				</view>
+
 				<view class="_bgox" @click="goMemberRecharge()">
 					<image src="../../static/new/n3.png" mode=""></image>
 					<view class="">会员充值</view>
@@ -30,7 +27,7 @@
 					<image src="../../static/new/n4.png" mode=""></image>
 					<view class="">积分兑换</view>
 				</view>
-				<view class="_bgox">
+				<view class="_bgox" @click="goCoupon()">
 					<image src="../../static/new/n5.png" mode=""></image>
 					<view class="">领券中心</view>
 				</view>
@@ -46,6 +43,10 @@
 					<image src="../../static/new/n8.png" mode=""></image>
 					<view class="">签到有礼</view>
 				</view>
+				<view class="_bgox" @click="goMyCard()">
+					<image src="../../static/new/hykb.png" mode=""></image>
+					<view class="">会员卡包</view>
+				</view>
 			</view>
 			<!-- 今日油价 -->
 			<view class="_yjbox">
@@ -120,7 +121,6 @@
 				<view class="_tbox">
 					<view class="_btop">第三方用户信息授权说明</view>
 					<view class="_bbox">
-
 						<view class="">您授权后，小程序开发者将收集您的位置信息，为您提 供智能推荐服务。开发者严格按照《钜油惠百业兴小程 序隐私保护指引》处理您的个人信息，如您发现开发者
 							不当处理您的个人信息，可进行投诉。</view>
 					</view>
@@ -270,6 +270,30 @@
 			tabbar
 		},
 		methods: {
+			goMyCard() {
+				uni.navigateTo({
+					url: '/pagesHome/MyCard/MyCard'
+				})
+			},
+			getCode() {
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: (res) => {
+						console.log('扫描二维码成功,结果:' + JSON.stringify(res) + res.result);
+						uni.navigateTo({
+							url: '/pagesHome/check/index'
+						})
+					},
+					error: (res) => {
+						console.log('扫描二维码出现错误')
+					}
+				})
+			},
+			goCoupon() {
+				uni.navigateTo({
+					url: '/pagesHome/certificate/index'
+				})
+			},
 			close() {
 				this.ruleShow = false
 			},
@@ -1192,4 +1216,4 @@
 		justify-content: center;
 		color: #fff;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue
index f913edd4c..da113e070 100644
--- a/gasStation-uni/pages/refuel/refuel.vue
+++ b/gasStation-uni/pages/refuel/refuel.vue
@@ -1,34 +1,22 @@
 <template>
 	<view class="content">
 		<view class="container">
-			<view class="my-header">
+			<!-- <view class="my-header">
 				<view class="my-text">一键加油</view>
-			</view>
+			</view> -->
 			<view class="top">
-				<view class="top-box">
-					<view class="dis" style="width: 78%;">
-						<view class="top-img">
-							<image v-if="!store.logo" src="../../static/logo.png" mode="aspectFit"></image>
-							<image v-else :src="baseUrl+store.logo" mode="aspectFit"></image>
-						</view>
-						<view style="width: 80%;">
-							<view class="top-title">{{store.name}}{{store.description ? "("+store.description+")" : ""}}
-							</view><!--九州加油站（总站）-->
-							<view class="top-hui">{{store.address}}</view><!--平安大道东200米-->
-							<view class="top-hong">￥{{oilPrice}}/{{oilUnit ? oilUnit : "L"}}</view>
-						</view>
+				<view class="dis">
+					<view class="top-img">
+						<image v-if="!store.logo" src="../../static/logo.png" mode="aspectFit"></image>
+						<image v-else :src="baseUrl+store.logo" mode="aspectFit"></image>
 					</view>
-					<view class="" @click="goRefuel" style="width: 22%;font-size: 14px;">
-						<view class="bulu">切换站点 <uni-icons type="right" color="#304fff" size="16"></uni-icons> </view>
+					<view style="width: 80%;">
+						<view class="top-title">{{store.name}}{{store.description ? "("+store.description+")" : ""}}
+						</view><!--九州加油站（总站）-->
+						<view class="top-hui">{{store.address}}</view><!--平安大道东200米-->
 
 					</view>
-					<!-- <view class="bulu-icon">
-						<view class=""></view>
-						<view class="">比国标降 0.22 元 </view>
-					</view> -->
-
 				</view>
-
 				<view v-if="appltType == 'ALIPAY'" style="height: 400px;overflow-y: scroll;">
 					<view class="fa-box">
 						<view class="fa-title">选择油号 <text class="top-hui"> 请务必与员工确认类型</text> </view>
@@ -140,10 +128,7 @@
 							<uni-icons type="closeempty" size="30" @click="closeStaff"></uni-icons>
 						</view>
 						<view class="wrap-box1" style="margin-left: 5%;">
-							<!-- <view class="box-oil2" :class=" {'xz' :sindex == index }" @click="getSIndex(index)"
-								v-for="(item,index) in 19" :key="index">
-								<text>{{index}}员工</text>
-							</view> -->
+
 							<view class="box-oil2" :class=" {'xz' :sindex == index }" v-for="(item,index) in staffList"
 								:key="index" @click="getSIndex(index,item.id)">
 								<text>{{item.realName}}</text>
@@ -763,13 +748,13 @@
 		width: 100%;
 		height: 100vh;
 		box-sizing: border-box;
-		padding-top: 88px;
+
 	}
 
 	.my-header {
 		width: 100%;
 		height: 88px;
-		background: #304fff;
+
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -786,7 +771,7 @@
 	.top {
 		width: 100%;
 		height: 200px;
-		background-image: linear-gradient(180deg, #304fff, #ffffff);
+
 		box-sizing: border-box;
 		padding: 1px;
 
@@ -797,12 +782,12 @@
 		height: 110px;
 		background-color: #ffffff;
 		border-radius: 8px;
-		margin: 20px auto;
+		margin: 10px auto;
 		box-sizing: border-box;
 		padding: 10px;
 		display: flex;
 		justify-content: space-between;
-		margin-top: 60px;
+
 	}
 
 	.top-title {
@@ -812,7 +797,7 @@
 	.top-img {
 		width: 46px;
 		height: 46px;
-		background-color: #304fff;
+		background-color: #eee;
 		border-radius: 6px;
 		overflow: hidden;
 		margin-right: 10px;
@@ -967,4 +952,4 @@
 		text-align: right;
 		color: #999999;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/gasStation-uni/pagesHome/PointsRedemption/index.vue b/gasStation-uni/pagesHome/PointsRedemption/index.vue
index 2c727e568..989f6f6d3 100644
--- a/gasStation-uni/pagesHome/PointsRedemption/index.vue
+++ b/gasStation-uni/pagesHome/PointsRedemption/index.vue
@@ -2,6 +2,7 @@
 	<view class="centenr">
 		<view class="Candywrapper">
 			<view class="top-box" @click="goIntegral">
+
 				<view class="">积分余额</view>
 				<view class="d-s">4800 <u-icon name="arrow-right"></u-icon> </view>
 			</view>
@@ -144,4 +145,4 @@
 		font-size: 10px;
 		color: #666666;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/gasStation-uni/pagesHome/certificate/details.vue b/gasStation-uni/pagesHome/certificate/details.vue
new file mode 100644
index 000000000..385e94dc6
--- /dev/null
+++ b/gasStation-uni/pagesHome/certificate/details.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="centenr">
+		<view class="Candywrapper">
+			<view class="bai-bs">
+				<view class="">
+					<image src="../../static/logo.png" style="width: 60px; height: 60px; "></image>
+				</view>
+				<view class="rr-box">
+					<view class="title_">50元优惠券</view>
+					<view style="font-size: 12px;color: #666666;">最低消费500元</view>
+					<view style="width: 100%;display: flex;justify-content: space-between; ">
+						<view class="red-size">兑换券</view>
+						<view class="red-size">剩余3张</view>
+					</view>
+				</view>
+			</view>
+			<view class="bai-bs">
+				<view class="title_">兑换数量</view>
+				<u-number-box v-model="value" @change="valChange"></u-number-box>
+			</view>
+			<view class="bai-box">
+				<view class="title_">兑换内容</view>
+				<view class="si_">本兑换券为一次性使用券，持有人凭此券可在指定兑换
+					点免费兑换一瓶可口可乐经典口味瓶装饮料（规格为
+					300毫升）。此券仅限兑换同等价值商品，不找零，不
+					兑换现金，不可与其他优惠活动同时使用。</view>
+			</view>
+			<view class="bai-box">
+				<view class="title_">使用须知</view>
+				<view class="si_">有效期：领取后3天内有效</view>
+			</view>
+			<view class="bai-box">
+				<view class="title_">兑换方式</view>
+				<view class="si_">门店自提</view>
+			</view>
+			<view class="bai-box">
+				<view style="width: 100%; display: flex;align-items: center;justify-content: space-between; ">
+					<view class="title_">适用门店</view>
+					<view class="d-s" style="font-size: 14px;color: #FF2828;">
+						<image src="../../static/icon/reddh.png" style="width: 18px; height: 18px; "></image>
+						导航
+					</view>
+				</view>
+				<view class="si">中建锦绣广场二期站</view>
+				<view class="si">山东省济南市槐荫区 | 3.0km</view>
+
+			</view>
+
+		</view>
+		<view class="bottom-box">
+			<view class="or-num">免费</view>
+			<view class="anniu">立即领取</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				value: 0
+			}
+		},
+		methods: {
+			valChange(e) {
+				console.log('当前值为: ' + e.value)
+			}
+		}
+	}
+</script>
+<style scoped lang="scss">
+	.centenr {
+		width: 100%;
+		height: 100vh;
+		background: #F9F9F9;
+	}
+
+	.Candywrapper {
+		background: #F9F9F9;
+		box-sizing: border-box;
+		padding: 10px;
+	}
+
+	.bottom-box {
+		width: 100%;
+		background: #fff;
+		box-sizing: border-box;
+		padding: 15px 10px;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		position: fixed;
+		left: 0px;
+		bottom: 0px;
+	}
+
+	.or-num {
+		font-weight: 600;
+		font-size: 20px;
+		color: #FA6400;
+	}
+
+	.bai-box {
+		background-color: #fff;
+		box-sizing: border-box;
+		padding: 10px;
+		width: 100%;
+		margin: 10px auto;
+	}
+
+	.bai-bs {
+		background-color: #fff;
+		box-sizing: border-box;
+		padding: 10px;
+		width: 100%;
+		margin: 10px auto;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.title_ {
+		font-weight: 600;
+		font-size: 16px;
+		margin-bottom: 5px;
+	}
+
+	.anniu {
+		width: 90px;
+		height: 30px;
+		background: #FF9655;
+		border-radius: 50px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #fff;
+	}
+
+	.rr-box {
+		width: 80%;
+
+	}
+
+	.red-size {
+		font-size: 12px;
+		color: #E02020;
+	}
+
+	.si_ {
+		font-size: 14px;
+		color: #333333;
+	}
+
+	.d-s {
+		display: flex;
+		align-items: center;
+	}
+</style>
diff --git a/gasStation-uni/pagesHome/certificate/index.vue b/gasStation-uni/pagesHome/certificate/index.vue
new file mode 100644
index 000000000..d5a1a3adb
--- /dev/null
+++ b/gasStation-uni/pagesHome/certificate/index.vue
@@ -0,0 +1,144 @@
+<template>
+	<view class="centenr">
+		<view class="Candywrapper">
+
+			<view class="f-box" v-for="(item,index) in 3" :key="index" @click="goDetails()">
+				<view class="f-top">中建锦绣二期站可用</view>
+				<view class="f-bs">
+					<image src="../../static/logo.png" style="width: 60px; height: 60px; "></image>
+					<view class="r-box">
+						<view class="">
+							<view class="m_">50元优惠</view>
+							<view class="p_">最低消费100元</view>
+							<view class="q_">代金券</view>
+						</view>
+						<view class="">
+							<view class="an_">领取</view>
+							<u-line-progress :percentage="50" :showText="false" height="6"
+								activeColor="#FF9655"></u-line-progress>
+							<view class="hui_">券已领70%</view>
+						</view>
+
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			goIntegral() {
+				uni.navigateTo({
+					url: '/pagesMy/integral/integral'
+				})
+			},
+			goDetails() {
+				uni.navigateTo({
+					url: '/pagesHome/certificate/details'
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.centenr {
+		width: 100%;
+		height: 100vh;
+		background: #F9F9F9;
+	}
+
+	.Candywrapper {
+		background: #F9F9F9;
+		box-sizing: border-box;
+		padding: 10px;
+	}
+
+	.top-box {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 10px;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		background: #fff;
+
+	}
+
+	.d-s {
+		display: flex;
+		align-items: center;
+
+	}
+
+	.f-box {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 10px;
+		background: #fff;
+		margin: 10px auto;
+		border-radius: 4px;
+	}
+
+	.f-top {
+		box-sizing: border-box;
+		padding: 5px 0px;
+		border-bottom: 1px dashed #eee;
+		margin-bottom: 15px;
+	}
+
+	.f-bs {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.r-box {
+		width: 80%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.m_ {
+		font-size: 16px;
+		color: #333333;
+		font-weight: bold;
+		margin-bottom: 5px;
+	}
+
+	.p_ {
+		font-size: 12px;
+		color: #666666;
+	}
+
+	.q_ {
+		font-size: 12px;
+		color: #E02020;
+	}
+
+	.an_ {
+		width: 80px;
+		height: 25px;
+		background: #FF9655;
+		border-radius: 4px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #fff;
+		margin-bottom: 5px;
+	}
+
+	.hui_ {
+		font-size: 10px;
+		color: #666666;
+	}
+</style>
diff --git a/gasStation-uni/pagesHome/check/index.vue b/gasStation-uni/pagesHome/check/index.vue
new file mode 100644
index 000000000..616b4e7f6
--- /dev/null
+++ b/gasStation-uni/pagesHome/check/index.vue
@@ -0,0 +1,119 @@
+<template>
+	<view class="centenr">
+		<view class="Candywrapper">
+			<view class="title_">中建锦绣二期站</view>
+			<view class="title_">选择油品油枪</view>
+			<view class="input_k">
+				<view class="input_sz" @click="show = true">
+					汽油92#1号枪
+				</view>
+				<view class="rr-box">小王</view>
+			</view>
+			<view class="title_">加油金额</view>
+			<view class="input_k">
+				<view class="input_sz">
+					<input type="text" placeholder="金额" />
+				</view>
+				<view class="rr-box">36.55L</view>
+			</view>
+			<view class="title_">付款备注</view>
+			<view class="input_k"></view>
+			<view class="x_"></view>
+			<view class="title_">支付方式</view>
+			<view class="d_box">
+				<image src="../../static/icon/hyk.png" style="width: 35px; height: 35px; "></image>
+				<div class="r-bot">
+					<view class="">
+						<view class="">会员卡类型</view>
+						<view class="">储值卡（余额：6532.89）</view>
+					</view>
+					<u-icon name="arrow-right" size="18"></u-icon>
+				</div>
+			</view>
+		</view>
+		<u-picker :show="show" :columns="columns" @cancel='cancel' @confirm='confirm'></u-picker>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				columns: [
+					['汽油95#1号枪', '汽油98#1号枪', '汽油92#1号枪']
+				],
+			}
+		},
+		methods: {
+			cancel() {
+				this.show = false
+			},
+			confirm() {
+				this.show = false
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.centenr {}
+
+	.Candywrapper {
+
+		box-sizing: border-box;
+		padding: 10px;
+	}
+
+	.title_ {
+		margin: 10px 0px;
+		font-size: 16px;
+		font-weight: bold;
+	}
+
+	.input_k {
+		width: 100%;
+		border-radius: 4px;
+		border: 1px solid #EEEEEE;
+		height: 40px;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.rr-box {
+		width: 80px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-left: 1px solid #EEEEEE;
+	}
+
+	.input_sz {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		margin-left: 10px;
+	}
+
+	.x_ {
+		margin: 10px auto;
+		border-bottom: 1px solid #EEEEEE;
+	}
+
+	.d_box {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 10px 0px;
+		border-bottom: 1px solid #EEEEEE;
+	}
+
+	.r-bot {
+		width: 80%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+
+	}
+</style>
diff --git a/gasStation-uni/static/icon/hyk.png b/gasStation-uni/static/icon/hyk.png
new file mode 100644
index 0000000000000000000000000000000000000000..778fe9bae93f0c49df8f49c211c0803fe6274551
GIT binary patch
literal 752
zcmXAnc`Vxj6vuyc#E}qT(~V(*PHHt2OUE4bGwn=Mw_pd^=E!C<3(Xc;!%$)oGF=(E
zVP*)4W73&S&{D%XSIIKRoEv54Xz6(S)n2~ueLwI0_g-Euli{bQYod!Fh#sAW24Q|l
zmD=j6`rGh5X1J6fKPu8VeCj9G$e33`d@)DZ;PnY8B5)PMIT4V1z^M-$h2V&BuL{T*
zh`>pBq$9wFSo^<XKo)|t5L`q+=>xYuxY!S#{oo}Asu<7#pnV4aK?oQG<`4u9L9_(!
zjKhNoNSg%KB(T3h{xtCBpllv07eKHIoomn~gKilJ*P(v{#2fJS4~%2lg2^rTz5~-c
zFtZD@yD+y43vyVL!;%7)74T~hWP7l&51UHZR)YL5C=Ni0=@1SN0SlzgU$waL!yra5
zqNbr^WO_b4f|bL4QQy!yGCIGiP-q`=MA(@M=%{x{M30P@5ZvuxklpT8-)VbypfW?A
zew}5PcRDW?;LE1EnXM+3mRc5*y&UCM5;syEFmsh{T^jR2GYqx&4Z9!UlbO5{#_rbO
zdIS}<_>|>IhV`P1PcrnPXmlt2%X2r2xD7c)tf}7UY7*z#6Ayjj>~<Kwm?Ne1jX5`T
zY`79*)sdCgb%Zfo7xmUzgv69;n4F-oafB?<Q}-;9CZ9U5UL|p$mGkV*r18znJuSwo
zMkE5=Ole0Ojs0@GHICV`Yp#<V^&@fE%3EJhT2s4}_x2qpvJzi$+b3dFp*8d<`1#{?
zLw~YVJCU1;PF0jk?=_aB52d*+g?n$cNllygteXUkd`hvjb)U~%jA^cMPfED3)6Pqk
zi^%d<@tpNBoA4Au9c4C==px_~YBIzVRT8V>oD4dVK(Yv5CD}LOl~%Ea^mseAzma9G
z8Y%E2L05^s(F(OhL%4y*b5R?+P+UOhu#pSCHqtEQ8NS)oAT*emRJeE`COLWXlL`-T
W1=&e!#~i3E)wj}p8E7N*M#eu~!I0_z

literal 0
HcmV?d00001

diff --git a/gasStation-uni/static/icon/wz.png b/gasStation-uni/static/icon/wz.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb6a6b8d2768af225876f88af703ca87000fe592
GIT binary patch
literal 1588
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

literal 0
HcmV?d00001

diff --git a/gasStation-uni/static/new/hykb.png b/gasStation-uni/static/new/hykb.png
new file mode 100644
index 0000000000000000000000000000000000000000..d304b7883f65e8c36632ca1e3959e81050ae93cd
GIT binary patch
literal 1555
zcmYk5c|4R`7{{k1TXR(uN-2XxQCD%xm2E5|A*rU)BI!!nkXy-38VaQ`mKl;Z)3s$!
zBcd>w5n>WqvW$0PEJ?;(z2}VgzPkV1^Z7o%=l49H=bS&z`J5OJHz%U<3S|O;K%_X6
zJ@I^EE)?Z(b^6`!B%bC4dpg+>@|(5AxbN_A^>V<Q*xVY$z9ZOF4<_lI^U`rlD#9ju
zv6%sEMu^Rbu^AC2LBRJf*grVKcnPOPm~<FUiJ)W<n-<CD6p={~O!@^^nFOB~$)*Nz
zGduks2$Udj8kv>g;2i`<Hn;Jok<3lb`Jei~=G>V-OA$)fMd>6o0Y?u_&_@{tC}SO(
zh+~K*tw)oL(Bus$(-dX>in7emG;=h=3VmRMKD0%%J<;qvXzqSAkBUC?M)SSVf}?=F
z6XYEL`G-NVFDN+)O8vp}08kbP%FcinIOhQ8Jm6da<v2m0JQ!451Qns6@)D>H2d}Sz
z*Ad{&4N!9f)Y3q06sU~`+*t574)Edu?=E<k1e#L8`*hHf0R&HALn3Ts!j=r!o&!7b
zV8=7qR{{H9!Tu`PUkwLdLtzaZtc8Ph5aB}PEfnGK;1@m|YJ|g0P}~f~@1eK_jtbyd
z8ys(k;~jAP6a4x~_U*H5vQIYIFZ+%&Ae$2YymO?T`_UGE+HE18ZhHvwM78A_E3{YZ
z=#oh5Hd$HOySeYDdY?W=i;t%#B;31SSi$4-`5oOoeIn7&(D?Y*Z__^joSn6H=Q$Aw
za%>9O*2}-QDQ)Pe+Gfp&+NXY<0;}N+8-=Kp+}N;*80E7|<m={ry&fwk-=or~b6VAS
zIR{~Qf9?Mfq!ZLMH9DPEdAU!6U}r=$XPRp6^egUkHCiqy4~%wsofr^j@r(Ygu#F$D
zE+R^uEy#jZMHYrzy{NUC_N{7V`wTtWIA-))w=1G|?;aA<>O!uJXsU~vO`IK=CF$)x
z0a0zGX<6#e|KicAQ+j+{?Hn17b`Gf|g;f5w250TP^RjN)Bv;z&L@CFNh_vr0WwE4=
zmA;1+5E~~oY1sJ->Kj-SkKJwDN=et4IfjU%`eb~v{2HhE0!%{ziM4NNO&>JoZ!HKJ
zX3)(jpOs^Dg6gY#e4>qx9Vt^S%U*lx(98YX#eZC~yfQmd`+g=YogI&w9OTBSMe?MU
zGvU=$WZ@&P%F!kj2ggE-D=xxZHzRKSPOBQ-d%eCSHa1CBxg#9yH-D65_Nn4?T#<jY
z_hfj;&B7$&xxyk*wPL$V9xJTy5cLgZ%qh=-!t$5|y+>>#VQ|mQ8g7ZLMXIl~X7j0h
zAK%&Pbt;x#%Rr>w<9xm1^ZV>~JmU|{exONI-E|)@F9}Q5EF4n!K41RF^~-hSl*qa`
z&6VngT4Yybqq9(8Z)R1>$j}m}3ZtgB)mR&Nm_@U4mTE30kt9poA_EELb-cx|PAG0p
zCUV-CoCx>u7*$#ulV;-@PFa-sk(p`h7*1JuqEmm=-6}QBWMJj-oV@w`lzLiR_`WxT
zFI5MaPHK8FM)c#!W9c^vLX~R#E>mJ<%XTdCDY$f>kz8j(-y5V}Gbo(S&eP*n<&E7q
z?_CM$$usI3=%y+uq@f)=%)mr`r|kMsT0tSP{L~VtrCMc>s7dcO<rg#hN-z(lKNGr5
zjp+R^Lb<JLmsrPWtm>Ieq_+4NS@7*xv5K5>iZ1JkoJGv4U`3(+`qhz{cY`bSe0ts_
zG3#P2kN5SfshF-Vx_;<*NV>b%#M`G<JI=5#2BzaiPwlrC{`&jBDQSzn+M1fY;;SAk
z&Cc51nb|cq9v4nae>LlBp1rU^%Z0kYA>WU^C2_^l4*{8hwi_{|gq+>Xv%GWG`&nd!
zIh(jEcFXVYb}7k5mNygp1rHbS{${26d#m^zIHTOymDIqsTNTz?om%<aroOA{;gb=@
zCNuT&uEx_vZ1QcB;WXco1Kn2-I^#j@zPcrVD#)64$u%ezgmOGKY%Hr~`>xFi<yc!9
W2XT#avJT_Fo<MPMBj?*4i~JV=DuO=%

literal 0
HcmV?d00001