diff --git a/api/oli-site.js b/api/oli-site.js
index 5750ba9..cba5db4 100644
--- a/api/oli-site.js
+++ b/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({
diff --git a/oilPricesReported/oilPricesReported.vue b/oilPricesReported/oilPricesReported.vue
new file mode 100644
index 0000000..7aa031c
--- /dev/null
+++ b/oilPricesReported/oilPricesReported.vue
@@ -0,0 +1,170 @@
+
+
+
+ 油价上报
+ 返回
+
+
+
+
+
+
+
+
+ 星卡互联加油站
+ 不可用
+
+
+
+ 经济开发区宿松路与休宁路站交口向西200米处200米......
+
+
+
+
+ 新增上报
+
+
+
+
+
+
+
+ 
+ 预约生效
+ 03-02 09:13
+
+ 0#
+
+
+
+ 油站价
+ ￥5.91
+ ￥6.51/L
+
+
+
+ 发改委
+ ￥5.91
+ ￥6.51/L
+
+
+
+ 审核通过
+
+
+
+ 创建时间:
+ 2022-3-2 09:13:15
+
+
+
+
+
+
+
+
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 33baeba..abe8698 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -83,6 +83,15 @@
{{ item.name }}
+
+
+
+
+ {{ cuIconList[9].badge > 99 ? '99+' : cuIconList[9].badge }}
+
+
+ {{ cuIconList[9].name }}
+
@@ -269,7 +278,13 @@
badge: 0,
name: '交易统计'
},
-
+ {
+ cuIcon: 'refund',
+ path: '/oilPricesReported/oilPricesReported',
+ color: 'purple',
+ badge: 0,
+ name: '油价上报'
+ },
]
};
diff --git a/pages/station-info/scan-camera/scan-camera.vue b/pages/station-info/scan-camera/scan-camera.vue
index e08c2bf..8d1a9c9 100644
--- a/pages/station-info/scan-camera/scan-camera.vue
+++ b/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: '未知二维码',
diff --git a/pages/stationDetail/ZYSite.vue b/pages/stationDetail/ZYSite.vue
index 420dcfc..fb663f0 100644
--- a/pages/stationDetail/ZYSite.vue
+++ b/pages/stationDetail/ZYSite.vue
@@ -58,7 +58,7 @@
{{ type=='RIRISHUN'? '日日顺司机': type=='shunfeng'?'顺丰司机': siteData.customerName}}
- {{ type=='RIRISHUN'? '保密': type=='shunfeng'?'保密': siteData.customerPhone}}
+ {{ type=='RIRISHUN'? '保密': type=='shunfeng'?'保密': siteData.customerPhone}}
@@ -373,7 +373,7 @@
}
},
onLoad(option) {
- console.log(option) //接收option.type
+ console.log(option) //接收option.type
if (option.user == 'kl') {
let code = uni.getStorageSync('qrCode'),
orderId = code.slice(0, -3)
@@ -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)
+ // }
+
}
})
},
diff --git a/static/img/oilPrice/add.png b/static/img/oilPrice/add.png
new file mode 100644
index 0000000..1e12105
Binary files /dev/null and b/static/img/oilPrice/add.png differ
diff --git a/static/img/oilPrice/bottom.png b/static/img/oilPrice/bottom.png
new file mode 100644
index 0000000..dbde08c
Binary files /dev/null and b/static/img/oilPrice/bottom.png differ
diff --git a/static/img/oilPrice/oilback.png b/static/img/oilPrice/oilback.png
new file mode 100644
index 0000000..d3dc749
Binary files /dev/null and b/static/img/oilPrice/oilback.png differ
diff --git a/static/img/oilPrice/time.png b/static/img/oilPrice/time.png
new file mode 100644
index 0000000..27ee092
Binary files /dev/null and b/static/img/oilPrice/time.png differ
diff --git a/static/img/oilPrice/top.png b/static/img/oilPrice/top.png
new file mode 100644
index 0000000..94dfbfd
Binary files /dev/null and b/static/img/oilPrice/top.png differ
diff --git a/static/img/oilPrice/wz.png b/static/img/oilPrice/wz.png
new file mode 100644
index 0000000..fe44761
Binary files /dev/null and b/static/img/oilPrice/wz.png differ
diff --git a/utils/request.js b/utils/request.js
index f33ecd7..b72f3ca 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,15 +1,16 @@
import axios from 'axios'
import utils from '@/utils/encode'
- // const env = 'production' /* */
- const env = 'test'// 仅用于测试、
+ const env = 'production' /* */
+ // 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({