1

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>

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>
 
 
 		<!-- 客户评价 -->