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 000000000..a8c81d299
Binary files /dev/null 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
new file mode 100644
index 000000000..2dcde4ae3
Binary files /dev/null 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
new file mode 100644
index 000000000..fec5d3e45
Binary files /dev/null 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
new file mode 100644
index 000000000..fefbbc03a
Binary files /dev/null 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
new file mode 100644
index 000000000..24f97b5e2
Binary files /dev/null and b/gasStation-uni/static/my/fleetRemove.png differ