From d4d20013f0bcb6e607cc827d4aa761393eef6328 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 7 Nov 2023 16:14:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/financialCenter/business.js               |  22 +-
 components/datePopup.vue                      | 196 +++++++++
 driverManagement/index/index.vue              |  55 +--
 financialCenter/enterprise/account/detail.vue | 161 +++++++
 financialCenter/enterprise/account/index.vue  | 166 ++++++++
 financialCenter/enterprise/recharge/index.vue | 392 ++++++++++++++++++
 .../enterprise/recharge/selEnterprise.vue     | 164 ++++++++
 .../serviceStation/account/detail.vue         | 125 ++++++
 .../serviceStation/account/index.vue          | 163 ++++++++
 pages.json                                    |  59 ++-
 pages/index/index.vue                         | 130 +++---
 pages/index/menu.json                         |  13 +-
 pages/index/newindex.css                      | 109 +++--
 pages/index/newindex.vue                      |   2 -
 static/close.png                              | Bin 0 -> 976 bytes
 utils/request.js                              |   2 +-
 16 files changed, 1584 insertions(+), 175 deletions(-)
 create mode 100644 components/datePopup.vue
 create mode 100644 financialCenter/enterprise/account/detail.vue
 create mode 100644 financialCenter/enterprise/account/index.vue
 create mode 100644 financialCenter/enterprise/recharge/index.vue
 create mode 100644 financialCenter/enterprise/recharge/selEnterprise.vue
 create mode 100644 financialCenter/serviceStation/account/detail.vue
 create mode 100644 financialCenter/serviceStation/account/index.vue
 create mode 100644 static/close.png

diff --git a/api/financialCenter/business.js b/api/financialCenter/business.js
index 053a1cc..9f5a348 100644
--- a/api/financialCenter/business.js
+++ b/api/financialCenter/business.js
@@ -1,11 +1,19 @@
 import request from '@/utils/request'
 
 export default {
-  getByPage (data) {
-     return request({
-       url: '/oil-finance/oilCompanyAccount/getByPage',
-       method: 'post',
-	   data:data
-     })
-   }
+	getByPage(data) {
+		return request({
+			url: '/oil-finance/oilCompanyAccount/getByPage',
+			method: 'post',
+			data: data
+		})
+	},
+	getByPageRecharge(data) {
+		return request({
+			url: '/oil-finance/oilCompanyAccountReverse/getByPage',
+			method: 'post',
+			data: data
+		})
+	},
+
 }
diff --git a/components/datePopup.vue b/components/datePopup.vue
new file mode 100644
index 0000000..ccd35c1
--- /dev/null
+++ b/components/datePopup.vue
@@ -0,0 +1,196 @@
+<template>
+	<view>
+		<uni-popup @change="change" ref="popup" type="center">
+			<view class="datebody">
+				<view style="text-align: end;">
+					<uni-icons @click="change({show:false})" type="clear" size="30"></uni-icons>
+				</view>
+				<view style="flex: 1;display: flex;flex-wrap: wrap;align-content: flex-start; gap:25rpx">
+					<view @click="seleFn(index)" v-for="(item,index) in dateOptions"
+						:class=" seleIndex==index?'seledatebody_item': 'datebody_item'">{{item.label}}</view>
+					<uni-datetime-picker @change='pickerClick' type="datetimerange" :start="starDate" :end="endDate"
+						rangeSeparator="至" v-model="single">
+						<view @click="seleIndex=4" :class=" seleIndex==4?'seledatebody_item':'datebody_item'">自定义</view>
+					</uni-datetime-picker>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			value: {
+				type: Boolean,
+				default: false
+			},
+			list: {
+				type: Array,
+				default: () => {
+					return [{
+							value: '1',
+							label: '江'
+						},
+						{
+							value: '2',
+							label: '湖'
+						}
+					]
+				}
+			}
+		},
+		watch: {
+			value: function(n, o) {
+				console.log('监听', n)
+				if (n) {
+					this.$refs.popup.open('center')
+				} else {
+					this.$refs.popup.close()
+				}
+			}
+		},
+		data() {
+			return {
+				single: '',
+				endDate: '',
+				starDate: '',
+				seleIndex: 1,
+				seachValue: '',
+				dateOptions: [{
+						value: 0,
+						label: '当天'
+					},
+					{
+						value: 1,
+						label: '昨日'
+					},
+					{
+						value: 2,
+						label: '上周'
+					},
+					{
+						value: 3,
+						label: '上月'
+					}
+				]
+			}
+		},
+		created() {
+			// let date = new Date
+			// this.starDate = new Date
+			// this.starDate.setMonth((date.getMonth() - 1 == 0 ? 12 : date.getMonth() - 1))
+			// this.starDate.setDate(1)
+			// this.starDate =
+			// 	`${this.starDate.getFullYear()}-${this.starDate.getMonth()+1}-${this.starDate.getDate()} ${this.starDate.getHours()}:${this.starDate.getMinutes()}`
+			// this.endDate =
+			// 	`${date.getFullYear()}-${date.getMonth()+1}-${date.getDate()} ${date.getHours()}:${date.getMinutes()}`
+		},
+		methods: {
+			pickerClick(e) {
+				this.$emit('input', false)
+				this.$emit('datePopupChange', e)
+			},
+			handlerDate(date) {
+				if(date instanceof String || date instanceof Number) {
+					date = new Date(parseInt(date))
+				}
+				if (!(date instanceof Date)) return {}
+				return {
+					y: date.getFullYear(),
+					M: (date.getMonth() + 1 + '').padStart(2, '0'),
+					d: (date.getDate() + '').padStart(2, '0'),
+				}
+			},
+			seleFn(index) {
+				this.seleIndex = index
+				let date = new Date()
+				switch (this.seleIndex) {
+					case 0:
+						let dayInfo =  this.handlerDate(date)
+						this.$emit('datePopupChange', [
+							`${dayInfo.y}-${dayInfo.M}-${dayInfo.d} 00:00:00`,
+							`${dayInfo.y}-${dayInfo.M}-${dayInfo.d} 23:59:59`
+						])
+						break;
+					case 1:
+						let yesterday = new Date((date.getTime() - (86400000)));
+						let yesterdayInfo = this.handlerDate(yesterday)
+						this.$emit('datePopupChange', [
+							`${yesterdayInfo.y}-${yesterdayInfo.M}-${yesterdayInfo.d} 00:00:00`,
+							`${yesterdayInfo.y}-${yesterdayInfo.M}-${yesterdayInfo.d} 23:59:59`
+						])
+						break;
+					case 2:
+						let endLastWeek = new Date(date.getTime() - ((date.getDay() == 0 ? 7 : date.getDay()) * 86400000))
+						let starLastWeek = new Date(endLastWeek.getTime() - (6 * 86400000))
+						
+						let starLastWeekInfo = this.handlerDate(starLastWeek)
+						let endLastWeekInfo = this.handlerDate(endLastWeek)
+						
+						this.$emit('datePopupChange', [
+							`${starLastWeekInfo.y}-${starLastWeekInfo.M}-${starLastWeekInfo.d} 00:00:00`,
+							`${endLastWeekInfo.y}-${endLastWeekInfo.M}-${endLastWeekInfo.d} 23:59:59`
+						])
+						break;
+					case 3:
+						let LastMonth = new Date(date.getTime() - ((86400000 * date.getDate())))
+						let LastMonthInfo = this.handlerDate(LastMonth)
+						this.$emit('datePopupChange', [
+							`${LastMonthInfo.y}-${LastMonthInfo.M}-01 00:00:00`,
+							`${LastMonthInfo.y}-${LastMonthInfo.M}-${LastMonthInfo.d} 23:59:59`
+						])
+						break;
+				}
+				this.$emit('input', false)
+			},
+			pickerChange(e) {
+				this.$emit('pickerChange', this.list[e.detail.value[0]])
+			},
+			change(e) {
+				this.$emit('input', e.show)
+			},
+			confirmFn() {
+
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.seledatebody_item {
+		width: 140rpx;
+		height: 60rpx;
+		background: #ADCEFF;
+		border-radius: 10px;
+		color: #FFFFFF;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 18rpx;
+	}
+
+	.datebody_item {
+		width: 140rpx;
+		height: 60rpx;
+		background: #FFFFFF;
+		border-radius: 10px;
+		color: #BBBBBB;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 18rpx;
+	}
+
+	.datebody {
+		width: 520rpx;
+		height: 500rpx;
+		background: #F0F0F0;
+		border-radius: 20px !important;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		flex-wrap: wrap;
+		padding: 15rpx 23rpx;
+	}
+</style>
diff --git a/driverManagement/index/index.vue b/driverManagement/index/index.vue
index 1493656..e96db21 100644
--- a/driverManagement/index/index.vue
+++ b/driverManagement/index/index.vue
@@ -91,19 +91,19 @@
 				seachValue: '',
 				styles: {},
 				seleindex: 0,
-				navigation: [{
-						text: '所有',
-						index: -1
-					},
-					{
-						text: '启用',
-						index: 1
-					},
-					{
-						text: '禁用',
-						index: 0
-					}
-				],
+				// navigation: [{
+				// 		text: '所有',
+				// 		index: -1
+				// 	},
+				// 	{
+				// 		text: '启用',
+				// 		index: 1
+				// 	},
+				// 	{
+				// 		text: '禁用',
+				// 		index: 0
+				// 	}
+				// ],
 				listData: []
 			}
 		},
@@ -265,20 +265,20 @@
 		align-items: center;
 	}
 
-	.form-item_body_left_bottom_text {
+/* 	.form-item_body_left_bottom_text {
 		font-size: 24rpx;
 		color: #999999;
-	}
+	} */
 
 	.form-item_body_left {
 		display: flex;
 		align-items: center;
 	}
 
-	.form_body_item_body_container {
+/* 	.form_body_item_body_container {
 		margin-left: 24rpx;
 		font-size: 28rpx;
-	}
+	} */
 
 	.form_body_item_body {
 		display: flex;
@@ -306,7 +306,7 @@
 		box-sizing: border-box;
 	}
 
-	.navigation_seleitem {
+/* 	.navigation_seleitem {
 		width: 150rpx;
 		height: 59rpx;
 		background: #F0F2FF;
@@ -320,9 +320,9 @@
 		transition: all 0.3s;
 		position: relative;
 		bottom: -2px;
-	}
+	} */
 
-	.navigation_item {
+/* 	.navigation_item {
 		width: 150rpx;
 		height: 59rpx;
 		border-top-left-radius: 11rpx;
@@ -334,14 +334,14 @@
 		align-items: center;
 		transition: all 0.3s;
 		bottom: -2px;
-	}
+	} */
 
-	.Navigation {
+/* 	.Navigation {
 		display: flex;
 		position: absolute;
 		bottom: 0px;
 		transition: all .5s;
-	}
+	} */
 
 	.header_seach_butten {
 		font-size: 24rpx !important;
@@ -400,13 +400,4 @@
 		height: var(--status-bar-height);
 	}
 
-	.copy {
-		position: relative;
-		top: 7rpx;
-		display: inline-block;
-		margin-left: 15rpx;
-		width: 32rpx;
-		height: 32rpx;
-		background: url('../../static/copy.png') 100%/ 100%;
-	}
 </style>
diff --git a/financialCenter/enterprise/account/detail.vue b/financialCenter/enterprise/account/detail.vue
new file mode 100644
index 0000000..378c1cf
--- /dev/null
+++ b/financialCenter/enterprise/account/detail.vue
@@ -0,0 +1,161 @@
+<template>
+	<view class="detail">
+		<view class="card">
+			<view>{{info.companyName}}</view>
+			<view>{{handlerNumber(info.totalBalance)}}</view>
+			<view>企业总余额(元)</view>
+		</view>
+		<view class="card-sec">
+			<view class="first">
+				<view>{{handlerNumber(info.balance)}}</view>
+				<view>账户总余额(元)</view>
+			</view>
+			<view class="second">
+				<view class="sepcial">
+					<view>{{handlerNumber(+info.outCountBalance + +info.inCountBalance)}}</view>
+					<view>油卡总余额</view>
+				</view>
+				<view>
+					<view>{{handlerNumber(info.inCountBalance)}}</view>
+					<view>自营油卡余额</view>
+				</view>
+				<view>
+					<view>{{handlerNumber(info.outCountBalance)}}</view>
+					<view>外营油卡余额</view>
+				</view>
+				<view class="sepcial">
+					<view>{{handlerNumber(+info.rechargeRebateBalance + +info.consumeRebateBalance)}}</view>
+					<view>返利总余额</view>
+				</view>
+				<view>
+					<view>{{handlerNumber(info.rechargeRebateBalance)}}</view>
+					<view>充值返利余额</view>
+				</view>
+				<view>
+					<view>{{handlerNumber(info.consumeRebateBalance)}}</view>
+					<view>消费返利余额</view>
+				</view>
+				<view class="sepcial">
+					<view>{{handlerNumber(info.rechargeBalance)}}</view>
+					<view>充值余额</view>
+				</view>
+				<view class="sepcial">
+					<view>{{handlerNumber(info.chargeRechargeBalance)}}</view>
+					<view>赊销充值余额</view>
+				</view>
+				<view class="sepcial">
+					<view>{{handlerNumber(info.totalChargeAmount)}}</view>
+					<view>赊销待还金额</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// import serve from '@/api/financialCenter/business.js'
+	export default {
+		data() {
+			return {
+				info: {}
+
+			}
+		},
+		onLoad(options) {
+			if (options.item) {
+				this.info = JSON.parse(decodeURI(options.item))
+			}
+		},
+		methods: {
+			handlerNumber(number) {
+				if (number == 0) return number
+				if (!number) {
+					return '--'
+				}
+				return +number.toFixed(2)
+			},
+		}
+	}
+</script>
+
+<style>
+	.detail {
+		padding: 100rpx 35rpx 0;
+
+	}
+
+	.sepcial {
+		padding-top: 13rpx !important;
+	}
+
+	.sepcial view:nth-of-type(1) {
+		font-size: 38rpx;
+	}
+
+	.card {
+		padding: 50rpx 40rpx 0;
+		wdith: 100%;
+		height: 285rpx;
+		background: url('https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/oms-card-bg.png') #fff 100%/100% no-repeat;
+		border-radius: 30rpx;
+	}
+
+	.card view {
+		color: #fff;
+	}
+
+	.card view:nth-of-type(2) {
+		margin-top: 60rpx;
+		font-size: 44rpx;
+	}
+
+	.card view:nth-of-type(1),
+	.card view:nth-of-type(3) {
+		font-size: 26rpx;
+	}
+
+	.card-sec {
+		width: 100%;
+		min-height: 500rpx;
+		padding: 45rpx 35rpx;
+		background: #FAEBD770;
+		border-radius: 30rpx;
+	}
+
+	.card-sec .first {
+		width: 100%;
+	}
+
+	.card-sec .first view:nth-of-type(1) {
+		font-size: 46rpx;
+	}
+
+	.card-sec .first view:nth-of-type(2) {
+		font-size: 26rpx;
+	}
+
+	.card-sec .second {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 20rpx;
+
+	}
+
+	.card-sec .second>view {
+		padding-top: 20rpx;
+		padding-left: 5rpx;
+		width: 33.3%;
+		height: 120rpx;
+	}
+
+	.card-sec .second>view view:nth-of-type(1) {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		color: #333;
+	}
+
+	.card-sec .second>view view:nth-of-type(2) {
+		color: #696969;
+		font-size: 24rpx;
+	}
+</style>
diff --git a/financialCenter/enterprise/account/index.vue b/financialCenter/enterprise/account/index.vue
new file mode 100644
index 0000000..a6150b0
--- /dev/null
+++ b/financialCenter/enterprise/account/index.vue
@@ -0,0 +1,166 @@
+<template>
+	<view style="height: 100vh;display: flex;flex-direction: column;">
+		<view class="header">
+			<view :style="{height:styles.top+'px'}"></view>
+			<uni-nav-bar @clickLeft='jump(-1)' :border="false" color='white' backgroundColor="rgba(0,0,0,0)"
+				left-icon="back" title="公司账户管理" />
+			<view class="seach">
+				<uni-easyinput @confirm='seachFn' style="border-radius:12rpx ;" prefixIcon="search"
+					placeholder-style="color:#bbb;font-weight: 100;" confirmType="搜索"
+					v-model="paramter.params.companyName" placeholder="请输入公司名称">
+				</uni-easyinput>
+			</view>
+		</view>
+		<view style="flex:1;overflow: hidden;">
+			<view v-if="!tableList.length"
+				style="width: 100vw; height: 100%; display: flex;align-items: center;justify-content: center;">
+				<image src="@/static/qx.png" style="width: 500rpx; height: 355rpx;"></image>
+			</view>
+			<scroll-view style="height: 100%;" scroll-y="true" @scrolltolower='scrolltolower'>
+				<view class="container">
+					<view class="item" v-for="item,index in tableList" :key="index"
+						@tap="jump(1,'/financialCenter/enterprise/account/detail',item)">
+						<image class="logo" src="@/static/company.png"></image>
+						<view>{{item.companyName}}</view>
+						<view>企业总余额：{{handlerNumber(item.totalBalance)}}</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/financialCenter/business.js'
+	export default {
+		data() {
+			return {
+				styles: {},
+				paramter: {
+					currentPage: 1,
+					pageSize: 10,
+					sorted:{
+						createTime:'desc'
+					},
+					params: {
+						companyName: ''
+					}
+				},
+				tableList: []
+			}
+		},
+		onLoad() {
+			this.styles = uni.getMenuButtonBoundingClientRect()
+			this.getByPage()
+		},
+		methods: {
+			seachFn() {
+				this.tableList = []
+				this.paramter.currentPage = 1
+				this.getByPage()
+				console.log('seachFn')
+			},
+			getByPage() {
+				serve.getByPage(this.paramter).then(res => {
+					if (!res.data.list.length) {
+						uni.showToast({
+							title: '没有数据了哦~',
+							icon: 'none'
+						})
+						return
+					}
+					this.tableList = this.tableList.concat(res.data.list);
+				})
+			},
+			// 触底加载
+			scrolltolower() {
+				this.paramter.currentPage += 1
+				this.getByPage()
+
+			},
+			handlerNumber(number) {
+				if (number == 0) return number
+				if (!number) {
+					return '--'
+				}
+				return +number.toFixed(2)
+			},
+
+			jump(e, path, item) {
+				console.log(123)
+				switch (e) {
+					case -1:
+						uni.navigateBack()
+						break;
+					case 1:
+						uni.navigateTo({
+							url: `${path}?item=${encodeURI(JSON.stringify(item))}`
+						})
+						break;
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+	.uni-easyinput__content {
+		background-color: #fff;
+	}
+
+	.header {
+		position: relative;
+		width: 100%;
+		min-height: 403rpx;
+		background: url('https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油admin小程序/sjbj.png') center/100% no-repeat;
+	}
+
+	.header .seach {
+		margin-top: 60rpx;
+		padding: 0 50rpx;
+	}
+
+	.container {
+		padding: 30rpx 55rpx;
+	}
+
+	.container .item {
+		position: relative;
+		margin-bottom: 25rpx;
+		padding-top: 60rpx;
+		height: 200rpx;
+		width: 100%;
+		background: #fff;
+		/* border: 1px solid #333; */
+		border-radius: 10rpx;
+	}
+
+	.container .item .logo {
+		position: absolute;
+		left: 20rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		/* border: 1px solid #333; */
+	}
+
+	.container .item view {
+		padding-left: 150rpx;
+
+	}
+
+	.container .item view:nth-of-type(1) {
+		/* margin-top: 57rpx; */
+		color: #333;
+		font-size: 30rpx;
+		font-weight: 550;
+	}
+
+	.container .item view:nth-of-type(2) {
+		margin-top: 10rpx;
+		color: #778899;
+		font-size: 24rpx;
+	}
+</style>
diff --git a/financialCenter/enterprise/recharge/index.vue b/financialCenter/enterprise/recharge/index.vue
new file mode 100644
index 0000000..9505ca5
--- /dev/null
+++ b/financialCenter/enterprise/recharge/index.vue
@@ -0,0 +1,392 @@
+<template>
+	<view style="height: 100vh;display: flex;flex-direction: column; ">
+		<view class="header">
+			<view :style="{height:styles.top+'px'}" class="top"></view>
+			<uni-nav-bar @clickLeft='back' color='white' backgroundColor="rgba(0,0,0,0)" left-icon="back"
+				title="企业充值" />
+
+			<view class="header_seach">
+				<view class="header_seach_seach">
+					<!-- <uni-easyinput @focus="inputFocus" @clear="inputClear"
+						style="height: 100%; flex: 1; background-color: #FFFFFF; border-radius:12rpx ;"
+						placeholder-style="color:#bbbbbb;font-weight: 100;" :value="parameter.params.name"
+						placeholder="企业名称">
+					</uni-easyinput> -->
+					<!-- <input @focus="inputFocus"
+						style="height: 100%; flex: 1; background-color: #FFFFFF; border-radius:12rpx ;"
+						placeholder-style="color:#bbbbbb;font-weight: 100;" :value="parameter.params.name"
+						placeholder="企业名称">
+					</input> -->
+					<view @click="inputFocus" class="special-input" >
+						{{ parameter.params.name || '企业名称'}}
+						<image v-if="parameter.params.name" class="close" src="../../../static/close.png" @click="inputClear"></image>
+					</view>
+
+
+					<button @tap='search' class="header_seach_butten">
+						<uni-icons type="search" size="20" color="#bbbbbb"></uni-icons>
+						<view>搜索</view>
+					</button>
+				</view>
+
+				<view class="date-chunk">
+					<text>日期：</text>
+					<text style="margin-left: 10rpx;" @click="controlWindows.datePopup=true">
+						{{ parameter.params.createTimeStart.split(' ')[0] || '开始时间' }} ~ {{ parameter.params.createTimeEnd.split(' ')[0] || '结束时间' }}
+					</text>
+				</view>
+			</view>
+		</view>
+		<view style="flex: 1;overflow: hidden;">
+			<scroll-view style="height: 100%;" scroll-y="true" @scrolltolower="scrolltolower">
+				<view v-for="(item,index) in listData">
+					<view class="item">
+						<view class="type">{{typeEnum[item.transactionType]}}</view>
+						<view class="top-region">
+							<image src="../../../static/selegs.png"
+								style="width: 100rpx; height: 100rpx;border-radius: 50%;"></image>
+							<view class="">{{item.companyName}}</view>
+							<view class="transfer">
+								<text class="pay">付</text>
+								<text>{{item.offlinePaymentCompany || '暂无'}}</text>
+							</view>
+							<view class="transfer">
+								<text class="collect">收</text>
+								<text>{{item.internalCompanyName || '暂无'}}</text>
+							</view>
+							<view class="status"
+								:class="statusEnum.find(_item => _item.value == item.transactionState).class">
+								{{statusEnum.find(_item => _item.value == item.transactionState).label}}
+							</view>
+						</view>
+						<view class="bottom-region">
+							<text>{{item.createTime}}</text>
+							<text>￥{{item.transactionAmount}}</text>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<datePopup @datePopupChange='datePopupChange' v-model="controlWindows.datePopup" />
+	</view>
+</template>
+
+<script>
+	import datePopup from '@/components/datePopup.vue'
+
+	import serve from '@/api/financialCenter/business.js'
+	export default {
+		components: {
+			datePopup
+		},
+		data() {
+			return {
+				controlWindows: {
+					datePopup: false
+				},
+				parameter: {
+					pageSize: 15,
+					currentPage: 1,
+					params: {
+						name: '',
+						companyId: '',
+						createTimeStart: '',
+						createTimeEnd: '',
+						businessLeader: '',
+					},
+					sorted: {
+
+					}
+				},
+				styles: {},
+				listData: [],
+				userInfo: uni.getStorageSync('user'),
+				statusEnum: [{
+						value: '0',
+						label: '已申请',
+						class: 'orange'
+					},
+					{
+						value: '1',
+						label: '已成功',
+						class: 'green'
+					},
+					{
+						value: '-1',
+						label: '已撤销',
+						class: 'gray'
+					}
+				],
+				typeEnum: {
+					'RECHARGE': '充值',
+					'REVOKE': '销账',
+					'CHARGE_SALES': '赊销',
+					'CONSUME_REBATE': '消费返利',
+					'TURN': '圈回',
+				}
+			}
+		},
+		onPullDownRefresh() {
+			console.log('下拉的生命周期')
+		},
+		onLoad() {
+			this.styles = uni.getMenuButtonBoundingClientRect()
+
+			uni.$on('currentEnterprise', (item) => {
+				if (!item.id) return
+				this.parameter.params.companyId = item.id
+				this.parameter.params.name = item.name
+
+			})
+		},
+		onShow() {
+			this.search();
+		},
+
+		methods: {
+			back() {
+				uni.navigateBack()
+			},
+			inputFocus(e) {
+				console.log('e', e)
+				uni.navigateTo({
+					url: './selEnterprise'
+				})
+			},
+			inputClear() {
+				this.parameter.params.companyId = ''
+				this.parameter.params.name = ''
+			},
+			datePopupChange(time) {
+				this.parameter.currentPage = 1
+				this.parameter.params.createTimeStart = time[0]
+				this.parameter.params.createTimeEnd = time[1]
+			},
+			search() {
+				// this.parameter.params['businessLeader'] = this.userInfo.id
+				serve.getByPageRecharge(this.parameter).then(res => {
+					if (res.code !== 20000) return
+					this.listData = this.listData.concat(res.data.list);
+				})
+			},
+
+			scrolltolower() {
+				this.parameter.currentPage += 1
+				this.search()
+			},
+
+			handlerDate(date) {
+				if (date instanceof String || date instanceof Number) {
+					date = new Date(parseInt(date))
+				}
+				if (!(date instanceof Date)) return {}
+				return {
+					y: date.getFullYear(),
+					M: (date.getMonth() + 1 + '').padStart(2, '0'),
+					d: (date.getDate() + '').padStart(2, '0'),
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F0F2FF;
+	}
+
+	.date-chunk {
+		margin-top: 19rpx;
+		padding: 0 40rpx;
+		height: 75rpx;
+		width: 555rpx;
+		line-height: 75rpx;
+		font-size: 27rpx;
+		background: #ADCEFF;
+		border-radius: 6px;
+	}
+
+	.special-input {
+		position: relative;
+		height: 100%;
+		flex: 1;
+		background-color: #FFF;
+		border-radius: 12rpx;
+		color: #333;
+		line-height: 80rpx;
+		padding-left: 20rpx;
+		.close {
+			position: absolute;
+			top: 50%;
+			right: 20rpx;
+			transform: translateY(-50%);
+			width: 36rpx;
+			height: 36rpx;
+		}
+	}
+
+	.item {
+		position: relative;
+		overflow: hidden;
+		margin: 40rpx auto 0;
+		padding: 20rpx 20rpx 15rpx 20rpx;
+		width: 700rpx;
+		font-size: 28rpx;
+		background: #fff;
+		border-radius: 12rpx;
+		box-shadow: 0px 3px 9px 0px rgba(88, 88, 88, 0.2);
+
+		.type {
+			position: absolute;
+			left: -24px;
+			width: 175rpx;
+			text-align: center;
+			height: 40rpx;
+			transform: rotate(-45deg);
+			font-size: 22rpx;
+			line-height: 40rpx;
+			z-index: 20;
+			color: #fff;
+			background: #1890FF;
+		}
+
+		.top-region {
+			position: relative;
+			padding-left: 135rpx;
+			min-height: 150rpx;
+
+			image {
+				position: absolute;
+				left: 5rpx;
+				top: 50%;
+				transform: translateY(-50%);
+				width: 100rpx;
+				height: 100rpx;
+				// border: 1px solid #333;
+			}
+
+			.transfer {
+				margin-top: 10rpx;
+
+				text {
+					font-size: 25rpx;
+
+					&:nth-of-type(1) {
+						vertical-align: top;
+						display: inline-block;
+						width: 40rpx;
+						height: 40rpx;
+						text-align: center;
+						line-height: 40rpx;
+
+						&.pay {
+							color: #1890ff;
+							background: #e8f4ff;
+							border: 1px solid #d1e9ff;
+						}
+
+						&.collect {
+							color: #13ce66;
+							background: #e7faf0;
+							border: 1px solid #d0f5e0;
+						}
+					}
+
+					&:nth-of-type(2) {
+						display: inline-block;
+						margin-left: 15rpx;
+						width: 450rpx;
+					}
+				}
+			}
+
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
+				font-size: 25rpx;
+
+				&.green {
+					color: #13ce66;
+				}
+
+				&.orange {
+					color: #ffba00;
+				}
+
+				&.gray {
+					color: #909399;
+				}
+			}
+		}
+
+		.bottom-region {
+			font-size: 22rpx;
+
+			text {
+				&:nth-of-type(1) {
+					color: #bbb;
+				}
+
+				&:nth-of-type(2) {
+					float: right;
+					font-size: 25rpx;
+					color: #1890FF;
+				}
+			}
+		}
+
+	}
+
+
+
+	.header_seach_butten {
+		font-size: 24rpx !important;
+		display: flex !important;
+		align-items: center !important;
+		margin: 0 !important;
+		flex-shrink: 1;
+		margin-left: 9rpx !important;
+		background: #FFFFFF !important;
+		justify-content: center;
+	}
+
+	.uni-easyinput__content {
+		height: 80rpx;
+	}
+
+	.uni-easyinput {
+		height: 80rpx;
+	}
+
+	.header_seach_seach {
+		display: flex;
+		height: 80rpx;
+		margin-top: 23rpx;
+	}
+
+	.header_seach {
+		font-size: 26rpx;
+		padding: 0 10px;
+	}
+
+	.uni-navbar--border {
+		border: 0px !important;
+	}
+
+	.header {
+		position: relative;
+		color: white;
+		min-height: 403rpx;
+		background: url('https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油admin小程序/sjbj.png') 100%/100%;
+	}
+
+	.uni-navbar__header-btns-right {
+		padding-right: 0 !important;
+		width: 120rpx !important;
+	}
+
+	.top {
+		height: var(--status-bar-height);
+	}
+</style>
diff --git a/financialCenter/enterprise/recharge/selEnterprise.vue b/financialCenter/enterprise/recharge/selEnterprise.vue
new file mode 100644
index 0000000..5a835aa
--- /dev/null
+++ b/financialCenter/enterprise/recharge/selEnterprise.vue
@@ -0,0 +1,164 @@
+<template>
+	<view>
+		<view class="company_body">
+			<view class="header_seach_seach">
+				<uni-easyinput @confirm="seachFn"
+					style="height: 100%; flex: 1; margin: 0 auto; background-color: #FFFFFF; border-radius:12rpx ;"
+					prefixIcon="search" v-model="params.name" placeholder="请输入企业名称进行查询">
+				</uni-easyinput>
+			</view>
+		</view>
+		<view class="company_list">
+			<view @tap="seleFn(item)" v-for="(item,index) in companyList" class="company_list_item">
+				<image src="../../../static/selegs.png" style="width: 73rpx; height: 73rpx;"></image>
+				<view class="company_list_item_text">{{item.name}}</view>
+<!-- 				<view style="flex-grow: 1; text-align: end;text-align: -webkit-right;">
+					<view class="checkboxs">
+						<view v-if="item.isChecked" class="checkboxss"></view>
+					</view>
+				</view> -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/userManagement/customer.js'
+	
+	export default {
+		data() {
+			return {
+				timer: null,
+				companyList: [],
+				params: {
+					name: ''
+				},
+			}
+		},
+
+		onShow() {
+			this.companyGetByPage()
+		},
+		// onReachBottom() {
+		// 	// this.getData.currentPage += 1
+		// 	this.getDriversList()
+		// },
+		methods: {
+			seleFn(item) {
+				uni.$emit('currentEnterprise', item)
+				this.timer = setTimeout(() => {
+					clearTimeout(this.timer)
+					uni.navigateBack()
+				}, 200)
+			},
+			seachFn() {
+				if (!this.params.name) {
+					uni.showToast({
+						title: '搜索条件不可为空',
+						icon: 'none'
+					})
+					return
+				}
+				this.companyGetByPage()
+			},
+			
+			companyGetByPage() {
+				serve.companyGetByPage(this.params).then(res => {
+					if (res.code !== 20000) return
+					this.companyList = res.data
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.companytip {
+		width: 88rpx;
+		height: 38rpx;
+		border-radius: 4rpx;
+		color: #FFFFFF;
+		font-size: 24rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.checkboxss {
+		width: 80%;
+		height: 80%;
+		background-color: #2866FF;
+		border-radius: 50px;
+	}
+
+	.checkboxs {
+		width: 20rpx;
+		height: 20rpx;
+		border-radius: 50px;
+		border: 1px solid #BBBBBB;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.checkbox__inner {
+		border-radius: 50px !important;
+	}
+
+	.uni-data-checklist {
+		flex: 0 !important;
+	}
+
+	.uni-data-checklist .checklist-group .checklist-box {
+		margin: 0 !important;
+	}
+
+	.uni-data-checklist {
+		width: max-content;
+	}
+
+	.company_list_item_text {
+		font-size: 28rpx;
+		color: #000000;
+		margin-left: 23rpx;
+	}
+
+	.company_list_item {
+		min-height: 92rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 3px 9px 0px rgba(88, 88, 88, 0.2);
+		border-radius: 8rpx;
+		font-size: 28rpx;
+		display: flex;
+		align-items: center;
+		padding: 9rpx 21rpx;
+		margin-top: 19rpx;
+	}
+
+	.company_list {
+		width: 100vw;
+		padding: 0 31rpx;
+		box-sizing: border-box;
+		margin-top: 40rpx;
+	}
+
+	.company_body {
+		background-color: #2866FF;
+		padding: 25rpx 0;
+	}
+
+	.uni-easyinput__content {
+		height: 80rpx;
+	}
+
+	.uni-easyinput {
+		height: 80rpx;
+	}
+
+	.header_seach_seach {
+		display: flex;
+		height: 80rpx;
+		background-color: #2866FF;
+		padding: 0 31rpx;
+	}
+</style>
diff --git a/financialCenter/serviceStation/account/detail.vue b/financialCenter/serviceStation/account/detail.vue
new file mode 100644
index 0000000..49c15c5
--- /dev/null
+++ b/financialCenter/serviceStation/account/detail.vue
@@ -0,0 +1,125 @@
+<template>
+	<view class="detail">
+		<view class="card">
+			<view>{{info.accountName}}</view>
+			<view>{{handlerNumber(info.balance)}}</view>
+			<view>账户总余额(元)</view>
+		</view>
+		<view class="card-sec">
+			<view class="second">
+				<view class="sepcial">
+					<view>{{handlerNumber(info.rechargeBalance)}}</view>
+					<view>账户充值余额</view>
+				</view>
+				<view class="sepcial">
+					<view>{{handlerNumber(info.rechargeRebateBalance)}}</view>
+					<view>充值返利余额</view>
+				</view>
+				<view class="sepcial">
+					<view>{{handlerNumber(info.consumeRebateBalance)}}</view>
+					<view>消费返利余额</view>
+				</view>
+				<view class="sepcial">
+					<view>{{handlerNumber(info.calibrationBalance)}}</view>
+					<view>校准金额</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				info: {}
+			}
+		},
+		onLoad(options) {
+			if (options.item) {
+				this.info = JSON.parse(decodeURI(options.item))
+			}
+		},
+		methods: {
+			handlerNumber(number) {
+				console.log(number)
+				if (number == 0) return number
+				if (!number) {
+					return '--'
+				}
+				return +number.toFixed(2)
+			},
+		}
+	}
+</script>
+
+<style>
+	.detail {
+		padding: 100rpx 35rpx 0;
+
+	}
+
+	.sepcial {
+		padding-top: 13rpx !important;
+	}
+
+	.sepcial view:nth-of-type(1) {
+		font-size: 38rpx;
+	}
+
+	.card {
+		padding: 50rpx 40rpx 0;
+		wdith: 100%;
+		height: 285rpx;
+		background: url('https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/oms-card-bg.png') #fff 100%/100% no-repeat;
+		border-radius: 30rpx;
+	}
+
+	.card view {
+		color: #fff;
+	}
+
+	.card view:nth-of-type(2) {
+		margin-top: 60rpx;
+		font-size: 44rpx;
+	}
+
+	.card view:nth-of-type(1),
+	.card view:nth-of-type(3) {
+		font-size: 26rpx;
+		/* margin-top: 10rpx; */
+	}
+
+	.card-sec {
+		width: 100%;
+		/* min-height: 500rpx; */
+		padding: 35rpx;
+		background: #FAEBD770;
+		border-radius: 30rpx;
+	}
+
+	.card-sec .second {
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 20rpx;
+
+	}
+
+	.card-sec .second>view {
+		padding-top: 20rpx;
+		padding-left: 5rpx;
+		width: 33.3%;
+		height: 120rpx;
+	}
+
+	.card-sec .second>view view:nth-of-type(1) {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		color: #333;
+	}
+
+	.card-sec .second>view view:nth-of-type(2) {
+		color: #696969;
+		font-size: 24rpx;
+	}
+</style>
diff --git a/financialCenter/serviceStation/account/index.vue b/financialCenter/serviceStation/account/index.vue
new file mode 100644
index 0000000..4485248
--- /dev/null
+++ b/financialCenter/serviceStation/account/index.vue
@@ -0,0 +1,163 @@
+<template>
+	<view style="height: 100vh;display: flex;flex-direction: column; background: #F0F2FF;">
+		<view class="header">
+			<view :style="{height:styles.top+'px'}"></view>
+			<uni-nav-bar @clickLeft='jump(-1)' :border="false" color='white' backgroundColor="rgba(0,0,0,0)"
+				left-icon="back" title="油站账户管理" />
+			<view class="seach">
+				<uni-easyinput @confirm='seachFn' style="border-radius:12rpx ;" prefixIcon="search"
+					placeholder-style="color:#bbb;font-weight: 100;" confirmType="搜索"
+					v-model="paramter.params.accountName" placeholder="请输入油站账户名称">
+				</uni-easyinput>
+			</view>
+		</view>
+		<view style="flex:1;overflow: hidden;">
+			<view v-if="!tableList.length"
+				style="width: 100vw; height: 100%; display: flex;align-items: center;justify-content: center;">
+				<image src="@/static/qx.png" style="width: 500rpx; height: 355rpx;"></image>
+			</view>
+			<scroll-view style="height: 100%;" scroll-y="true" @scrolltolower='scrolltolower'>
+				<view class="container">
+					<view class="item" v-for="item,index in tableList" :key="index"
+						@tap="jump(1,'/financialCenter/serviceStation/detail',item)">
+						<image class="logo" src="@/static/serviceStation.png"></image>
+						<view>{{item.accountName}}</view>
+						<view>账户总余额：{{handlerNumber(item.balance)}}</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/financialCenter/serviceStation.js'
+	export default {
+		data() {
+			return {
+				styles: {},
+				paramter: {
+					currentPage: 1,
+					pageSize: 10,
+					sorted:{
+						createTime:'desc'
+					},
+					params: {
+						accountName: ''
+					}
+				},
+				tableList: []
+			}
+		},
+		onLoad() {
+			this.styles = uni.getMenuButtonBoundingClientRect()
+			this.getByPage()
+		},
+		// onShow() {
+		// 	this.getByPage()
+		// },
+		methods: {
+			seachFn() {
+				this.tableList = []
+				this.paramter.currentPage = 1
+				this.getByPage()
+				console.log('seachFn')
+			},
+			getByPage() {
+				serve.getByPage(this.paramter).then(res => {
+					if (!res.data.list.length) {
+						uni.showToast({
+							title: '没有数据了哦~',
+							icon: 'none'
+						})
+						return
+					}
+					this.tableList = this.tableList.concat(res.data.list);
+				})
+			},
+			// 触底加载
+			scrolltolower() {
+				this.paramter.currentPage += 1
+				this.getByPage()
+			},
+			handlerNumber(number) {
+				if (number == 0) return number
+				if (!number) {
+					return '--'
+				}
+				return +number.toFixed(2)
+			},
+			jump(e, path, item) {
+				switch (e) {
+					case -1:
+						uni.navigateBack()
+						break;
+					case 1:
+						uni.navigateTo({
+							url: `${path}?item=${encodeURI(JSON.stringify(item))}`
+						})
+						break;
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+	.uni-easyinput__content {
+		background-color: #fff;
+	}
+
+	.header {
+		position: relative;
+		width: 100%;
+		min-height: 403rpx;
+		background: url('https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油admin小程序/sjbj.png') center/100% no-repeat;
+	}
+
+	.header .seach {
+		margin-top: 30rpx;
+		padding: 0 50rpx;
+	}
+
+	.container {
+		padding: 30rpx 55rpx;
+	}
+
+	.container .item {
+		position: relative;
+		margin-bottom: 25rpx;
+		padding-top: 60rpx;
+		height: 200rpx;
+		width: 100%;
+		background: #fff;
+		border-radius: 10rpx;
+	}
+
+	.container .item .logo {
+		position: absolute;
+		left: 20rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		/* border: 1px solid #333; */
+	}
+
+	.container .item view {
+		padding-left: 150rpx;
+	}
+
+	.container .item view:nth-of-type(1) {
+		color: #333;
+		font-size: 30rpx;
+		font-weight: 550;
+	}
+
+	.container .item view:nth-of-type(2) {
+		margin-top: 10rpx;
+		color: #778899;
+		font-size: 24rpx;
+	}
+</style>
diff --git a/pages.json b/pages.json
index 35001f1..914f17b 100644
--- a/pages.json
+++ b/pages.json
@@ -393,13 +393,36 @@
 		{
 			"root": "financialCenter",
 			"pages": [{
-					"path": "business/index",
+					"path": "enterprise/account/index",
 					"style": {
 						"navigationBarTitleText": "企业账户管理",
 						"navigationStyle": "custom",
 						"enablePullDownRefresh": false
 					}
 
+				}, {
+					"path": "enterprise/account/detail",
+					"style": {
+						"navigationBarBackgroundColor": "#2866FF",
+						"navigationBarTitleText": "企业账户管理",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "enterprise/recharge/index",
+					"style": {
+						"navigationBarTitleText": "企业充值",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "enterprise/recharge/selEnterprise",
+					"style": {
+						"navigationBarTitleText": "请选择公司",
+						"enablePullDownRefresh": false
+					}
+
 				}, {
 					"path": "serviceStation/index",
 					"style": {
@@ -409,15 +432,7 @@
 					}
 
 				},
-				{
-					"path": "business/detail",
-					"style": {
-						"navigationBarBackgroundColor": "#2866FF",
-						"navigationBarTitleText": "公司账户管理",
-						"enablePullDownRefresh": false
-					}
-				
-				},
+
 				{
 					"path": "serviceStation/detail",
 					"style": {
@@ -425,7 +440,7 @@
 						"navigationBarTitleText": "油站账户管理",
 						"enablePullDownRefresh": false
 					}
-				
+
 				}
 
 			]
@@ -439,7 +454,7 @@
 						"navigationStyle": "custom",
 						"enablePullDownRefresh": false
 					}
-		
+
 				},
 				{
 					"path": "customer/detail",
@@ -448,7 +463,7 @@
 						"navigationBarTitleText": "用户详情",
 						"enablePullDownRefresh": false
 					}
-				
+
 				},
 				{
 					"path": "customer/components/company",
@@ -456,7 +471,7 @@
 						"navigationBarTitleText": "请选择公司",
 						"enablePullDownRefresh": false
 					}
-				
+
 				},
 				{
 					"path": "customer/components/auth",
@@ -464,18 +479,18 @@
 						"navigationBarTitleText": "请选择权限",
 						"enablePullDownRefresh": false
 					}
-				
-				},{
+
+				}, {
 					"path": "yunSite/index",
 					"style": {
 						"navigationBarTitleText": "星油云站用户信息",
 						"navigationStyle": "custom",
 						"enablePullDownRefresh": false
 					}
-		
+
 				},
 
-				
+
 				{
 					"path": "yunSite/detail",
 					"style": {
@@ -483,7 +498,7 @@
 						"navigationBarTitleText": "用户详情",
 						"enablePullDownRefresh": false
 					}
-				
+
 				},
 				{
 					"path": "yunSite/components/serviceStation",
@@ -491,7 +506,7 @@
 						"navigationBarTitleText": "请选择油站",
 						"enablePullDownRefresh": false
 					}
-				
+
 				},
 				{
 					"path": "yunSite/components/auth",
@@ -499,9 +514,9 @@
 						"navigationBarTitleText": "请选择权限",
 						"enablePullDownRefresh": false
 					}
-				
+
 				}
-		
+
 			]
 		}
 	],
diff --git a/pages/index/index.vue b/pages/index/index.vue
index edb353d..93769ca 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -16,7 +16,8 @@
 				<view class="index_topbody">
 					<view :style="{marginTop:'calc(267rpx - ' + shikHeig + ')'}" class="index_top_car">
 						<view class="index_top_car_header_photo">
-							<image style="width: 140rpx; height:140rpx;border-radius: 50%;" :src=" user.headPhoto || '/static/tx.png' "></image>
+							<image style="width: 140rpx; height:140rpx;border-radius: 50%;"
+								:src=" user.headPhoto || '/static/tx.png' "></image>
 						</view>
 						<view style="padding-top: 70rpx;">
 							<view class="bgtext" style="">{{user.name?user.name:'暂未设置'}}</view>
@@ -28,8 +29,8 @@
 							</view>
 						</view>
 					</view>
-			</view>
 				</view>
+			</view>
 		</topBar>
 		<view class="index_list">
 			<view class="index_list_item">
@@ -43,7 +44,7 @@
 						</image>
 						<view class="listtext">司机列表</view>
 					</view>
-					<view v-if="jurisdiction('driver:info:add')"  @tap="jump(2)" class="index_list_item_right_item">
+					<view v-if="jurisdiction('driver:info:add')" @tap="jump(2)" class="index_list_item_right_item">
 						<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/dirverIndex.png">
 						</image>
 						<view class="listtext">新增司机</view>
@@ -57,12 +58,14 @@
 					<view class="left_text">油品分发</view>
 				</view>
 				<view class="index_list_item_right">
-					<view v-if="jurisdiction('distributeReverse:info:list')" @tap="jump(1)" class="index_list_item_right_item">
+					<view v-if="jurisdiction('distributeReverse:info:list')" @tap="jump(1)"
+						class="index_list_item_right_item">
 						<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/oliList.png">
 						</image>
 						<view class="listtext">分发列表</view>
 					</view>
-					<view v-if="jurisdiction('distributeReverse:info:add')" @tap="jump(3)" class="index_list_item_right_item">
+					<view v-if="jurisdiction('distributeReverse:info:add')" @tap="jump(3)"
+						class="index_list_item_right_item">
 						<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/addoli.png">
 						</image>
 						<view class="listtext">新增分发</view>
@@ -70,32 +73,35 @@
 				</view>
 			</view>
 			<view class="index_list_item">
-				<view  style="background: linear-gradient(122deg, #EEBA5F 0%, #FBAF2B 100%);"class="index_list_item_left">
-					<image style="width: 107rpx; height: 103rpx; margin-bottom: 15rpx;" src="@/static/order.png"></image>
+				<view style="background: linear-gradient(122deg, #EEBA5F 0%, #FBAF2B 100%);"
+					class="index_list_item_left">
+					<image style="width: 107rpx; height: 103rpx; margin-bottom: 15rpx;" src="@/static/order.png">
+					</image>
 					<view class="left_text">订单管理</view>
 				</view>
 				<view class="index_list_item_right">
-					<view v-if="jurisdiction('oilOrder:info:list')"  @tap="jump(4)" class="index_list_item_right_item">
+					<view v-if="jurisdiction('oilOrder:info:list')" @tap="jump(4)" class="index_list_item_right_item">
 						<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/orderList.png">
 						</image>
 						<view class="listtext">订单列表</view>
 					</view>
-					
+
 				</view>
 			</view>
 			<view class="index_list_item">
-				<view  style="background: linear-gradient(122deg, #EEBA5F 0%, #FBAF2B 100%);"
+				<view style="background: linear-gradient(122deg, #EEBA5F 0%, #FBAF2B 100%);"
 					class="index_list_item_left">
-					<image style="width: 107rpx; height: 103rpx; margin-bottom: 15rpx;" src="@/static/order.png"></image>
+					<image style="width: 107rpx; height: 103rpx; margin-bottom: 15rpx;" src="@/static/order.png">
+					</image>
 					<view class="left_text">动销排名</view>
 				</view>
 				<view class="index_list_item_right">
-					<view v-if="jurisdiction('ranking:info:list')"  @tap="jump(6)" class="index_list_item_right_item">
+					<view v-if="jurisdiction('ranking:info:list')" @tap="jump(6)" class="index_list_item_right_item">
 						<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/orderList.png">
 						</image>
 						<view class="listtext"> 油站动销</view>
 					</view>
-					<view v-if="jurisdiction('ranking:info:list')"  @tap="jump(8)" class="index_list_item_right_item">
+					<view v-if="jurisdiction('ranking:info:list')" @tap="jump(8)" class="index_list_item_right_item">
 						<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/orderList.png">
 						</image>
 						<view class="listtext"> 企业动销 </view>
@@ -103,23 +109,25 @@
 				</view>
 			</view>
 			<view class="index_list_item">
-				<view  style="background: linear-gradient(122deg, #EEBA5F 0%, #FBAF2B 100%);"
+				<view style="background: linear-gradient(122deg, #EEBA5F 0%, #FBAF2B 100%);"
 					class="index_list_item_left">
-					<image style="width: 107rpx; height: 103rpx; margin-bottom: 15rpx;" src="@/static/order.png"></image>
+					<image style="width: 107rpx; height: 103rpx; margin-bottom: 15rpx;" src="@/static/order.png">
+					</image>
 					<view class="left_text">调价管理</view>
 				</view>
 				<view class="index_list_item_right">
-					<view   v-if="jurisdiction('priceAdjust:info:list')"  @tap="jump(5)" class="index_list_item_right_item">
+					<view v-if="jurisdiction('priceAdjust:info:list')" @tap="jump(5)"
+						class="index_list_item_right_item">
 						<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/orderList.png">
 						</image>
 						<view class="listtext">调价申请</view>
 					</view>
-					<view v-if="jurisdiction('priceTask:info:list')"  @tap="jump(7)" class="index_list_item_right_item">
+					<view v-if="jurisdiction('priceTask:info:list')" @tap="jump(7)" class="index_list_item_right_item">
 						<image style="width: 43rpx; height: 43rpx;margin-right: 15rpx;" src="@/static/orderList.png">
 						</image>
 						<view class="listtext">调价任务</view>
 					</view>
-					
+
 				</view>
 			</view>
 		</view>
@@ -138,59 +146,50 @@
 				title: 'Hello',
 				shikHeig: '',
 				user: {
-					authList:[]
+					authList: []
 				},
 			}
 		},
 		onShow() {
 			this.user = uni.getStorageSync('user')
-			
+
 		},
 		onLoad() {
 			try {
-				let that = this
+				// let that = this
 				let style = uni.getMenuButtonBoundingClientRect()
 				const query = uni.createSelectorQuery().in(this);
 				query.select('.index_top_car').boundingClientRect(data => {
 					let shikHeig = Number(style.height) + Number(style.top) + (Number(data.height) / 2)
-					that.shikHeig = shikHeig + 'px'
-					console.log("得到布局位置信息" + JSON.stringify(data));
-					console.log("节点离页面顶部的距离为" + data.top, shikHeig);
+					this.shikHeig = shikHeig + 'px'
 				}).exec();
 			} catch (err) {
-				console.log('失败')
+				console.log('onLoad err')
 			}
 			this.upDate()
 		},
 		methods: {
-			upDate(){
-				console.log('检查更新中----');
+			upDate() {
 				const updateManager = wx.getUpdateManager();
-				updateManager.onCheckForUpdate(function (res) {
-				  // 请求完新版本信息的回调
-				  console.log(res.hasUpdate,'版本信息')
+				updateManager.onCheckForUpdate(function(res) {
+					// 请求完新版本信息的回调
+					console.log(res.hasUpdate, '版本信息')
 				})
-				// updateManager.onUpdateFailed(function () {
-				// 	console.log('安装包下载失败')
-				//   // 新版本下载失败
-				// });
-				updateManager.onUpdateReady(function () {
-				  wx.showModal({
-				    title: '更新提示',
-				    content: '新版本已经准备好，是否重启应用？',
-				    success: function (res) {
-						console.log(res,'****')
-				      if (res.confirm) {
-				        // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-				        updateManager.applyUpdate()
-				      }
-				    }
-				  })
+
+				updateManager.onUpdateReady(function() {
+					wx.showModal({
+						title: '更新提示',
+						content: '新版本已经准备好，是否重启应用？',
+						success: function(res) {
+							if (res.confirm) {
+								// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+								updateManager.applyUpdate()
+							}
+						}
+					})
 				})
 			},
-			jurisdiction(e){
-				// console.log(`%c  当前校验项:${e},校验结果:${this.user.authList.includes(e)},返回权限数据↓`,'color:red;font-size:50px;');
-				// console.log(this.user.authList)
+			jurisdiction(e) {
 				return this.user.authList.includes(e)
 			},
 			jump(e) {
@@ -198,9 +197,6 @@
 					case 0:
 						uni.navigateTo({
 							url: "/driverManagement/index/index",
-							fail(e) {
-								console.log(e, '--')
-							},
 						})
 						break;
 					case 1:
@@ -208,40 +204,40 @@
 							url: "/oilDistribution/index/index",
 						})
 						break;
-						case 2:
+					case 2:
 						uni.navigateTo({
-							url:'/driverManagement/addDiver/addDiver'
+							url: '/driverManagement/addDiver/addDiver'
 						})
 						break
-						case 3:
+					case 3:
 						uni.navigateTo({
-							url:'/oilDistribution/distribute/distribute'
+							url: '/oilDistribution/distribute/distribute'
 						})
-						
+
 						break
-						case 4:
+					case 4:
 						uni.navigateTo({
-							url:'/orderList/index/index'
+							url: '/orderList/index/index'
 						})
 						break
-						case 5:
+					case 5:
 						uni.navigateTo({
-							url:'/priceAdjustment/page/index/index'
+							url: '/priceAdjustment/page/index/index'
 						})
 						break
-						case 6:
+					case 6:
 						uni.navigateTo({
-							url:'/salesRanking/page/index/index' 
+							url: '/salesRanking/page/index/index'
 						})
 						break
-						case 7:
+					case 7:
 						uni.navigateTo({
-							url:'/priceAdjustmentTask/page/index'
+							url: '/priceAdjustmentTask/page/index'
 						})
 						break
-						case 8:
+					case 8:
 						uni.navigateTo({
-							url:'/salesRanking/page/index/enterpriseIndex'
+							url: '/salesRanking/page/index/enterpriseIndex'
 						})
 						break
 				}
diff --git a/pages/index/menu.json b/pages/index/menu.json
index 75a2661..f9e38d3 100644
--- a/pages/index/menu.json
+++ b/pages/index/menu.json
@@ -133,16 +133,23 @@
 			{
 				"icon":"iconxiugaijiage",
 				"name":"公司账户管理",
-				"router":"/financialCenter/business/index",
-				"lable":"finance:account:enterprise",
+				"router":"/financialCenter/enterprise/account/index",
+				"lable":"finance:enterprise:account",
 				"image":"../../static/newindex/accountEnterpriseList.png"
 			},
 			{
 				"icon":"iconxiugaijiage", 
 				"name":"油站账户管理",
 				"router":"/financialCenter/serviceStation/index",
-				"lable":"finance:account:serviceStation",
+				"lable":"finance:serviceStation:account",
 				"image":"../../static/newindex/accountServiceStationList.png"
+			},
+			{
+				"icon":"iconxiugaijiage",
+				"name":"企业充值",
+				"router":"/financialCenter/enterprise/recharge/index",
+				"lable":"finance:enterprise:recharge",
+				"image":"../../static/newindex/customerList.png"
 			}
 		]
 	},
diff --git a/pages/index/newindex.css b/pages/index/newindex.css
index 81545b5..38568b7 100644
--- a/pages/index/newindex.css
+++ b/pages/index/newindex.css
@@ -7,9 +7,9 @@
 	padding-top: 330rpx;
 	width: 100vw;
 	overflow: hidden;
-	
-	
-/* 	display: flex;
+
+
+	/* 	display: flex;
 	height: 100vh;
 	flex-direction: column; */
 }
@@ -169,6 +169,7 @@
 	background: #2866FF;
 	z-index: 10;
 }
+
 .info-frame {
 	position: absolute;
 	left: 50%;
@@ -184,8 +185,8 @@
 	background: #fff;
 }
 
-.info-frame > view:nth-of-type(1),
-.info-frame > view:nth-of-type(3) {
+.info-frame>view:nth-of-type(1),
+.info-frame>view:nth-of-type(3) {
 	/* font-size: 32rpx; */
 	overflow: hidden;
 	width: 320rpx;
@@ -194,12 +195,13 @@
 	white-space: nowrap;
 	color: #666;
 }
-.info-frame > view:nth-of-type(2) {
+
+.info-frame>view:nth-of-type(2) {
 	/* font-size: 32rpx; */
 	color: #bbb;
 }
 
-.info-frame > image {
+.info-frame>image {
 	position: absolute;
 	left: 40rpx;
 	top: -30rpx;
@@ -207,41 +209,51 @@
 	height: 120rpx;
 	/* border-radius: 50%; */
 }
+
 .domain {
 	/* flex: 1; */
-	
+
 	padding-bottom: 320rpx;
 }
-.domain > .item {
-	margin-top: 30rpx;
+
+.domain>.item {
+	margin-top: 13rpx;
 }
-.domain > .item:nth-of-type(1) {
+
+.domain>.item:nth-of-type(1) {
 	margin-top: 90rpx;
 }
 
-.domain > .item > .title {
+.domain>.item>.title {
 	padding-left: 40rpx;
 	font-size: 32rpx;
 	color: #666;
 }
+
 .options-frame {
 	margin-top: 10rpx;
 	padding: 0 35rpx;
 	display: flex;
+	justify-content: space-between;
+	flex-wrap: wrap;
 }
-.options-frame > .option {
+
+.options-frame>.option {
 	position: relative;
-	margin-left: 20rpx;
+	/* margin-left: 20rpx; */
+	margin-bottom: 17rpx;
 	padding: 10rpx 14rpx;
 	width: 335rpx;
 	height: 140rpx;
 	background: #fff;
 	border-radius: 20rpx;
 }
-.options-frame > .option:nth-of-type(1) {
+
+.options-frame>.option:nth-of-type(1) {
 	margin-left: 0;
 }
-.options-frame > .option > .star {
+
+.options-frame>.option>.star {
 	position: absolute;
 	top: 5rpx;
 	right: 8rpx;
@@ -252,16 +264,18 @@
 	background: #ffffff;
 	border-radius: 20rpx;
 	z-index: 5;
-	
+
 }
-.options-frame > .option > .wall {
+
+.options-frame>.option>.wall {
 	position: relative;
 	padding-top: 9rpx;
 	width: 297rpx;
 	height: 120rpx;
 	border-radius: 20rpx;
 }
-.options-frame > .option > .wall > .name {
+
+.options-frame>.option>.wall>.name {
 	position: absolute;
 	left: 110rpx;
 	bottom: 40rpx;
@@ -270,7 +284,7 @@
 }
 
 
-.collection{
+.collection {
 	position: fixed;
 	left: 0;
 	bottom: 0;
@@ -279,7 +293,8 @@
 	background: #F0F2FF;
 	z-index: 10;
 }
-.collection > .collect-frame {
+
+.collection>.collect-frame {
 	display: flex;
 	justify-content: space-between;
 	position: absolute;
@@ -291,33 +306,35 @@
 	background: #adceff;
 	border-radius: 30rpx 30rpx 0 0;
 }
+
 .collection_item {
 	position: relative;
 	top: -74rpx;
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	/* margin-left: calc((100% - 60/* 0rpx) / 2); */ 
+	/* margin-left: calc((100% - 60/* 0rpx) / 2); */
 	width: 200rpx;
 	height: 240rpx;
 	background-color: #FFF;
 	border-radius: 20rpx;
 	animation: name 0.5s;
 }
+
 .collection-empty {
 	position: relative;
 	top: -74rpx;
 
 	width: 200rpx;
 	height: 240rpx;
-	
+
 	display: flex;
 	justify-content: center;
 	align-items: center;
 	flex-direction: column;
-	
+
 	background-color: #FFF;
-	border:  6rpx dashed #BBBBBB;
+	border: 6rpx dashed #BBBBBB;
 	border-radius: 20rpx;
 }
 
@@ -371,22 +388,30 @@
 
 
 
-@keyframes name{
-	from{opacity: 0;}
-	to{opacity: 1;}
+@keyframes name {
+	from {
+		opacity: 0;
+	}
+
+	to {
+		opacity: 1;
+	}
 }
-.collectionbg .collection_itembg:first-child{
-	margin-left: 0;  
+
+.collectionbg .collection_itembg:first-child {
+	margin-left: 0;
 }
-.collection_item:first-child{
-	margin-left: 0;  
+
+.collection_item:first-child {
+	margin-left: 0;
 }
 
 
-.collection_item_name{
+.collection_item_name {
 	text-align: center;
 }
-.tip{
+
+.tip {
 	position: absolute;
 	top: -10rpx;
 	right: -10rpx;
@@ -398,13 +423,15 @@
 	justify-content: center !important;
 	align-items: center !important;
 }
-.collection_item_text{
+
+.collection_item_text {
 	margin-top: 20rpx;
 	font-size: 32rpx;
 	color: #666666;
 }
+
 .Submenu_item .label {
-	margin-top: 65rpx ;
+	margin-top: 65rpx;
 	height: 217rpx;
 	width: 90rpx;
 	background-color: #F0F0F0;
@@ -413,9 +440,10 @@
 	flex-direction: column;
 	justify-content: flex-end;
 	align-items: center;
-	padding:  20rpx 0;
+	padding: 20rpx 0;
 }
-.Submenu_item_name{
+
+.Submenu_item_name {
 	font-weight: 400;
 	font-size: 32rpx;
 	color: #666666;
@@ -423,10 +451,9 @@
 	text-align: center;
 	margin-top: 45rpx;
 }
-.Submenu_item:nth-child(2){
+
+.Submenu_item:nth-child(2) {
 	display: flex;
 	flex-direction: column;
 	align-items: flex-end;
 }
-
-
diff --git a/pages/index/newindex.vue b/pages/index/newindex.vue
index dadbf84..77fddb6 100644
--- a/pages/index/newindex.vue
+++ b/pages/index/newindex.vue
@@ -201,9 +201,7 @@
 					})
 					return 
 				}
-				
 				let isHave = this.collection.find(i => i.name === item.name)
-				// 是否已收藏
 				if(isHave) {
 					this.remove(item)
 					return 
diff --git a/static/close.png b/static/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..de8f4f0713d1835ef636a6531bcd3094950def24
GIT binary patch
literal 976
zcmV;>126oEP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&ib+I4RA@u(S!;^hFc6lo50X7eHz(Q6AuPzRY<>mgLo|DmW>3-_#71R|WX7{2
zX(Y#`ff_=<59#~nJtM82{L)X3U;QT#G<dmOc5U0fIp=mtDg3+pci{i7wTAz%uIp}(
z(Ech7Akgm~bO|OPa?@IWt|3!J00I9fK^%E^A~KHS`FK1AZHbpHCeZi&$vMXX2lKf4
zoxg@*xC0;{3-{W#-Ffr+p_BrR(QEp?>$<ZTy;5=~1|Ut-{8UQ4k`2HN&Lw8xH3)>>
z7&7;99QRUfh&15A{~~q{5<8Rt=Oh~ujF?20fZyOZ-dt<_QL5^kSumz45>S!=CwZ;)
zey!AFWct2;b<TmN!<E%Ul7O`q7MpE;OYk_KG);pwemBOv#7IX8P?i1-@ByT?7NQgc
zjBs6zF$azWOMu$_7B*k#6H!xQ30P}^eTdaJW6VCc;TF${3A0-GMu0j}%5=P{Pc;ch
z@-4x_Mx}2AN~CYC1!tQwZHbwYJ(5nE(*j2TgGz=>#?iC+fq)0@Q3r*GR0}jBEeKHa
zF~(%`gfF4z+9;(727K1Pn1Hen>H;7MUrEW}xGf=310IFdIUi90Q35#n9E>rcx=aQc
zuDr$@tpN`k6TvRDMhRf1MI}RwgfF3S`J6QyDlKB#NdmJ2kK_0vEooEcL`(0QoI?Cy
z5w)lWT-dON0DPP1)`}$`sgGm?auF!y6pYOm<q2+WYwavtjE!nQoC9J6IPl@!l4OV1
zFEOENC-%_-M=`hs?dA>l&^07VoVY5Cdhm<h0l<U9=0dEb2u$TCnu+nmLF{z2@uB6x
zS`x%87x`&HAZ2R_o2QazGx!=3*nw$u<cc}5ACwkmH6&<vMx!Iw4~WeOOD0!UCX(G_
z%jsP8hfT?s)9<AX4beojXp}Tpl9n<lAxRXeeJ9t<OpO$`_&?axt5|6x9jn09_$)22
zYb74OV@xO7=|u@JGfUB^Z!LIcl$p#&*_N?s8a&jk8i7kmaihi5R4(cRi9!k<Z9;-O
zcaTg2v(xEN;}cB;BAboZrK5Wh0Yu`&97tSi&bd+tCM8{)m_Vl6nlu6xD4an0lSl<)
zcznd9l!D_W6*;1+YI=$YB+3D)pR(`O^ayj4v}R{i62KV(Jv+-SJq3ed7(Ppf2YBHs
y4aBmy^q_k!=uHUZ#J$z?hiPCdfVp*_p1>b|0qRc=4G4_@0000<MNUMnLSTYFD6!T6

literal 0
HcmV?d00001

diff --git a/utils/request.js b/utils/request.js
index 57d7b2d..5e42a5d 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -3,7 +3,7 @@ import utils from '@/utils/encode'
 // const env = process.env.NODE_ENV
 // const env = 'test'
 const env = 'production'
-const testUrl = 'http://192.168.1.85:38080'
+const testUrl = 'http://192.168.1.83:38080'
 // const productUrl = 'https://www.xingoil.com/adminapi'
 // const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
 const productUrl = 'http://uat.xingoil.com/adminapi'