修改

api/oli-site.js

@@ -145,6 +145,14 @@ export default{
 			data:data
 		})
 	},
+	// 安能支付
+	AnPay(data) {
+		return request({
+			url: `/${service_name}/anneng/pay`,
+			method: 'POST',
+			data:data
+		})
+	},
 	//根据id回显促销编辑
 	getPrice (id) {
 	  return request({

oilPricesReported/oilPricesReported.vue

@@ -0,0 +1,170 @@
+<template>
+	<view class="page-content my-bg">
+		<cu-custom class="main-topbar bg-main-oil" bgColor="bg-main-oil" :isBack="true">
+			<block slot="content">油价上报</block>
+			<block slot="backText" class="back-text">返回</block>
+		</cu-custom>
+		<view class="oil-price">
+			<image src="../static/img/oilPrice/oilback.png" mode=""></image>
+		</view>
+		<view class="oil-price-body">
+			<view class="oil-price-body-top">
+				<view class="body-top">
+					<view class="">
+						<text>星卡互联加油站</text>
+						<text>不可用</text>
+					</view>
+					<view class="">
+						<image src="../static/img/oilPrice/wz.png" mode=""></image>
+						<text>经济开发区宿松路与休宁路站交口向西200米处200米......</text>
+					</view>
+					<view class="">
+						<view class="">
+							<image src="../static/img/oilPrice/add.png" mode=""></image>
+							<text>新增上报</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="oil-price-body" style="margin-top: 20px;border-radius: 3px;padding: 0 40rpx;">
+				<view class="oil-price-list">
+					<img src="../static/img/oilPrice/time.png" style="width: 32rpx;height: 32rpx;" alt="">
+					<text style="margin: 0 10px 0 5px;">预约生效</text>
+					<text>03-02 09:13</text>
+				</view>
+				<view class="oil-price-list">0#</view>
+				<view class="oil-price-list">
+					<view class="">
+						<view class="">
+							<text>油站价</text>
+							<text>￥5.91</text>
+							<text>￥6.51/L</text>
+							<image src="../static/img/oilPrice/top.png" style="width: 22rpx;height: 15rpx;" mode=""></image>
+						</view>
+						<view class="">
+							<text>发改委</text>
+							<text>￥5.91</text>
+							<text>￥6.51/L</text>
+							<image src="../static/img/oilPrice/bottom.png" style="width: 22rpx;height: 15rpx;" mode=""></image>
+						</view>
+					</view>
+					<text style="color: #67982F;">审核通过</text>
+				</view>
+				<view style="width: 100%;height: 1px;background: #F1F2F7;border: 1px solid #F1F2F7;"></view>
+				<view class="oil-price-list" style="display: block;padding: 10rpx 0;color: #999999;">
+					<text>创建时间: </text>
+					<text>2022-3-2 09:13:15</text>
+				</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped>
+	.oil-price image{
+		width: 100%;
+		margin-top: -160rpx;
+	}
+	.oil-price-body{
+		position: relative;
+		width: 90%;
+		margin: 0 auto;
+		background: #fff;
+		top: -130rpx;
+		padding: 30rpx 0 10rpx;
+		border-radius: 3px 3px 0px 0px;
+	}
+	.body-top view{
+		padding: 10rpx 40rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		color: #666;
+		font-weight: 600;
+	}
+	.body-top view:first-child{
+		color: #000;
+	}
+	.body-top view:nth-child(2) image{
+		width: 5%;
+		height: 28rpx;
+	}
+	.body-top view:nth-child(2) text{
+		overflow: hidden;
+		-webkit-line-clamp: 1;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		margin-left: 20rpx;
+	}
+	.body-top view:nth-child(3) image{
+		width: 20rpx;
+		height: 20rpx;
+		margin-right: 10px;
+	}
+	.body-top view:nth-child(3){
+		justify-content: flex-end;
+		padding: 10rpx 0;
+	}
+	.body-top view:nth-child(3) view{
+		padding: 12rpx 35rpx;
+		background: #FF0000;
+		color: #fff;
+		border-radius: 15px 0px 0px 15px;
+	}
+	.oil-price-list{
+		display: flex;
+	}
+	.oil-price-list:first-child{
+		justify-content: flex-end;
+		align-items: center;
+		color: #BB2626;
+		padding-top: 3px;
+	}
+	.oil-price-list:nth-child(2){
+		font-size: 40rpx;
+		font-weight: 600;
+	}
+	.oil-price-list:nth-child(3){
+		align-items: center;
+		justify-content: space-between;
+		margin: 20rpx 0px;
+	}
+	.oil-price-list view view{
+		display: flex;
+		align-items: center;
+	}
+	.oil-price-list view view text:first-child{
+		font-size: 30rpx;
+		color: #666;
+	}
+	.oil-price-list view view text:nth-child(2){
+		font-size: 35rpx;
+	}
+	.oil-price-list view view text:nth-child(3){
+		color: #999999;
+		margin: 0 10rpx;
+		text-decoration: line-through;
+	}
+	.oil-price-list view view:first-child text:nth-child(2){
+		color: #FF7E35;
+		margin-left: 30rpx;
+	}
+	.oil-price-list view view:last-child text:nth-child(2){
+		color: #ff0000;
+		margin-left: 30rpx;
+	}
+</style>

pages/home/home.vue

@@ -83,6 +83,15 @@
 				</view> 
 				<text>{{ item.name }}</text>
 			</view>
+			<view class="cu-item" @tap="routerTo(cuIconList[9].path)">
+				<view :class="['cuIcon-' + cuIconList[9].cuIcon, 'text-' + cuIconList[9].color]" class="text-sl">
+					<view class="cu-tag badge" v-if="cuIconList[9].badge != 0">
+						<block v-if="cuIconList[9].badge != 9">
+							{{ cuIconList[9].badge > 99 ? '99+' : cuIconList[9].badge }}</block>
+					</view>
+				</view>
+				<text>{{ cuIconList[9].name }}</text>
+			</view>
 			<view class="cu-item" @tap="routerTo('/pages/station-price/station-price')">
 				<view :class="['cuIcon-' + cuIconList[1].cuIcon, 'text-' + cuIconList[1].color]" class="text-sl">
 					<view class="cu-tag badge" v-if="cuIconList[1].badge != 0">
@@ -269,7 +278,13 @@
 						badge: 0,
 						name: '交易统计'
 					},
-
+					{
+						cuIcon: 'refund',
+						path: '/oilPricesReported/oilPricesReported',
+						color: 'purple',
+						badge: 0,
+						name: '油价上报'
+					},
 
 				]
 			};

pages/station-info/scan-camera/scan-camera.vue

@@ -135,6 +135,8 @@
 							url = '/pages/stationDetail/ZYSite?type=RIRISHUN'
 					} else if (res.indexOf('OP') != -1 ){
 							url = '/pages/stationDetail/openStationDetail'  
+					}else if (res.indexOf('confirmerCode')!=-1){
+							url = '/pages/stationDetail/ZYSite?type=ANNENG'  
 					}else{
 						uni.showToast({
 							title: '未知二维码',

pages/stationDetail/ZYSite.vue

@@ -58,7 +58,7 @@
 					</view>
 					<view class="newdirvercard_name ">
 						<view class="newdirvercard_name_text  ">{{ type=='RIRISHUN'? '日日顺司机': type=='shunfeng'?'顺丰司机': siteData.customerName}}</view>   
-						<view class="newdirvercard_name_phone  ">{{ type=='RIRISHUN'? '保密': type=='shunfeng'?'保密': siteData.customerPhone}}</view>
+						<view class="newdirvercard_name_phone  " v-if="type!='ANNENG'">{{ type=='RIRISHUN'? '保密': type=='shunfeng'?'保密': siteData.customerPhone}}</view>
 					</view>
 				</view>
 				<view class="newdirvercard_right">   
@@ -647,6 +647,10 @@
 							this.FyOrder()
 							return
 						}
+						if (this.type == 'ANNENG') {
+							this.NnOrder()
+							return
+						}
 						if (this.testResult) {
 							if (this.qrCode.substring(0, 4) == 'XING') {
 								this.saveZeyiOrder()
@@ -742,6 +746,83 @@
 							}, 400)
 						}
 
+					}
+				})
+			},//安能
+			NnOrder() {
+				const data7 = {
+					qrCode: uni.getStorageSync('qrCode'), //类型：String 必有字段 二维码 qrcode
+					orderSource: "WECHAT_MINIAPPS",
+					siteId: this.siteData.siteId, //类型：String 必有字段  油站id siteId
+					priceId: this.insertResult.priceId, //类型：String 必有字段 油价id priceId
+					companyId: this.siteData.companyId, //类型：String  必有字段  企业id companyId
+					customerId: this.siteData.customerId, //类型：String  必有字段  司机id customerId
+					volume: parseFloat(this.insertResult.vol), //类型：number  必有字段  升数  volume,
+					vehicleLicenseNum: this.carNumber,
+					version: 1, //类型：Number  必有字段  备注：版本号
+					xoilAmountGun: this.insertResult.vol, //类型：String  必有字段  备注：加油升数
+				}
+				console.log(data7)
+				if (!data7.qrCode) {
+					uni.showToast({
+						title: 'qrCode为空',
+						icon: 'none'
+					});
+					return false
+				}
+				if (!data7.siteId) {
+					uni.showToast({
+						title: '请选择油站id',
+						icon: 'none'
+					});
+					return false
+				}
+				if (!data7.companyId) {
+					uni.showToast({
+						title: '请选择企业id',
+						icon: 'none'
+					});
+					return false
+				}
+				if (!data7.customerId) {
+					uni.showToast({
+						title: '请选择司机id',
+						icon: 'none'
+					});
+					return false
+				}
+				if (!data7.volume) {
+					uni.showToast({
+						title: '请输入加油体积',
+						icon: 'none'
+					});
+					return false
+				}
+				oliSiteApi.AnPay(data7).then(res => {
+					if (res.code === 20000) {
+						uni.showToast({
+							title: '下单成功！'
+						});
+						uni.setStorageSync('orderInfo', data7)
+						console.log(res.data.orderId)
+						let orderId = res.data.orderId
+						// this.checkSf(res.data.orderId)
+						this.gotoOrderStatus(res.data)
+						// uni.setStorageSync('formQr', true)
+						// uni.setStorageSync('orderSource', 'mpxoil')
+						// if (!this.isG7) {
+						// 	setTimeout(() => {
+						// 		this.toDetails(res.data.orderId)
+						// 	}, 400)
+						// } else {
+						// 	this.beforePay = false
+						// 	setTimeout(() => {
+						// 		this.orderId = res.data.orderId
+						// 		this.queryTimer()
+						// 		this.getPayStatus(this.orderId)
+						// 	}, 400)
+						// }
+
 					}
 				})
 			},

utils/request.js

@@ -1,15 +1,16 @@
 import axios from 'axios'
 import utils from '@/utils/encode'
 
- // const env = 'production' /* */
+ const env = 'production' /* */
- const env = 'test'//   仅用于测试、
+ // const env = 'test'//   仅用于测试、
  // const env = 'production'
 //42 洛超  /29 孙志华 /40 阿浩
 // 测试日日顺时需要连阿浩
 
-const testUrl = 'http://192.168.0.28:38080'
+const testUrl = 'http://192.168.0.150:38080'
 // const productionUrl = 'https://www.51xingka.net/oilApp' // 生产，加密 old
-const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
+// const productionUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
+const productionUrl = 'http://192.168.0.191:38080' //测试
 // const productionUrl = 'http://121.196.213.68/adminapi' //预生产
 // const env = process.env.NODE_ENV  // 环境
 const service = axios.create({