From 895d23dd5c2ec8e8d992afe84bf2742f43f80486 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Fri, 15 Mar 2024 08:51:39 +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/dataStatistics/networkPoint.js            |  45 ++
 api/orderList/orderDetails.js                 |  46 ++
 .../networkPoint/components/charge.vue        | 132 ++++++
 dataStatistics/networkPoint/img/1.png         | Bin 0 -> 1818 bytes
 dataStatistics/networkPoint/img/2.png         | Bin 0 -> 1826 bytes
 dataStatistics/networkPoint/img/3.png         | Bin 0 -> 2037 bytes
 dataStatistics/networkPoint/index.vue         | 424 ++++++++++++++++++
 dataStatistics/networkPoint/province.vue      | 325 ++++++++++++++
 orderList/orderDetails/orderDetails.vue       | 295 +++++++-----
 pages.json                                    |  20 +
 pages/index/menu.json                         |  15 +
 salesRanking/components/charge.vue            |   2 +-
 utils/request.js                              |   8 +-
 13 files changed, 1197 insertions(+), 115 deletions(-)
 create mode 100644 api/dataStatistics/networkPoint.js
 create mode 100644 api/orderList/orderDetails.js
 create mode 100644 dataStatistics/networkPoint/components/charge.vue
 create mode 100644 dataStatistics/networkPoint/img/1.png
 create mode 100644 dataStatistics/networkPoint/img/2.png
 create mode 100644 dataStatistics/networkPoint/img/3.png
 create mode 100644 dataStatistics/networkPoint/index.vue
 create mode 100644 dataStatistics/networkPoint/province.vue

diff --git a/api/dataStatistics/networkPoint.js b/api/dataStatistics/networkPoint.js
new file mode 100644
index 0000000..d4660a0
--- /dev/null
+++ b/api/dataStatistics/networkPoint.js
@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+export default {
+	getByProvince(data) {
+		return request({
+			url: '/oil-finance/siteOperateRecord/getByProvince',
+			method: 'post',
+			data: data
+		})
+	},
+	getCheckInfo(data) {
+		return request({
+			url: '/oil-site/oilSiteAppInfo/getCheckInfo',
+			method: 'get'
+		})
+	},
+	getByProvincePage(data) {
+		return request({
+			url: '/oil-finance/siteOperateRecord/getByProvincePage',
+			method: 'post',
+			data: data
+		})
+	},
+	getNetworkCount(data) {
+		return request({
+			url: '/oil-finance/siteOperateRecord/getNetworkCount',
+			method: 'post',
+			data: data
+		})
+	},
+
+	// getByProvincePage(data) {
+	// 	return request({
+	// 		url: '/oil-finance/siteOperateRecord/getByProvincePage',
+	// 		method: 'post',
+	// 		data: data
+	// 	})
+	// },
+	liekQuery(query) {
+		return request({
+			url: `/oil-user/sysCustomerInfo/liekQuery/${query}`,
+			method: 'get'
+		})
+	},
+}
diff --git a/api/orderList/orderDetails.js b/api/orderList/orderDetails.js
new file mode 100644
index 0000000..52b3d4d
--- /dev/null
+++ b/api/orderList/orderDetails.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+
+export default {
+	// 福佑
+	fuyouRefund(data) {
+		return request({
+			url: '/oil-site/fuYou/refund',
+			method: 'post',
+			data: data
+		})
+	},
+	//智猪 长久 牧原 新希望（黑龙江中锐）
+	orderRefund(data) {
+		return request({
+			url: '/oil-site/openPlatform/orderRefund',
+			method: 'post',
+			data: data
+		})
+	},
+	//顺丰
+	sfRefund(data) {
+		return request({
+			url: '/oil-site/sf/refund',
+			method: 'post',
+			data: data
+		})
+	},
+	// 安能
+	refund(id) {
+		return request({
+			url: `/oil-finance/oilOrderInfo/refund/${id}`,
+			method: 'get'
+		})
+	},
+	// 安途 圆通（易管油）
+	unifiedRefund(data) {
+		return request({
+			url: '/oil-site/xoil/unifiedRefund',
+			method: 'post',
+			data: data
+		})
+	},
+
+
+
+}
diff --git a/dataStatistics/networkPoint/components/charge.vue b/dataStatistics/networkPoint/components/charge.vue
new file mode 100644
index 0000000..0b6809a
--- /dev/null
+++ b/dataStatistics/networkPoint/components/charge.vue
@@ -0,0 +1,132 @@
+<template>
+	<view>
+		<uni-popup @change="change" ref="popup" type="bottom" background-color="#fff">
+			<view style="height:50vh; display: flex;flex-direction: column;padding-top: 20rpx;">
+				<view style="display: flex;">
+					<uni-easyinput  @confirm="confirmFn" style="width: 90%; margin: 0 auto;"
+						prefixIcon="search" v-model="nameOrPhone" placeholder="请输入内容" />
+				</view>
+				<picker-view @change="pickerChange" style="flex: 1;">
+					<picker-view-column>
+						<view style="display: flex;align-items: center;justify-content: center;"
+							v-for="(item,index) in list" :key="index">{{ item.userName ||  item.nickName }}</view>
+					</picker-view-column>
+				</picker-view>
+				<view @click="buttenFn" class="butten">
+					确定
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/dataStatistics/networkPoint.js'
+
+	export default {
+		name: 'charge',
+		props: {
+			value: {
+				type: Boolean,
+				default: false
+			},
+		},
+		watch: {
+			value: function(n, o) {
+				if (n) {
+					this.$refs.popup.open('bottom')
+				} else {
+					this.$refs.popup.close()
+				}
+			}
+		},
+		created() {
+			// this.getlist()
+		},
+		data() {
+			return {
+				determine: null,
+				list: [
+
+				],
+				seleData: null,
+
+
+				nameOrPhone: ''
+			}
+		},
+		methods: {
+			// iconClick() {
+			// 	if (!this.nameOrPhone) {
+			// 		this.getlist()
+			// 	}
+			// },
+			buttenFn() {
+				clearTimeout(this.determine)
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.determine = setTimeout(() => {
+					this.$emit('chargeChange', this.seleData)
+					uni.hideLoading()
+					this.$emit('input', false)
+				}, 700)
+			},
+			getlist() {
+				// if (!this.nameOrPhone) {
+				// 	this.list = [{
+				// 		nickName: '全部',
+				// 		id: ''
+				// 	}]
+				// 	this.seleData = this.list[0]
+				// 	return
+				// }
+				serve.liekQuery(this.nameOrPhone).then(res => {
+					if (res.code !== 20000) return
+					if (res.data.length == 0) {
+						uni.showToast({
+							title: '暂无数据',
+							icon: 'none'
+						})
+						return
+					}
+					this.list = res.data
+					this.list.unshift({
+						nickName: '全部',
+						customerId: ''
+					})
+					this.seleData = this.list[0]
+				})
+			},
+			pickerChange(e) {
+				console.log('pickerChange(e)',e)
+				this.seleData = this.list[e.detail.value[0]]
+			},
+			change(e) {
+				// console.log('change(e)',e)
+				this.$emit('input', e.show)
+			},
+			confirmFn() {
+				this.getlist()
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.charge-container {
+		padding-top: 20rpx;
+	}
+
+	.butten {
+		display: flex;
+		justify-content: center;
+		font-size: 35rpx;
+		color: #ffffff;
+		width: 60%;
+		margin: 10rpx auto;
+		border-radius: 10px;
+		background: #007AFF;
+		padding: 20rpx 0;
+	}
+</style>
diff --git a/dataStatistics/networkPoint/img/1.png b/dataStatistics/networkPoint/img/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..13c330ab6a21c59888bc08e9b12abce58b004071
GIT binary patch
literal 1818
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

literal 0
HcmV?d00001

diff --git a/dataStatistics/networkPoint/img/2.png b/dataStatistics/networkPoint/img/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..edbba75dc7330cdda5608ed0d6b77e13d2fdacb2
GIT binary patch
literal 1826
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
Op#coi+WZ~dGx>k4{>hvG

literal 0
HcmV?d00001

diff --git a/dataStatistics/networkPoint/img/3.png b/dataStatistics/networkPoint/img/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcb4bb7798cf839c7e5c863210287f8be6ee5733
GIT binary patch
literal 2037
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
T<FP2k00000NkvXXu0mjfw;?WD

literal 0
HcmV?d00001

diff --git a/dataStatistics/networkPoint/index.vue b/dataStatistics/networkPoint/index.vue
new file mode 100644
index 0000000..5ccdb6e
--- /dev/null
+++ b/dataStatistics/networkPoint/index.vue
@@ -0,0 +1,424 @@
+<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='back' :border="false" color='white' backgroundColor="rgba(0,0,0,0)"
+				left-icon="back" title="网点数据统计" />
+		</view>
+		<view class="options">
+			<view @click="changeUser">{{params.nickName || '负责人'}}
+				<uni-icons type="forward"></uni-icons>
+			</view>
+			<view>
+				<picker :range="areaList" range-key="areaName" @change="changeArea">
+					<view class="uni-input">
+						<text class="special">{{params.provinceName || '省份'}}</text>
+						<uni-icons style="vertical-align: top;" type="forward"></uni-icons>
+					</view>
+				</picker>
+			</view>
+			<view>
+				<uni-datetime-picker type="daterange" @change="changeDatetime">
+					{{dataTime.start || '开始时间'}} ~ {{dataTime.end || '结束时间'}}
+					<uni-icons type="forward"></uni-icons>
+				</uni-datetime-picker>
+			</view>
+		</view>
+		<view class="overview">
+			<view>{{info.revenueAmountCount || '- - '}}元</view>
+			<view>GMV总金额</view>
+			<view>
+				<text>总毛利：{{info.grossProfitCount || '- - '}}元</text>
+				<text>毛利率：{{info.grossMargin || '- - '}}%</text>
+			</view>
+		</view>
+		<view class="title">省份排名：</view>
+		<view style="flex:1;overflow: hidden;margin-top: 35rpx;">
+			<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">
+				<view class="container">
+					<view class="item" v-for="item,index in tableList" :key="index" @click="jumpDetail(item)">
+						<view class="sequence" :class="['first','second','third'][index] || ''">{{
+							index < 3 ? '' : index + 1
+						}}</view>
+						<view class="info">
+							<view>
+								<text>{{item.provinceName}}</text>
+								<text>动销油站（<text style="color: #ff0000;">{{item.siteDXCount}}</text>）</text>
+								<text>{{item.revenueAmountCount || '- - '}}元</text>
+							</view>
+							<view>
+								<view :style="{
+										width:(item.revenueAmountCount/denominator * 100 > 2 
+											  ? item.revenueAmountCount/denominator * 100 
+											  : 2 ) 
+											  + '%'}">
+								</view>
+							</view>
+							<view>
+								<text>总毛利：{{item.grossProfitCount|| '- - '}}元</text>
+								<text>毛利率：{{item.grossMargin|| '- - '}}%</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<view style="height: 50rpx;"></view>
+		<charge v-model="controlWindows.charge" @chargeChange='chargeChange' />
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/dataStatistics/networkPoint.js'
+
+	import charge from './components/charge.vue'
+	export default {
+		components: {
+			charge
+		},
+		data() {
+			return {
+				controlWindows: {
+					charge: false
+				},
+				dataTime: {
+					start: '',
+					end: ''
+				},
+				styles: {},
+				areaList: [],
+				params: {
+					businessLeader: '',
+					nickName: '',
+					provinceName: '',
+					dateStartTime: '',
+					dateEndTime: ''
+				},
+				tableList: [],
+				denominator: '',
+				info: {},
+
+			}
+		},
+		onLoad() {
+			this.styles = uni.getMenuButtonBoundingClientRect()
+			this.getCheckInfo()
+			this.initDate()
+			this.seachFn()
+
+
+		},
+
+		methods: {
+			getNetworkCount() {
+
+				serve.getNetworkCount(this.params).then(res => {
+					if (res.code === 20000) {
+						let {
+							grossMargin,
+							grossProfitCount,
+							revenueAmountCount
+						} = res.data
+						this.info = {
+							grossMargin: this.toFixed2Handle(grossMargin),
+							grossProfitCount: this.toFixed2Handle(grossProfitCount),
+							revenueAmountCount: this.toFixed2Handle(revenueAmountCount)
+						}
+						this.denominator = revenueAmountCount
+					}
+				})
+			},
+			chargeChange(item) {
+				let {
+					id,
+					nickName
+				} = item
+				this.params.businessLeader = id
+				this.params.nickName = nickName
+				this.seachFn()
+			},
+			initDate() {
+				let yesterday = new Date().getTime() - 86400000
+				let {
+					year,
+					month,
+					day
+				} = this.dateHandle(yesterday)
+				this.dataTime.start = this.dataTime.end = `${year}-${month}-${day}`
+			},
+			dateHandle(datetime) {
+				let date = new Date(datetime)
+				let year = date.getFullYear()
+				let month = date.getMonth() + 1
+				let day = date.getDate()
+				return {
+					year,
+					month,
+					day
+				}
+			},
+			jumpDetail(item) {
+				uni.navigateTo({
+					url: `./province?info=${encodeURIComponent(JSON.stringify({
+						dataTime:this.dataTime,
+						item
+					}))}`
+				})
+			},
+			changeUser() {
+				this.controlWindows.charge = true
+			},
+			changeArea(event) {
+				let index = event.detail.value
+				this.params.provinceName = index == 0 ? '' : this.areaList[index].areaName
+				this.seachFn()
+			},
+			changeDatetime(value) {
+				let [start, end] = value
+				this.dataTime.start = start
+				this.dataTime.end = end
+				this.seachFn()
+			},
+			async seachFn() {
+				this.tableList = []
+				let {
+					start,
+					end
+				} = this.dataTime
+				this.params.dateStartTime = start + ' 00:00:00'
+				this.params.dateEndTime = end + ' 23:59:59'
+				await this.getNetworkCount()
+				this.getByPage()
+
+			},
+			getByPage() {
+				serve.getByProvince(this.params).then(res => {
+					if (res.code === 20000) {
+						this.tableList = res.data.filter(item => {
+							if(item.provinceName) return item
+						}).map((item, index) => {
+							item.grossMargin = this.toFixed2Handle(item.grossMargin)
+							item.grossProfitCount = this.toFixed2Handle(item.grossProfitCount)
+							item.revenueAmountCount = this.toFixed2Handle(item.revenueAmountCount)
+							return item
+						});
+					}
+
+				})
+			},
+			toFixed2Handle(value) {
+				if (!value && value != 0) {
+					return ''
+				}
+				return +value.toFixed(2) + ''
+			},
+			getCheckInfo() {
+				serve.getCheckInfo().then(res => {
+					if (res.code == 20000) {
+						this.areaList = res.data.areaCodeList
+						this.areaList.unshift({
+							areaName: '全部'
+						})
+					}
+				})
+			},
+			// // 触底加载
+			// scrolltolower() {
+			// 	this.paramter.currentPage += 1
+			// 	this.getByPage()
+
+			// },
+
+			back() {
+				uni.navigateBack()
+			},
+			jump(item) {
+				uni.navigateTo({
+					url: `./details?details=${item.details}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	// .uni-easyinput__content {
+	// 	background-color: #fff;
+	// }
+
+	.header {
+		position: relative;
+		width: 100%;
+		background: #2866FF;
+		// min-height: 403rpx;
+		// background: url('https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油admin小程序/sjbj.png') center/100% no-repeat;
+	}
+
+	.options {
+		display: flex;
+		margin-top: 30rpx;
+		padding: 0 33rpx;
+
+		>view {
+
+			&:nth-of-type(1),
+			&:nth-of-type(2),
+				{
+				flex: 1;
+			}
+
+			&:nth-of-type(3),
+				{
+				flex: 2.5;
+			}
+		}
+
+		.special {
+			display: inline-block;
+			max-width: 115rpx;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+	}
+
+	.overview {
+		margin: 27rpx auto 0;
+		padding: 55rpx 41rpx 0;
+		width: 684rpx;
+		height: 285rpx;
+		color: #333;
+		background: url('https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/networkPoint-background.png') 100%/100%;
+		border-radius: 30rpx;
+
+		>view {
+			&:nth-of-type(1) {
+				text-align: center;
+				font-size: 60rpx;
+				color: #fff;
+			}
+
+			&:nth-of-type(2) {
+				// margin-top: 5rpx;
+				text-align: center;
+				font-size: 20rpx;
+				color: #fff;
+			}
+
+			&:nth-of-type(3) {
+				margin-top: 45rpx;
+				display: flex;
+				justify-content: space-between;
+				color: #fff;
+			}
+		}
+	}
+
+	.title {
+		margin-top: 34rpx;
+		padding-left: 33rpx;
+		font-size: 28rpx;
+	}
+
+	.container {
+		// margin-top: ;
+		padding: 0 60rpx 0 32rpx;
+
+		.item {
+			display: flex;
+			margin-bottom: 35rpx;
+
+			&:nth-last-of-type(1) {
+				margin-bottom: 0;
+			}
+
+			.sequence {
+				position: relative;
+				top: 3rpx;
+				width: 60rpx;
+				height: 60rpx;
+				font-size: 24rpx;
+				color: #999999;
+				line-height: 60rpx;
+				text-align: center;
+
+				&.first {
+					background: url('./img/1.png') 100%/100%;
+				}
+
+				&.second {
+					background: url('./img/2.png') 100%/100%;
+				}
+
+				&.third {
+					background: url('./img/3.png') 100%/100%;
+				}
+			}
+
+			.info {
+				margin-left: 15rpx;
+				flex: 1;
+
+				>view {
+					&:nth-of-type(1) {
+						font-size: 28rpx;
+						color: #333;
+
+						>text {
+							&:nth-of-type(1) {
+								display: inline-block;
+								width: 135rpx;
+								font-weight: 550;
+							}
+
+							&:nth-of-type(2) {
+								margin-left: 25rpx;
+							}
+
+							&:nth-of-type(3) {
+
+								float: right;
+								color: #333333;
+							}
+						}
+					}
+
+					&:nth-of-type(2) {
+
+						position: relative;
+						margin-top: 15rpx;
+						width: 100%;
+						height: 15rpx;
+						border-radius: 37rpx;
+						background: #E5E5E5;
+
+						>view {
+							position: relative;
+							width: 20%;
+							height: 15rpx;
+							border-radius: 37rpx;
+							background: #2866FF;
+						}
+					}
+
+					&:nth-of-type(3) {
+						margin-top: 5rpx;
+						padding-left: 97rpx;
+						color: #666666;
+						font-size: 24rpx;
+
+						>text {
+							&:nth-of-type(2) {
+								float: right;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/dataStatistics/networkPoint/province.vue b/dataStatistics/networkPoint/province.vue
new file mode 100644
index 0000000..25909dd
--- /dev/null
+++ b/dataStatistics/networkPoint/province.vue
@@ -0,0 +1,325 @@
+<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='back' :border="false" color='white' backgroundColor="rgba(0,0,0,0)"
+				left-icon="back" title="网点数据统计" />
+		</view>
+		<view class="options">
+			时间：{{dataTime.start}} ~ {{dataTime.end}}
+		</view>
+		<view class="overview">
+			<view>{{info.revenueAmountCount}}元</view>
+			<view>{{paramter.params.provinceName}}油站消费总金额</view>
+			<view>
+				<text>总毛利：{{info.grossProfitCount}}元</text>
+				<text>毛利率：{{info.grossMargin}}%</text>
+			</view>
+		</view>
+		<view class="category">
+			<text v-for="item,index in menuList" :key="index" :class="currentIndex == index ? 'active':''"
+				@click="changeCategory(index,item)">{{item.label}}</text>
+		</view>
+		<view style="flex:1;overflow: hidden;margin-top: 55rpx;">
+			<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">
+						<view class="sequence" :class="['first','second','third'][index] || ''">{{
+							index < 3 ? '' : index + 1
+						}}</view>
+						<view class="info">
+							<view>
+								<text>{{item.siteName || item.accountName || ''}}</text>
+								<text>{{item.revenueAmountCount|| '- - '}}元</text>
+							</view>
+							<view>
+								<view :style="{
+										width:(item.revenueAmountCount/info.revenueAmountCount * 100 > 2
+											  ? item.revenueAmountCount/info.revenueAmountCount * 100 
+											  : 2)  
+											  + '%'}">
+								</view>
+							</view>
+							<view>
+								<text>总毛利：{{item.grossProfitCount|| '- - '}}元</text>
+								<text>毛利率：{{item.grossMargin|| '- - '}}%</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<view style="height: 50rpx;"></view>
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/dataStatistics/networkPoint.js'
+
+	export default {
+		data() {
+			return {
+				styles: {},
+				currentIndex: 0,
+				paramter: {
+					currentPage: 1,
+					pageSize: 10,
+					params: {
+						provinceName: '',
+						dateStartTime: '',
+						dateEndTime: '',
+						type: '1'
+					}
+				},
+
+				tableList: [],
+				denominator: '',
+				menuList: [{
+						value: '1',
+						label: '油站排名'
+					},
+					{
+						value: '2',
+						label: '油站账户排名'
+					},
+				],
+				info: {},
+				dataTime: {}
+			}
+		},
+		onLoad(options) {
+			this.styles = uni.getMenuButtonBoundingClientRect()
+			let {
+				dataTime,
+				item
+			} = JSON.parse(decodeURIComponent(options.info))
+			this.dataTime = dataTime
+			this.info = item
+			this.paramter.params.provinceName = item.provinceName
+			this.paramter.params.dateStartTime = dataTime.start + ' 00:00:00'
+			this.paramter.params.dateEndTime = dataTime.end + ' 23:59:59'
+			this.seachFn()
+		},
+
+		methods: {
+			changeCategory(index, item) {
+				this.currentIndex = index
+				this.paramter.params.type = item.value
+				this.seachFn()
+			},
+
+			seachFn() {
+				this.tableList = []
+				this.paramter.currentPage = 1
+
+				this.getByPage()
+			},
+			getByPage() {
+				
+				serve.getByProvincePage(this.paramter).then(res => {
+					if (res.code === 20000) {
+						if (this.paramter.currentPage !== 1 && !res.data.list.length) {
+							uni.showToast({
+								title: '没有更多数据了~',
+								icon: 'none'
+							})
+							return
+						}
+
+						let filterData = res.data.list.map((item, index) => {
+							// if (this.paramter.currentPage = 1 && index == 0) {
+							// 	this.denominator = item.revenueAmountCount
+							// }
+							item.grossMargin = this.toFixed2Handle(item.grossMargin)
+							item.grossProfitCount = this.toFixed2Handle(item.grossProfitCount)
+							item.revenueAmountCount = this.toFixed2Handle(item.revenueAmountCount)
+							return item
+						});
+
+						this.tableList = this.tableList.concat(filterData)
+					}
+
+				})
+			},
+			toFixed2Handle(value) {
+				if (!value && value != 0) {
+					return ''
+				}
+				return +value.toFixed(2) + ''
+			},
+
+			// 触底加载
+			scrolltolower() {
+				this.paramter.currentPage += 1
+				this.getByPage()
+
+			},
+			back() {
+				uni.navigateBack()
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.header {
+		position: relative;
+		width: 100%;
+		background: #2866FF;
+	}
+
+	.options {
+		margin-top: 30rpx;
+		padding: 0 33rpx;
+
+		.special {
+			display: inline-block;
+			max-width: 115rpx;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+	}
+
+	.overview {
+		margin: 27rpx auto 0;
+		padding: 55rpx 41rpx 0;
+		width: 684rpx;
+		height: 285rpx;
+		color: #333;
+		background: url('https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/networkPoint-background.png') 100%/100%;
+		border-radius: 30rpx;
+
+		>view {
+			&:nth-of-type(1) {
+				text-align: center;
+				font-size: 60rpx;
+				color: #fff;
+			}
+
+			&:nth-of-type(2) {
+				text-align: center;
+				font-size: 20rpx;
+				color: #fff;
+			}
+
+			&:nth-of-type(3) {
+				margin-top: 45rpx;
+				display: flex;
+				justify-content: space-between;
+				color: #fff;
+			}
+		}
+	}
+
+
+
+	.category {
+		display: flex;
+		justify-content: space-evenly;
+		margin-top: 45rpx;
+
+		>text {
+			color: #999999;
+
+			&.active {
+				font-weight: 550;
+				color: #333;
+			}
+		}
+	}
+
+	.container {
+		padding: 0 60rpx 0 32rpx;
+
+		.item {
+			display: flex;
+			margin-bottom: 35rpx;
+
+			&:nth-last-of-type(1) {
+				margin-bottom: 0;
+			}
+
+			.sequence {
+				position: relative;
+				top: 3rpx;
+				width: 60rpx;
+				height: 60rpx;
+				font-size: 24rpx;
+				color: #999999;
+				line-height: 60rpx;
+				text-align: center;
+
+				&.first {
+					background: url('./img/1.png') 100%/100%;
+				}
+
+				&.second {
+					background: url('./img/2.png') 100%/100%;
+				}
+
+				&.third {
+					background: url('./img/3.png') 100%/100%;
+				}
+			}
+
+			.info {
+				margin-left: 15rpx;
+				flex: 1;
+
+				>view {
+					&:nth-of-type(1) {
+						font-size: 28rpx;
+						color: #333;
+
+						>text {
+							&:nth-of-type(1) {
+								display: inline-block;
+								width: 400rpx;
+								font-weight: 550;
+							}
+
+							&:nth-of-type(2) {
+								float: right;
+								color: #333333;
+							}
+						}
+					}
+
+					&:nth-of-type(2) {
+						position: relative;
+						margin-top: 15rpx;
+						width: 100%;
+						height: 15rpx;
+						border-radius: 37rpx;
+						background: #E5E5E5;
+
+						>view {
+							position: relative;
+							width: 20%;
+							height: 15rpx;
+							border-radius: 37rpx;
+							background: #2866FF;
+						}
+					}
+
+					&:nth-of-type(3) {
+						margin-top: 5rpx;
+						color: #666666;
+						font-size: 24rpx;
+
+						>text {
+							&:nth-of-type(2) {
+								float: right;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/orderList/orderDetails/orderDetails.vue b/orderList/orderDetails/orderDetails.vue
index 4423f81..dbc4ea3 100644
--- a/orderList/orderDetails/orderDetails.vue
+++ b/orderList/orderDetails/orderDetails.vue
@@ -6,15 +6,18 @@
 					<image style="width: 65%;height: 65%;" :src="details.siteImages"></image>
 				</view>
 				<view class="payLi felx justifyContent  alignItems">{{details.payAccountType==0?'个人':'企业'}}</view>
-				<view :style="{background:paymentStatus(details.orderStatus).bg,color:paymentStatus(details.orderStatus).color}" class="payment felx justifyContent  alignItems">{{paymentStatus(details.orderStatus).text}}</view>
+				<view
+					:style="{background:paymentStatus(details.orderStatus).bg,color:paymentStatus(details.orderStatus).color}"
+					class="payment felx justifyContent  alignItems">{{paymentStatus(details.orderStatus).text}}</view>
 			</view>
 			<view class="paymentInformation">
 				<view class=" flex">
 					<view></view>
 					<view>
 						<view class="Text">
-						{{details.siteName}}
-						<uni-icons @click="copy(details.siteName)" style="margin-left: 10rpx;" color="#bbbbbb" custom-prefix="iconfont" type="iconfuzhi" size="20"></uni-icons>
+							{{details.siteName}}
+							<uni-icons @click="copy(details.siteName)" style="margin-left: 10rpx;" color="#bbbbbb"
+								custom-prefix="iconfont" type="iconfuzhi" size="20"></uni-icons>
 						</view>
 						<view class="smallText">{{details.siteId}}</view>
 					</view>
@@ -22,7 +25,11 @@
 				<view style="margin:33rpx 0;" class="flex">
 					<view></view>
 					<view>
-						<view class="Text"> <text>{{details.customerName}}</text> <text style="margin-left:35rpx;">{{details.customerPhone}}</text> <uni-icons @click="copy(details.customerPhone)" style="margin-left: 10rpx;" color="#bbbbbb" custom-prefix="iconfont" type="iconfuzhi" size="20"></uni-icons> </view>
+						<view class="Text"> <text>{{details.customerName}}</text> <text
+								style="margin-left:35rpx;">{{details.customerPhone}}</text>
+							<uni-icons @click="copy(details.customerPhone)" style="margin-left: 10rpx;" color="#bbbbbb"
+								custom-prefix="iconfont" type="iconfuzhi" size="20"></uni-icons>
+						</view>
 						<view class="smallText">{{details.customerId}}</view>
 					</view>
 				</view>
@@ -45,12 +52,14 @@
 				<view class="price felx">
 					<view>
 						<view class="smallText">价格</view>
-						<view class="bgtext">{{ details.realAmount}}<text style="position: relative;left: 20rpx;" class="Text">元</text>
+						<view class="bgtext">{{ details.realAmount}}<text style="position: relative;left: 20rpx;"
+								class="Text">元</text>
 						</view>
 					</view>
 					<view style="margin-left: 143rpx;">
 						<view class="smallText">升数</view>
-						<view class="bgtext">{{details.volume}} <text style="position: relative;left: 20rpx;" class="Text">L</text>
+						<view class="bgtext">{{details.volume}} <text style="position: relative;left: 20rpx;"
+								class="Text">L</text>
 						</view>
 					</view>
 				</view>
@@ -76,13 +85,16 @@
 					</view>
 				</view>
 			</view>
-			<view v-if="details.orderWfStatus==0" @tap='codeFn' :style="{marginBottom:!moreOpen?'':'0',background:'#228B22'}"
+			<view v-if="details.orderWfStatus==0" @tap='codeFn'
+				:style="{marginBottom:!moreOpen?'':'0',background:'#228B22'}"
 				class="writeOff felx justifyContent alignItems ">待核销</view>
-			<view v-else  :style="{marginBottom:!moreOpen?'':'0',background:'#BBBBBB'}"
+			<view v-else :style="{marginBottom:!moreOpen?'':'0',background:'#BBBBBB'}"
 				class="writeOff felx justifyContent alignItems ">已核销</view>
-			<view v-if="!moreOpen" @click="moreOpen=!moreOpen" class="moreButten felx justifyContent alignItems smallText ">
+			<view v-if="!moreOpen" @click="moreOpen=!moreOpen"
+				class="moreButten felx justifyContent alignItems smallText ">
 				更多信息&退款信息
-				<uni-icons :style="{transform:moreOpen?'rotate(180deg)':'rotate(0deg)',transition:'transform .3s' }"  size="15" class="content-clear-icon" type="bottom" color="#c0c4cc" ></uni-icons>
+				<uni-icons :style="{transform:moreOpen?'rotate(180deg)':'rotate(0deg)',transition:'transform .3s' }"
+					size="15" class="content-clear-icon" type="bottom" color="#c0c4cc"></uni-icons>
 			</view>
 			<view class="dxx" :style="{height:moreOpen?'265rpx':'0rpx'}">
 				<view class="splitLine">
@@ -94,41 +106,53 @@
 				</view>
 				<view class="more">
 					<view @tap='moreOpen=false' style="display: flex; justify-content: space-between;" class="Text">
-					{{details.orderSerialNumber}}
-					<uni-icons :style="{transform:moreOpen?'rotate(0deg)':'rotate(180deg)',transition:'transform .3s' }"  size="15" class="content-clear-icon" type="top" color="#c0c4cc" ></uni-icons>
-					
+						{{details.orderSerialNumber}}
+						<uni-icons
+							:style="{transform:moreOpen?'rotate(0deg)':'rotate(180deg)',transition:'transform .3s' }"
+							size="15" class="content-clear-icon" type="top" color="#c0c4cc"></uni-icons>
+
 					</view>
 					<view style="margin-bottom:33rpx;" class="smallText">{{details.createTime}}</view>
-					<view @tap="refund" v-if="!customerList.includes(details.createSource)" :style="{background:details.orderStatus==1?'':'#bbbbbb'}" class="refund felx justifyContent alignItems">退款</view>
+					<!-- <view @tap="refund" v-if="!customerList.includes(details.createSource)"
+						:style="{background:details.orderStatus==1?'':'#bbbbbb'}"
+						class="refund felx justifyContent alignItems">退款</view> -->
+					<view @tap="refundff" :style="{background:details.orderStatus==1?'':'#bbbbbb'}"
+						class="refund felx justifyContent alignItems">退款</view>
 				</view>
 			</view>
 		</view>
 		<view class="footerButten felx">
-			<view @click="copy(details.orderSerialNumber)" class="copyButten felx  justifyContent alignItems">复制订单号</view>
+			<view @click="copy(details.orderSerialNumber)" class="copyButten felx  justifyContent alignItems">复制订单号
+			</view>
 			<!-- <button class="forwardButten felx justifyContent alignItems" open-type="share">分享</button> -->
 		</view>
-		<popup :show='show' @confirmFn='confirmFn' @closeFn='closeFn' :butten='butten' :styles="{height:'350rpx',width:'350rpx'}" v-model="iShow.seting">
+		<popup :show='show' @confirmFn='confirmFn' @closeFn='closeFn' :butten='butten'
+			:styles="{height:'350rpx',width:'350rpx'}" v-model="iShow.seting">
 			<view slot="coment">
-			<view style="height: 350rpx;display: flex;align-items: center; width: 100%;justify-content: center;flex-wrap: wrap;flex-direction: column;">
-				<view v-if="!details.secondChannelCode" style="width: 100%; font-size: 34rpx;text-align: center; margin-bottom: 15rpx;" class="smallText">核销二维码</view>
-				<qrcode v-if="iShow.seting&&details.secondChannelCode" ref="qrcode" cid="2" loadMake iconSize="10"  :val="details.secondChannelCode"  unit="upx"
-				background="#fff" foreground="#000" pdground="#000"   onval
-				 @result="qrR" />
-				 <view v-if="!details.secondChannelCode">
-					 二维码生成错误
-				 </view>
-			</view>
+				<view
+					style="height: 350rpx;display: flex;align-items: center; width: 100%;justify-content: center;flex-wrap: wrap;flex-direction: column;">
+					<view v-if="!details.secondChannelCode"
+						style="width: 100%; font-size: 34rpx;text-align: center; margin-bottom: 15rpx;"
+						class="smallText">核销二维码</view>
+					<qrcode v-if="iShow.seting&&details.secondChannelCode" ref="qrcode" cid="2" loadMake iconSize="10"
+						:val="details.secondChannelCode" unit="upx" background="#fff" foreground="#000" pdground="#000"
+						onval @result="qrR" />
+					<view v-if="!details.secondChannelCode">
+						二维码生成错误
+					</view>
+				</view>
 			</view>
 		</popup>
-		
+
 	</view>
 </template>
 
 <script>
 	import orderList from '@/api/orderList'
 	import qrcode from '@/components/tki-qrcode/tki-qrcode'
-	
 	import tool from '@/utils/tool.js'
+
+	import serve from '@/api/orderList/orderDetails.js'
 	export default {
 		onShareAppMessage(res) {
 			return {
@@ -141,18 +165,18 @@
 		},
 		data() {
 			return {
-				customerList:['HLL','FENGTU'],
-				details:{},
-				show:{
-					img:false,
-					footer:false
+				customerList: ['HLL', 'FENGTU'],
+				details: {},
+				show: {
+					img: false,
+					footer: false
 				},
 				iShow: {
 					seting: false
 				},
 				moreOpen: false,
-				val:'898989898',
-				id:null,
+				val: '898989898',
+				id: null,
 				butten: {
 					colse: '取消',
 					confirm: '确定',
@@ -161,54 +185,103 @@
 					confirmBg: '',
 					confirmColor: ''
 				},
+				refundMap: new Map([
+					[
+						['FUYOU'], {
+							interface: serve.fuyouRefund,
+							type: 'post'
+						}
+					],
+					[
+						['ZHIZHU', 'NEWHOPE', 'MUYUAN', 'G7CLUSTER-CAHNGJIU'], {
+							interface: serve.orderRefund,
+							type: 'post'
+						}
+					],
+					[
+						['SHUNFENG'], {
+							interface: serve.sfRefund,
+							type: 'post'
+						}
+					],
+					[
+						['ANNENG'], {
+							interface: serve.refund,
+							type: 'get'
+						}
+					],
+					[
+						['YIGUANYOU', 'ANTU'], {
+							interface: serve.unifiedRefund,
+							type: 'post'
+						}
+					],
+				])
 			}
 		},
+
 		onLoad(e) {
-			if(e.jsData){
+			if (e.jsData) {
 				console.log(JSON.parse(e.jsData));
-				this.id  = JSON.parse(e.jsData).id
+				this.id = JSON.parse(e.jsData).id
 				this.getList(this.id)
 			}
-			
+			console.log('refundMap', this.refundMap)
 		},
 		methods: {
-			codeFn(){
-				if(this.details.orderWfStatus==0){
-					
-					orderList.getOrderQrCodeOms(this.details.orderSerialNumber).then(res=>{
-						if(res.code==20000){
+			refundff() {
+				let {createSource} = this.details
+				if(!createSource) {
+					uni.showToast({
+						title:"createSource 为空",
+						icon:"none"
+					})
+					return 
+				}
+				let keys = this.refundMap.keys()
+				console.log(keys)
+				// console.log(this.details)
+				// console.log('refundff')
+			},
+			codeFn() {
+				if (this.details.orderWfStatus == 0) {
+
+					orderList.getOrderQrCodeOms(this.details.orderSerialNumber).then(res => {
+						if (res.code == 20000) {
 							console.log(res)
 							this.val = res.data.codeStr
-							this.iShow.seting=true
-						}else{
+							this.iShow.seting = true
+						} else {
 							uni.showToast({
-								title:res.msg,
-								icon:'none'
+								title: res.msg,
+								icon: 'none'
 							})
 						}
 					})
-					
-				}else{
-					this.iShow.seting=false
+
+				} else {
+					this.iShow.seting = false
 				}
 			},
-			refund(){
-				if(this.details.orderStatus!==1) return ;
-				let that =this
+			refund() {
+				if (this.details.orderStatus !== 1) return;
+				let that = this
 				uni.showModal({
 					title: '提示',
 					content: '是否确认退款',
-					success: function (res) {
+					success: function(res) {
 						if (res.confirm) {
-							orderList.refund({id:that.id}).then(res=>{
-								if(res.code==20000){
+							orderList.refund({
+								id: that.id
+							}).then(res => {
+								if (res.code == 20000) {
 									uni.showToast({
 										title: '退款成功',
 										duration: 2000
 									});
-									setTimeout(()=>{
+									setTimeout(() => {
 										that.getList(that.id)
-									},1000)
+									}, 1000)
 								}
 							})
 							console.log('用户点击确定');
@@ -218,70 +291,72 @@
 					}
 				});
 			},
-			paymentStatus(e){
-				switch(e){
+			paymentStatus(e) {
+				switch (e) {
 					case 0:
-					return {
-						text:'待支付',
-						color:'#EBC153',
-						bg:'#FFF6DD'
-					}
-					break;
+						return {
+							text: '待支付',
+								color: '#EBC153',
+								bg: '#FFF6DD'
+						}
+						break;
 					case 1:
-					return {
-						text:'已支付',
-						color:'#17A00E',
-						bg:'#D1FFDA'
-					}
-					break;
+						return {
+							text: '已支付',
+								color: '#17A00E',
+								bg: '#D1FFDA'
+						}
+						break;
 					case -1:
-					return {
-						text:'支付失败',
-						color:'#EC4645',
-						bg:'#FFC8C8'
-					}
-					break;
+						return {
+							text: '支付失败',
+								color: '#EC4645',
+								bg: '#FFC8C8'
+						}
+						break;
 					case 2:
-					return {
-						text:'已取消',
-						color:'#999999',
-						bg:'#E9E9E9'
-					}
-					break;
+						return {
+							text: '已取消',
+								color: '#999999',
+								bg: '#E9E9E9'
+						}
+						break;
 					case 3:
-					return {
-						text:'已退款',
-						color:'#999999',
-						bg:''
-					}
-					break;
+						return {
+							text: '已退款',
+								color: '#999999',
+								bg: ''
+						}
+						break;
 					case 4:
-					return {
-						text:'退款中',
-						color:'#EBC153',
-						bg:''
-					}
-					// return '退款中'
-					break;
+						return {
+							text: '退款中',
+								color: '#EBC153',
+								bg: ''
+						}
+						// return '退款中'
+						break;
 					case 5:
-					return {
-						text:'退款失败',
-						color:'#EC4645',
-						bg:''
-					}
-					break;
-			}
+						return {
+							text: '退款失败',
+								color: '#EC4645',
+								bg: ''
+						}
+						break;
+				}
 			},
-			getList(e){
+			getList(e) {
 				orderList.findOrderDetails({
-					orderId:e
-				}).then(res=>{
-					if(res.code!==20000)return
+					orderId: e
+				}).then(res => {
+					if (res.code !== 20000) return
 					this.details = res.data;
-					tool.numberSetting(this.details,['realAmount','volume','realPrice','marketPrice','sitePrice'],2);
+					tool.numberSetting(this.details, ['realAmount', 'volume', 'realPrice', 'marketPrice',
+						'sitePrice'
+					], 2);
 				})
 			},
-			qrR(){
+			qrR() {
 				console.log('1')
 			},
 			closeFn() {
@@ -306,7 +381,7 @@
 			},
 			copy(text) {
 				uni.setClipboardData({
-					data:`${text}`,
+					data: `${text}`,
 					// data: `订单ID:${this.details.id}\n订单流水号:${this.details.orderSerialNumber}\n订单金额:${this.details.realAmount}元\n订单升数:${this.details.volume}升\n订单类型:${this.details.payAccountType==0?'个人':'企业'}\n司机姓名:${this.details.customerName}\n司机id:${this.details.customerId} ${this.details.companyName?'\n订单所属公司:' + this.details.companyName :''}\n手机号码:${this.details.customerPhone}`, //要被复制的内容
 					// ${(this.details.payAccountType==0?'司机姓名':'订单所属公司') + ':' + (this.details.payAccountType==0? this.details.customerName:this.details.companyName)}
 					success: () => { //复制成功的回调函数
diff --git a/pages.json b/pages.json
index 694acc8..fd24ac5 100644
--- a/pages.json
+++ b/pages.json
@@ -551,6 +551,26 @@
 					"enablePullDownRefresh": false
 				}
 			}]
+		},
+		{
+			"root": "dataStatistics",
+			"pages": [{
+				"path": "networkPoint/index",
+				"style": {
+					"navigationBarTitleText": "网点数据统计",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "networkPoint/province",
+				"style": {
+					"navigationBarTitleText": "各省数据统计",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh": false
+				}
+			}
+			]
 		}
 	],
 	"globalStyle": {
diff --git a/pages/index/menu.json b/pages/index/menu.json
index b6865eb..ad9a968 100644
--- a/pages/index/menu.json
+++ b/pages/index/menu.json
@@ -204,5 +204,20 @@
 				"image":"../../static/newindex/customerList.png"
 			}
 		]
+	},
+	{
+		"name":"数据统计",
+		"icon":"iconxiugaiyonghuxinxi",
+		"label":"dataStatistics",
+		"colorOpen":false,
+		"submenu":[
+			{
+				"icon":"iconxiugaiyonghuxinxi",
+				"name":"网点统计",
+				"router":"/dataStatistics/networkPoint/index",
+				"lable":"dataStatistics:networkPoint:list", 
+				"image":"../../static/newindex/customerList.png"
+			}
+		]
 	}
 ]
\ No newline at end of file
diff --git a/salesRanking/components/charge.vue b/salesRanking/components/charge.vue
index 5b3c07d..f758c6c 100644
--- a/salesRanking/components/charge.vue
+++ b/salesRanking/components/charge.vue
@@ -31,7 +31,7 @@
 			},
 			type: {
 				type: String,
-				default: 0
+				default: 1
 			}
 		},
 		watch: {
diff --git a/utils/request.js b/utils/request.js
index 16e0f51..c1e39f6 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,11 +1,11 @@
 import axios from 'axios'
 import utils from '@/utils/encode'
 // const env = process.env.NODE_ENV
-// const env = 'test'
-const env = 'production'
-// const testUrl = 'http://172.16.23.95:38080'
+const env = 'test'
+// const env = 'production'
+const testUrl = 'http://192.168.110.77:38080'
+
 // const productUrl = 'https://www.xingoil.com/adminapi'
-// const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new
 const productUrl = 'http://uat.xingoil.com/adminapi'
 
 const service = axios.create({