From 198d7f5462ebe8112869e7f267cf4666579ed46a Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Mon, 23 Sep 2024 13:41:19 +0800
Subject: [PATCH] 9.23

---
 .../pagesHome/cardDetails/index.vue           |  98 ++++++++-
 gasStation-uni/pagesMy/fleetInfo/index.vue    |  86 ++++++--
 gasStation-uni/pagesMy/fleetLimit/index.vue   | 170 ++++++++++++++++
 .../pagesMy/fleetMember/addMember.vue         | 190 ++++++++++++++++++
 gasStation-uni/pagesMy/fleetMember/index.vue  |  92 +++++++++
 gasStation-uni/static/my/fleetAdd.png         | Bin 0 -> 346 bytes
 gasStation-uni/static/my/fleetAmount.png      | Bin 0 -> 830 bytes
 gasStation-uni/static/my/fleetCar.png         | Bin 0 -> 676 bytes
 gasStation-uni/static/my/fleetMember.png      | Bin 0 -> 750 bytes
 gasStation-uni/static/my/fleetRemove.png      | Bin 0 -> 862 bytes
 10 files changed, 616 insertions(+), 20 deletions(-)
 create mode 100644 gasStation-uni/pagesMy/fleetLimit/index.vue
 create mode 100644 gasStation-uni/pagesMy/fleetMember/addMember.vue
 create mode 100644 gasStation-uni/pagesMy/fleetMember/index.vue
 create mode 100644 gasStation-uni/static/my/fleetAdd.png
 create mode 100644 gasStation-uni/static/my/fleetAmount.png
 create mode 100644 gasStation-uni/static/my/fleetCar.png
 create mode 100644 gasStation-uni/static/my/fleetMember.png
 create mode 100644 gasStation-uni/static/my/fleetRemove.png

diff --git a/gasStation-uni/pagesHome/cardDetails/index.vue b/gasStation-uni/pagesHome/cardDetails/index.vue
index 9470c87c3..4fea49397 100644
--- a/gasStation-uni/pagesHome/cardDetails/index.vue
+++ b/gasStation-uni/pagesHome/cardDetails/index.vue
@@ -1,17 +1,17 @@
 <template>
 	<view class="centenr">
-		<view class="top-box">
+		<!-- 储值卡 -->
+		<view class="top-box" v-if="type=='balance'">
 			<view class="t-db">
 				<view class="d-s">
-					<view style="margin-right: 10px;" v-if="type=='balance'">储值卡</view>
-					<view style="margin-right: 10px;" v-if="type=='oilCard'">囤油卡</view>
-					<view class="icon_" v-if="type=='balance'">主卡</view>
+					<view style="margin-right: 10px;">储值卡</view>
+					<view class="icon_">主卡</view>
 				</view>
 				<image src="../../static/new/rwm.png" style="width: 25px; height: 25px; " @click="goCode()"></image>
 			</view>
 			<view class="on-title">可用余额</view>
 			<view class="on-num">¥{{cardBalance.cardBalance || 0}}</view>
-			<view class="d-a" v-if="type=='balance'">
+			<view class="d-a">
 				<view class="_dj">
 					<view class="" v-if="cardBalance.giveAmount">¥{{cardBalance.cardBalance - cardBalance.giveAmount}}
 					</view>
@@ -24,10 +24,45 @@
 				</view>
 			</view>
 		</view>
+		<!-- 囤油卡 -->
+		<view class="top-box" v-if="type=='oilCard'">
+			<view class="t-db">
+				<view class="d-s">
+					<view style="margin-right: 10px;">囤油卡</view>
+				</view>
+				<image src="../../static/new/rwm.png" style="width: 25px; height: 25px; " @click="goCode()"></image>
+			</view>
+			<view class="on-title">剩余油量（L）</view>
+			<view class="on-num">¥{{cardBalance.cardBalance || 0}}</view>
+		</view>
+		<!-- 车队信息 -->
+		<view class="top-box" v-if="type=='fleet'">
+			<view class="t-db">
+				<view class="d-s">
+					<view style="margin-right: 10px;">储值卡</view>
+					<view class="icon_">主卡</view>
+				</view>
+			</view>
+			<view class="on-title">总余额（元）</view>
+			<view class="on-num">123456.78</view>
+			<view class="d-a">
+				<view class="_dj">
+					<view class="">10909.20</view>
+					<view style="font-size: 14px;">本金金额（元）</view>
+				</view>
+				<view class="_dj">
+					<view class="">109053.60</view>
+					<view style="font-size: 14px;">赠送金额（元）</view>
+				</view>
+			</view>
+		</view>
+
 		<view class="bottom-box">
 			<view class="or-aniu" @click="goMemberRecharge()">立即充值</view>
 		</view>
-		<view class="b_box">
+
+		<!-- 储值卡 / 囤油卡 -->
+		<view class="b_box" v-if="type == 'balance' || type == 'oilCard'">
 			<view class="g-box" @click="godetail()">
 				<view class="d-s">
 					<image src="../../static/new/k1.png" style="width: 20px; height: 20px;margin-right: 5px; "></image>
@@ -50,6 +85,37 @@
 				<u-icon name="arrow-right" color="#333"></u-icon>
 			</view>
 		</view>
+		<!-- 车队信息 -->
+		<view class="b_box" v-if="type=='fleet'">
+			<view class="g-box" @click="goFleet()">
+				<view class="d-s">
+					<image src="../../static/my/fleetCar.png" style="width: 20px; height: 20px;margin-right: 5px; ">
+					</image>
+					<view class="">车队信息</view>
+				</view>
+				<u-icon name="arrow-right" color="#333"></u-icon>
+			</view>
+			<view class="g-box">
+				<view class="d-s">
+					<image src="../../static/my/fleetMember.png" style="width: 20px; height: 20px;margin-right: 5px; ">
+					</image>
+					<view class="">成员管理</view>
+				</view>
+				<u-icon name="arrow-right" color="#333"></u-icon>
+			</view>
+			<view class="g-box">
+				<view class="d-s">
+					<image src="../../static/my/fleetAmount.png" style="width: 20px; height: 20px;margin-right: 5px; ">
+					</image>
+					<view class="">资金明细</view>
+				</view>
+				<u-icon name="arrow-right" color="#333"></u-icon>
+			</view>
+
+		</view>
+
+		<view class="but-sub" v-if="type=='fleet'">添加副卡</view>
+
 		<u-popup :show="ruleShow" :closeable="true" :round="10" mode="bottom" @close="ruleclose">
 			<view class="_tbox">
 				<view class="_btop">规则说明</view>
@@ -127,7 +193,7 @@
 	export default {
 		data() {
 			return {
-				type: "balance",
+				type: "fleet",
 				query: {
 					chainStoreId: '',
 					couponType: '',
@@ -151,6 +217,12 @@
 			this.getEquity()
 		},
 		methods: {
+			// 跳转车队信息
+			goFleet(){
+				uni.navigateTo({
+					url: '/pagesMy/fleetInfo/index'
+				})
+			},
 			goCode() {
 				uni.navigateTo({
 					url: '/pagesHome/QRcode/QRcode'
@@ -355,4 +427,16 @@
 		justify-content: center;
 
 	}
+
+	.but-sub {
+		width: 305px;
+		height: 40px;
+		line-height: 40px;
+		margin: 0 auto;
+		background-color: #FF9655;
+		color: white;
+		border-radius: 50px;
+		text-align: center;
+		margin-top: 35vh;
+	}
 </style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/fleetInfo/index.vue b/gasStation-uni/pagesMy/fleetInfo/index.vue
index 003ce58b7..84085bc9f 100644
--- a/gasStation-uni/pagesMy/fleetInfo/index.vue
+++ b/gasStation-uni/pagesMy/fleetInfo/index.vue
@@ -1,13 +1,46 @@
 <template>
 	<view class="content">
 		<view class="container">
-			<view class="box-hang" @click="goEdit(0)">
-				<view class="">车队名称</view>
+			<view class="box-hang">
+				<view class=""><span style="color: red;">*</span>车队名称</view>
 				<view class="dis">
-					<text >xxxxxx</text>
-					<!-- <uni-icons type="right" size="16"></uni-icons> -->
+					<input v-model="value" style="text-align: right;"></input>
 				</view>
 			</view>
+			<view class="box-hang">
+				<view class=""><span style="color: red;">*</span>开户门店</view>
+				<view class="dis">
+					<input v-model="value" style="text-align: right;"></input>
+				</view>
+			</view>
+			<view class="box-hang">
+				<view class=""><span style="color: red;">*</span>开户类型</view>
+				<view class="dis">
+					<input v-model="value" style="text-align: right;"></input>
+				</view>
+			</view>
+			<view class="box-hang" style="margin-top: 10px;">
+				<view class=""><span style="color: red;">*</span>是否启用</view>
+				<view class="dis">
+					<u-switch v-model="value1" activeColor="#6DD400" inactiveColor="rgb(230, 230, 230)"></u-switch>
+				</view>
+			</view>
+			<view class="box-hang">
+				<view class=""><span style="color: red;">*</span>管理员</view>
+				<view class="dis">
+					<text>xxxxxx</text>
+					<image style="width: 24px;height: 24px;margin-left: 5px;" src="@/static/my/fleetRemove.png"></image>
+				</view>
+			</view>
+			<view class="box-end">
+				<image style="width: 15px;height: 15px;margin-right: 5px;margin-top: 6px;"
+					src="@/static/my/fleetAdd.png" @click="show = !show"></image>
+				<text>添加管理员</text>
+			</view>
+
+			<view class="but-sub">保存</view>
+
+			<u-picker :show="show" :columns="columns" @cancel="cancel" @confirm="confirm"></u-picker>
 		</view>
 
 	</view>
@@ -23,15 +56,20 @@
 				pageNo: 1,
 				pageSize: 10,
 				totalPage: '',
-
+				value: "xxxxxx",
+				value1: true,
+				show: false,
+				columns: [
+					['管理员', '小王', '小李']
+				],
 			}
 		},
 		onLoad() {
-			
+
 		},
 		onPullDownRefresh() {
 			//下拉刷新
-			
+
 		},
 		onReachBottom() {
 			// 触底加载
@@ -42,7 +80,7 @@
 				})
 			} else {
 				this.pageNo++
-				
+
 			}
 		},
 
@@ -50,7 +88,12 @@
 
 		},
 		methods: {
-			
+			cancel() {
+				this.show = false
+			},
+			confirm() {
+				this.show = false
+			},
 			goback() {
 				uni.navigateBack()
 			}
@@ -67,7 +110,7 @@
 		width: 100%;
 		height: 100vh;
 		box-sizing: border-box;
-		padding-top: 88px;
+		padding-top: 10px;
 	}
 
 	.my-header {
@@ -91,7 +134,7 @@
 		position: fixed;
 		top: 0px;
 	}
-	
+
 	.box-hang {
 		background-color: white;
 		width: 100%;
@@ -99,11 +142,28 @@
 		align-items: center;
 		justify-content: space-between;
 		box-sizing: border-box;
-		padding: 15px 0px;
+		padding: 15px 15px;
 		border-bottom: 1px solid #f4f5f6;
 	}
-	
+
 	.dis {
 		color: #a69999;
 	}
+
+	.box-end {
+		text-align: center;
+		margin-top: 10px;
+	}
+
+	.but-sub {
+		width: 305px;
+		height: 40px;
+		line-height: 40px;
+		margin: 0 auto;
+		background-color: #FF9655;
+		color: white;
+		border-radius: 50px;
+		text-align: center;
+		margin-top: 40vh;
+	}
 </style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/fleetLimit/index.vue b/gasStation-uni/pagesMy/fleetLimit/index.vue
new file mode 100644
index 000000000..9dec4b9ad
--- /dev/null
+++ b/gasStation-uni/pagesMy/fleetLimit/index.vue
@@ -0,0 +1,170 @@
+<template>
+	<view class="content">
+		<view class="container">
+			<view class="box-hang">
+				<view class="">副卡额度</view>
+				<view class="dis">
+					<input v-model="value" style="text-align: right;"></input>
+				</view>
+			</view>
+			<view class="box-hang">
+				<view class="">已用额度</view>
+				<view class="dis">
+					<input v-model="value" style="text-align: right;"></input>
+				</view>
+			</view>
+			<view class="box-hang">
+				<view class="">剩余额度</view>
+				<view class="dis">
+					<input v-model="value" style="text-align: right;"></input>
+				</view>
+			</view>
+			<view class="box-hang">
+				<view class=""><span style="color: red;">*</span>调整类型</view>
+				<view class="dis" @click="show = !show">
+					<text>增加/扣除</text>
+					<uni-icons type="right" size="16"></uni-icons>
+				</view>
+			</view>
+			<view class="box-hang">
+				<view class=""><span style="color: red;">*</span>调整额度</view>
+				<view class="dis">
+					<input v-model="value" style="text-align: right;" placeholder="请输入"></input>
+				</view>
+			</view>
+			<view class="box-hang">
+				<view class="">备注</view>
+				<view class="dis">
+					<input v-model="value" style="text-align: right;" placeholder="请输入"></input>
+				</view>
+			</view>
+
+			<view class="but-sub">确认</view>
+
+			<u-picker :show="show" :columns="columns" @cancel="cancel" @confirm="confirm"></u-picker>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import request from '../../utils/request';
+	export default {
+		data() {
+			return {
+				title: '',
+				List: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalPage: '',
+				value: 0.00,
+				value1: true,
+				show: false,
+				columns: [
+					['增加', '扣除']
+				],
+			}
+		},
+		onLoad() {
+
+		},
+		onPullDownRefresh() {
+			//下拉刷新
+
+		},
+		onReachBottom() {
+			// 触底加载
+			if (this.pageNo >= this.totalPage) {
+				uni.showToast({
+					title: '没有下一页数据',
+					icon: 'none'
+				})
+			} else {
+				this.pageNo++
+
+			}
+		},
+
+		components: {
+
+		},
+		methods: {
+			cancel() {
+				this.show = false
+			},
+			confirm() {
+				this.show = false
+			},
+			goback() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		background: #f4f5f6;
+	}
+
+	.container {
+		width: 100%;
+		height: 100vh;
+		box-sizing: border-box;
+		padding-top: 10px;
+	}
+
+	.my-header {
+		width: 100%;
+		height: 88px;
+		background: #ffffff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		color: #000;
+		box-sizing: border-box;
+		padding: 0px 15px;
+		padding-top: 40px;
+		z-index: 99999;
+
+		.my-icons {
+			width: 20px;
+
+		}
+
+		position: fixed;
+		top: 0px;
+	}
+
+	.box-hang {
+		background-color: white;
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding: 15px 15px;
+		border-bottom: 1px solid #f4f5f6;
+	}
+
+	.dis {
+		color: #a69999;
+	}
+
+	.box-end {
+		text-align: center;
+		margin-top: 10px;
+	}
+
+	.but-sub {
+		width: 305px;
+		height: 40px;
+		line-height: 40px;
+		margin: 0 auto;
+		background-color: #FF9655;
+		color: white;
+		border-radius: 50px;
+		text-align: center;
+		margin-top: 40vh;
+	}
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/fleetMember/addMember.vue b/gasStation-uni/pagesMy/fleetMember/addMember.vue
new file mode 100644
index 000000000..2d11b7e6c
--- /dev/null
+++ b/gasStation-uni/pagesMy/fleetMember/addMember.vue
@@ -0,0 +1,190 @@
+<template>
+	<view class="content">
+		<view class="container">
+			<view class="box-hang">
+				<view class=""><span style="color: red;">*</span>姓名</view>
+				<view class="dis">
+					<input v-model="value" style="text-align: right;" placeholder="请输入"></input>
+				</view>
+			</view>
+			<view class="box-hang">
+				<view class=""><span style="color: red;">*</span>手机号</view>
+				<view class="dis">
+					<input v-model="value" style="text-align: right;" placeholder="请输入"></input>
+				</view>
+			</view>
+			<view class="box-hang">
+				<view class="">会员卡号</view>
+				<view class="dis">
+					<input v-model="value" style="text-align: right;" placeholder="请输入"></input>
+				</view>
+			</view>
+			<view class="box-hang">
+				<view class="">车牌号</view>
+				<view class="dis">
+					<text>未设置</text>
+					<uni-icons type="right" size="16"></uni-icons>
+				</view>
+			</view>
+			<view class="box-hang">
+				<view class=""><span style="color: red;">*</span>副卡类型</view>
+				<view class="dis" @click="show = !show">
+					<text>共享副卡-不限额</text>
+					<uni-icons type="right" size="16"></uni-icons>
+				</view>
+			</view>
+			<view class="box-hang" style="margin-top: 10px;">
+				<view class=""><span style="color: red;">*</span>是否开启消费通知</view>
+				<view class="dis">
+					<u-switch v-model="value1" activeColor="#6DD400" inactiveColor="rgb(230, 230, 230)"></u-switch>
+				</view>
+			</view>
+			<view class="box-hang">
+				<view class=""><span style="color: red;">*</span>是否启用</view>
+				<view class="dis">
+					<u-switch v-model="value2" activeColor="#6DD400" inactiveColor="rgb(230, 230, 230)"></u-switch>
+				</view>
+			</view>
+			<view class="box-end">
+				<view style="display: flex;">
+					<view style="height: 14px;margin-right: 5px;"><u-icon name="info-circle"></u-icon></view>
+					
+					<view>注：</view>
+				</view>
+				<view>
+					<view>共享副卡-不限额：副卡与主卡共享钱包，同步余额。</view>
+					<view>共享副卡-限额：副卡与主卡共享钱包，副卡可设置限额。</view>
+					<view>独立副卡：副卡与主卡独立钱包，独立余额。</view>
+				</view>
+			</view>
+
+			<view class="but-sub">保存</view>
+
+			<u-picker :show="show" :columns="columns" @cancel="cancel" @confirm="confirm"></u-picker>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import request from '../../utils/request';
+	export default {
+		data() {
+			return {
+				title: '',
+				List: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalPage: '',
+				value: "",
+				value1: true,
+				value2: true,
+				show: false,
+				columns: [
+					['共享副卡-不限额', '共享副卡-限额', '独立副卡']
+				],
+			}
+		},
+		onLoad() {
+
+		},
+		onPullDownRefresh() {
+			//下拉刷新
+
+		},
+		onReachBottom() {
+			// 触底加载
+			if (this.pageNo >= this.totalPage) {
+				
+			} else {
+				this.pageNo++
+
+			}
+		},
+
+		components: {
+
+		},
+		methods: {
+			cancel() {
+				this.show = false
+			},
+			confirm() {
+				this.show = false
+			},
+			goback() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		background: #f4f5f6;
+	}
+
+	.container {
+		width: 100%;
+		height: 100vh;
+		box-sizing: border-box;
+		padding-top: 10px;
+	}
+
+	.my-header {
+		width: 100%;
+		height: 88px;
+		background: #ffffff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		color: #000;
+		box-sizing: border-box;
+		padding: 0px 15px;
+		padding-top: 40px;
+		z-index: 99999;
+
+		.my-icons {
+			width: 20px;
+
+		}
+
+		position: fixed;
+		top: 0px;
+	}
+
+	.box-hang {
+		background-color: white;
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding: 15px 15px;
+		border-bottom: 1px solid #f4f5f6;
+	}
+
+	.dis {
+		color: #a69999;
+	}
+
+	.box-end {
+		margin-top: 10px;
+		display: flex;
+		color: #999999;
+		font-size: 12px;
+		padding: 0 15px;
+	}
+
+	.but-sub {
+		width: 305px;
+		height: 40px;
+		line-height: 40px;
+		margin: 0 auto;
+		background-color: #FF9655;
+		color: white;
+		border-radius: 50px;
+		text-align: center;
+		margin-top: 20vh;
+	}
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/fleetMember/index.vue b/gasStation-uni/pagesMy/fleetMember/index.vue
new file mode 100644
index 000000000..8cdae842f
--- /dev/null
+++ b/gasStation-uni/pagesMy/fleetMember/index.vue
@@ -0,0 +1,92 @@
+<template>
+	<view class="content">
+		<view class="container">
+			<view class="my-header">
+				<view class="my-icons" @click="goback"> <uni-icons type="left" size="16"></uni-icons> </view>
+				<view class="my-text">样版页</view>
+				<view class="my-icons"></view>
+			</view>
+
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import request from '../../utils/request';
+	export default {
+		data() {
+			return {
+				title: '',
+				List: [],
+				pageNo: 1,
+				pageSize: 10,
+				totalPage: '',
+
+			}
+		},
+		onLoad() {
+		},
+		onPullDownRefresh() {
+			//下拉刷新
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			// 触底加载
+			if (this.pageNo >= this.totalPage) {
+				uni.showToast({
+					title: '没有下一页数据',
+					icon: 'none'
+				})
+			} else {
+				this.pageNo++
+			}
+		},
+
+		components: {
+
+		},
+		methods: {
+
+			goback() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		background: #f4f5f6;
+	}
+
+	.container {
+		width: 100%;
+		height: 100vh;
+		box-sizing: border-box;
+		padding-top: 88px;
+	}
+
+	.my-header {
+		width: 100%;
+		height: 88px;
+		background: #ffffff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		color: #000;
+		box-sizing: border-box;
+		padding: 0px 15px;
+		padding-top: 40px;
+		z-index: 99999;
+
+		.my-icons {
+			width: 20px;
+
+		}
+
+		position: fixed;
+		top: 0px;
+	}
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/static/my/fleetAdd.png b/gasStation-uni/static/my/fleetAdd.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8c81d2996f0839adc79f7bd0b49bc7a225dc32b
GIT binary patch
literal 346
zcmV-g0j2(lP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$6iGxuR5(wilD|qrF%-tXPdnUM8ec(*h%X@6-9e$vrr_)qT?Cg7845*kQH(F3
zTPo<_Ucna-k>V>Daqdt(_9j|VanRc=;hdA-$#?z`KaQMgg;}ft9}6)w^Ne@ga?knn
zDZdRd^$L_SAT&g-L3s=@;S$IV2pqgOG`(Tr4&WDb14tkKwMEk#q}j#PGpK4CU=7}{
z7jOivZUd4r?;ea5oawEQdDmTxeYSZFaKPNP7;38E9xr}5{Yk9e4`A+2l5#T4s|O6R
zLa}-qkQ(#u;e@<jz^JZy1h7xBjn1ecPu#h>ltLac7Zb>8ym=Q*ycM$Lys<fI)Z#Q?
sS*c~4Q+gazEkFYQZ{;TD_s1pw1Q>|Ha}r}w4gdfE07*qoM6N<$g5GbA0{{R3

literal 0
HcmV?d00001

diff --git a/gasStation-uni/static/my/fleetAmount.png b/gasStation-uni/static/my/fleetAmount.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dcde4ae3c44fe2d86e0c112b8026fcb6d849d0c
GIT binary patch
literal 830
zcmV-E1Ht@>P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px%_(?=TR5(wSlwW9-WgN%9-{;+*Vp?p7U|<e~B64Tj^Bk4Kj4;r&F2<-Rkgg0T
z2u{Tn<wdeWC9ta!@lu1jGQH5Ng0R-j>3Mg~*=cCd5}n9_{lOJ%=e+Ox{PGz)qs7_L
zJ(utM{65d`&-eQy>Kv{0yCjDIJTD?6&bfhHE|;wr!&*PJ*8L<u1h5gnKomtkH#9UH
zAlVP#L6Riz=W@AUYsD@BySlo1lv2k4JPTkG$v*&`wbuUP1C23_&be1fUU~$60ANZ)
z?#FRFR45ews=^n5#+VHNZUgvAMD7519l&H5hCZWZ#~Aach+G433qXcs##;Ll0Pz<W
zfLiN5lE<yJuPi?B5r94b-`6N>&^h<s$jHbKKHeA;0oZJ<y}JZ7#=IjU2g5Mj?LVf|
z>0S}pU#Iz>S!+iZ9~Y(6mTWdVz9O*R6l=8L$$?ty!8ne;Effk9ekdaH$^88Mxv{aa
zf2v?(%&LGVNgjyfcyAB{XGpFE@TRra_if><3b;71Pf4Bx@KdQ&>YbRFnEP+pPYmqr
z?0g{zf}uxFQ2_jqZjzi4k?+DVyt3*HJ32aAo0^*55)lvl62NJ%%_K>N^ZESms|GIi
zrzj%NdH0a~TSUqvyR5a|Db*f&&0et9K76cfQmNGX=H})#&bd%2)eB%eo6X+KWHL|B
z&CTrzf}o{bF8^387E9F!s@7X3?Eh;`YdswVLE4Kql}f$X*w}boM1CVV4d4v`N3FG2
zmoiMJ({DTH`m0W<A>I?EQt4|yVXgH|02iHe<0M}bk#Cez!%-A%9UUE=sb;tXz_oI@
zyscO)-do8j?d|PPwY9ZPg<-h1ySsZA$<Ik%7Lk1<eIKtctuJHDc@a58vgVEiV6C;=
zjWIJ(6umq<J3HCh+S(HY!L*26PLkxH-;v9LjWO$#QqR=Nuu`d%^ZERJt@RfGb|y)3
zSSdA4@?&q9FbsW_Zl!GM?S}@f^(m4ch)4^78<k4sNOjWx0)sWHBvk~e;Q#;t07*qo
IM6N<$g00$$1ONa4

literal 0
HcmV?d00001

diff --git a/gasStation-uni/static/my/fleetCar.png b/gasStation-uni/static/my/fleetCar.png
new file mode 100644
index 0000000000000000000000000000000000000000..fec5d3e457014645bdd1c8af02b5a2a6040198b6
GIT binary patch
literal 676
zcmV;V0$crwP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px%UP(kjR5(wql+SAuK@`WoZ?_GJ2Mr!tMDQSr5Rx=IQ-$~gK|QnxqF@h#q6ZJ^
zL5~#=_9Pxe{|W{1DhPr<f+&hIyGtS^y=b){Jt!(tV$#e!JFy$mq-j_1!Csd4KJ)#)
zdGiSWIjDo@3Ly?Uj<Y$=8O%JdlzIh#JM$x;E2Vq_AO~PB4iLb001uT?r+a{&=N)z&
z=Ru><*iorezQ+M(GMR0uRO$nOtWv5P)wC2!DJKA2S4vrhu|rDv(-<=r1i|aIfRxYY
zH}s>H%jMqy^s<okfl|tw0Isef^N~{OXl!7ySWMOH^{xGY#+a{R82*S2jNL#0LI?{U
z^L_tK-yV9NcZ!J4v=fNx3kwV9tJUha?!yX&LLr?_zb}<a&9#6>9LG5kB`~uEPR-2B
z{EDOgpT<T?c?-aJCzzQ(`@Vk+Kucv0Fq_Q|CzHv1RHU`82SM;cO1X)dXSLS*2L}h+
z7L74?0ZjV7|7=yD5aI?AUF%S>XpGtEy6#?M%*CZQd||~?Bf7-QItYR*s{-xMOeT|v
ziiU=UOsP~dLWs9SlmxK2N-ww6YPG`j^z?ko^62R3NoJnv_w=mY<)v{Cz%HfKAzLSe
zuujeq(JV9H_I>|x3pg?|vS(mm;JMa%Ul@j!E(LZy87bu_B06r2v6s?vKt!h5Y~FWW
z_a!qIf*|<P-iJbnJ4AFDfZGjZ=5ZoA3*Z1VTkG#^4l@q}m{{t0Ln&p~+231^!p<oG
z`>lvD4CivW+{Q#Av0EwiG+GWe$@9FT)_T5NE`RI+#u?o8a{d6zk}@RqKXM2F0000<
KMNUMnLSTaWE-+&N

literal 0
HcmV?d00001

diff --git a/gasStation-uni/static/my/fleetMember.png b/gasStation-uni/static/my/fleetMember.png
new file mode 100644
index 0000000000000000000000000000000000000000..fefbbc03a91e5d0b9c321f5d28e6199d7d0c0b3e
GIT binary patch
literal 750
zcmV<K0ulX*P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px%s7XXYR5(wq)J;fKQ4|O8|GAT66UmSTZPJ8<$i{r{UZI7dLo1QOmW5I6BHILg
zKoDsyqM(AX0x75nDsUS`^r2L4YVN%{lr6Gyk*$&#G)C-sPd#x$bet*hE#Eo(-n-|X
za|lcP&=Pwn22yo(b=mOn@Hha@eOxKEZES2TH8L_XIsb?9f=a0s0L}t90AMwM41oL7
z)6*v>CML4+c>D{1taEOswRUJOx&W-Hsfos7vFFUZj)*#gAV>=#HWJZk0KX<DCmUk1
zm;-Q!nd^ffNTk#0pE+~^D5X3cLe9B5YwfpOVr^~hs*;it6GFzA&Z?@a<>lq&pNObK
zYkjj2_!Pi^G3NOE`ba6mcWuTPFN{ek9}v+Gt@WWoV2YXVS!*xn0rwKoIjwbN7*k3;
z0q{<1eY6mGmx#)=*1Ph6-2m1bW12nB^CFSR8|Pe$wf5Pfpi*ipfY;32Zj8B+OY}Ui
zRS40;%&pA4QV4Mszzbu{o`SbLTbqMKbd8w}5q)Il3IGk^1w^CKOH)%*<IEhkP4mFO
zKz~8d_x(m8#C2xg6xIj8cK~YuB#3B)nU6T<rX!I^JAh^Yr?l4R^B!4B*+xXS!`29b
zpkr`wa5R^gNF*wv(dZcf`$N=P+vWTIJ|enBM7y=tJz?(OK9o{!A)>bcPH3&KEH>jx
zsbkE1K?u>9N~QXxlwAOJ7-Kd7aC5;&;UpMiT8k|VrPM=aE;Gh7d7f7#g!l}g$r$r$
z223OpYfDQ@N1b!qt+g+UfxhoI5m9dt1eNJ@`s<%keI%l8t@Xtju)e-N$;^+l*=&4h
zXlSY!I6Lp*!f4T2_bR2rIsXvWaRy8#lgl!h%w}utU@<Hg_kF)E9*@88>+1`O_Tj&x
g`SOY_*#EYF17U(GB-8zRp#T5?07*qoM6N<$f`cYn>Hq)$

literal 0
HcmV?d00001

diff --git a/gasStation-uni/static/my/fleetRemove.png b/gasStation-uni/static/my/fleetRemove.png
new file mode 100644
index 0000000000000000000000000000000000000000..24f97b5e28ff1d6d6b7f0463595d8e23727ec7b6
GIT binary patch
literal 862
zcmV-k1EKthP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px&7)eAyR7gv;mCuV5R}ja)-#246;y)m`)30W;tE*yMT|#2OkU$`UId~8fe;jiV
z#Wfp$B=H^=O@t%{A&1;Hkl@XOf*}M^4+*;dh@#mH+wb)>=wBcz-Cb@^wuhN@)){xn
zyEU)s`>9t|T}AxQhrQ^}RI6*ss+$y8nf>SRaG5bv{WCMu-TW5>gd(pRU|$C8Cor^t
z&@{8`OlHiFRp%aevgrs2SFL)B<?<xR*8nJhTTs0WAes{iKyD?lQ2|1=rfIsj8pnUm
zhdc*}DwQ2+sq_nhJ^&ZW<d^+nc&k%%vB*dQOaRyh;IT>5kAiyrT&ryxz*)Nm<R4I7
zM)I(A?%QrT&hMSIp8@z9<Wo(OcUxc51l0Tcm#3xD9gqVGj8}UUF9K*l$Wv6UW#opU
zCQX2|_AtnApn6`s-`-2)^KG2Sg*;u%vT++ljn}sVYI*col8g+*@$JO`@|vW;R0h<l
z&aG|&d=RWtW9~wAO1vLkjCkP_irmb*D<g*o!tkHQ3!JrkKu!|)&N}z$QUKoC@0C1g
zfL(!ec{eryMgEV7_ooVgxAr%XZ+8J+vCe(aQtYE3PZAi<yRZN>IsmF|04H)Dz?K&R
zRIiHnA2w4I1jlI1iJ}t=z;2K~L-n+HKem(<Ict9adBCLU$3eaRYXcC93=_DQj|6dU
zWGMhIa$A87r6gHhiQ|8pZ5oP98(>gXN5%Uai-Gtc7*%7g0k|*Dt!?`cd=MN`WAdV0
zY%SW$fbynL@_lC6n2n;-Z2%n{?2D4*Zv}=l%RaA0(aDz)4@JJ19gq_WOef{?>qE8L
zlQuy95mhR0WTnz2s`kweuH)9Z6ForK5Lf*wpQu#bYNP0S;rHCQcGl)|=q$+PQ2o7>
zrpGIB{8uMXUF6MFbpqsjP<;eor+A;wqvq+jaOR3N31E26@}2^hsoGdLBm)KBX}zCa
zI(x<Ysri8{xH9houdJ~469D@`uJ4#C)jLX_dF0$r>w%}8Y<gPy4@BgN>Sh2d4XIRp
on2<NB&be+i>Iu+I<VE+-0IRu7DDu~{4FCWD07*qoM6N<$f{Y`S=>Px#

literal 0
HcmV?d00001