From 7bd17a36921b7df3c8828b0479c815183b545420 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Thu, 12 Oct 2023 11:02:14 +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

---
 App.vue                                       |   2 +
 BagStation/orderDetail/orderDetail.vue        |  46 +-
 .../components/addressSelector.vue            |  19 +-
 .../pages/stationDetail/stationDetail.vue     | 539 ++++++++++--------
 BagStation/static/img/customer-service.png    | Bin 0 -> 988 bytes
 components/tabbar/index.vue                   | 121 ++++
 main.js                                       |   3 +-
 pages.json                                    |   4 +-
 pages/tabbar/home/home.vue                    |   9 +-
 pages/tabbar/order/orderList/orderList.vue    |   1 +
 pages/tabbar/qrCenter/qrCenter.vue            |   1 +
 pages/tabbar/station/stationList.vue          |  12 +-
 pages/tabbar/user/user.vue                    |   1 +
 static/img/tabbar/icon.png                    | Bin 0 -> 2791 bytes
 utils/request.js                              |   4 +-
 15 files changed, 497 insertions(+), 265 deletions(-)
 create mode 100644 BagStation/static/img/customer-service.png
 create mode 100644 components/tabbar/index.vue
 create mode 100644 static/img/tabbar/icon.png

diff --git a/App.vue b/App.vue
index c04481a..3d42bb1 100644
--- a/App.vue
+++ b/App.vue
@@ -38,6 +38,8 @@
 			})
 			this.onShareAppMessage(option.query.scene);
 			
+			
+			
 		},
 		methods: {
 		
diff --git a/BagStation/orderDetail/orderDetail.vue b/BagStation/orderDetail/orderDetail.vue
index 0fbea0d..9625806 100644
--- a/BagStation/orderDetail/orderDetail.vue
+++ b/BagStation/orderDetail/orderDetail.vue
@@ -60,7 +60,8 @@
 				<view class="padding-tb-xs text-left">
 					油品油枪
 					<text class="fr nowrap">
-						{{order.oilsCode?order.oilsCode+' ':'' }}{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}} </text>
+						{{order.oilsCode?order.oilsCode+' ':'' }}{{ order.gunName?order.gunName+'号枪': order.oilsBar?order.oilsBar+'号枪':'未选择油枪'}}
+					</text>
 				</view>
 				<view class="padding-tb-xs  text-left">
 					{{order.oilProductType=='GAS'?'加气重量：':'加油升数：'}}
@@ -74,7 +75,8 @@
 				</view>
 				<view class="padding-tb-xs  text-left">
 					优惠价格
-					<text class="fr">约{{moneyIntercept(order.realPrice) }}￥/{{order.oilProductType=='GAS'?'L':'L'}}</text>
+					<text
+						class="fr">约{{moneyIntercept(order.realPrice) }}￥/{{order.oilProductType=='GAS'?'L':'L'}}</text>
 				</view>
 				<view class="padding-tb-xs  text-left">
 					加油员
@@ -144,12 +146,16 @@
 				<button class="cu-btn block flex-sub  lg bg-main-oil " @tap="makePay">立即支付</button>
 				<button class="cu-btn block flex-sub lg margin-left" @tap="cancelOrder">取消订单</button>
 			</view>
-			<view class="cu-btn bg-white oil-main-color block flex-sub lg" @click="makeCall">
+			<!-- <view class="cu-btn bg-white oil-main-color block flex-sub lg" @click="makeCall">
 				<text class="cuIcon-service padding-right-sm">联系客服</text>
-			</view>
+			</view> -->
 			<!-- <button class=" cu-btn bg-white oil-main-color block flex-sub lg  " open-type="contact"><text class="cuIcon-service padding-right-sm"></text>	在线客服</button> -->
 			<!-- <button class="cu-btn block lg margin-top " @tap="delOrder">删除订单</button> -->
 		</view>
+		<view class="customer-service" @click="arousePhone">
+			<image src="../../static/img/customer-service.png"></image>
+			联系客服
+		</view>
 	</view>
 </template>
 
@@ -194,12 +200,12 @@
 			tkiQrcode
 		},
 		methods: {
-			// 拨打电话
-			makeCall() {
+			arousePhone() {
 				uni.makePhoneCall({
-					phoneNumber: '4008-56-5355' //仅为示例
+					phoneNumber: '4008-56-5355' 
 				})
 			},
+			
 			newQrString() {
 				this.getOrderQrCode()
 			},
@@ -395,7 +401,31 @@
 	}
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+
+	.customer-service {
+		position: fixed;
+		right: 0;
+		top: 60%;
+		padding-left: 15rpx;
+		width: 180rpx;
+		height: 57rpx;
+		line-height: 57rpx;
+		background: #FFE9CC;
+		font-size: 26rpx;
+		color: #FF6700;
+		box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(255, 232.1327966451645, 216.63716733455658, 1);
+		border-radius: 30rpx 0rpx 0rpx 30rpx;
+
+		image {
+			position: relative;
+			top: 11rpx;
+			// vertical-align: middle;
+			width: 40rpx;
+			height: 40rpx;
+			margin-right: 7rpx;
+		}
+	}
 	.move-tops {
 		transform: translateY(-17px);
 	}
diff --git a/BagStation/pages/newRoutePlanning/components/addressSelector.vue b/BagStation/pages/newRoutePlanning/components/addressSelector.vue
index 6f2ff62..7dbab70 100644
--- a/BagStation/pages/newRoutePlanning/components/addressSelector.vue
+++ b/BagStation/pages/newRoutePlanning/components/addressSelector.vue
@@ -13,11 +13,12 @@
 					<view class="flexone margin size">{{Route.start.title}}</view>
 				</view>
 
-				<view v-for="item,index in midwayPointList" :key="index"
-					@click="chooseLocation('midwayPoint',index)" class=" Padding addressInput flex ac flexone height79">
+				<view v-for="item,index in midwayPointList" :key="index" @click="chooseLocation('midwayPoint',index)"
+					class=" Padding addressInput flex ac flexone height79">
 					<view style="background-color: #32CD32;" class="yuan" />
 					<view class="flexone margin size">{{item.title || '请输入途经点'}}</view>
-					<image @click.stop="removeLocation(index)" class="remove" src="../../../static/img/remove.png"></image>
+					<image @click.stop="removeLocation(index)" class="remove" src="../../../static/img/remove.png">
+					</image>
 				</view>
 
 				<view @click="chooseLocation('end')" class=" Padding addressInput flex ac flexone height79">
@@ -134,7 +135,7 @@
 
 				this.midwayPointList.splice(index, 1)
 				this.$parent.passiveRedraw(this.midwayPointList)
-				
+
 			},
 			additionLocation() {
 				this.midwayPointList.push({
@@ -174,17 +175,17 @@
 								value: items.id
 							})
 						})
-						this.menuList.push(data)
+						if (item === 'productCodes') {
+							this.menuList.push(data)
+						}
 					})
 					this.menuList[2].Sublist.unshift({
 						lable: '全渠道',
 						value: ''
 					});
-					// [this.menuList[1],this.menuList[3]]=[this.menuList[3],this.menuList[1]]
-					[this.menuList[0], this.menuList[1], this.menuList[2], this.menuList[3]] = [this.menuList[0],
-						this.menuList[3], this.menuList[1], this.menuList[2]
+					[this.menuList[0], this.menuList[1], this.menuList[2], ] = [this.menuList[0],
+						this.menuList[2], this.menuList[1]
 					];
-					// console.log(this.menuList, '***')
 				})
 			},
 			datassFn() {
diff --git a/BagStation/pages/stationDetail/stationDetail.vue b/BagStation/pages/stationDetail/stationDetail.vue
index 518dfa6..200a121 100644
--- a/BagStation/pages/stationDetail/stationDetail.vue
+++ b/BagStation/pages/stationDetail/stationDetail.vue
@@ -4,14 +4,16 @@
 			<block slot="content">中石化紫云路</block>
 			<block slot="backText">返回</block>
 		</cu-custom> -->
-		<view class="bg-img fixed-top  flex align-end margin-bottom-lg " :style="'background-image: url('+imgURL+'site-bg.png '+');width: 750upx;height: 326rpx;background-size:cover'">
-			<image v-if="isShow" @tap="goBack" :src="imgURL+'site-back.png'" width="20upx" mode="widthFix" class="position-ab site-back">
+		<view class="bg-img fixed-top  flex align-end margin-bottom-lg "
+			:style="'background-image: url('+imgURL+'site-bg.png '+');width: 750upx;height: 326rpx;background-size:cover'">
+			<image v-if="isShow" @tap="goBack" :src="imgURL+'site-back.png'" width="20upx" mode="widthFix"
+				class="position-ab site-back">
 			</image>
 			<view class="cu-list menu margin padding-sm  radius my-shadow  bg-white yu-card-xuan">
 				<view class="cu-item ">
-					<view class="content"  style="overflow: hidden;"   >
-						<view style="width: 100%; display: flex;" class="strong padding-bottom-xs"  >
-						<text style="width: 100%;flex: 1;" class="text-cut">{{siteInfo.siteName}}</text>
+					<view class="content" style="overflow: hidden;">
+						<view style="width: 100%; display: flex;" class="strong padding-bottom-xs">
+							<text style="width: 100%;flex: 1;" class="text-cut">{{siteInfo.siteName}}</text>
 							<!-- <text v-if="siteInfo.siteLevel" class="cu-tag round bg-self-yellow  yu-tag text-xs tag-red" style="margin-left: 20px;">{{siteInfo.siteLevel}}级</text> -->
 						</view>
 						<view class="font-12 color-999 site-label text-cut">
@@ -30,8 +32,10 @@
 				</view>
 			</view>
 		</view>
-		<view class="bg-img placeholder-hidden  flex align-end margin-bottom-lg " :style="'background-image: url('+imgURL+'site-bg.png '+');width: 750upx;height: 326rpx;background-size:cover'">
-			<image @tap="goBack" :src="imgURL+'site-back.png'" width="20upx" mode="widthFix" class="position-ab site-back">
+		<view class="bg-img placeholder-hidden  flex align-end margin-bottom-lg "
+			:style="'background-image: url('+imgURL+'site-bg.png '+');width: 750upx;height: 326rpx;background-size:cover'">
+			<image @tap="goBack" :src="imgURL+'site-back.png'" width="20upx" mode="widthFix"
+				class="position-ab site-back">
 			</image>
 			<view class="flex-sub">
 				<view class="cu-list menu margin padding-sm  radius my-shadow  bg-white yu-card-xuan">
@@ -62,32 +66,34 @@
 		</view>
 		<!-- 价格 -->
 		<price-tab @onChangeChannelCode="getChannelCode" @onChangePayQr="onChangePayQr" @onChangePay="onChangePay"
-		 :channel-list="siteInfo.oilSiteChannelDetailsVos" :channelPrice="siteInfo"></price-tab>
-		 <!-- 客户评价 -->
-		 <view class="bg-gray padding-top-sm " v-if="siteInfo.xoilUreaPriceVos">
-		 	<view class="bg-white padding ">
-		 		<text>尿素</text>
-		 		<view class="padding-top-sm">
-		 			<view class="nsjz-flex">
-		 				<view class="nsjz-flex-left">
-		 					<image :src="ureaproductType == 2?areaLogoUrl1:areaLogoUrl" mode="" style="width: 36rpx;height: 36rpx;"></image>
+			:channel-list="siteInfo.oilSiteChannelDetailsVos" :channelPrice="siteInfo"></price-tab>
+		<!-- 客户评价 -->
+		<view class="bg-gray padding-top-sm " v-if="siteInfo.xoilUreaPriceVos">
+			<view class="bg-white padding ">
+				<text>尿素</text>
+				<view class="padding-top-sm">
+					<view class="nsjz-flex">
+						<view class="nsjz-flex-left">
+							<image :src="ureaproductType == 2?areaLogoUrl1:areaLogoUrl" mode=""
+								style="width: 36rpx;height: 36rpx;"></image>
 							<view class="nsjz-flex-left-body">
 								<text>{{ureaproductType == '2'?'品牌桶装尿素':'加注机'}}</text>
-								<text v-if="ureaproductType == 2">{{areaPrice}}元/桶<text style="font-size: 12px;margin: 0;">起</text></text>
+								<text v-if="ureaproductType == 2">{{areaPrice}}元/桶<text
+										style="font-size: 12px;margin: 0;">起</text></text>
 								<text v-if="ureaproductType == 1">￥{{areaPrice}}/L</text>
 							</view>
-		 				</view>
+						</view>
 						<view class="nsjz-flex-botton" @tap="areaJump">
 							{{ureaproductType == 2?'去购买':'去加注'}}
 						</view>
-		 			</view>
+					</view>
 					<view style="margin-left: 56rpx;font-size: 12px;">
 						加注支付前,请与油站工作人员确认
 					</view>
-		 		</view>
-		 	</view>
-		 
-		 </view>
+				</view>
+			</view>
+
+		</view>
 		<!-- 客户评价 -->
 		<view class="bg-gray padding-top-sm ">
 			<view class="bg-white  padding ">
@@ -112,7 +118,8 @@
 					<text class=" text-black ">加 {{itm.oilsCode}} {{itm.volume}}L 节省 <text class="text-red">
 							￥{{itm.discountAmount}}</text></text>
 				</view>
-				<view class="cu-item no-border" v-if="siteInfo.oilSiteOrderInfoVos && !siteInfo.oilSiteOrderInfoVos.length">
+				<view class="cu-item no-border"
+					v-if="siteInfo.oilSiteOrderInfoVos && !siteInfo.oilSiteOrderInfoVos.length">
 					暂无
 				</view>
 
@@ -152,15 +159,17 @@
 		<view class=" cu-modal show" v-show="showtitle">
 			<view class="cu-dialog overflow-unset dialog-box box-paddings">
 				<view class="close-icon" @tap="hidendialog">
-					<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close.png" mode="" style="width:50rpx;height: 50rpx;"></image>
+					<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/close.png" mode=""
+						style="width:50rpx;height: 50rpx;"></image>
 				</view>
 				<view class="">
-					<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/errIcon.png" mode="" style="width:100rpx;height: 100rpx;"></image>
+					<image src="https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/errIcon.png" mode=""
+						style="width:100rpx;height: 100rpx;"></image>
 				</view>
-				<view class="cu-bar box-panding text-centerS" >
-				<text class="headShow">	 支付提醒 </text>
+				<view class="cu-bar box-panding text-centerS">
+					<text class="headShow"> 支付提醒 </text>
 				</view>
-				<view class="cu-bar box-panding" >
+				<view class="cu-bar box-panding">
 					<text class="showtext">当前油站距离您较远，请与加油员确认您选择的油站是否正确。</text>
 				</view>
 				<view class="checklocation_box_button">
@@ -172,7 +181,11 @@
 					</view>
 				</view>
 			</view>
-		</view> 
+		</view>
+		<view class="customer-service" @click="arousePhone">
+			<image src="../../static/img/customer-service.png"></image>
+			联系客服
+		</view>
 	</view>
 </template>
 
@@ -189,14 +202,14 @@
 		},
 		onUnload() {
 			// console.log('这里是卸载页面')
-				this.innerAudioContext?.stop()
+			this.innerAudioContext?.stop()
 		},
 		data() {
-			return { 
-				showtitle:false,
+			return {
+				showtitle: false,
 				radio: 'B',
-				areaLogoUrl:'../../../static/img/xy-jyz.png',
-				areaLogoUrl1:'../../../static/img/xy-ns.png',
+				areaLogoUrl: '../../../static/img/xy-jyz.png',
+				areaLogoUrl1: '../../../static/img/xy-ns.png',
 				mainURL: this.global.mainURL,
 				imgURL: this.global.imgURL,
 				active: 0,
@@ -208,50 +221,59 @@
 				siteId: '',
 				activeChannelCode: '',
 				secondChannelCode: '',
-				ureaNum:false,
-				ureaproductType:'',
-				areaPrice:'',
-				isShow:true
+				ureaNum: false,
+				ureaproductType: '',
+				areaPrice: '',
+				isShow: true
 			}
 		},
 		onHide() {
 			this.innerAudioContext?.stop()
 		},
 		onLoad(option) {
-			if(option.siteId && !option.customerJump) {
+			if (option.siteId && !option.customerJump) {
 				this.isShow = false
 				this.siteId = option.siteId
-				this.getSiteInfo(option.siteId) 
-				uni.setStorageSync('siteId',option.siteId)
-				return 
+				this.getSiteInfo(option.siteId)
+				uni.setStorageSync('siteId', option.siteId)
+				return
 			}
 
-			let oilItem = option.channerCode == 'TY' ? uni.getStorageSync('OtherSiteInfo') : option.item ? JSON.parse(option.item) : {siteId:option.siteId}
+			let oilItem = option.channerCode == 'TY' ? uni.getStorageSync('OtherSiteInfo') : option.item ? JSON.parse(
+				option.item) : {
+				siteId: option.siteId
+			}
 
-			uni.setStorageSync('oilItem',oilItem) 
+			uni.setStorageSync('oilItem', oilItem)
 			this.getSiteInfo(oilItem.siteId)
 			this.siteId = oilItem.siteId
 
-			if(oilItem.listTag == '万金油'){
+			if (oilItem.listTag == '万金油') {
 				this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/wanjinyou.mp3'
-			}else if(oilItem.listTag == '星油'){
+			} else if (oilItem.listTag == '星油') {
 				this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/xingyouyunzhan.mp3'
-			}else if(oilItem.listTag == '壳牌'){
+			} else if (oilItem.listTag == '壳牌') {
 				this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/qiaopainew.mp3'
-			}else if(oilItem.listTag == '上汽联名卡' ){
+			} else if (oilItem.listTag == '上汽联名卡') {
 				this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/shangqi.mp3'
-			}else if(oilItem.listTag == '集卡加油') {
+			} else if (oilItem.listTag == '集卡加油') {
 				this.audioUrl = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/shangqijika.mp3'
 			}
 			this.ContextAudio(this.audioUrl)
 		},
 		methods: {
-			areaJump(){
+			arousePhone() {
+				uni.makePhoneCall({
+					phoneNumber:'4008-56-5355'
+				})
+			},
+			areaJump() {
 				// var itemS = {
 				// 	siteId:this.siteInfo.xoilUreaPriceVos[0].siteId
 				// }
 				uni.navigateTo({
-					url: '/BagStation/pages/ureaDetail/ureaDetail?item='+ JSON.stringify(this.siteInfo.xoilUreaPriceVos[0]),
+					url: '/BagStation/pages/ureaDetail/ureaDetail?item=' + JSON.stringify(this.siteInfo
+						.xoilUreaPriceVos[0]),
 					fail: (err) => {
 						// console.log(err)
 					},
@@ -261,37 +283,37 @@
 				})
 			},
 			// 生成音频文件
-			ContextAudio(url){
+			ContextAudio(url) {
 				this.innerAudioContext = uni.createInnerAudioContext();
 				this.innerAudioContext.autoplay = true;
 				this.innerAudioContext.src = url;
 				this.innerAudioContext.onPlay(() => {
-				  console.log('开始播放');
+					console.log('开始播放');
 				});
 				this.innerAudioContext.onError((res) => {
-				  console.log(res)
+					console.log(res)
 				});
 			},
-			hidendialog(){
-				this.showtitle =false
+			hidendialog() {
+				this.showtitle = false
 			},
-			backTohome(){
+			backTohome() {
 				uni.switchTab({
-					url:'../../../pages/tabbar/home/home'
+					url: '../../../pages/tabbar/home/home'
 				})
 			},
 			// 距离过远提示弹窗
 			makePay() {
 				console.log(this.siteInfo.juli)
-				if(this.siteInfo.juli > 1000 ){
+				if (this.siteInfo.juli > 1000) {
 					this.showtitle = true
-				}else{
+				} else {
 					this.innerAudioContext?.stop()
 					uni.navigateTo({
 						url: `/BagStation/pages/makeOrder/makeOrder?siteId=${this.siteId}&activeCur=${this.activeCur}`
 					})
 				}
-				
+
 			},
 			getChannelCode(val, sec) {
 				this.activeChannelCode = val
@@ -310,37 +332,37 @@
 					siteId: id
 				}
 				oilSiteApi.getSiteDetails(data2).then(res => {
-					console.log('getSiteDetails',res)
+					console.log('getSiteDetails', res)
 					if (res.code == 20000) {
 						this.siteInfo = res.data
-						if(this.siteInfo.xoilUreaPriceVos){
+						if (this.siteInfo.xoilUreaPriceVos) {
 							var areaPriceList = []
-							this.siteInfo.xoilUreaPriceVos.forEach(item =>{
-								if(item.productType == '1'){
+							this.siteInfo.xoilUreaPriceVos.forEach(item => {
+								if (item.productType == '1') {
 									this.ureaproductType = 1
-								}else{
+								} else {
 									this.ureaproductType = 2
 								}
 								areaPriceList.push(item.guidePrice)
 							})
 							this.areaPrice = Math.min(...areaPriceList)
 						}
-					}else if(res.code == 40000){
+					} else if (res.code == 40000) {
 						uni.showModal({
-						    title: '提示',
-						    content: res.msg,
-							showCancel:false,
-						    success: function (res) {
-						        if (res.confirm) {
-									if(getCurrentPages().length > 1) {
+							title: '提示',
+							content: res.msg,
+							showCancel: false,
+							success: function(res) {
+								if (res.confirm) {
+									if (getCurrentPages().length > 1) {
 										uni.navigateBack()
-										return 
+										return
 									}
-						           uni.switchTab({
-						           	url:'../../../pages/tabbar/home/home'
-						           })
-						        }  
-						    }
+									uni.switchTab({
+										url: '../../../pages/tabbar/home/home'
+									})
+								}
+							}
 						});
 					}
 				})
@@ -376,9 +398,12 @@
 				// uni.navigateBack()
 				this.innerAudioContext?.stop()
 				let siteId = uni.getStorageSync('siteId')
-				siteId 
-				? uni.switchTab({url:'../../../pages/tabbar/home/home'}) 
-				: uni.navigateBack() ;
+				siteId
+					?
+					uni.switchTab({
+						url: '../../../pages/tabbar/home/home'
+					}) :
+					uni.navigateBack();
 			},
 			selectRadio() {
 				this.radio === 'A' ? this.radio = '' : this.radio = 'A'
@@ -432,8 +457,31 @@
 	}
 </script>
 
-<style scoped>
-	
+<style lang="scss" scoped>
+	.customer-service {
+		position: fixed;
+		right: 0;
+		top: 60%;
+		padding-left: 15rpx;
+		width: 180rpx;
+		height: 57rpx;
+		line-height: 57rpx;
+		background: #FFE9CC;
+		font-size: 26rpx;
+		color: #FF6700;
+		box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(255, 232.1327966451645, 216.63716733455658, 1);
+		border-radius: 30rpx 0rpx 0rpx 30rpx;
+
+		image {
+			position: relative;
+			top: 11rpx;
+			// vertical-align: middle;
+			width: 40rpx;
+			height: 40rpx;
+			margin-right: 7rpx;
+		}
+	}
+
 	.content {
 		min-height: 100%;
 		position: relative;
@@ -527,25 +575,30 @@
 	.yu-card-xuan .action {
 		white-space: nowrap;
 	}
-	.text-centerS{
+
+	.text-centerS {
 		display: flex;
 		justify-content: center;
 		align-items: center;
 		text-align: center;
 	}
-	.red_btn{
+
+	.red_btn {
 		margin-right: 20rpx;
 		color: #FFFFFF;
 		background-color: #FF6700;
 	}
-	.box-paddings{
-		padding:40rpx 0;
+
+	.box-paddings {
+		padding: 40rpx 0;
 	}
-	.headShow{
+
+	.headShow {
 		font-size: 36rpx;
 		font-weight: 600;
 	}
-	.showtext{
+
+	.showtext {
 		line-height: 2;
 		font-size: 30rpx;
 		margin-bottom: 30rpx;
@@ -554,13 +607,15 @@
 		letter-spacing: 3px;
 		text-align: left;
 	}
-	.checklocation_box_button{
+
+	.checklocation_box_button {
 		display: flex;
 		justify-content: center;
 		/* align-items: center; */
 		padding: 0 5%;
 	}
-	.btn-box{
+
+	.btn-box {
 		width: 45%;
 		flex: 0 0 auto;
 		text-align: center;
@@ -570,154 +625,166 @@
 		box-sizing: border-box;
 		border: 2rpx solid #bfbfbf;
 	}
-	.box-panding{
-		padding:10 0;
+
+	.box-panding {
+		padding: 10 0;
 	}
-		.checklocation{
-			position: fixed;
-			top: 50%;
-			left: 20%;
-			right: 20%;
-			z-index: 999;
-		}
-		.checklocation_box{
-			background-color: #FFFFFF;
-		}
-		.content {
-			min-height: 100%;
-			position: relative;
-		}
-	
-		.navigation {
-			position: absolute;
-			right: 16px;
-			top: 10px;
-		}
-	
-		.icon-self {
-			width: 1rem;
-			height: 1rem;
-		}
-	
-		.oil-price {
-			position: relative;
-		}
-	.close-icon{
+
+	.checklocation {
+		position: fixed;
+		top: 50%;
+		left: 20%;
+		right: 20%;
+		z-index: 999;
+	}
+
+	.checklocation_box {
+		background-color: #FFFFFF;
+	}
+
+	.content {
+		min-height: 100%;
+		position: relative;
+	}
+
+	.navigation {
+		position: absolute;
+		right: 16px;
+		top: 10px;
+	}
+
+	.icon-self {
+		width: 1rem;
+		height: 1rem;
+	}
+
+	.oil-price {
+		position: relative;
+	}
+
+	.close-icon {
 		position: absolute;
 		right: 2%;
 		top: 2%;
 	}
-	.dialog-box{
+
+	.dialog-box {
 		position: relative;
 	}
-		.oil-price radio {
-			position: absolute;
-			left: 0rem;
-			top: 10px;
-		}
-	
-		.qr-icon {
-			font-size: 2rem;
-		}
-	
-		.pay-desc {
-			line-height: 2rem;
-		}
-	
-		.bottom-pay {
-			min-height: 100rpx;
-			width: 750upx;
-		}
-	
-		.pay-bar {
-			width: 750upx;
-			position: absolute;
-			bottom: 0;
-		}
-	
-	
-	
-		.placeholder {
-			min-height: 10upx;
-		}
-	
-		.yu-card-xuan {
-			position: relative;
-			top: 110rpx
-		}
-	
-		.site-label {
-			max-width: 450upx;
-			min-width: 450upx;
-		}
-	
-		.cu-btn.sm {
-			width: 80%;
-		}
-	
-		.site-back {
-			width: 2rem;
-			top: 2.8rem;
-			left: 1rem;
-		}
-	
-		.site-icon {
-			width: 1.5rem;
-			vertical-align: middle;
-		}
-	
-		.my-tag {
-			padding: 0 12rpx;
-		}
-	
-		.fixed {
-			position: fixed;
-			bottom: 0;
-			width: 750upx;
-		}
-	
-		.placeholder-hidden {
-			opacity: 0;
-		}
-	
-		.yu-card-xuan .action {
-			white-space: nowrap;
-		}
-		
-		.err_btnBox{
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-		
-		
-		.nsjz-flex{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-		}
-		.nsjz-flex-left{
-			display: flex;
-			align-items: center;
-		}
-		.nsjz-flex-left-body text{
-			font-weight: 600;
-			color: #000;
-		}
-		.nsjz-flex-left-body{
-			margin-left: 20rpx;
-		}
-		.nsjz-flex-left-body text:last-child{
-			color: #ff6700;
-			margin-left: 30rpx;
-			font-size: 32rpx;
-		}
-		.nsjz-flex-botton{
-			color: #FFFFFF;
-			border-radius: 5px;
-			background: #FF6700;
-			padding: 0rpx 34rpx;
-			line-height: 30px;
-			font-size: 16px;
-		}
+
+	.oil-price radio {
+		position: absolute;
+		left: 0rem;
+		top: 10px;
+	}
+
+	.qr-icon {
+		font-size: 2rem;
+	}
+
+	.pay-desc {
+		line-height: 2rem;
+	}
+
+	.bottom-pay {
+		min-height: 100rpx;
+		width: 750upx;
+	}
+
+	.pay-bar {
+		width: 750upx;
+		position: absolute;
+		bottom: 0;
+	}
+
+
+
+	.placeholder {
+		min-height: 10upx;
+	}
+
+	.yu-card-xuan {
+		position: relative;
+		top: 110rpx
+	}
+
+	.site-label {
+		max-width: 450upx;
+		min-width: 450upx;
+	}
+
+	.cu-btn.sm {
+		width: 80%;
+	}
+
+	.site-back {
+		width: 2rem;
+		top: 2.8rem;
+		left: 1rem;
+	}
+
+	.site-icon {
+		width: 1.5rem;
+		vertical-align: middle;
+	}
+
+	.my-tag {
+		padding: 0 12rpx;
+	}
+
+	.fixed {
+		position: fixed;
+		bottom: 0;
+		width: 750upx;
+	}
+
+	.placeholder-hidden {
+		opacity: 0;
+	}
+
+	.yu-card-xuan .action {
+		white-space: nowrap;
+	}
+
+	.err_btnBox {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+
+	.nsjz-flex {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.nsjz-flex-left {
+		display: flex;
+		align-items: center;
+	}
+
+	.nsjz-flex-left-body text {
+		font-weight: 600;
+		color: #000;
+	}
+
+	.nsjz-flex-left-body {
+		margin-left: 20rpx;
+	}
+
+	.nsjz-flex-left-body text:last-child {
+		color: #ff6700;
+		margin-left: 30rpx;
+		font-size: 32rpx;
+	}
+
+	.nsjz-flex-botton {
+		color: #FFFFFF;
+		border-radius: 5px;
+		background: #FF6700;
+		padding: 0rpx 34rpx;
+		line-height: 30px;
+		font-size: 16px;
+	}
 </style>
diff --git a/BagStation/static/img/customer-service.png b/BagStation/static/img/customer-service.png
new file mode 100644
index 0000000000000000000000000000000000000000..50a69d340377c34ae51f08fd5556d1ed26029ca9
GIT binary patch
literal 988
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxK#^NA%Cx&(BWL^T<odG@}u0X;6
zKorXG-vLZ|GW<^fGtwCT$ATG24F7>_pkNfk|4fGei46Z!82)F0*+B7BBnFTRRGiN6
zKN(B{r82;>K=nWdP!=c!K|n5$0aO4af#N_eoQ=tasDWz-GSJu%F2qc@EL;u5Mu;Jp
zBwQJUflNX)!WF>v;$i?*;#UmU2v-JSfXUWH*1^EYXetTv3ua(sW?^IJ;N;@w;pG<)
z6ciPgRZ><{*EKLQF)_2WvbJ?_aP#o;4-5(p2@Q*gjEYZ4N={49$jr&jFDNdltZHa#
zZf$Gt?4LYk>a2P57cE)7a@FcJ>o;xQvUS_ueMgR+JAdKw)oa&p+`e=7!NW(7pFVs3
z=H2@bA3uHm`tAFVpTB<p`TLJ~8^d}~a`AL=46!)<_DXp0p#TBa2dsu2tkvPO61o@N
zuoh#fe&4|;YAu#DUFe+tcgF%Il>>|U-vysLH+^Qc`ApSc)}dK)^UH4R&Nk8xo$r3Y
zpLLGtr*+TeKIrppjf(hvPg==4Dl=>kbK+jRiCn+e3taHtX(WG6>L_oTnN-r{SiyE%
zU$66j<hCt2$ouB`Qd8fB&reMWlm62x^jxwfdg7H6yL(K%?_KD<w&YH0?#n=v2P&HK
z4*JH?{Hu;m{;?<c#DTz`&LH7yPxgh$nz^3r(zKi*|F~{G?;Y!TF<zR>N^Fm?oD=Zh
z&UC(hfiqXxqt@rGvn!hVSD3#%v){BWPDx(q!feT^|A~1Ynoe{HDqUK!=};4+?$$X<
zdqU?iva!kvPSosrt#IyYQik(^*Svd=O%|5tUUTupLANt{Y)1l$c^+h2eAM@~VPweb
z^k{!N<!@lnp^mtm`O%TQpR$z1`qpsg%ehy5GmM%oYShl4^w;uDfa~cqDWZS({$dli
XD^AG$e$Nh=7#KWV{an^LB{Ts5Hukpl

literal 0
HcmV?d00001

diff --git a/components/tabbar/index.vue b/components/tabbar/index.vue
new file mode 100644
index 0000000..9e0b1e0
--- /dev/null
+++ b/components/tabbar/index.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="container">
+		<view class="item" v-for="item,index in menuList">
+			<image :src="currentPage == index ? item.selectedIconPath :item.iconPath" @click="jump(item.pagePath)"></image>
+			<!-- {{index}} -->
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			currentPage: Number
+		},
+		data() {
+			return {
+				menuList: [{
+						// 首页
+						"pagePath": "/pages/tabbar/home/home",
+						"iconPath": "../../static/img/tabbar/home.png",
+						"selectedIconPath": "../../static/img/tabbar/homeactive.png"
+					},
+					{
+						// 油站
+						"pagePath": "/pages/tabbar/station/stationList",
+						"iconPath": "../../static/img/tabbar/oil.png",
+						"selectedIconPath": "../../static/img/tabbar/oilactive.png"
+
+					},
+					{
+						// 加油
+						"pagePath": "/pages/tabbar/qrCenter/qrCenter",
+						"iconPath": "../../static/img/tabbar/icon.png",
+						"selectedIconPath": "../../static/img/tabbar/icon.png"
+					},
+
+					{
+						// 订单
+						"pagePath": "/pages/tabbar/order/orderList/orderList",
+						"iconPath": "../../static/img/tabbar/order.png",
+						"selectedIconPath": "../../static/img/tabbar/orderactive.png"
+					},
+					{
+						// 司机
+						"pagePath": "/pages/tabbar/user/user",
+						"iconPath": "../../static/img/tabbar/me.png",
+						"selectedIconPath": "../../static/img/tabbar/meactive.png"
+					}
+				]
+			}
+		},
+		methods: {
+			jump(path) {
+				console.log('path',path)
+				uni.switchTab({
+					url:path
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		display: flex;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 120rpx;
+		background: #fff;
+
+		.item {
+			position: relative;
+			flex: 1;
+			text-align: center;
+			line-height: 120rpx;
+
+			image {
+				width: 50rpx;
+				height: 50rpx;
+
+			}
+
+			&:nth-of-type(2) {
+				image {
+					position: relative;
+					left: -13rpx
+				}
+
+				;
+			}
+
+			&:nth-of-type(4) {
+				image {
+					position: relative;
+					right: -13rpx
+				}
+
+				;
+			}
+
+			&:nth-of-type(3) {
+				flex: none;
+				width: 110rpx;
+				height: 110rpx;
+				position: relative;
+				transform: translateY(-30%);
+				border-radius: 100%;
+				overflow: hidden;
+				background: #fff;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+	}
+</style>
diff --git a/main.js b/main.js
index 9086bcc..c122703 100644
--- a/main.js
+++ b/main.js
@@ -9,7 +9,7 @@ import encode from '@/utils/encode'
 import global from '@/api/global.js'
 import topBar from './components/topbar.vue'
 import tools from '@/utils/tools.js'
-
+// import tabbar from '@/components/tabbar/index.vue'
 
 
 
@@ -17,6 +17,7 @@ import tools from '@/utils/tools.js'
 
 import Empty from '@/components/Empty.vue'
 
+// Vue.component('tabbar', tabbar)
 Vue.component('my-icon', myIcon)
 Vue.component('cu-custom', cuCustom)
 Vue.component('my-empty', Empty)
diff --git a/pages.json b/pages.json
index 95c93ec..9402493 100644
--- a/pages.json
+++ b/pages.json
@@ -377,8 +377,8 @@
 			//#ifdef MP-WEIXIN
 			{
 				"pagePath": "pages/tabbar/qrCenter/qrCenter",
-				"iconPath": "static/img/tabbar/qr.png",
-				"selectedIconPath": "static/img/tabbar/qractive.png"
+				"iconPath": "static/img/tabbar/icon.png",
+				"selectedIconPath": "static/img/tabbar/icon.png"
 			},
 			//#endif
 			//#ifndef MP-WEIXIN
diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue
index b5d4ec0..15b15e9 100644
--- a/pages/tabbar/home/home.vue
+++ b/pages/tabbar/home/home.vue
@@ -142,7 +142,7 @@
 			</view>
 		</view>
 		<!-- 筛选开始 -->
-		<view class="screentop bg-white  " @tap="scrollScreen">
+		<view class="screentop bg-white" @tap="scrollScreen">
 			<!-- <view class="">
 				<sl-filter @result="filterRes" reflexTitle ref="slFilter" :menuList="menuList"></sl-filter>
 			</view> -->
@@ -160,6 +160,7 @@
 		<msg-models :showAuthFrror="showAuthFrror" @hideOneModal="hideModel"></msg-models>
 		<three-sites @hideOneModal="showThreeSites=false" :showThreeSites="showThreeSites"></three-sites>
 		<transBlcok ref="transBlcok" />
+		<!-- <tabbar :current-page="0"/> -->
 	</view>
 </template>
 
@@ -330,8 +331,10 @@
 				console.log(n, o, '=================')
 			}
 		},
-		created() {},
+
 		onReady() {
+			
+			
 			let _that = this
 			let IsOtherUser = _that.isOther
 			if (IsOtherUser) {
@@ -362,6 +365,8 @@
 			}
 		},
 		onLoad(e) {
+			// uni.hideTabBar()
+			
 			let _that = this
 			let IsOtherUser = _that.isOther
 
diff --git a/pages/tabbar/order/orderList/orderList.vue b/pages/tabbar/order/orderList/orderList.vue
index e0e2335..472de80 100644
--- a/pages/tabbar/order/orderList/orderList.vue
+++ b/pages/tabbar/order/orderList/orderList.vue
@@ -63,6 +63,7 @@
 			</view>
 		</view>
 		<uni-load-more status="more"></uni-load-more>
+		<!-- <tabbar :current-page="3"/> -->
 	</view>
 </template>
 
diff --git a/pages/tabbar/qrCenter/qrCenter.vue b/pages/tabbar/qrCenter/qrCenter.vue
index 0426d9e..a981606 100644
--- a/pages/tabbar/qrCenter/qrCenter.vue
+++ b/pages/tabbar/qrCenter/qrCenter.vue
@@ -33,6 +33,7 @@
 			</view>
 		</view>
 		<three-sites @hideOneModal="showThreeSites=false" :showThreeSites="showThreeSites"></three-sites>
+		<!-- <tabbar :current-page="2"/> -->
 	</view>
 </template>
 
diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue
index 4d1a2d5..1a4115e 100644
--- a/pages/tabbar/station/stationList.vue
+++ b/pages/tabbar/station/stationList.vue
@@ -52,6 +52,7 @@
 		<view class="bg-white">
 			<uni-load-more :status="loadText"></uni-load-more>
 		</view>
+		<!-- <tabbar :current-page="1"/> -->
 	</view>
 </template>
 
@@ -280,7 +281,8 @@
 					currentPage: this.currentPage,
 					pageSize: 10,
 					params: { //类型：Object  必有字段  备注：// 筛选对象  
-						siteNameOrId: this.siteName, //产品类型(加注方式)：
+						// siteNameOrId: this.siteName, //产品类型(加注方式)：
+						address:this.siteAddress,
 						productType: this.productType ? this.productType : '', //1-加注机； 2-桶装   
 						brandName: this.brandName ? this.brandName : '', // 桶装品牌名称
 						currentLongitude: location.longitude + '', // 当前经度
@@ -392,10 +394,10 @@
 
 						res.data.channelCodes.map(item => {
 
-							this.menuList[3].detailLists.push({
-								title: item.name,
-								value: item.id
-							})
+							// this.menuList[3].detailLists.push({
+							// 	title: item.name,
+							// 	value: item.id
+							// })
 						})
 						res.data.productCodes.map(item => {
 							this.menuList[2].detailList.push({
diff --git a/pages/tabbar/user/user.vue b/pages/tabbar/user/user.vue
index 2e32550..6a81ace 100644
--- a/pages/tabbar/user/user.vue
+++ b/pages/tabbar/user/user.vue
@@ -134,6 +134,7 @@
 		</view>
 		<SwitchEnterprises @submit='upadteCompanyCard' @logout='logout' :is-show.sync="isSwitchEnterprises">
 		</SwitchEnterprises>
+		<!-- <tabbar :current-page="4"/> -->
 	</view>
 
 </template>
diff --git a/static/img/tabbar/icon.png b/static/img/tabbar/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca4bc9000c97204f70cbb7dd75721b2de67deb63
GIT binary patch
literal 2791
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

literal 0
HcmV?d00001

diff --git a/utils/request.js b/utils/request.js
index b3f52f0..dd7714e 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -6,9 +6,9 @@ import utils from '@/utils/encode'
 const env = 'production'
 // 45
 const testUrl = 'http://192.168.1.132:38080' 
-// const productUrl = 'https://www.xingoil.com/adminapi'
+const productUrl = 'https://www.xingoil.com/adminapi'
 
-const productUrl = 'http://uat.xingoil.com/adminapi'
+// 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({