Merge branch 'master' of http://121.196.213.68:3000/caoliancun/MP-XiaoXing into caolc

Reviewed-on: #13

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"
+						<tki-qrcode ref="qrcode" cid="2" loadMake :val="val" :size="250" unit="upx" background="#fff"
-							background="#fff" foreground="#000" pdground="#000" :icon="iconUrl" iconSize="40" onval
+							foreground="#000" pdground="#000" :icon="iconUrl" iconSize="40" onval
-							:usingComponents="usingComponents" showLoading  />
+							: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">
+				<view class="more-frame">
-					<button class="cu-btn nowrap bg-white" @tap="gotoInvoicing()">查看开票信息</button>
+					<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,
+				showQr: false,
-				val:'',
+				val: '',
 				showThirdResult: false,
 				id: '',
 				order: {},
@@ -212,35 +221,53 @@
 				}
 			}
 		},
-		watch:{
+		watch: {
-			showMiniBtn:function(){
+			showMiniBtn: function() {
 				// setTimeout(()=>{
 				// 	this.showMiniBtn = false
 				// },1000)
 			}
 		},
 		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()
 			},
-			getOrderQrCode(){ 
+			getOrderQrCode() {
-				oilSiteApi.getOrderQrCode(this.order.orderSerialNumber).then( (res)=>{
+				oilSiteApi.getOrderQrCode(this.order.orderSerialNumber).then((res) => {
-					console.log(res)
 					this.val = res.data
-					if(res.code == 40000){
+					if (res.code == 40000) {
-						this.showQr = false  
+						this.showQr = false
-					}else if(res.code == 20000){
+					} else if (res.code == 20000) {
 						this.showQr = true
-						this.val =res.data.codeStr
+						this.val = res.data.codeStr
 					}
-				} )
+				})
 			},
 			gotoInvoicing() { //前往开票
-				console.log(this.order,'+++++++++++++')
 				financelApi.checkStatus(this.order.orderSerialNumber).then((res) => {
-					console.log('这里是check是否开发票')
-					console.log(res)
-					console.log(this.order.realAmount)
 					if (res.code == 20000) {
 						if (res.data.openInvoicMark === 'TO_INVOICED') {
 							uni.navigateTo({
@@ -250,7 +277,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
 							})
 						}
@@ -285,7 +313,7 @@
 			// 		}
 			// 	})
 			// },
-			
+
 			// 三方支付结果弹窗结束
 			onCopy(id) {
 				uni.setClipboardData({
@@ -303,7 +331,7 @@
 					if (res.code == 20000) {
 						this.order = res.data
 						uni.setStorageSync('oilItem', res.data)
-							this.getOrderQrCode()
+						this.getOrderQrCode()
 						if (res.data.payMethod == 2) {
 							this.tyPayMethod = res.data.payMethod
 							// this.queryOrderStatusSq()
@@ -311,11 +339,11 @@
 					}
 				})
 			},
-		toDetail(item) {
+			toDetail(item) {
-			var itemS = JSON.stringify(item)
+				var itemS = JSON.stringify(item)
-			uni.setStorageSync('siteInfo',itemS) 
+				uni.setStorageSync('siteInfo', itemS)
-			uni.navigateTo({
+				uni.navigateTo({
-				url: `/BagStation/pages/stationDetail/stationDetail`,
+					url: `/BagStation/pages/stationDetail/stationDetail`,
 					fail: (err) => {
 						// console.log(err)
 					},
@@ -367,7 +395,7 @@
 			}
 
 		},
-		onLoad(option) { 
+		onLoad(option) {
 			this.id = option.id
 			this.getOrderInfo()
 			uni.showShareMenu()
@@ -381,7 +409,7 @@
 			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
 				}
@@ -405,9 +433,9 @@
 				}
 			},
 			moneyFormath(value) {
-				console.log(value) 
+				console.log(value)
-				if (value != 'xxx.x') { 
+				if (value != 'xxx.x') {
-					let number =  parseFloat(value).toFixed(2)
+					let number = parseFloat(value).toFixed(2)
 					return number
 				} else {
 					return value
@@ -449,19 +477,41 @@
 	}
 </script>
 
-<style scoped>.move-tops{
+<style scoped lang="scss">
-	transform: translateY(-17px);
+	.more-frame {
-}
+		height: 158rpx;
-.bg-red{
+		overflow-y: auto;
-	background-color: red;
+
-}
+		.more-item {
-.text-centers {
+			margin: 10rpx 0;
-      text-align: center;
+			padding: 0 30rpx;
-      width: 90%;
+			font-size: 28rpx;
-      margin: 0 auto;
+			height: 64rpx;
-      border-radius: 7px;
+			line-height: 64rpx;
-      overflow: hidden;
+			text-align: center;
-}
+
+			&::after {
+				border: none;
+			}
+		}
+	}
+
+	.move-tops {
+		transform: translateY(-17px);
+	}
+
+	.bg-red {
+		background-color: red;
+	}
+
+	.text-centers {
+		text-align: center;
+		width: 90%;
+		margin: 0 auto;
+		border-radius: 7px;
+		overflow: hidden;
+	}
+
 	.move-top {
 		margin-top: -2rem;
 	}
@@ -470,6 +520,7 @@
 		right: 110upx;
 		bottom: 10upx;
 	}
+
 	.move-top {
 		margin-top: -2rem;
 	}

BagStation/pages/components/price-tab.vue

@@ -32,7 +32,13 @@
 				<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>
@@ -43,6 +49,12 @@
 			channelList: {
 				type: Array,
 				default () {}
+			},
+			siteInfo:{
+				type: Object,
+				default: () => {
+					return {}
+				}
 			}
 		},
 		data() {
@@ -124,7 +136,7 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 	.site-icon {
 		width: 2rem;
 		vertical-align: middle;
@@ -133,4 +145,19 @@
 	.my-tag {
 		padding: 0 12rpx;
 	}
+	.activity {
+		margin-top: 15rpx;
+		display: flex;
+		width: 45%;
+		border:2rpx solid #fbbd0850;
+		
+		// border-radius: 10rpx;
+		.content {
+			flex: 1;
+			padding: 10rpx 20rpx;
+			line-height: 36rpx;
+			// min-height: 80rpx;
+			color: #fbbd08;
+		}
+	}
 </style>

BagStation/pages/stationDetail/stationDetail.vue

@@ -65,7 +65,7 @@
 		</view>
 		<!-- 价格 -->
 		<price-tab @onChangeChannelCode="getChannelCode" @onChangePayQr="onChangePayQr" @onChangePay="onChangePay"
-			:channel-list="siteInfo.oilSiteChannelDetailsVos"></price-tab>
+			:channel-list="siteInfo.oilSiteChannelDetailsVos" :siteInfo="siteInfo"></price-tab>
 
 
 		<!-- 客户评价 -->

components/site-item/site-item.vue

@@ -1,25 +1,34 @@
 <template>
-	<view class="cu-item cur padding no-mr-border site-item" :style="{height:siteItem.oilProductCodeAndPrices?siteItem.oilProductCodeAndPrices.length>3?'220rpx !important':listHeight?listHeight + 'rpx !important':'': ''}">
+	<!-- :style="{height:siteItem.oilProductCodeAndPrices?siteItem.oilProductCodeAndPrices.length>3?'220rpx !important':listHeight?listHeight + 'rpx !important':'': ''}" -->
-		<view class="cu-avatar radius lg "
+	<view class="site-item">
-			:style="'background-image:url('+(siteItem.siteImages?siteItem.siteImages:defaultLogo)+');'"> 
+		<view class="radius"
-		</view> 
+			:style="'background-image:url('+(siteItem.siteImages?siteItem.siteImages:defaultLogo)+');'">
-		<view class="content"> 
+		</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>
 			<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> -->
-				<view class="cu-tag round bg-self-yellow  yu-tag text-xs" :class="siteItem.channelCode=='XOIL'?'tag-red':''">{{siteItem.listTag|channelCodeFamt}}
+				<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="">
-				<view class="text-cut color-666 text-sm  "> 
+				<view class="text-cut color-666 text-sm  ">
-					{{siteItem.address}} 
+					{{siteItem.address}}
-				</view> 
+				</view>
 			</view>
-			<view class="text-gray flex" style="width: calc(100% + 30%);display: flex;flex-wrap: wrap;">
+			<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">
+				<view v-if="listHeight" class="youpin" style=""
+					v-for="(item,index) in siteItem.oilProductCodeAndPrices">
 					<view class="text-bold  yellow-oil text-xl padding-right-xs">
 						{{item.oilProductCode}}
 					</view>
@@ -36,25 +45,25 @@
 				<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>
-				<view v-if="!listHeight" class="text-cut padding-left-sm text-lg"> 
+				<view v-if="!listHeight" class="text-cut padding-left-sm text-lg">
-					<text class="text-delete color-333 text-sm padding-right-xs"> 
+					<text class="text-delete color-333 text-sm padding-right-xs">
-						￥{{siteItem.oilSitePrice|moneyFormat}}/L 
+						￥{{siteItem.oilSitePrice|moneyFormat}}/L
 					</text>
-				<!-- 	<my-icon iconName="￥.png" class="padding-right-xs icon-rectangle"></my-icon>
+					<!-- 	<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>
+			<view class="activity" v-if="siteItem.activitySwitch">
+				<view class="title">活动</view>
+				<view class="content">
+					{{siteItem.activityContent}}
+				</view>
+			</view>
+
 		</view>
-		
+
-		<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> 
 
 	</view>
 </template>
@@ -70,47 +79,47 @@
 				type: Boolean,
 				default: false
 			},
-			listHeight:{
+			listHeight: {
-				type:Number,
+				type: Number,
-				default:0
+				default: 0
 			}
 		},
 		data() {
 			return {
 				starUrl: this.global.starUrl,
-				defaultLogo:'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/logo_default.png',
+				defaultLogo: 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/logo_default.png',
-				audioUrl:''
+				audioUrl: ''
 			}
-		}, 
+		},
 		methods: {
 
 		},
 		filters: {
-				channelCodeFamt(value) {
+			channelCodeFamt(value) {
-					console.log(value)
+				console.log(value)
-					if (!value) {
+				if (!value) {
-						return '未知'
+					return '未知'
-						// 渠道编码 ( XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
+					// 渠道编码 ( XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油 YDJY：一点加油（壳牌）)
-						// switch (value) {
+					// switch (value) {
-						// 	case 'XOIL':
+					// 	case 'XOIL':
-						// 		return '星油'
+					// 		return '星油'
-						// 	case 'WJY':
+					// 	case 'WJY':
-						// 		return '万金油'
+					// 		return '万金油'
-						// 	case 'LV':
+					// 	case 'LV':
-						// 		return '老吕（找油网）'
+					// 		return '老吕（找油网）'
-						// 	case 'TY':
+					// 	case 'TY':
-						// 		return '团油'
+					// 		return '团油'
-						// 	case 'YDJY':
+					// 	case 'YDJY':
-						// 		return '一点加油（壳牌）'
+					// 		return '一点加油（壳牌）'
-						// }
+					// }
-					} else {
+				} else {
-						return value
+					return value
-					}
+				}
-				},
+			},
 			distanceFilter(value) {
 				if (value) {
 					return value > 1000 ? ((value / 1000).toFixed(2) + 'km') : (value + 'm')
-				}else{
+				} else {
 					return '0.00km'
 				}
 			},
@@ -125,20 +134,43 @@
 	}
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 	.site-item {
-		margin-bottom: 1.8rem; 
+		position: relative;
-		align-items: flex-start !important; 
+		display: flex;
-		height: 150rpx!important;
+		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{
+
-		background-color: transparent !important;
+
-	}
+	.youpin {
-	.youpin{
 		border: 1px solid #e4e4e4;
 		display: flex;
 		border-radius: 5px;
@@ -146,7 +178,33 @@
 		margin-right: 5px;
 		margin-bottom: 5px;
 	}
-	.text-xl{
+
+	.text-xl {
 		font-size: 30rpx;
 	}
+
+	.activity {
+		display: flex;
+		width: 85%;
+		// padding: 10rpx 20rpx;
+		border: 2rpx solid #FF8C00;
+		border-radius: 10rpx;
+
+		.title {
+			width: 20%;
+			padding: 10rpx 0;
+			line-height: 36rpx;
+			text-align: center;
+			color: #FF8C00;
+			background: #FF8C0030;
+		}
+
+		.content {
+			flex: 1;
+			padding: 10rpx 20rpx;
+			line-height: 36rpx;
+			min-height: 80rpx;
+			color: #FFA500;
+		}
+	}
 </style>

pages/tabbar/home/home.vue

@@ -201,18 +201,18 @@
 		data() {
 			return {
 				swiperArray: [
-					// {
+					{
-					// 	src:this.global.starUrl+'banner.png',
+						src:this.global.starUrl+'banner.png',
-					// 	link:''
+						link:''
-					// },
+					},
 					// {
 					// 	src: 'https://xoil-public.oss-cn-beijing.aliyuncs.com/WMP-IMG/banner-2dwk.png',
 					// 	link: 'https://tengxun.hkzj168.com/?ChannelId=20220831152210221048473'
 					// },
-					{
+					// {
-						src:'https://xoil-public.oss-cn-beijing.aliyuncs.com/baichuan_MP/banner_baichuan.png',
+					// 	src:'https://xoil-public.oss-cn-beijing.aliyuncs.com/baichuan_MP/banner_baichuan.png',
-						JumpPage:'/Activity/pages/index/index'
+					// 	JumpPage:'/Activity/pages/index/index'
-					},
+					// },
 				],
 				listHeight: 160,
 				siteInfo: {