diff --git a/Activity/pages/index/index.vue b/Activity/pages/index/index.vue
new file mode 100644
index 0000000..822d790
--- /dev/null
+++ b/Activity/pages/index/index.vue
@@ -0,0 +1,122 @@
+<template>
+	<view class="Activity_body">
+		<scroll-view @refresherrefresh='refresherrefresh' :refresher-enabled='true'
+			:refresher-triggered='refresherTriggered' style="height: 100%;" scroll-y="true"
+			@scrolltolower='scrolltolower'>
+			<view v-for="(item,index) in siteList" :key="item.id">
+				<site-item @tap="toDetail(item)"  :site-item="item" class="cu-list menu-avatar cu-item" />
+				<view class="activityContent">{{item.activityDetail}}</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import oilSiteApi from '@/api/oil-site.js'
+	export default {
+		data() {
+			return {
+				refresherTriggered: false,
+				page: {
+					currentPage: 1,
+					pageSize: 10,
+					params: { //类型：Object  必有字段  备注：// 筛选对象
+						// sort: "juli", //类型：String  必有字段  备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
+						siteName: '',
+						...uni.getStorageSync('location'),
+						// ...this.filterData
+						// siteBrand: this.siteName ? '' : this.filterDatas
+						siteBrand: '', //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
+						// channelCode: this.siteName ? '' : this.filterDatas
+						channelCode: '', //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
+						// oilProductCode: this.siteName ? '' : this.filterDatas
+						oilProductCode: '', //   备注：// 油号选择 ( 0# 92# 92#) 
+						siteLevel: '',
+						sort: 'juli',
+						provinceCode: '',
+						cityCode: '',
+						areaCode: '',
+						distance: '',
+						 clientBelong:'ZHONGPIN'
+					}
+				},
+				siteList: []
+			}
+		},
+		created() {
+			this.init()
+		},
+		methods: {
+			toDetail(item){
+				let itemS = encodeURIComponent(JSON.stringify(item))
+				// console.log(uni.getStorageSync('user'))
+				// return 
+				if (uni.getStorageSync('user')) {
+					uni.navigateTo({
+						url: `/BagStation/pages/stationDetail/stationDetail?item=${itemS}`,
+						fail: (err) => {
+							// console.log(err)
+						},
+						success: () => {
+							// console.log('err')
+						}
+					})
+				} else {
+					uni.showModal({
+						title: '请您登录',
+						content: "登录小星加油才可以加油 |˛˙꒳​˙)♡",
+						confirmText: '去登陆',
+						success: (res) => {
+							if (res.confirm) {
+								uni.reLaunch({
+									url: '../../../BagAuth/pages/login/login'
+								})
+							}
+						}
+					})
+				}
+			},
+			refresherrefresh() {
+				this.page.currentPage =1;
+				this.refresherTriggered = true;
+				this.getSiteList()
+			}, 
+			init(){
+				this.getSiteList();
+			},
+			getSiteList() { 
+				let location = uni.getStorageSync('location');
+				oilSiteApi.getBSitesByActivity(this.page).then(res => { 
+					if(this.page.currentPage>1){ 
+						this.siteList = this.siteList.concat(res.data.list)
+					}else{
+						this.siteList = res.data.list
+					}
+				}).finally(()=>{
+					this.refresherTriggered = false;
+				})
+			}, 
+			scrolltolower() {
+				this.page.currentPage += 1;
+				this.getSiteList() 
+			}, 
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.activityContent{
+		    background: #ff670026; 
+		    border-radius: 10rpx;
+		    margin: 10rpx 30rpx;
+		    box-sizing: border-box;
+		    padding: 20rpx 30rpx;
+		    color: #FF6700;
+			font-size: 30rpx;
+	}
+	.Activity_body {
+		width: 100vw;
+		height: 100vh;
+		overflow: hidden;
+	}
+</style>
\ No newline at end of file
diff --git a/BagStation/orderDetail/orderDetail.vue b/BagStation/orderDetail/orderDetail.vue
index 60994bf..d8740f9 100644
--- a/BagStation/orderDetail/orderDetail.vue
+++ b/BagStation/orderDetail/orderDetail.vue
@@ -1,5 +1,5 @@
 <template>
-	<view @tap.stop='showMiniBtn = false' >
+	<view @tap.stop='showMiniBtn = false'>
 		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
 			<block slot="backText">返回</block>
 			<block slot="content">订单支付结果</block>
@@ -13,14 +13,15 @@
 			<view class="qr-container  ">
 				<view class="qrimg">
 					<view class="qrimg" @tap="newQrString">
-						<tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx"
-							background="#fff" foreground="#000" pdground="#000" :icon="iconUrl" iconSize="40" onval
-							:usingComponents="usingComponents" showLoading  />
+						<tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx" background="#fff"
+							foreground="#000" pdground="#000" :icon="iconUrl" iconSize="40" onval
+							:usingComponents="usingComponents" showLoading />
 					</view>
 				</view>
 			</view>
 			<view class="text-center  text-sm  justify-center align-center flex">
-				<image src="../static/img/YDJY.png" mode="" style="width: 60upx;height:60upx;" class="margin-right-sm"></image>
+				<image src="../static/img/YDJY.png" mode="" style="width: 60upx;height:60upx;" class="margin-right-sm">
+				</image>
 				<text>壳牌</text>
 			</view>
 			<view class="text-center padding-top text-sm margin-bottom">
@@ -38,7 +39,8 @@
 				<view class="padding-bottom-xs margin-bottom-xs dashed-bottom">
 					<view class="padding-tb-xs text-left" @tap="onCopy(order.orderSerialNumber)">
 						订单编号：
-						<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text class="cuIcon-copy padding-left-xs"></text></text>
+						<text class="fr">{{order.orderSerialNumber?order.orderSerialNumber:''}} <text
+								class="cuIcon-copy padding-left-xs"></text></text>
 
 					</view>
 				</view>
@@ -87,7 +89,8 @@
 				</view>
 				<view class="padding-tb-xs text-left">
 					星油优惠：
-					<text class="text-red fr">{{order.xoilDiscountAmount>0?order.xoilDiscountAmount:'xxx.x'|moneyFormat}}</text>
+					<text
+						class="text-red fr">{{order.xoilDiscountAmount>0?order.xoilDiscountAmount:'xxx.x'|moneyFormat}}</text>
 				</view>
 				<view class="padding-tb-xs text-left">
 					优惠券：
@@ -96,12 +99,13 @@
 
 				<view class="padding-tb-xs text-left">
 					合计：
-					<text class="text-red text-bold text-lg fr">{{order.payRealAmount>0?order.payRealAmount:'xxx.x' }}</text>
+					<text
+						class="text-red text-bold text-lg fr">{{order.payRealAmount>0?order.payRealAmount:'xxx.x' }}</text>
 				</view>
 				<view class="padding-tb-xs text-left">
 					支付方式：
 					<text class="   fr" v-if='order.orderSource ==  "SXF_WECHAT_MINIAPPS" '>随行付支付</text>
-					
+
 					<text class="   fr" v-else>{{order.payAccountType==0?'个人账户支付':'企业账户支付'}}</text>
 				</view>
 				<view class="padding-tb-xs text-left">
@@ -128,28 +132,31 @@
 				</view>
 			</view>
 		</view>
-		 <view class="padding-md padding-right padding-left-xl  text-right position-re" @tap.stop="showMiniBtn=true"
+		<view class="padding-md padding-right padding-left-xl  text-right position-re" @tap.stop="showMiniBtn=true"
 			v-if="order.orderStatus == 1 ">
 			<view class="radius shadow mini-btn bg-white padding-xs flex-wrap position-ab ab-rihgt-bootm"
-				v-if="showMiniBtn"> 
+				v-if="showMiniBtn">
 				<!-- <view class="margin-bottom-sm ">
 					<button class="cu-btn nowrap  bg-white" @tap="deleteOrder(item.orderSerialNumber)">删除</button>
 				</view> -->
 				<!-- <view class=" ">
 					<button class="cu-btn nowrap " @tap="showMiniBtn=false">收起</button>
 				</view> -->
-			 	<view class="margin-bottom-sm">
-					<button class="cu-btn nowrap bg-white" @tap="gotoInvoicing()">查看开票信息</button>
+				<view class="more-frame">
+					<button class="more-item nowrap bg-white " @tap="goDiscount()">优惠油站</button>
+					<button class="more-item nowrap bg-white " @tap="toRiskControl()">中交风控</button>
+					<button class="more-item nowrap bg-white " @tap="gotoInvoicing()">查看开票信息</button>
 				</view>
 			</view>
 			<text class="text-lg">更多</text>
-		</view> 
+		</view>
 		<view class="padding bg-white fixed-bottom">
 			<view class="flex margin-bottom" v-if="order.orderStatus==0">
 				<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>
-			<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 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>
@@ -158,7 +165,8 @@
 				<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>
-			<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 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>
@@ -172,6 +180,7 @@
 	import oilSiteApi from '@/api/oil-site.js'
 	import tkiQrcode from "../pages/components/tki-qrcode/tki-qrcode.vue" //二维码生成器
 	import financelApi from '@/api/oil-finance.js'
+	import Financial from '@/api/Financial.js'
 	export default {
 		components: {
 			ThirdPartyVoucher,
@@ -180,8 +189,8 @@
 		data() {
 			return {
 				showMiniBtn: false,
-				showQr:false,
-				val:'',
+				showQr: false,
+				val: '',
 				showThirdResult: false,
 				id: '',
 				order: {},
@@ -212,8 +221,8 @@
 				}
 			}
 		},
-		watch:{
-			showMiniBtn:function(){
+		watch: {
+			showMiniBtn: function() {
 				// setTimeout(()=>{
 				// 	this.showMiniBtn = false
 				// },1000)
@@ -235,16 +244,46 @@
 			console.log('onHide')
 		},
 		methods: {
+			goDiscount() {
+				uni.navigateTo({
+					url: '/Activity/pages/index/index'
+				})
+			},
+			toRiskControl() {
+				const user = uni.getStorageSync('user');
+				if (user) {
+					Financial.findHomePageReport({
+						customerId: user.id
+					}).then(res => {
+						if (res.data) {
+							uni.navigateTo({
+								url: `/Financial/pages/estimate/index?data=${encodeURIComponent(JSON.stringify(res.data))}`
+							})
+						} else {
+							uni.navigateTo({
+								url: '/Financial/pages/index?guide=1'
+							})
+						}
+					});
+				}
+			},
 			newQrString() {
 				this.getOrderQrCode()
 			},
+<<<<<<< HEAD
 			getOrderQrCode(){ 
 				oilSiteApi.getOrderQrCode(this.id).then( (res)=>{
+=======
+			getOrderQrCode() {
+				oilSiteApi.getOrderQrCode(this.order.orderSerialNumber).then((res) => {
+					console.log(res)
+>>>>>>> 5adc52996c062f4b7bfecbc5bbd21413b04487f2
 					this.val = res.data
-					if(res.code == 40000){
-						this.showQr = false  
-					}else if(res.code == 20000){
+					if (res.code == 40000) {
+						this.showQr = false
+					} else if (res.code == 20000) {
 						this.showQr = true
+<<<<<<< HEAD
 						this.val =res.data.codeStr;
 						if(!this.timeinterval){
 							this.timeinterval = setInterval(() => {
@@ -252,11 +291,14 @@
 								this.newQrString()
 							}, 1000 * 60 * 3);
 						}
+=======
+						this.val = res.data.codeStr
+>>>>>>> 5adc52996c062f4b7bfecbc5bbd21413b04487f2
 					}
-				} )
+				})
 			},
 			gotoInvoicing() { //前往开票
-				console.log(this.order,'+++++++++++++')
+				console.log(this.order, '+++++++++++++')
 				financelApi.checkStatus(this.order.orderSerialNumber).then((res) => {
 					console.log('这里是check是否开发票')
 					console.log(res)
@@ -270,7 +312,8 @@
 						} else {
 							uni.navigateTo({
 								url: '/BagStation/orderInvoicing/orderInvoicing?orderId=' + this.order
-									.orderSerialNumber + '&&customerId=' + this.order.customerId + '&&payRealAmount=' + this.order.payRealAmount +
+									.orderSerialNumber + '&&customerId=' + this.order.customerId +
+									'&&payRealAmount=' + this.order.payRealAmount +
 									'&&realAmount=' + this.order.realAmount + '&&code=' + 1
 							})
 						}
@@ -305,7 +348,7 @@
 			// 		}
 			// 	})
 			// },
-			
+
 			// 三方支付结果弹窗结束
 			onCopy(id) {
 				uni.setClipboardData({
@@ -323,7 +366,11 @@
 					if (res.code == 20000) {
 						this.order = res.data
 						uni.setStorageSync('oilItem', res.data)
+<<<<<<< HEAD
 							// this.getOrderQrCode()
+=======
+						this.getOrderQrCode()
+>>>>>>> 5adc52996c062f4b7bfecbc5bbd21413b04487f2
 						if (res.data.payMethod == 2) {
 							this.tyPayMethod = res.data.payMethod
 							// this.queryOrderStatusSq()
@@ -331,12 +378,12 @@
 					}
 				})
 			},
-		toDetail(item) {
-			if(item.zpDisable === 'DISABLE') return 
-			var itemS = JSON.stringify(item)
-			uni.setStorageSync('siteInfo',itemS) 
-			uni.navigateTo({
-				url: `/BagStation/pages/stationDetail/stationDetail`,
+			toDetail(item) {
+				if (item.zpDisable === 'DISABLE') return
+				var itemS = JSON.stringify(item)
+				uni.setStorageSync('siteInfo', itemS)
+				uni.navigateTo({
+					url: `/BagStation/pages/stationDetail/stationDetail`,
 					fail: (err) => {
 						// console.log(err)
 					},
@@ -346,7 +393,7 @@
 				})
 			},
 			cancelOrder() {
-				
+
 				orderApi.cancelOrder(this.id).then(res => {
 					if (res.code == 20000) {
 						uni.showToast({
@@ -391,12 +438,25 @@
 			}
 
 		},
+<<<<<<< HEAD
 	
+=======
+		onLoad(option) {
+			this.id = option.id
+			this.getOrderInfo()
+			uni.showShareMenu()
+			let _that = this
+			this.timeinterval = setInterval(() => {
+				console.log('1')
+				_that.newQrString()
+			}, 1000 * 60 * 3);
+		},
+>>>>>>> 5adc52996c062f4b7bfecbc5bbd21413b04487f2
 		filters: {
 			moneyFormat(value) {
 				if (value != 'xxx.x') {
 					console.log(value)
-					return  (parseInt(value * 100) / 100).toFixed(2)
+					return (parseInt(value * 100) / 100).toFixed(2)
 				} else {
 					return value
 				}
@@ -420,9 +480,9 @@
 				}
 			},
 			moneyFormath(value) {
-				console.log(value) 
-				if (value != 'xxx.x') { 
-					let number =  parseFloat(value).toFixed(2)
+				console.log(value)
+				if (value != 'xxx.x') {
+					let number = parseFloat(value).toFixed(2)
 					return number
 				} else {
 					return value
@@ -464,19 +524,41 @@
 	}
 </script>
 
-<style scoped>.move-tops{
-	transform: translateY(-17px);
-}
-.bg-blue{
-	background-color: red;
-}
-.text-centers {
-      text-align: center;
-      width: 90%;
-      margin: 0 auto;
-      border-radius: 7px;
-      overflow: hidden;
-}
+<style scoped lang="scss">
+	.more-frame {
+		height: 158rpx;
+		overflow-y: auto;
+
+		.more-item {
+			margin: 10rpx 0;
+			padding: 0 30rpx;
+			font-size: 28rpx;
+			height: 64rpx;
+			line-height: 64rpx;
+			text-align: center;
+
+			&::after {
+				border: none;
+			}
+		}
+	}
+
+	.move-tops {
+		transform: translateY(-17px);
+	}
+
+	.bg-blue {
+		background-color: red;
+	}
+
+	.text-centers {
+		text-align: center;
+		width: 90%;
+		margin: 0 auto;
+		border-radius: 7px;
+		overflow: hidden;
+	}
+
 	.move-top {
 		margin-top: -2rem;
 	}
@@ -485,6 +567,7 @@
 		right: 110upx;
 		bottom: 10upx;
 	}
+
 	.move-top {
 		margin-top: -2rem;
 	}
diff --git a/BagStation/pages/components/price-tab.vue b/BagStation/pages/components/price-tab.vue
index e4f2b1f..7052cd3 100644
--- a/BagStation/pages/components/price-tab.vue
+++ b/BagStation/pages/components/price-tab.vue
@@ -27,12 +27,18 @@
 				<view class="padding-top-sm">
 					<text class="cu-tag line-yellow margin-right-xs" v-for="(itemy, index) in tagList" :key="index">{{ itemy }}</text>
 				</view>
+				<view class="activity" v-if="siteInfo.activitySwitch">
+					<view class="content">
+						{{siteInfo.activityContent}}
+					</view>
+				</view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+<<<<<<< HEAD
 export default {
 	props: {
 		channelList: {
@@ -57,6 +63,19 @@ export default {
 				}
 				this.$emit('onChangeChannelCode', channelCode, secondChannelCode);
 				return channelCode;
+=======
+	export default {
+		props: {
+			channelList: {
+				type: Array,
+				default () {}
+			},
+			siteInfo:{
+				type: Object,
+				default: () => {
+					return {}
+				}
+>>>>>>> 5adc52996c062f4b7bfecbc5bbd21413b04487f2
 			}
 		},
 		tagList() {
@@ -121,6 +140,7 @@ export default {
 };
 </script>
 
+<<<<<<< HEAD
 <style scoped>
 .site-icon {
 	width: 2rem;
@@ -130,4 +150,29 @@ export default {
 .my-tag {
 	padding: 0 12rpx;
 }
+=======
+<style scoped lang="scss">
+	.site-icon {
+		width: 2rem;
+		vertical-align: middle;
+	}
+
+	.my-tag {
+		padding: 0 12rpx;
+	}
+	.activity {
+		margin-top: 15rpx;
+		display: flex;
+		width: 45%;
+		border:2rpx solid #1890FF50;
+		// border-radius: 10rpx;
+		.content {
+			flex: 1;
+			padding: 10rpx 20rpx;
+			line-height: 36rpx;
+			// min-height: 80rpx;
+			color: #1890FF; 
+		}
+	}
+>>>>>>> 5adc52996c062f4b7bfecbc5bbd21413b04487f2
 </style>
diff --git a/BagStation/pages/stationDetail/stationDetail.vue b/BagStation/pages/stationDetail/stationDetail.vue
index 12bc4c9..a16aea7 100644
--- a/BagStation/pages/stationDetail/stationDetail.vue
+++ b/BagStation/pages/stationDetail/stationDetail.vue
@@ -61,7 +61,7 @@
 		</view>
 		<!-- 价格 -->
 		<price-tab @onChangeChannelCode="getChannelCode" @onChangePayQr="onChangePayQr" @onChangePay="onChangePay"
-		 :channel-list="siteInfo.oilSiteChannelDetailsVos"></price-tab>
+		 :channel-list="siteInfo.oilSiteChannelDetailsVos" :siteInfo="siteInfo"></price-tab>
 
 
 		<!-- 客户评价 -->
diff --git a/api/oil-site.js b/api/oil-site.js
index 7761f4a..5bf3f24 100644
--- a/api/oil-site.js
+++ b/api/oil-site.js
@@ -31,6 +31,13 @@ export default {
 			data: data
 		})
 	},
+	getBSitesByActivity(data) {   
+		return request({
+			url: `/${service_name}/${group_name}/getBCSitesByActivity`,
+			method: 'post',
+			data:  data
+		})
+	},
 	getSiteLists(data) {
 		data.params.targetApp='SAAS'
 		return request({
diff --git a/components/site-item/site-item.vue b/components/site-item/site-item.vue
index 7083a26..da6b54b 100644
--- a/components/site-item/site-item.vue
+++ b/components/site-item/site-item.vue
@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
 <<<<<<< HEAD
 	<view class="cu-item cur padding no-mr-border site-item" >
 =======
@@ -8,11 +9,26 @@
 			:style="'background-image:url('+(siteItem.siteImages?siteItem.siteImages:defaultLogo)+');'"> 
 		</view> 
 		<view class="content"> 
+=======
+	<!-- :style="{height:siteItem.oilProductCodeAndPrices && siteItem.oilProductCodeAndPrices.length>3?'220rpx !important':listHeight?listHeight + 'rpx !important':''}" -->
+	<view class="site-item">
+		<view class="radius"
+			:style="'background-image:url('+(siteItem.siteImages?siteItem.siteImages:defaultLogo)+');'">
+		</view>
+		<view class="content">
+			<view class="action">
+				<view class="text-grey text-sm  " style="padding-top: 6rpx;">
+					<!-- <my-icon iconName="sy-der-icon.png" class="padding-right-xs text-sm"></my-icon> -->
+					{{siteItem.juli|distanceFilter}}
+				</view>
+			</view>
+>>>>>>> 5adc52996c062f4b7bfecbc5bbd21413b04487f2
 			<view>
-				<view class="text-cut text-black  text-lg padding-right-sm ">{{siteItem.siteName}}</view> 
+				<view class="text-cut text-black  text-lg padding-right-sm ">{{siteItem.siteName}}</view>
 			</view>
 			<view class="listTages">
 				<!-- <view v-if="siteItem.siteLevel" class=" cu-tag round bg-self--dark-yellow yu-tag text-xs">{{siteItem.siteLevel}}级</view> -->
+<<<<<<< HEAD
 				<view class="cu-tag round bg-self-yellow  yu-tag text-xs" :class="siteItem.channelCode=='XOIL'?'tag-red':''">{{siteItem.listTag||'未知'}}
 				</view>
 				<view class="cu-tag round bg-self--dark-yellow yu-tag text-xs" v-show="first">距离最近</view>
@@ -24,6 +40,21 @@
 			</view>
 			<!-- <view class="text-gray flex" style="width: calc(100% + 30%);display: flex;flex-wrap: wrap;">
 				<view v-if="listHeight" class="youpin" style="" v-for="(item,index) in siteItem.oilProductCodeAndPrices">
+=======
+				<view class="cu-tag round bg-self-yellow  yu-tag text-xs"
+					:class="siteItem.channelCode=='XOIL'?'tag-red':''">{{siteItem.listTag|channelCodeFamt}}
+				</view>
+				<view class="cu-tag round bg-self--dark-yellow yu-tag text-xs" v-show="first">距离最近</view>
+			</view>
+			<view class="">
+				<view class="text-cut color-666 text-sm  ">
+					{{siteItem.address}}
+				</view>
+			</view>
+			<view class="text-gray flex" style="display: flex;flex-wrap: wrap;">
+				<view v-if="listHeight" class="youpin" style=""
+					v-for="(item,index) in siteItem.oilProductCodeAndPrices">
+>>>>>>> 5adc52996c062f4b7bfecbc5bbd21413b04487f2
 					<view class="text-bold  oil-main-color text-xl padding-right-xs">
 						{{item.oilProductCode}}   
 					</view>
@@ -40,11 +71,12 @@
 				<view v-if="!listHeight" class="">
 					<text class="cu-tag   oil-tag radius  text-xs"
 						v-if="siteItem.oilSitePrice - siteItem.sitePrice>0">省￥{{(siteItem.oilSitePrice - siteItem.sitePrice)|moneyFormat}}</text>
-				</view> 
-				<view v-if="!listHeight" class="text-cut padding-left-sm text-lg"> 
-					<text class="text-delete color-333 text-sm padding-right-xs"> 
-						￥{{siteItem.oilSitePrice|moneyFormat}}/L 
+				</view>
+				<view v-if="!listHeight" class="text-cut padding-left-sm text-lg">
+					<text class="text-delete color-333 text-sm padding-right-xs">
+						￥{{siteItem.oilSitePrice|moneyFormat}}/L
 					</text>
+<<<<<<< HEAD
 		
 				</view>
 			</view> -->
@@ -68,6 +100,21 @@
 				{{ siteItem.juli|distanceFilter}} 
 			</view> 
 		</view> 
+=======
+					<!-- 	<my-icon iconName="￥.png" class="padding-right-xs icon-rectangle"></my-icon>
+					<my-icon iconName="f.png" class="padding-right-xs "></my-icon> -->
+				</view>
+			</view>
+			<view class="activity" v-if="siteItem.activitySwitch">
+				<view class="title">活动</view>
+				<view class="content">
+					{{siteItem.activityContent}}
+				</view>
+			</view>
+		</view>
+
+
+>>>>>>> 5adc52996c062f4b7bfecbc5bbd21413b04487f2
 
 	</view>
 </template>
@@ -83,24 +130,29 @@
 				type: Boolean,
 				default: false
 			},
-			listHeight:{
-				type:Number,
-				default:0
+			listHeight: {
+				type: Number,
+				default: 0
 			}
 		},
 		data() {
 			return {
 				starUrl: this.global.starUrl,
-				defaultLogo:'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/logo_default.png',
-				audioUrl:''
+				defaultLogo: 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/logo_default.png',
+				audioUrl: ''
 			}
-		}, 
+		},
 		created() {
+<<<<<<< HEAD
+=======
+			console.log(this.siteItem, '-----------------')
+>>>>>>> 5adc52996c062f4b7bfecbc5bbd21413b04487f2
 		},
 		methods: {
 
 		},
 		filters: {
+<<<<<<< HEAD
 				channelCodeFamt(value) {
 					if (!value) {
 						return '未知'
@@ -121,6 +173,29 @@
 						return value
 					}
 				},
+=======
+			channelCodeFamt(value) {
+				console.log(value)
+				if (!value) {
+					return '未知'
+					// 渠道编码 ( XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
+					// switch (value) {
+					// 	case 'XOIL':
+					// 		return '星油'
+					// 	case 'WJY':
+					// 		return '万金油'
+					// 	case 'LV':
+					// 		return '老吕（找油网）'
+					// 	case 'TY':
+					// 		return '团油'
+					// 	case 'YDJY':
+					// 		return '一点加油（壳牌）'
+					// }
+				} else {
+					return value
+				}
+			},
+>>>>>>> 5adc52996c062f4b7bfecbc5bbd21413b04487f2
 			distanceFilter(value) {
 				if (value) {
 					return value > 1000 ? ((value / 1000).toFixed(2) + 'km') : (value + 'm')
@@ -139,20 +214,42 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 	.site-item {
-		margin-bottom: 1.8rem; 
-		align-items: flex-start !important; 
-		height: 150rpx!important;
-	}
+		position: relative;
+		display: flex;
+		align-items: flex-start !important;
+		padding: 25rpx;
+		// margin-bottom: 1.8rem;
+		line-height:1.5rem;
+		.content {
+			flex:1;
+			overflow: hidden;
+			.action {
+				position: absolute;
+				right: 35rpx;
+				top: 24rpx;
+			}
+		}
+		>.radius {
+			margin-right: 30rpx;
+			width: 96rpx;
+			height: 96rpx;
+			font-size: 2em;
+			background-size: 100% 100%;
 		
-	.yellow-oil{
+		}
+	}
+
+	.yellow-oil {
 		color: #e8775a;
 	}
-	.cu-avatar{
+
+	.cu-avatar {
 		background-color: transparent !important;
 	}
-	.youpin{
+
+	.youpin {
 		border: 1px solid #e4e4e4;
 		display: flex;
 		border-radius: 5px;
@@ -160,7 +257,32 @@
 		margin-right: 5px;
 		margin-bottom: 5px;
 	}
-	.text-xl{
+
+	.text-xl {
 		font-size: 30rpx;
 	}
+	.activity {
+		display: flex;
+		width: 85%;
+		// padding: 10rpx 20rpx;
+		border:2rpx solid #1890FF ;
+		border-radius: 10rpx;
+	
+		.title {
+			width: 20%;
+			padding: 10rpx 0;
+			line-height: 36rpx;
+			text-align: center;
+			color: #1890FF ;
+			background: #1890FF30;
+		}
+	
+		.content {
+			flex: 1;
+			padding: 10rpx 20rpx;
+			line-height: 36rpx;
+			min-height: 80rpx;
+			color: #1890FF;
+		}
+	}
 </style>
diff --git a/manifest.json b/manifest.json
index 01210d6..2c32c2c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,10 @@
 {
     "name" : "XiaoXing",
+<<<<<<< HEAD
     "appid" : "__UNI__A32B754",
+=======
+    "appid" : "__UNI__113D280",
+>>>>>>> 5adc52996c062f4b7bfecbc5bbd21413b04487f2
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
diff --git a/pages.json b/pages.json
index ad7786d..86ac03a 100644
--- a/pages.json
+++ b/pages.json
@@ -141,6 +141,22 @@
 		        }
 		    ]
 		},
+        {
+        	"root": "Activity",
+        	"pages": [{
+                    "path" : "pages/index/index",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "油站活动",
+                   "enablePullDownRefresh": false,
+                   "navigationStyle": "default",
+                   "navigationBarBackgroundColor": "#0081ff",
+                   "navigationBarTextStyle": "white"
+                }
+                
+                }
+            ]
+        },
 		{
 			"root": "BagMoney",
 			"pages": [{
diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue
index aa9c886..2b6be05 100644
--- a/pages/tabbar/home/home.vue
+++ b/pages/tabbar/home/home.vue
@@ -15,9 +15,10 @@
 					</view>
 					<view class="search-form radius" @tap="InputFocus">
 						<text class="cuIcon-search"></text>
-						<input disabled :adjust-position="false" type="text" placeholder="搜索油站名称" confirm-type="search" />
+						<input disabled :adjust-position="false" type="text" placeholder="搜索油站名称"
+							confirm-type="search" />
 					</view>
-				<!-- 	<view class="">
+					<!-- 	<view class="">
 						阿三
 					</view> -->
 				</view>
@@ -108,16 +109,16 @@
 		</view>
 		<!-- 广告图片开始 -->
 		<view class="my-bg padding">
-			<view class="" >
-				<!-- <swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular >
+			<view class="">
+				<swiper autoplay interval='5000' style="width: 100%;height: 204rpx;" class="swiper" circular >
 					<swiper-item @click="swiperClick(item,index)" v-for="(item,index) in swiperArray">
 						<image :src="item.src" style="width: 100%;"  mode="widthFix"></image>
 					</swiper-item>
-					<swiper-item>
+					<!-- <swiper-item>
 						<ad unit-id="adunit-fae65289bc72095d" ad-intervals="30"></ad>
-					</swiper-item>
-				</swiper> -->
-				<image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image>
+					</swiper-item> -->
+				</swiper>
+				<!-- <image :src="starUrl+'banner.png'" style="width: 100%;" mode="widthFix"></image> -->
 			</view>
 		</view>
 		<!-- 筛选开始 -->
@@ -127,8 +128,8 @@
 			</view> -->
 			<view class="  ">
 				<view class="" v-if="siteList.length>0">
-					<site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0" :listHeight="listHeight"
-						class="cu-list menu-avatar cu-item" @tap="toDetail(item)">
+					<site-item v-for="(item,index) in siteList" :key="item.id" :site-item="item" :first="index==0"
+						:listHeight="listHeight" class="cu-list menu-avatar cu-item" @tap="toDetail(item)">
 					</site-item>
 				</view>
 				<view class="" v-else>
@@ -158,17 +159,22 @@
 		},
 		data() {
 			return {
-				swiperArray:[
-					// {
-					// 	src:this.global.starUrl+'banner.png',
-					// 	link:''
-					// },
+				swiperArray: [
 					{
-						src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png',
-						link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473'
+						src:this.global.starUrl+'banner.png',
+						link:''
 					},
+					// {
+					// 	src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/baichuan_MP/banner_baichuan.png',
+					// 	JumpPage: '/Activity/pages/index/index'
+					// },
+					
+					// {
+					// 	src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png',
+					// 	link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473'
+					// },
 				],
-				listHeight:160,
+				listHeight: 160,
 				siteInfo: {
 
 				},
@@ -285,13 +291,13 @@
 				]
 			};
 		},
-		onTabItemTap(res){
-			this.showThreeSites =false
+		onTabItemTap(res) {
+			this.showThreeSites = false
 		},
 		onLoad() {
 			this.reverseGeocoder(this.location)
 			this.refreshLocation()
-			
+
 			// if (!uni.getStorageSync('filterData')) {
 			// 	this.getFilterData()
 			// }
@@ -329,38 +335,45 @@
 		},
 
 		methods: {
-			toManagement(){
+			toManagement() {
 				const user = uni.getStorageSync('user');
-				if(user){
-					Financial.findHomePageReport({customerId:user.id}).then(res=>{
-						if(res.data){
+				if (user) {
+					Financial.findHomePageReport({
+						customerId: user.id
+					}).then(res => {
+						if (res.data) {
 							uni.navigateTo({
-								url:`../../../Financial/pages/estimate/index?data=${encodeURIComponent(JSON.stringify(res.data))}`
+								url: `../../../Financial/pages/estimate/index?data=${encodeURIComponent(JSON.stringify(res.data))}`
 							})
-						}else{
+						} else {
 							uni.navigateTo({
-								url:'../../../Financial/pages/index?guide=1'
+								url: '../../../Financial/pages/index?guide=1'
 							})
 						}
 					});
-				}else{
+				} else {
 					uni.showToast({
 						title: '请先登录！',
 						icon: 'none'
 					})
 				}
 			},
-			swiperClick(item,index) {
-				if(!item?.link) return
-				switch (Number(index)) {
-					// case 0:
-					// 	this.goCall()
-					// 	break;
-					 default:
-					 console.log('item.link')
-						uni.navigateTo({
-							url: '/pages/tabbar/home/link?url=' +   encodeURIComponent(JSON.stringify(item.link)) 
-						})
+			swiperClick(item, index) {
+				// if (!item?.link) return
+				// switch (Number(index)) {
+				// 	// case 0:
+				// 	// 	this.goCall()
+				// 	// 	break;
+				// 	default:
+				// 		console.log('item.link')
+				// 		uni.navigateTo({
+				// 			url: '/pages/tabbar/home/link?url=' + encodeURIComponent(JSON.stringify(item.link))
+				// 		})
+				// }
+				if(item?.JumpPage){
+					uni.navigateTo({
+						url: item.JumpPage
+					})
 				}
 			},
 			goToPage(url) {
@@ -447,10 +460,11 @@
 					// 	url: 'plugin://routePlan/index?key=' + this.qqMapKey + '&referer=' + referer +
 					// 		'&endPoint=' + endPoint
 					// })
-					 uni.removeStorageSync("origins")
-					     uni.removeStorageSync("destination")
+					uni.removeStorageSync("origins")
+					uni.removeStorageSync("destination")
 					wx.navigateTo({
-					      url:'../../../BagStation/pages/routePlain/routePlain'})
+						url: '../../../BagStation/pages/routePlain/routePlain'
+					})
 				} else if (index == 8) {
 					this.goToPage('/BagAuth/pages/agreeMent/OperationGuide')
 				}
@@ -504,9 +518,9 @@
 						// siteBrand: "", //   备注：// 石油品牌 ( 1-中国石油 2-中国石化 3-壳牌 4-民营 5-中海油 6-京博 7-中化石油 8-其他 )
 						// channelCode: "", //   备注：// 渠道编码 ( OIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
 						// oilProductCode: "0#" //   备注：// 油号选择 ( 0# 92# 92#)
-						clientBelong:'ZHONGPIN',
-						comprehensiveSort:1,
-						zpDisable:'ENABLE',
+						clientBelong: 'ZHONGPIN',
+						comprehensiveSort: 1,
+						zpDisable: 'ENABLE',
 						sort: "juli", //类型：String  必有字段  备注：// 智能排序 ( price：价格最低 juli：距离最近 ) 默认距离排序
 						...uni.getStorageSync('location'),
 						...this.filterData,
@@ -572,13 +586,13 @@
 					})
 				} else {
 					uni.showModal({
-						title:'请您登录',
-						content:"登录小星加油才可以加油 |˛˙꒳​˙)♡",
-						confirmText:'去登陆',
+						title: '请您登录',
+						content: "登录小星加油才可以加油 |˛˙꒳​˙)♡",
+						confirmText: '去登陆',
 						success: (res) => {
-							if(res.confirm){
+							if (res.confirm) {
 								uni.reLaunch({
-									url:'../../../BagAuth/pages/login/login'
+									url: '../../../BagAuth/pages/login/login'
 								})
 							}
 						}
@@ -795,4 +809,4 @@
 	.my-icon-sm .text-sm {
 		line-height: 1rem;
 	}
-</style>
+</style>
\ No newline at end of file