From 6df26c7fe557fee6efede5dcc67febda9ad5c3a7 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Wed, 30 Aug 2023 11:32:32 +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

---
 .../pages/newRoutePlanning/chooseLocation.vue |  73 +++--
 .../components/footerScroll.vue               | 251 +++++++++++++-----
 .../newRoutePlanning/components/mapIcon.vue   |  31 ++-
 .../newRoutePlanning/components/screen.vue    | 107 ++++----
 .../newRoutePlanning/newRoutePlanning.vue     | 125 +++++----
 .../pages/newRoutePlanning/siteList.vue       | 188 +++++++++++++
 pages.json                                    |  33 ++-
 pages/index/startPage/startPage.vue           |   2 -
 static/img/empty.png                          | Bin 0 -> 12941 bytes
 static/img/list.png                           | Bin 0 -> 227 bytes
 static/img/switch.png                         | Bin 0 -> 344 bytes
 utils/request.js                              |  10 +-
 12 files changed, 590 insertions(+), 230 deletions(-)
 create mode 100644 BagStation/pages/newRoutePlanning/siteList.vue
 create mode 100644 static/img/empty.png
 create mode 100644 static/img/list.png
 create mode 100644 static/img/switch.png

diff --git a/BagStation/pages/newRoutePlanning/chooseLocation.vue b/BagStation/pages/newRoutePlanning/chooseLocation.vue
index a84f73d..28e5ba6 100644
--- a/BagStation/pages/newRoutePlanning/chooseLocation.vue
+++ b/BagStation/pages/newRoutePlanning/chooseLocation.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="seach_body">
 		<view class="seach_input">
-			<view @click="isShowFn" class="seach_input_left color-66">
+			<!-- <view @click="isShowFn" class="seach_input_left color-66">
 				<uni-icons class="mar" type="search" size="20"></uni-icons>
 				<view>{{addressData.city}}</view>
 				<uni-icons color="#bbbbbb" class="bottom" type="back" size="15"></uni-icons>
-			</view>
+			</view> -->
 			<view class="seach_input_right">
-				<input v-model="seachValue" placeholder="请输入地址" type="text" @confirm="seachFn" />
+				<input style="flex:1" v-model="seachValue" placeholder="请输入地址" type="text" @confirm="seachFn" />
 				<view @click="seachFn" class="seach_input_butten"> 搜索</view>
 				<!-- <uni-combox @input="seachFn" emptyTips="请输入内容" class="seach_input_right_input" :border="false" :candidates="candidates" placeholder="Location..."></uni-combox> -->
 			</view>
@@ -17,7 +17,7 @@
 				<view @click="seleClick(item)" v-for="(item,index) in List" class="list_item">
 					<view class="list_item_size">{{item.title}}</view>
 					<view class="list_item_samall_size">{{item.address}}</view>
-				</view> 
+				</view>
 			</scroll-view>
 		</view>
 		<charge :addressData="addressData" @chargeChange='chargeChange' v-model="isShow.address"></charge>
@@ -28,7 +28,7 @@
 	import amapFile from '@/utils/qqmap-wx-jssdk.js'
 	import charge from './components/charge.vue'
 	export default {
-		components:{
+		components: {
 			charge
 		},
 		data() {
@@ -41,7 +41,7 @@
 				isShow: {
 					address: false
 				},
-				type:1,
+				type: 1,
 				seachValue: '',
 				List: [],
 				TXSDK: null,
@@ -66,10 +66,14 @@
 				console.log(this.List, Boolean(Number(this.List)))
 				this.TXSDK.reverseGeocoder({
 					sig: 'mOPvEv4WmyaxymycTYy00pSiad2jnQil',
-					location:that.location,
-					success(e){
-						({province:that.addressData.province,city:that.addressData.city,district:that.addressData.area}=e.result.address_component)
-						console.log(e,that.addressData,'地址逆解析')
+					location: that.location,
+					success(e) {
+						({
+							province: that.addressData.province,
+							city: that.addressData.city,
+							district: that.addressData.area
+						} = e.result.address_component)
+						console.log(e, that.addressData, '地址逆解析')
 					},
 					fail(e) {
 						console.log(e, '地址逆解析 错误')
@@ -83,16 +87,16 @@
 			});
 		},
 		methods: {
-			seleClick(e){
-				uni.$emit('UpdateAddress',e,this.type)
+			seleClick(e) {
+				uni.$emit('UpdateAddress', e, this.type)
 				uni.navigateBack()
 			},
-			chargeChange(e){
-				this.addressData = Object.assign(this.addressData,e)
+			chargeChange(e) {
+				this.addressData = Object.assign(this.addressData, e)
 				console.log(e)
 			},
 			isShowFn() {
-				 this.isShow.address = true
+				this.isShow.address = true
 			},
 			loding(e) {
 				if (e) {
@@ -106,14 +110,15 @@
 					}, 500);
 				}
 			},
-			getRegion(){
+			getRegion() {
 				let that = this
 				this.loding(true)
 				this.TXSDK.search({
 					sig: 'mOPvEv4WmyaxymycTYy00pSiad2jnQil',
 					keyword: that.seachValue,
 					auto_extend: '0',
-					region:that.addressData.province.indexOf('市')!==-1? that.addressData.province : that.addressData.province + that.addressData.city,
+					region: that.addressData.province.indexOf('市') !== -1 ? that.addressData.province : that
+						.addressData.province + that.addressData.city,
 					page_size: that.pageSize.page_size,
 					location: that.location || '',
 					page_index: that.pageSize.page,
@@ -138,20 +143,45 @@
 					},
 				})
 			},
+			getSuggestion() {
+				this.loding(true)
+				this.TXSDK.getSuggestion({
+					sig: 'mOPvEv4WmyaxymycTYy00pSiad2jnQil',
+					keyword: this.seachValue,
+					region: this.addressData.city || '全国',
+					page_size: this.pageSize.page_size,
+					page_index: this.pageSize.page,
+					success: e => {
+						this.loding(false)
+						if (e.message !== 'query ok') return
+						if (e.data.length == 0) {
+							uni.showToast({
+								title: '没有数据了',
+								icon: 'none'
+							})
+						}
+						if (this.pageSize.page > 1) {
+							this.List = this.List.concat(e.data)
+							return
+						}
+						this.List = e.data
+					}
+				})
+			},
 			seachFn(e) {
 				this.pageSize.page = 1
-				this.getRegion()
+				this.getSuggestion()
 			},
 			lower() {
 				this.pageSize.page += 1
-				this.getRegion()
+				this.getSuggestion()
 			},
 		}
 	}
 </script>
 
 <style scoped>
-	.seach_input_butten{
+	.seach_input_butten {
 		color: #FF6700;
 		height: 100%;
 		white-space: nowrap;
@@ -159,6 +189,7 @@
 		align-items: center;
 		padding: 0 10rpx;
 	}
+
 	.list_item_samall_size {
 		color: #BBBBBB;
 		font-size: 24rpx;
@@ -209,7 +240,7 @@
 
 	.seach_input_right {
 		flex: 1;
-		margin:0 10rpx;
+		margin: 0 10rpx;
 		display: flex;
 		align-items: center;
 	}
diff --git a/BagStation/pages/newRoutePlanning/components/footerScroll.vue b/BagStation/pages/newRoutePlanning/components/footerScroll.vue
index 2ab4f09..d6151bd 100644
--- a/BagStation/pages/newRoutePlanning/components/footerScroll.vue
+++ b/BagStation/pages/newRoutePlanning/components/footerScroll.vue
@@ -38,14 +38,37 @@
 			</view>
 			<view class="screen_bottom">沿途站点</view>
 		</view> -->
-		<!--  图标 -->
-		    <mapIcon @swich='swich' @reset='reset' ref='mapIcon' :polyline='polyline' @strategy='strategy'  />
-			<!--  收藏 -->
-			<recentSearch  ref='recentSearch' v-if='!isShow.screen&&list.length!==0' @mapRoutePlanning='mapRoutePlanning'></recentSearch>
-			<!-- 价格筛选 -->
-			<screen  @swich='swich' @mapEventListeners='mapEventListeners' ref = 'screen'  @filter='filter' v-show="isShow.screen&&!isShow.serviceStation" :selePrice='selePrice'/>
-			<!-- 详情 -->
-			<serviceStation  @openMapApp='openMapApp' @dragMap='dragMap'  :details='details' v-if="isShow.serviceStation"/>
+		<!-- 油站列表 -->
+		<view class="site" v-if="isShow.screen">
+			
+			<view @click="showSite">油站列表</view>
+		</view>
+		<view class="line" v-if="isShow.screen">
+			<view @click="showLine">线路切换(3)</view>
+			<view v-if="isShow.strategy">
+				<view @click="strategy('LEAST_TIME')" style="top:-270rpx" class="strategy-item"
+					:class="seleIndex=='LEAST_TIME'? 'active' :'' ">
+					推荐路线
+				</view>
+				<view @click="strategy('LEAST_FEE')" style="top:-180rpx" class="strategy-item"
+					:class="seleIndex=='LEAST_FEE'? 'active' :'' ">费用最少</view>
+				<view @click="strategy('AVOID_HIGHWAY')" style="top:-90rpx" class="strategy-item"
+					:class="seleIndex=='AVOID_HIGHWAY'? 'active' :'' ">不走高速</view>
+			</view>
+		</view>
+		<!-- 定位 -->
+		<view class="position">
+			<image @click="reset" src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/myPosition.png"></image>
+		</view>
+		<!-- <mapIcon @swich='swich' @reset='reset' ref='mapIcon' :polyline='polyline' @strategy='strategy' /> -->
+		<!--  收藏 -->
+		<recentSearch ref='recentSearch' v-if='!isShow.screen&&list.length!==0' @mapRoutePlanning='mapRoutePlanning'>
+		</recentSearch>
+		<!-- 价格筛选 -->
+		<screen @swich='swich' @mapEventListeners='mapEventListeners' ref='screen' @filter='filter'
+			v-show="isShow.screen&&!isShow.serviceStation" :selePrice='selePrice' />
+		<!-- 详情 -->
+		<serviceStation @openMapApp='openMapApp' @dragMap='dragMap' :details='details' v-if="isShow.serviceStation" />
 	</view>
 </template>
 <script>
@@ -54,16 +77,16 @@
 	import mapIcon from './mapIcon.vue'
 	import serviceStation from './serviceStation.vue'
 	export default {
-		components:{
+		components: {
 			screen,
 			recentSearch,
 			mapIcon,
 			serviceStation
 		},
 		props: {
-			selePrice:{
-				type:Object,
-				default:()=>{
+			selePrice: {
+				type: Object,
+				default: () => {
 					return null
 				}
 			},
@@ -73,97 +96,114 @@
 					return []
 				}
 			},
-			details:{
-				type:Object,
-				default:()=>{
+			details: {
+				type: Object,
+				default: () => {
 					return null
 				}
+			},
+			markers:{
+				type: Array,
+				default: () => {
+					return []
+				}
 			}
 		},
 		data() {
 			return {
-				seleIndex:1,
-				filterData:[
-					{
-						lable:'所有价格',
-						value:0
+				seleIndex: 'LEAST_TIME',
+				filterData: [{
+						lable: '所有价格',
+						value: 0
 					},
 					{
-						lable:'低于7.72',
-						value:1
+						lable: '低于7.72',
+						value: 1
 					},
 					{
-						lable:'最低价格',
-						value:2
+						lable: '最低价格',
+						value: 2
 					}
 				],
 				list: [],
 				isShow: {
 					screen: false, //路线规划价格筛选条件
-					filterBox:false,//价格显示控制，已迁移组件内部
-					strategy:false,//路线规划策略选着
-					serviceStation:false,//油站详情控件
-					
+					filterBox: false, //价格显示控制，已迁移组件内部
+					strategy: false, //路线规划策略选着
+					serviceStation: false, //油站详情控件
+
 				}
 			}
 		},
 		created() {
 			//获取最近地址列表
 			this.list = uni.getStorageSync('recentSearch') || [];
-			console.log(this.list)
+			// console.log(this.list)
 		},
 		watch: {
 			//是否开始路线规划控制最近搜索显示隐藏
 			polyline: function(n, o) {
 				n.length !== 0 ? this.isShow.screen = true : this.isShow.screen = false
 			},
-			details:function(n,o){
-				this.isShow.serviceStation = n? true:false
-				console.log(n,'油站点击','控件状态→',this.isShow.serviceStation)
+			details: function(n, o) {
+				this.isShow.serviceStation = n ? true : false
+				console.log(n, '油站点击', '控件状态→', this.isShow.serviceStation)
 			}
 		},
 		methods: {
-			swich(e){
-				if(e){
+			showSite() {
+				console.log('footerScroll this.markers',this.markers)
+				let markers = encodeURIComponent(JSON.stringify(this.markers))
+				uni.navigateTo({
+					url:`/BagStation/pages/newRoutePlanning/siteList?markers=${markers}`
+				})
+			},
+			showLine() {
+				this.isShow.strategy = !this.isShow.strategy
+			},
+			strategy(e) {
+				this.seleIndex = e;
+				setTimeout(() => {
+					this.isShow.strategy = false
+					this.$emit('mapEventListeners', 'updateRoute', null, null, this.seleIndex);
+				}, 500)
+			},
+			swich(e) {
+				if (e) {
 					this.$refs.screen.closeFn()
-				}else{
-					this.$refs.mapIcon.isShow.strategy=false
+				} else {
+					this.isShow.strategy = false
 				}
 				this.$emit('closeAddressSelector')
+			}, 
+			mapIconClose() { 
+				this.isShow.strategy = false
 			},
-			mapIconClose(){
-				this.$refs.mapIcon.isShow.strategy=false
-			},
-			screenClose(){
+			screenClose() {
 				this.$refs.screen.closeFn()
 			},
-			openMapApp(){
-				console.log('导')
+			openMapApp() {
 				this.$emit('openMapApp')
 			},
-			mapEventListeners(e,w,j=''){
-				console.log(e,w,'****')
-				this.$emit(e,w,j)
+			mapEventListeners(e, w, j = '') {
+				// console.log(e, w, '****')
+				this.$emit(e, w, j)
 			},
-			filter(){
+			filter() {
 				return {
-					enterprisePrice:this.$refs.screen.getprice()
+					enterprisePrice: this.$refs.screen.getprice()
 				}
 			},
-			reset(){
-					this.$emit('mapEventListeners','reset')
+			reset() {
+				this.$emit('mapEventListeners', 'reset')
 			},
-			strategy(e){
-					this.$emit('mapEventListeners','updateRoute',null,null,e);
-					
-			},
-			dragMap(e,w){
-				console.log('组件内触发')
-				this.$emit('dragMap',e,w)
+			dragMap(e, w) {
+				// console.log('组件内触发')
+				this.$emit('dragMap', e, w)
 			},
 			//点击最近开始路线规划
 			mapRoutePlanning(e, i) {
-				this.$emit('mapEventListeners','cardPlanning', e)
+				this.$emit('mapEventListeners', 'cardPlanning', e)
 			},
 			//修改缓存最近搜索逻辑
 			collection(e, i) {
@@ -199,25 +239,100 @@
 </script>
 
 <style lang="scss">
-	.seleStrategy{
+	.site {
+		position: absolute;
+		top: -95rpx;
+		right: 350rpx;
+		padding: 0 20rpx 0 45rpx;
+		width: 180rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+		font-size: 28rpx;
+		border-radius: 15rpx;
+		background: url('../../../../static/img/list.png') #fff 10rpx center/32rpx 32rpx no-repeat;
+	}
+	.line {
+		position: absolute;
+		top: -95rpx;
+		right: 110rpx;
+		padding: 0 20rpx 0 45rpx;
+		width: 212rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+		font-size: 28rpx;
+		border-radius: 15rpx;
+		background: url('../../../../static/img/switch.png') #fff 10rpx center/33rpx 33rpx no-repeat;
+	}
+
+	.position {
+		position: absolute;
+		top: -90rpx;
+		right: 30rpx;
+		padding-top: 8rpx;
+		width: 60rpx;
+		height: 60rpx;
+		border-radius: 15rpx;
+		background: #fff;
+		text-align: center;
+
+		image {
+			width: 45rpx;
+			height: 45rpx;
+		}
+	}
+
+	.strategy-item {
+		position: absolute;
+		left: 0;
+		top: 0;
 		height: 80rpx;
 		width: 180rpx;
-		background-color: #FFFFFF;
+		text-align: center;
+		line-height: 80rpx;
+		background: #fff;
+		border-radius: 10px;
+
+		&.active {
+			background: #FF6700;
+			color: #fff;
+		}
+	}
+
+	.Strategy {
+		height: 80rpx;
+		width: 180rpx;
+		background-color: #FF6700;
 		border-radius: 10px;
 		position: absolute;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		transition: top .3s,right 0.3s,opacity 0s;
+		transition: top .3s, right 0.3s, opacity 0s;
 		overflow: hidden;
+		color: #FFFFFF;
 	}
-	.mapIcon{
-		text-align: end;
-		padding-right: 30rpx;
-		padding-bottom: 15rpx;
-		position: relative;
-		height: 80rpx;
-	}
+
+	// .seleStrategy {
+	// 	height: 80rpx;
+	// 	width: 180rpx;
+	// 	background-color: #FFFFFF;
+	// 	border-radius: 10px;
+	// 	position: absolute;
+	// 	display: flex;
+	// 	align-items: center;
+	// 	justify-content: center;
+	// 	transition: top .3s, right 0.3s, opacity 0s;
+	// 	overflow: hidden;
+	// }
+
+	// .mapIcon {
+	// 	text-align: end;
+	// 	padding-right: 30rpx;
+	// 	padding-bottom: 15rpx;
+	// 	position: relative;
+	// 	height: 80rpx;
+	// }
+
 	.filterBox {
 		position: absolute;
 		width: max-content;
@@ -315,7 +430,7 @@
 		position: absolute;
 		z-index: 999999;
 		width: 100vw;
-		bottom:0rpx;
+		bottom: 0rpx;
 		// height: 300rpx;
 	}
 
diff --git a/BagStation/pages/newRoutePlanning/components/mapIcon.vue b/BagStation/pages/newRoutePlanning/components/mapIcon.vue
index b202396..97f5a67 100644
--- a/BagStation/pages/newRoutePlanning/components/mapIcon.vue
+++ b/BagStation/pages/newRoutePlanning/components/mapIcon.vue
@@ -1,8 +1,10 @@
 <template>
 	<view class="mapIcon">
-		<view  class="Position">
-			<image @click="$emit('reset')" v-if="polyline.length==0" src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/myPosition.png"  ></image>
-			<image @click="$emit('swich',true);isShow.strategy=!isShow.strategy" v-else src="../../../static/img/trajectory.png"  ></image>
+		<view class="Position">
+			<image @click="$emit('reset')" v-if="polyline.length==0"
+				src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/myPosition.png"></image>
+			<image @click="$emit('swich',true);isShow.strategy=!isShow.strategy" v-else
+				src="../../../static/img/trajectory.png"></image>
 		</view>
 		<!-- <uni-icons  v-if="polyline.length!==0"  @click=" isShow.strategy=!isShow.strategy" type="map-pin-ellipse" size='25'></uni-icons> -->
 		<view @click="strategy('LEAST_TIME')"
@@ -111,18 +113,21 @@
 </script>
 
 <style lang="scss">
-	.Position image{
-		width: 45rpx;height: 45rpx;
+	.Position image {
+		width: 45rpx;
+		height: 45rpx;
 	}
-	.Position{
+
+	.Position {
+		border-radius: 10px;
 		border-radius: 10px;
-		    border-radius: 10px;
-		    background-color: #FFFFFF;
-		    padding: 10rpx;
-		    width: min-content;
-		    float: right;
-		
+		background-color: #FFFFFF;
+		padding: 10rpx;
+		width: min-content;
+		float: right;
+
 	}
+
 	.seleStrategy {
 		height: 80rpx;
 		width: 180rpx;
@@ -132,7 +137,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		transition: top .3s, right 0.3s, opacity 0s,display 0s;
+		transition: top .3s, right 0.3s, opacity 0s, display 0s;
 		overflow: hidden;
 	}
 
diff --git a/BagStation/pages/newRoutePlanning/components/screen.vue b/BagStation/pages/newRoutePlanning/components/screen.vue
index f2801a4..9f85101 100644
--- a/BagStation/pages/newRoutePlanning/components/screen.vue
+++ b/BagStation/pages/newRoutePlanning/components/screen.vue
@@ -1,25 +1,26 @@
 <template>
-		<view  class="screen">
-			<view class="screen_left">
-				<!-- <uni-icons type="smallcircle-filled" size='25'></uni-icons> -->
-				<image style="width: 50rpx;height: 50rpx;" src="../../../static/img/price.png"></image>
-				<view class="screen_text">
-					<text @click="showFn" >{{filterData[seleIndex].lable}}</text>
-					<view v-if="isShow.filterBox" class="filterBox">
-						<view @click="priceSele(item,index)" :style="{color:index==seleIndex?'#666666':''}" v-for="(item,index) in filterData">{{item.lable}}</view>
-					</view>
+	<view class="screen">
+		<view class="screen_left">
+			<!-- <uni-icons type="smallcircle-filled" size='25'></uni-icons> -->
+			<image style="width: 50rpx;height: 50rpx;" src="../../../static/img/price.png"></image>
+			<view class="screen_text">
+				<text @click="showFn">{{filterData[seleIndex].lable}}</text>
+				<view v-if="isShow.filterBox" class="filterBox">
+					<view @click="priceSele(item,index)" :style="{color:index==seleIndex?'#666666':''}"
+						v-for="(item,index) in filterData">{{item.lable}}</view>
 				</view>
-				<image style="width: 40rpx;height: 25rpx;" src="../../../static/img/chevron-up.png"></image>
 			</view>
-			<view @click="move" class="screen_bottom">{{site?'沿途站点':'全路径'}}</view>
+			<image style="width: 40rpx;height: 25rpx;" src="../../../static/img/chevron-up.png"></image>
 		</view>
+		<view @click="move" class="screen_bottom">{{site?'沿途站点':'全路径'}}</view>
+	</view>
 </template>
 <script>
 	export default {
 		props: {
-			selePrice:{
-				type:Object,
-				default:()=>{
+			selePrice: {
+				type: Object,
+				default: () => {
 					return null
 				}
 			},
@@ -32,82 +33,84 @@
 		},
 		data() {
 			return {
-				site:true,
-				seleIndex:1,
-				filterData:[],
+				site: true,
+				seleIndex: 1,
+				filterData: [],
 				list: [],
 				isShow: {
 					screen: false,
-					filterBox:false,
-					strategy:false
+					filterBox: false,
+					strategy: false
 				}
 			}
 		},
 		created() {
 			// this.list = uni.getStorageSync('recentSearch') || [];
 			// console.log(this.list)
-			
+
 		},
 		watch: {
 			polyline: function(n, o) {
 				n.length !== 0 ? this.isShow.screen = true : this.isShow.screen = false;
-				
+
 			},
 			selePrice: function(n, o) {
-				console.log(this.selePrice,'jiage');
+				console.log(this.selePrice, 'jiage');
 				// this.filterData[1].lable = '低于' + this.selePrice.middlePrice;
 				// this.filterData[1].value = this.selePrice.middlePrice;
 				// this.filterData[2].lable = '最低价格';
 				// this.filterData[2].value = this.selePrice.minPrice;
 				// this.filterData
 				this.filterData = []
-				if(n){
-					Object.keys(this.selePrice).forEach((item,index)=>{
-						if(this.selePrice[item]!==null){
+				if (n) {
+					Object.keys(this.selePrice).forEach((item, index) => {
+						if (this.selePrice[item] !== null) {
 							this.filterData.push({
-								lable:item=='middlePrice'?'低于'  + this.moneyIntercept(this.selePrice.middlePrice)  :'最低价格',
-								value:item=='middlePrice'? this.moneyIntercept(this.selePrice.middlePrice)  : this.moneyIntercept(this.selePrice.minPrice)
+								lable: item == 'middlePrice' ? '低于' + this.moneyIntercept(this
+									.selePrice.middlePrice) : '最低价格',
+								value: item == 'middlePrice' ? this.moneyIntercept(this.selePrice
+									.middlePrice) : this.moneyIntercept(this.selePrice.minPrice)
 							})
 						}
 					})
 					this.filterData.unshift({
-						lable:'所有价格',
-						value:99999
+						lable: '所有价格',
+						value: 99999
 					});
-					if(	this.filterData.length==1){
-						 this.seleIndex = 0;
-					}else{
+					if (this.filterData.length == 1) {
+						this.seleIndex = 0;
+					} else {
 						this.seleIndex = 1;
 					}
 				}
-				
+
 			}
 		},
 		methods: {
-			closeFn(){
-				this.isShow.filterBox=false
+			closeFn() {
+				this.isShow.filterBox = false
 			},
-			showFn(e){
-				this.isShow.filterBox=!this.isShow.filterBox;
-				this.$emit('swich',false);
+			showFn(e) {
+				this.isShow.filterBox = !this.isShow.filterBox;
+				this.$emit('swich', false);
 			},
-			move(){
-				this.$emit('mapEventListeners','mapEventListeners','MoveToLocation',this.site);
+			move() {
+				this.$emit('mapEventListeners', 'mapEventListeners', 'MoveToLocation', this.site);
 				this.site = !this.site;
-				
+
 			},
-			getprice(){
-				if(	this.filterData.length==1) this.seleIndex = 0;
-				return this.filterData[this.seleIndex].value||0.00
+			getprice() {
+				if (this.filterData.length == 1) this.seleIndex = 0;
+				return this.filterData[this.seleIndex].value || 0.00
 			},
-			priceSele(e,w){
+			priceSele(e, w) {
 				this.seleIndex = w;
 				this.isShow.filterBox = false;
-				this.$emit('mapEventListeners','mapEventListeners','localScreen','footer')
+				this.$emit('mapEventListeners', 'mapEventListeners', 'localScreen', 'footer')
 				console.log(e)
 			},
-			mapRoutePlanning(e,i) {
-				this.$emit('mapEventListeners','cardPlanning', e)
+			mapRoutePlanning(e, i) {
+				this.$emit('mapEventListeners', 'cardPlanning', e)
 			},
 			collection(e, i) {
 				let recentSearch = uni.getStorageSync('recentSearch');
@@ -142,7 +145,7 @@
 </script>
 
 <style lang="scss">
-	.seleStrategy{
+	.seleStrategy {
 		height: 80rpx;
 		width: 180rpx;
 		background-color: #FFFFFF;
@@ -151,16 +154,18 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		transition: top .3s,right 0.3s,opacity 0s;
+		transition: top .3s, right 0.3s, opacity 0s;
 		overflow: hidden;
 	}
-	.mapIcon{
+
+	.mapIcon {
 		text-align: end;
 		padding-right: 30rpx;
 		padding-bottom: 15rpx;
 		position: relative;
 		height: 80rpx;
 	}
+
 	.filterBox {
 		position: absolute;
 		width: max-content;
diff --git a/BagStation/pages/newRoutePlanning/newRoutePlanning.vue b/BagStation/pages/newRoutePlanning/newRoutePlanning.vue
index bdca6d3..a007f12 100644
--- a/BagStation/pages/newRoutePlanning/newRoutePlanning.vue
+++ b/BagStation/pages/newRoutePlanning/newRoutePlanning.vue
@@ -5,10 +5,10 @@
 			@mapEventListeners='mapEventListeners' :polyline="polyline" :Route="Route" />
 		<footerScroll @closeAddressSelector='closeAddressSelector' @openMapApp='openMapApp' ref='footerScroll'
 			:selePrice='selePrice' @dragMap='dragMap' :details='details' :polyline="polyline"
-			@mapEventListeners='mapEventListeners' />
+			@mapEventListeners='mapEventListeners' :markers="markers" />
 		<view class="map_body">
-			<map @bindregionchange='bindregionchange' @tap='poitap' @updated='mapUpdated' :scale='mapScale' @callouttap='callouttap'
-				:enable-scroll='enableScroll' @markertap='markertap' :polyline="polyline"
+			<map @bindregionchange='bindregionchange' @tap='poitap' @updated='mapUpdated' :scale='mapScale'
+				@callouttap='callouttap' :enable-scroll='enableScroll' @markertap='markertap' :polyline="polyline"
 				subkey="UTXBZ-BUH6D-TQD44-HCEG4-UKOFT-U2BDN" layer-style='2' id="map_Id" :show-location="true"
 				:markers="markers" class="map_xx" :latitude="coordinate.latitude" :longitude="coordinate.longitude">
 				<cover-view slot="callout">
@@ -83,14 +83,21 @@
 				key: 'UTXBZ-BUH6D-TQD44-HCEG4-UKOFT-U2BDN'
 			});
 		},
-		watch:{
-			enableScroll:function(n,o){
-				console.log('全局是否可拖动',n)
+		watch: {
+			enableScroll: function(n, o) {
+				console.log('全局是否可拖动', n)
 			}
 		},
 		methods: {
-			bindregionchange(e){
-				console.log(e,'***********')
+			perspectives(item) {
+				let {
+					latitude,
+					longitude
+				} = item
+				this.newMapMoveToLocation(longitude, latitude, 'reset')
+			},
+			bindregionchange(e) {
+				console.log(e, '***********')
 			},
 			mapUpdated(e) {
 				let that = this
@@ -111,7 +118,8 @@
 			async mapEventListeners(e) {
 				switch (e) {
 					case 'updateRoute':
-						this.mapRoutePlanning(arguments[1] ? arguments[1] : this.Route.start, arguments[2] ? arguments[2] : this.Route.end, arguments[3] ? arguments[3] : 'LEAST_TIME')
+						this.mapRoutePlanning(arguments[1] ? arguments[1] : this.Route.start, arguments[2] ? arguments[
+							2] : this.Route.end, arguments[3] ? arguments[3] : 'LEAST_TIME')
 						break;
 					case 'UpdateLocation':
 						this.UpdateLocation(arguments[1], arguments[2])
@@ -121,10 +129,10 @@
 						this.mapRoutePlanning()
 						break;
 					case 'details':
-							// this.details.a = 1 ;
-							let d = arguments[1]
-							this.details = d;
-							this.newMapMoveToLocation(this.details.longitude, this.details.latitude)
+						// this.details.a = 1 ;
+						let d = arguments[1]
+						this.details = d;
+						this.newMapMoveToLocation(this.details.longitude, this.details.latitude)
 						break;
 					case 'apiScreen':
 						//接口更新站点 
@@ -134,13 +142,14 @@
 						let markerList = await this.mapUpdateMarkers(this.polyline[0].points, oilProductCode, juLi,
 							siteChannel);
 						//处理站点数据回显
+
 						this.spareMarkers = this.locationProcessing(markerList);
-						this.markers =   await this.filterMarkers(JSON.parse(JSON.stringify(this.spareMarkers)));
+						this.markers = await this.filterMarkers(JSON.parse(JSON.stringify(this.spareMarkers)));
 						break;
 					case 'localScreen':
 						// 手动筛选 备份下数据
 						let markers = JSON.parse(JSON.stringify(this.spareMarkers));
-						this.markers =  await this.filterMarkers(markers);
+						this.markers = await this.filterMarkers(markers);
 						/* 老版更新价格  
 						this.markers =  await this.filterMarkers(markers);
 						if (arguments[1] !== 'footer') {
@@ -168,7 +177,7 @@
 						 	this.markers = this.filterMarkers(this.markers,this.$refs.footerScroll.filter());
 						 },0)
 						*/
-						
+
 						break;
 					case 'MoveToLocation':
 						arguments[1] ? (this.newMapMoveToLocation(this.Route.start.longitude, this.Route.start
@@ -189,7 +198,7 @@
 				// 获取路径
 				let res = await this.getMapRoutePlanning(start, end, strategy);
 				//处理数据
-				 this.polyline = this.RoutePlanningHandle(res);
+				this.polyline = this.RoutePlanningHandle(res);
 				//缩放显示所有经纬度
 				this.zoomRoutePlanning();
 				// 获取筛选数据 更新油站站点
@@ -200,10 +209,14 @@
 				} = this.$refs.addressSelector.datassFn();
 				let markerList = await this.mapUpdateMarkers(this.polyline[0].points, oilProductCode, juLi,
 					siteChannel);
+				console.log('newRoutePlanning markerList', markerList)
 				//处理油站站点数据并显示
 				this.spareMarkers = this.locationProcessing(markerList);
+				console.log('newRoutePlanning spareMarkers', this.spareMarkers)
 				let markers = JSON.parse(JSON.stringify(this.spareMarkers));
-				this.markers  =  await this.filterMarkers(markers);
+				console.log('markers', markers)
+				this.markers = await this.filterMarkers(markers);
+				console.log('newRoutePlanning this.markers', this.markers)
 			},
 			// 更新最近搜索
 			UpdateLocation(Route, type) {
@@ -229,7 +242,7 @@
 			UpdateAddress() {
 				let that = this
 				uni.$on('UpdateAddress', function(region, type) {
-					console.log(`%c ${(type=='start'?'起点更新':'终点更新')} 地址→ ${region.title}`,'color:red;font-size:50px')
+					// console.log(`%c ${(type=='start'?'起点更新':'终点更新')} 地址→ ${region.title}`,'color:red;font-size:50px')
 					that.Route[type].longitude = region.location.lng;
 					that.Route[type].latitude = region.location.lat;
 					that.Route[type].title = region.title;
@@ -268,12 +281,12 @@
 							res(e)
 						},
 						fail(e) {
-							setTimeout(()=>{
+							setTimeout(() => {
 								uni.showToast({
-									title:e.msg,
-									icon:"none"
+									title: e.msg,
+									icon: "none"
 								});
-							},1000)
+							}, 1000)
 							rej(e)
 							console.log('获取路线规划失败', e)
 						}
@@ -337,7 +350,7 @@
 			},
 			// 点击地图
 			poitap() {
-				if(this.polyline.length==0) return;
+				if (this.polyline.length == 0) return;
 				this.$refs.footerScroll.isShow.screen = true;
 				this.$refs.footerScroll.isShow.serviceStation = false;
 				this.enableScroll = true;
@@ -354,7 +367,9 @@
 					oilProductCode: oilProductCode ? oilProductCode : '0#',
 					juLi: juLi ? juLi : '5',
 					siteChannel: siteChannel,
-					countJuLi: points[0].distance
+					countJuLi: points[0].distance,
+					latitude: this.coordinate.latitude,
+					longitude: this.coordinate.longitude
 				}
 				let taht = this;
 				return new Promise(function(re, rj) {
@@ -369,27 +384,17 @@
 							rj(markerList.code + markerList.msg)
 							return
 						}
-						// if (markerList.data.length == 0) {
-						// 	setTimeout(() => {	
-						// 		uni.showToast({
-						// 			title: '暂无油站信息' + markerList.data.length,
-						// 			icon: 'none'
-						// 		})
-						// 	}, 500)
-						// 	rj('暂无油站信息' + markerList.data.length)
-						// 	return
-						// }
 						taht.selePrice = {
 							middlePrice: markerList.data.middlePrice,
 							minPrice: markerList.data.minPrice
 						}
-						re(markerList.data.siteGeoVos)
+						re(markerList.data.siteGeoVoList)
 					})
 				})
 			},
 			//定位处理
 			locationProcessing(markerList) {
-				console.log(markerList, '----')
+				// console.log(markerList, '----')
 				markerList.forEach((item, index) => {
 					let configure = {
 						siteId: item.id,
@@ -419,7 +424,7 @@
 					longitude: String(this.coordinate.longitude),
 					siteId: seleMark[0].siteId
 				});
-				console.log(details, '***')
+				// console.log(details, '***')
 				if (details.code !== 20000) {
 					uni.showToast({
 						title: details.msg,
@@ -485,7 +490,7 @@
 
 			},
 			//价格排序
-			priceSort(list){
+			priceSort(list) {
 				let sort = list.sort((a, b) => {
 					return a.enterprisePrice - b.enterprisePrice
 				});
@@ -493,32 +498,38 @@
 			},
 			//手动筛选
 			filterMarkers(e, w) {
-				let that = this 
-				return new Promise(function(re,rj){
+				let that = this
+				return new Promise(function(re, rj) {
 					w = that.$refs.addressSelector.datassFn();
 					let filterMarkers = [];
 					//第一步筛选 是否高速
-					let highSpeedMarkers = Object.keys(w).includes('highSpeed') && w.highSpeed ? e.filter((item, index) => {
+					let highSpeedMarkers = Object.keys(w).includes('highSpeed') && w.highSpeed ? e.filter((item,
+						index) => {
 						return Number(w.highSpeed) == 2 ? item : item.highSpeedMark == Number(w.highSpeed)
 					}) : e;
-					let sort = that.priceSort(highSpeedMarkers);
-					that.selePrice = sort.length !== 0?
-					{
-						middlePrice: sort[Number.isInteger((sort.length / 2)) ? (sort.length / 2)  : ((sort.length + 1) / 2) - 1].enterprisePrice,
+					
+					let copy = JSON.parse(JSON.stringify(highSpeedMarkers))
+					
+					let sort = that.priceSort(copy);
+					that.selePrice = sort.length !== 0 ? {
+						middlePrice: sort[Number.isInteger((sort.length / 2)) ? (sort.length / 2) : ((sort
+							.length + 1) / 2) - 1].enterprisePrice,
 						minPrice: sort[0].enterprisePrice,
-					}:{};
+					} : {};
 					// 获取更新之后的值 this.$nextTick()也行
-					setTimeout(()=>{w = Object.assign(w,that.$refs.footerScroll.filter());},0)
+					setTimeout(() => {
+						w = Object.assign(w, that.$refs.footerScroll.filter());
+					}, 0)
 					//第二步筛选价格 
-					setTimeout(()=>{
-						filterMarkers = Object.keys(w).includes('enterprisePrice') && w.enterprisePrice ? 
-						highSpeedMarkers.filter((item, index) => {
-							return item.enterprisePrice <= Number(w.enterprisePrice)
-						}) : highSpeedMarkers;
+					setTimeout(() => {
+						filterMarkers = Object.keys(w).includes('enterprisePrice') && w.enterprisePrice ?
+							highSpeedMarkers.filter((item, index) => {
+								return item.enterprisePrice <= Number(w.enterprisePrice)
+							}) : highSpeedMarkers;
 						re(filterMarkers)
-					},0)
+					}, 0)
 				})
-			
+
 			},
 			copy(obj) {
 				let newobj = null // 接受拷贝的新对象
@@ -536,11 +547,11 @@
 			dragMap(e, w) {
 				let that = this
 				this.enableScroll = w;
-				console.log('辅助控件触发;是否可以拖动地图1>',that.enableScroll)
+				console.log('辅助控件触发;是否可以拖动地图1>', that.enableScroll)
 				this.newMapMoveToLocation(e.longitude, e.latitude)
 				uni.$on('dragMap', function(e) {
 					that.enableScroll = e
-					console.log('辅助控件触发;是否可以拖动地图>',that.enableScroll)
+					console.log('辅助控件触发;是否可以拖动地图>', that.enableScroll)
 				})
 			}
 		}
diff --git a/BagStation/pages/newRoutePlanning/siteList.vue b/BagStation/pages/newRoutePlanning/siteList.vue
new file mode 100644
index 0000000..4f9bfbc
--- /dev/null
+++ b/BagStation/pages/newRoutePlanning/siteList.vue
@@ -0,0 +1,188 @@
+<template>
+	<view class="site-list">
+		<view class="container" v-if="siteList.length">
+			<list >
+				<view class="item" v-for="item,index in siteList" :key="index">
+					<image
+						:src="item.siteImages || 'https://static.czb365.com/1647787216992.jpg?x-oss-process=image/resize,m_lfit,h_420,w_630/format,png'">
+					</image>
+					<view>{{item.siteName}}</view>
+					<view>
+						<view>{{item.address}}</view> <text>{{item.juli | adjust}}km</text>
+					</view>
+					<view>0# ￥7.94</view>
+					<view>
+						<view @click="lookPosition(item)">查看位置</view>
+						<view @click="jump(item)">查看详情</view>
+					</view>
+				</view>
+			</list>
+		</view>
+		<view v-else class="empty">
+			<image src="../../../static/img/empty.png"></image>
+			<view>当前线路附近暂无油站</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				siteList: []
+			}
+		},
+		onLoad(options) {
+			if (!options.markers) return
+			let markers = JSON.parse(decodeURIComponent(options.markers))
+			this.siteList = markers
+			console.log('site markers',markers)
+		},
+		filters: {
+			adjust(val) {
+				if (!val) return '--'
+				val = +val
+				return val.toFixed(2)
+			}
+		},
+		methods: {
+			lookPosition(item) {
+				// console.log(getCurrentPages())
+				getCurrentPages()[0].$vm.perspectives(item)
+				uni.navigateBack()
+			},
+			jump(item) {
+				let obj = {
+					siteId: item.id,
+					longitude: item.longitude,
+					latitude: item.latitude,
+				}
+				let itemS = JSON.stringify(obj)
+				// return
+				uni.navigateTo({
+					url: `../stationDetail/stationDetail?item=${itemS}&&types=map`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	// page {
+	// 	background: #f0f0f0;
+	// }
+	.empty {
+		padding-top: 150rpx;
+		width: 100%;
+		background: #fff;
+		text-align: center;
+		image {
+			width: 450rpx;
+			height: 381rpx;
+		}
+		view {
+			color: #999;
+		}
+	}
+	.site-list {
+		min-height: 100vh;
+		.container {
+			padding: 50rpx;
+			background: #f0f0f0;
+		}
+	}
+
+	.item {
+		position: relative;
+		padding: 30rpx 30rpx 100rpx 160rpx;
+		margin-bottom: 30rpx;
+		min-height: 200rpx;
+		background: #fff;
+		// border: 1px solid #333;
+		border-radius: 15rpx;
+
+		>view {
+			&:nth-of-type(1) {
+				font-weight: 550;
+				font-size: 32rpx;
+			}
+
+			&:nth-of-type(2) {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-top: 10rpx;
+				font-size: 24rpx;
+				color: #999;
+
+				view {
+					width: 80%;
+				}
+
+				// text {
+				// 	float: right;
+				// }
+			}
+
+			&:nth-of-type(3) {
+				font-weight: 550;
+				margin-top: 10rpx;
+				color: #FF8C00;
+			}
+
+			&:nth-of-type(4) {
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				width: 100%;
+				height: 80rpx;
+
+				&::before {
+					content: '';
+					position: absolute;
+					top: 0;
+					left: 50%;
+					transform: translateX(-50%);
+					width: 90%;
+					height: 1rpx;
+					background: #d3d3d3;
+				}
+
+				view {
+					display: inline-block;
+					width: 50%;
+					height: 80rpx;
+					text-align: center;
+					line-height: 80rpx;
+
+					&:nth-of-type(1) {
+						color: #1E90FF;
+					}
+
+					&:nth-of-type(2) {
+						color: #FF8C00;
+					}
+				}
+
+				&::after {
+					content: '';
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					transform: translateY(-50%);
+					width: 1rpx;
+					height: 30rpx;
+					background: #d3d3d3;
+				}
+			}
+		}
+
+		image {
+			position: absolute;
+			left: 30rpx;
+			top: 13%;
+			width: 100rpx;
+			height: 100rpx;
+		}
+	}
+</style>
diff --git a/pages.json b/pages.json
index 8faa7ac..60f70d6 100644
--- a/pages.json
+++ b/pages.json
@@ -113,18 +113,16 @@
 		{
 			"root": "Activity",
 			"pages": [{
-                    "path" : "pages/index/index",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "油站活动",
-                   "enablePullDownRefresh": false,
-                   "navigationStyle": "default",
-                   "navigationBarBackgroundColor": "#FF6700",
-                   "navigationBarTextStyle": "white"
-                }
-                
-                }
-            ]
+				"path": "pages/index/index",
+				"style": {
+					"navigationBarTitleText": "油站活动",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "default",
+					"navigationBarBackgroundColor": "#FF6700",
+					"navigationBarTextStyle": "white"
+				}
+
+			}]
 		},
 		{
 			"root": "Financial",
@@ -308,6 +306,15 @@
 
 					}
 
+				}, {
+					"path": "pages/newRoutePlanning/siteList",
+					"style": {
+						"navigationBarTitleText": "油站列表",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "default",
+						"navigationBarBackgroundColor": "#F0F0F0",
+						"navigationBarTextStyle": "black"
+					}
 				}, {
 					"path": "pages/overviewMap/overviewMap",
 					"style": {
@@ -405,4 +412,4 @@
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/pages/index/startPage/startPage.vue b/pages/index/startPage/startPage.vue
index f9860a4..99ac96f 100644
--- a/pages/index/startPage/startPage.vue
+++ b/pages/index/startPage/startPage.vue
@@ -93,8 +93,6 @@
 				});
 			},
 			async initFn(option) {
-				console.log(option, '启动页');
-				console.log(`%c 二维码进入 ${option.scene}`, 'color:red;font-size:50px')
 				const token = uni.getStorageSync('Authorization')
 				const openid = uni.getStorageSync('openid')
 				this.key = '';
diff --git a/static/img/empty.png b/static/img/empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb5589b5a107f7886716e5ab9ec42c942cf35b00
GIT binary patch
literal 12941
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
bj>iA&jl=R1z7p!s^=K*zn({woErb6bAXHvS

literal 0
HcmV?d00001

diff --git a/static/img/list.png b/static/img/list.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5c1bedb47d9831c6e6d1f0e18f5293c796f2d23
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b3I)gLn7SY
zPCLlkV!*@F?)TzJRHK)`)H@eXUgTW5U@FHa<x8EPl`GfG_nc!f`OPWj-sFrLJG}!e
zyHq}~xh1gmEfDI}y?$r^qn}LCcecAFFvVSWQaut-IP*g5wH=Pr{U_{v_&7$`pi!!E
zQRzw5Uk!E<VQtnQeyTeEK9H=NF0_V8_{Al5FJ~p?uD=aZlhz2Hym95lorm@bOllYA
a9N@H@DXGZ)Kb8^bPzFy|KbLh*2~7aHD_V~L

literal 0
HcmV?d00001

diff --git a/static/img/switch.png b/static/img/switch.png
new file mode 100644
index 0000000000000000000000000000000000000000..5257c684a5d7c7262e07748866b1b17abf1e8bea
GIT binary patch
literal 344
zcmV-e0jK_nP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$5=lfsR9Hvt*1-{iFc1aMU7!%Xao8fH615Vw672+fAerH&jWFx%O!VLolIS9r
z<VuD-mY+=!Rvx(W`j7#t6{zcaGYrEc<+rK<h-e1@Ei>P&wZ~Y58bH3js;avzoPtmT
z$im+sQ~}>0)B&l8MF1&?NdOU@nE4Q!WZyhQ+`OLog6RXa03h2+b9Ba-=JSP<0GH;s
zUPEDw>89SZSO#Lz8IUXBt$;h-VzU&Sm$VCrNWBj*^TS%Zjp_r^2?5~jj@G0LhOZPw
zQC#}IzeNFDBiai><cN6ml`vTQzyxmw{)L#`hW|hW`+!4S<#1Z!cLV{iv%M@!3FdAb
q$0qgWI~Ri}z^_5efLwvO3OoU7$%!GTy~{5E0000<MNUMnLSTYUHk1ee

literal 0
HcmV?d00001

diff --git a/utils/request.js b/utils/request.js
index fba27e7..6c3fbd1 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -2,14 +2,14 @@ import axios from 'axios'
 import utils from '@/utils/encode'
 // const env = process.env.NODE_ENV
 // const env = 'production'/*  */
-// const env = 'test'
+// const env = 'test' 
 const env = 'production'
 // 45
-const testUrl = 'http://192.168.0.254:38080' 
-const productUrl = 'https://www.xingoil.com/adminapi'
+const testUrl = 'http://192.168.1.132:38080' 
+// const productUrl = 'https://www.xingoil.com/adminapi'
 
-// const productUrl = 'http://uat.xingoil.com/adminapi'
-// const productUrl = 'http://192.168.0.191:38080' 	
+const productUrl = 'http://uat.xingoil.com/adminapi'
+// const productUrl = 'http://192.168.0.191:38080'
 // const productUrl = 'http://121.196.213.68/adminapi'
 const service = axios.create({
 	baseURL: env == 'production' ? productUrl : testUrl,