Compare commits
13 Commits
8534bd605e
...
363813553a
| Author | SHA1 | Date | |
|---|---|---|---|
|
363813553a | ||
|
|
95e82b750d | ||
|
|
4279ac5dfd | ||
|
|
d03ffc4850 | ||
|
|
4ffb634e97 | ||
|
e684eab82f | ||
| b9a38fed20 | |||
| 6f2fd08562 | |||
|
|
d97f8a59e9 | ||
|
|
88f47d0873 | ||
|
|
b64916bb3d | ||
|
|
1f04fa9733 | ||
|
|
2b72b9be8c |
@@ -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({
|
||||
|
||||
170
oilPricesReported/oilPricesReported.vue
Normal file
170
oilPricesReported/oilPricesReported.vue
Normal file
@@ -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>
|
||||
251
package-lock.json
generated
251
package-lock.json
generated
@@ -1,77 +1,178 @@
|
||||
{
|
||||
"name": "lsm_oil_site",
|
||||
"version": "1.0.0",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
"axios": {
|
||||
"version": "0.19.2",
|
||||
"resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
|
||||
"integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
|
||||
"requires": {
|
||||
"follow-redirects": "1.5.10"
|
||||
}
|
||||
},
|
||||
"crypto-js": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.0.0.tgz",
|
||||
"integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw="
|
||||
},
|
||||
"debug": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
|
||||
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
|
||||
"requires": {
|
||||
"ms": "2.0.0"
|
||||
}
|
||||
},
|
||||
"follow-redirects": {
|
||||
"version": "1.5.10",
|
||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
|
||||
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
|
||||
"requires": {
|
||||
"debug": "=3.1.0"
|
||||
}
|
||||
},
|
||||
"js-cookie": {
|
||||
"version": "2.2.1",
|
||||
"resolved": "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz",
|
||||
"integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg="
|
||||
},
|
||||
"js-md5": {
|
||||
"version": "0.7.3",
|
||||
"resolved": "https://registry.npm.taobao.org/js-md5/download/js-md5-0.7.3.tgz",
|
||||
"integrity": "sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I="
|
||||
},
|
||||
"jsencrypt": {
|
||||
"version": "3.0.0-rc.1",
|
||||
"resolved": "https://registry.npm.taobao.org/jsencrypt/download/jsencrypt-3.0.0-rc.1.tgz",
|
||||
"integrity": "sha1-DgpHRLpDzFV/tc9i/oZGvOtWGxw="
|
||||
},
|
||||
"ms": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
||||
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
|
||||
},
|
||||
"tki-qrcode": {
|
||||
"version": "0.1.6",
|
||||
"resolved": "https://registry.npm.taobao.org/tki-qrcode/download/tki-qrcode-0.1.6.tgz",
|
||||
"integrity": "sha1-cTc9nEs/iUT6pU0+6Ziroz2X3n8="
|
||||
},
|
||||
"tsc": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.nlark.com/tsc/download/tsc-2.0.3.tgz",
|
||||
"integrity": "sha1-A3/leeO9Z6XL2qYEtDxsGZGwS+8="
|
||||
},
|
||||
"typescript": {
|
||||
"version": "4.3.5",
|
||||
"resolved": "https://registry.nlark.com/typescript/download/typescript-4.3.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftypescript%2Fdownload%2Ftypescript-4.3.5.tgz",
|
||||
"integrity": "sha1-TRw3zBbok5c8RaBohrcRMjTxGfQ="
|
||||
},
|
||||
"uview-ui": {
|
||||
"version": "1.8.4",
|
||||
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz",
|
||||
"integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA=="
|
||||
}
|
||||
}
|
||||
"name": "lsm_oil_site",
|
||||
"version": "1.0.0",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "lsm_oil_site",
|
||||
"version": "1.0.0",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"axios": "^0.19.2",
|
||||
"crypto-js": "4.0.0",
|
||||
"js-cookie": "2.2.1",
|
||||
"js-md5": "0.7.3",
|
||||
"jsencrypt": "^3.0.0-rc.1",
|
||||
"tki-qrcode": "^0.1.6",
|
||||
"tsc": "^2.0.3",
|
||||
"typescript": "^4.3.5",
|
||||
"uview-ui": "^1.8.4"
|
||||
}
|
||||
},
|
||||
"node_modules/axios": {
|
||||
"version": "0.19.2",
|
||||
"resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
|
||||
"integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
|
||||
"deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410",
|
||||
"dependencies": {
|
||||
"follow-redirects": "1.5.10"
|
||||
}
|
||||
},
|
||||
"node_modules/crypto-js": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.0.0.tgz",
|
||||
"integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw="
|
||||
},
|
||||
"node_modules/debug": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
|
||||
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
|
||||
"dependencies": {
|
||||
"ms": "2.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/follow-redirects": {
|
||||
"version": "1.5.10",
|
||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
|
||||
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
|
||||
"dependencies": {
|
||||
"debug": "=3.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/js-cookie": {
|
||||
"version": "2.2.1",
|
||||
"resolved": "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz",
|
||||
"integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg="
|
||||
},
|
||||
"node_modules/js-md5": {
|
||||
"version": "0.7.3",
|
||||
"resolved": "https://registry.npm.taobao.org/js-md5/download/js-md5-0.7.3.tgz",
|
||||
"integrity": "sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I="
|
||||
},
|
||||
"node_modules/jsencrypt": {
|
||||
"version": "3.0.0-rc.1",
|
||||
"resolved": "https://registry.npm.taobao.org/jsencrypt/download/jsencrypt-3.0.0-rc.1.tgz",
|
||||
"integrity": "sha1-DgpHRLpDzFV/tc9i/oZGvOtWGxw="
|
||||
},
|
||||
"node_modules/ms": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
||||
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
|
||||
},
|
||||
"node_modules/tki-qrcode": {
|
||||
"version": "0.1.6",
|
||||
"resolved": "https://registry.npm.taobao.org/tki-qrcode/download/tki-qrcode-0.1.6.tgz",
|
||||
"integrity": "sha1-cTc9nEs/iUT6pU0+6Ziroz2X3n8="
|
||||
},
|
||||
"node_modules/tsc": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.nlark.com/tsc/download/tsc-2.0.3.tgz",
|
||||
"integrity": "sha1-A3/leeO9Z6XL2qYEtDxsGZGwS+8=",
|
||||
"bin": {
|
||||
"tsc": "bin/tsc"
|
||||
}
|
||||
},
|
||||
"node_modules/typescript": {
|
||||
"version": "4.3.5",
|
||||
"resolved": "https://registry.nlark.com/typescript/download/typescript-4.3.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftypescript%2Fdownload%2Ftypescript-4.3.5.tgz",
|
||||
"integrity": "sha1-TRw3zBbok5c8RaBohrcRMjTxGfQ=",
|
||||
"bin": {
|
||||
"tsc": "bin/tsc",
|
||||
"tsserver": "bin/tsserver"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=4.2.0"
|
||||
}
|
||||
},
|
||||
"node_modules/uview-ui": {
|
||||
"version": "1.8.4",
|
||||
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz",
|
||||
"integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA=="
|
||||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": {
|
||||
"version": "0.19.2",
|
||||
"resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
|
||||
"integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
|
||||
"requires": {
|
||||
"follow-redirects": "1.5.10"
|
||||
}
|
||||
},
|
||||
"crypto-js": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.0.0.tgz",
|
||||
"integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw="
|
||||
},
|
||||
"debug": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
|
||||
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
|
||||
"requires": {
|
||||
"ms": "2.0.0"
|
||||
}
|
||||
},
|
||||
"follow-redirects": {
|
||||
"version": "1.5.10",
|
||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
|
||||
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
|
||||
"requires": {
|
||||
"debug": "=3.1.0"
|
||||
}
|
||||
},
|
||||
"js-cookie": {
|
||||
"version": "2.2.1",
|
||||
"resolved": "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz",
|
||||
"integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg="
|
||||
},
|
||||
"js-md5": {
|
||||
"version": "0.7.3",
|
||||
"resolved": "https://registry.npm.taobao.org/js-md5/download/js-md5-0.7.3.tgz",
|
||||
"integrity": "sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I="
|
||||
},
|
||||
"jsencrypt": {
|
||||
"version": "3.0.0-rc.1",
|
||||
"resolved": "https://registry.npm.taobao.org/jsencrypt/download/jsencrypt-3.0.0-rc.1.tgz",
|
||||
"integrity": "sha1-DgpHRLpDzFV/tc9i/oZGvOtWGxw="
|
||||
},
|
||||
"ms": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
||||
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
|
||||
},
|
||||
"tki-qrcode": {
|
||||
"version": "0.1.6",
|
||||
"resolved": "https://registry.npm.taobao.org/tki-qrcode/download/tki-qrcode-0.1.6.tgz",
|
||||
"integrity": "sha1-cTc9nEs/iUT6pU0+6Ziroz2X3n8="
|
||||
},
|
||||
"tsc": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.nlark.com/tsc/download/tsc-2.0.3.tgz",
|
||||
"integrity": "sha1-A3/leeO9Z6XL2qYEtDxsGZGwS+8="
|
||||
},
|
||||
"typescript": {
|
||||
"version": "4.3.5",
|
||||
"resolved": "https://registry.nlark.com/typescript/download/typescript-4.3.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftypescript%2Fdownload%2Ftypescript-4.3.5.tgz",
|
||||
"integrity": "sha1-TRw3zBbok5c8RaBohrcRMjTxGfQ="
|
||||
},
|
||||
"uview-ui": {
|
||||
"version": "1.8.4",
|
||||
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.4.tgz",
|
||||
"integrity": "sha512-Zr+D5dFdNy6CdHQLBEXeGq/w0LkjxzBtsgaaDwLl0P58g67H7fBBDvy6AzWK/k0c7dwPYMBiK7I4Tr9p92+0DA=="
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
{{item.oilsCode}}
|
||||
</text>
|
||||
<text class=" text-lg text-bold text-red " v-if="item.volume">
|
||||
{{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'KG':'L'}}</text>
|
||||
{{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'L':'L'}}</text>
|
||||
|
||||
</view>
|
||||
<view class="bottom text-left">
|
||||
|
||||
@@ -55,11 +55,11 @@
|
||||
</view> -->
|
||||
<view class="margin-bottom-sm">
|
||||
油机单价
|
||||
<text class="fr">￥{{orderItem.sitePrice|| orderItem.price | UnitPriceFormat}} / {{orderItem.oilProductType=='GAS'?'KG':'L'}}</text>
|
||||
<text class="fr">￥{{orderItem.sitePrice|| orderItem.price | UnitPriceFormat}} / {{orderItem.oilProductType=='GAS'?'L':'L'}}</text>
|
||||
</view>
|
||||
<view class="margin-bottom-sm">
|
||||
{{ orderItem.oilProductType=='GAS'?'加气重量':'加油升数' }}
|
||||
<text class="fr">{{orderItem.volume|numberFormats}} {{orderItem.oilProductType=='GAS'?'KG':'L'}}</text>
|
||||
{{ orderItem.oilProductType=='GAS'?'加气升数':'加油升数' }}
|
||||
<text class="fr">{{orderItem.volume|numberFormats}} {{orderItem.oilProductType=='GAS'?'L':'L'}}</text>
|
||||
</view>
|
||||
<view class="margin-bottom-sm" v-if="orderSource=='mpxoil'">
|
||||
油机总价
|
||||
@@ -183,7 +183,7 @@
|
||||
},
|
||||
filters:{
|
||||
company(e){
|
||||
if(e) return e=='GAS'?'KG':'L';
|
||||
if(e) return e=='GAS'?'L':'L';
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
@@ -454,7 +454,8 @@
|
||||
// if( _that.zeyiType == 1){
|
||||
// return value
|
||||
// }
|
||||
let number = Number(value.toString().match(/^\d+(?:\.\d{0,2})?/))
|
||||
// let number = Number(value.toString().match(/^\d+(?:\.\d{0,2})?/))
|
||||
let number = Number(value).toFixed(2)
|
||||
return number
|
||||
} else {
|
||||
return '0.00'
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
</view>
|
||||
<view class="bottom text-left margin-top-xs margin-bottom-xs">
|
||||
<text class="padding-left-xs text-lg">
|
||||
<text class=" text-lg " v-if="item.volume">{{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'KG':'L'}}</text>
|
||||
<text class=" text-lg " v-if="item.volume">{{item.volume|numberFilter}} {{item.oilProductType=='GAS'?'L':'L'}}</text>
|
||||
<!-- {{item.createTime}} -->
|
||||
</text>
|
||||
</view>
|
||||
|
||||
@@ -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: '油价上报'
|
||||
},
|
||||
|
||||
]
|
||||
};
|
||||
@@ -297,7 +312,7 @@
|
||||
markerPhone(){
|
||||
if (this.sitInfo.phone) {
|
||||
uni.makePhoneCall({
|
||||
phoneNumber:this.sitInfo.phone
|
||||
phoneNumber:'4008-56-5355'
|
||||
})
|
||||
} else {
|
||||
uni.showToast({
|
||||
@@ -405,7 +420,7 @@
|
||||
this.SiteOliInfo = res.data.oil
|
||||
if(res.data.oil.length <3){
|
||||
this.showHeight = ' auto'
|
||||
}else{
|
||||
}else{
|
||||
this.showHeight = '340rpx'
|
||||
}
|
||||
uni.setStorageSync('oilSitePriceId',res.data.site.id)
|
||||
|
||||
@@ -129,8 +129,21 @@
|
||||
this.longiCheck()
|
||||
// //console.log('++++++++')
|
||||
//console.log('这里是传值处menus',this.menusList)
|
||||
this.getPosition()
|
||||
},
|
||||
methods: {
|
||||
getPosition(){
|
||||
let that = this
|
||||
uni.getLocation({
|
||||
type: 'gcj02',
|
||||
success: function(res) {
|
||||
uni.setStorage({
|
||||
key:'location',
|
||||
data:res
|
||||
})
|
||||
}
|
||||
});
|
||||
},
|
||||
changMenus(data){
|
||||
//console.log('这里是获取子级数据的地方+++++',data)
|
||||
this.menusList =data
|
||||
|
||||
@@ -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: '未知二维码',
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<view class="cu-avatar xl round text-sl headImg showIcons">
|
||||
<image src="../../static/img/new_logo.png" class='showimgs' mode=""></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="radius margin bg-white padding-top padding " style="padding-top: 125rpx;">
|
||||
<view class="">
|
||||
<view class="payStatue_text">
|
||||
|
||||
@@ -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">
|
||||
@@ -105,11 +105,11 @@
|
||||
name="input" /> -->
|
||||
|
||||
<view style="flex-grow: 1; display: flex;" @tap="showModel='show'">
|
||||
<view v-if="hz(carNumber.charAt(0))" class="sign">
|
||||
{{carNumber.charAt(0)||''}}
|
||||
<view v-if="hz( String(carNumber).charAt(0))" class="sign">
|
||||
<text v-if="carNumber">{{String(carNumber).charAt(0)||''}}</text>
|
||||
<uni-icons color="#ffffff" type="forward" size="15"></uni-icons>
|
||||
</view>
|
||||
<view class="flexcenter">{{carNumber.substr(1,6)||'请输入车牌号'}}</view>
|
||||
<view class="flexcenter">{{String(carNumber).substr(1,6)||'请输入车牌号'}}</view>
|
||||
</view>
|
||||
|
||||
<!-- <text class="cuIcon-roundclosefill text-gray"></text> -->
|
||||
@@ -168,7 +168,10 @@
|
||||
v-if="(insertResult.sitePrice -1+1)>0">￥{{ insertResult.sitePrice|numberFilter}}/{{siteData.siteType|company}}</text>
|
||||
<text class="text-blod oil-main-color" v-else>无价格</text>
|
||||
</text>
|
||||
<text style="margin-left: 75rpx; color: #222222;font-weight: bold;" >油站价格:￥{{insertResult.oilSitePrice }}/{{siteData.siteType|company }}</text>
|
||||
<text style="margin-left: 75rpx; color: #222222;font-weight: bold;" >油站价格:￥
|
||||
<text v-if="insertResult.oilSitePrice">{{insertResult.oilSitePrice}}/{{siteData.siteType|company }}</text>
|
||||
<text class="text-blod oil-main-color" v-else>无价格</text>
|
||||
</text>
|
||||
</view>
|
||||
|
||||
|
||||
@@ -203,13 +206,15 @@
|
||||
<text>约￥{{insertResult.vMoney|numberFilter}}</text>
|
||||
</view>
|
||||
<view class="cu-form-group" v-else>
|
||||
<view class="title newtitle"> {{siteData.siteType=='2'?'加气金额':'加油金额'}}</view>
|
||||
<input class="newtitle" :placeholder="`请输入${siteData.siteType=='2'?'加气金额':'加油金额'}`" @input="checkNumber" type="digit" @blur="getMoney"
|
||||
<view class="title newtitle"> {{siteData.siteType=='2'?'加气升数':'加油金额'}}</view>
|
||||
<input class="newtitle" :placeholder="`请输入${siteData.siteType=='2'?'加气升数':'加油金额'}`" @input="checkNumber" type="digit" @blur="getMoney"
|
||||
v-model="insertResult.vol" name="input" />
|
||||
<view style="width: 170rpx;text-align: end;" class="textEllipsis">
|
||||
<text class="">
|
||||
<!-- 约 {{ vlom? vlom:'xxx.x' }} L clc 注销 -->
|
||||
{{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'KG':'L'):''}}
|
||||
<text v-if="siteData.siteType!='2'">{{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + (siteData.siteType=='2'?'元':'L'):''}}</text>
|
||||
<text v-if="siteData.siteType=='2'">{{vlom?'约' + ( insertResult.vDoMoney ? insertResult.vDoMoney+insertResult.discountMoney:'') + (siteData.siteType=='2'?'元':'L'):''}}</text>
|
||||
<!-- {{vlom?'约' + ( (Math.round(vlom*100)/100).toFixed(2) ) + 'L':''}} -->
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
@@ -226,7 +231,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<button class="margin round bg-main-oil" @tap="charge">立即下单</button>
|
||||
<button :disabled="shake!==null" class="margin round bg-main-oil" @tap="charge"> {{shake==null?'立即下单':'下单中'}}</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class v-show="!beforePay&&isG7">
|
||||
@@ -373,7 +378,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)
|
||||
@@ -501,10 +506,10 @@
|
||||
getMoney(e) {
|
||||
console.log(e)
|
||||
if (e.detail.value == '') {
|
||||
uni.showToast({
|
||||
title: '请输入金额',
|
||||
icon: 'none'
|
||||
})
|
||||
// uni.showToast({
|
||||
// title: '请输入金额',
|
||||
// icon: 'none'
|
||||
// })
|
||||
return
|
||||
}
|
||||
let isNumber = this.isNumber(e.detail.value)
|
||||
@@ -537,7 +542,8 @@
|
||||
userType: uerTyps,
|
||||
xoilAmountGun: e.detail.value,
|
||||
priceId: this.activeSitePrice,
|
||||
companyId: this.siteData.companyId
|
||||
companyId: this.siteData.companyId,
|
||||
createSource:this.siteData.siteType=='2'?'XOIL':''
|
||||
}
|
||||
}
|
||||
this.xoilAmountGun = e.detail.value
|
||||
@@ -627,6 +633,7 @@
|
||||
this.changTypes = 0
|
||||
},
|
||||
charge() {
|
||||
//防抖
|
||||
clearTimeout(this.shake)
|
||||
this.shake = setTimeout(()=>{
|
||||
this.tsetPlate()
|
||||
@@ -647,6 +654,10 @@
|
||||
this.FyOrder()
|
||||
return
|
||||
}
|
||||
if (this.type == 'ANNENG') {
|
||||
this.NnOrder()
|
||||
return
|
||||
}
|
||||
if (this.testResult) {
|
||||
if (this.qrCode.substring(0, 4) == 'XING') {
|
||||
this.saveZeyiOrder()
|
||||
@@ -658,12 +669,14 @@
|
||||
title: '车牌号校验不通过',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
}
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: '您选择的油品没有油价，不能加油',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
}
|
||||
},500)
|
||||
|
||||
@@ -687,6 +700,7 @@
|
||||
title: 'qrCode为空',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
if (!data6.siteId) {
|
||||
@@ -694,6 +708,7 @@
|
||||
title: '请选择油站id',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
if (!data6.companyId) {
|
||||
@@ -701,6 +716,7 @@
|
||||
title: '请选择企业id',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
if (!data6.customerId) {
|
||||
@@ -708,6 +724,7 @@
|
||||
title: '请选择司机id',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
if (!data6.volume) {
|
||||
@@ -715,6 +732,7 @@
|
||||
title: '请输入加油体积',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
oliSiteApi.FYPay(data6).then(res => {
|
||||
@@ -741,6 +759,85 @@
|
||||
this.getPayStatus(this.orderId)
|
||||
}, 400)
|
||||
}
|
||||
// setTimeout(()=>{
|
||||
// this.shake=null
|
||||
// },1000)
|
||||
}
|
||||
})
|
||||
},//安能
|
||||
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)
|
||||
// }
|
||||
|
||||
}
|
||||
})
|
||||
@@ -764,6 +861,7 @@
|
||||
title: 'qrCode为空',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
if (!data6.siteId) {
|
||||
@@ -771,6 +869,7 @@
|
||||
title: '请选择油站id',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
if (!data6.companyId) {
|
||||
@@ -778,6 +877,7 @@
|
||||
title: '请选择企业id',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
if (!data6.customerId) {
|
||||
@@ -785,6 +885,7 @@
|
||||
title: '请选择司机id',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
if (!data6.volume) {
|
||||
@@ -792,6 +893,7 @@
|
||||
title: '请输入加油体积',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
oliSiteApi.sfPay(data6).then(res => {
|
||||
@@ -818,7 +920,9 @@
|
||||
// this.getPayStatus(this.orderId)
|
||||
// }, 400)
|
||||
// }
|
||||
|
||||
// setTimeout(()=>{
|
||||
// this.shake=null
|
||||
// },1000)
|
||||
}
|
||||
})
|
||||
},
|
||||
@@ -857,6 +961,7 @@
|
||||
title: '请选择油品',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
if (!data6.volume) {
|
||||
@@ -864,6 +969,7 @@
|
||||
title: '请输入加油体积',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
oliSiteApi.RrsPay(data6).then(res => {
|
||||
@@ -903,7 +1009,9 @@
|
||||
this.getPayStatus(this.orderId)
|
||||
}, 400)
|
||||
}
|
||||
|
||||
// setTimeout(()=>{
|
||||
// this.shake=null
|
||||
// },1000)
|
||||
}
|
||||
})
|
||||
},
|
||||
@@ -913,6 +1021,7 @@
|
||||
let PlateNumberImages = this.PlateNumberImages,
|
||||
refuellerImages = this.refuellerImages
|
||||
if (PlateNumberImages == '') {
|
||||
this.shake=null
|
||||
uni.showToast({
|
||||
icon: 'none',
|
||||
title: '请上传车辆照片'
|
||||
@@ -924,6 +1033,7 @@
|
||||
icon: 'none',
|
||||
title: '请上传油机照片'
|
||||
})
|
||||
this.shake=null
|
||||
return
|
||||
}
|
||||
var data6 = {
|
||||
@@ -950,7 +1060,7 @@
|
||||
oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请
|
||||
accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号
|
||||
siteUserName: "1", //类型：String 必有字段 备注：加油员名称
|
||||
version: 1, //类型：Number 必有字段 备注：版本号
|
||||
version: this.siteData.siteType=='2'?null:'1', //类型：Number 必有字段 备注：版本号
|
||||
xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数
|
||||
}
|
||||
} else {
|
||||
@@ -975,7 +1085,7 @@
|
||||
oilCardType: this.siteData.oilCardNature, //类型：String 必有字段 备注：油卡性质 1：个人 2：企业 3：外请
|
||||
accountCardCode: this.siteData.accountCardCode, //类型：String 必有字段 备注：油卡卡号
|
||||
siteUserName: "1", //类型：String 必有字段 备注：加油员名称
|
||||
version: 1, //类型：Number 必有字段 备注：版本号
|
||||
version: this.siteData.siteType=='2'?null:"1", //类型：Number 必有字段 备注：版本号
|
||||
xoilAmountGun: this.insertResult.vol, //类型：String 必有字段 备注：加油升数
|
||||
}
|
||||
}
|
||||
@@ -985,17 +1095,80 @@
|
||||
title: '请选择油品',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
if (!data6.volume) {
|
||||
uni.showToast({
|
||||
title: '请输入加油体积',
|
||||
icon: 'none'
|
||||
});
|
||||
if (!Number(data6.volume)) {
|
||||
if(this.siteData.siteType=='2'){
|
||||
uni.showToast({
|
||||
title: '请输入加油升数',
|
||||
icon: 'none'
|
||||
});
|
||||
}else{
|
||||
uni.showToast({
|
||||
title: '请输入加油金额',
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
let location = uni.getStorageSync('location')||{longitude:'',latitude:''};
|
||||
// if(!location){
|
||||
// let locationChenk = true
|
||||
// let that = this
|
||||
// uni.getLocation({
|
||||
// type: 'gcj02',
|
||||
// success: function(res) {
|
||||
// uni.setStorage({
|
||||
// key:'location',
|
||||
// data:res
|
||||
// })
|
||||
// },
|
||||
// fail(e) {
|
||||
// locationChenk = false
|
||||
// },
|
||||
// });
|
||||
// if(!locationChenk){
|
||||
// uni.showToast({
|
||||
// title:'请授权位置',
|
||||
// icon:'error'
|
||||
// })
|
||||
// }
|
||||
// console.log(location,'**************************************************')
|
||||
// return
|
||||
// }
|
||||
// uni.getLocation({
|
||||
// type: 'gcj02',
|
||||
// success: function(res) {
|
||||
// uni.setStorage({
|
||||
// key:'location',
|
||||
// data:res
|
||||
// })
|
||||
// },
|
||||
// fail(e) {
|
||||
// uni.showModal({
|
||||
// title:'获取定位',
|
||||
// content:'是否重新获取定位?',
|
||||
// success:function(e){
|
||||
// wx.openSetting({
|
||||
// success:function(e){
|
||||
// if (res.authSetting['scope.userLocation']){
|
||||
// console.log('******')
|
||||
// }
|
||||
// },
|
||||
// fail:function(e){
|
||||
// console.log(e,'//////')
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// },
|
||||
// });
|
||||
// return
|
||||
//
|
||||
console.log(data6, 'data6+++++')
|
||||
oliSiteApi.xoilPay(data6).then(res => {
|
||||
oliSiteApi.xoilPay(Object.assign(data6,{longitude:location.longitude,latitude:location.latitude})).then(res => {
|
||||
console.log(res)
|
||||
if (res.code === 20000) {
|
||||
uni.showToast({
|
||||
@@ -1017,7 +1190,6 @@
|
||||
// createDatetime: res.data.orderTime,
|
||||
// realamount: res.data.payRealAmount,
|
||||
// istate: res.data.orderStatus
|
||||
|
||||
// }
|
||||
// uni.setStorageSync('tempOrderInfo', data8)
|
||||
uni.setStorageSync('orderSource', 'mpxoil')
|
||||
@@ -1033,8 +1205,10 @@
|
||||
this.getPayStatus(this.orderId)
|
||||
}, 400)
|
||||
}
|
||||
|
||||
}
|
||||
setTimeout(()=>{
|
||||
this.shake=null
|
||||
},1000)
|
||||
})
|
||||
},
|
||||
// 收费则yi
|
||||
@@ -1061,6 +1235,7 @@
|
||||
title: '请选择油品',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
if (!data6.volume) {
|
||||
@@ -1068,6 +1243,7 @@
|
||||
title: '请输入加油体积',
|
||||
icon: 'none'
|
||||
});
|
||||
this.shake=null
|
||||
return false
|
||||
}
|
||||
oliSiteApi.zeyiPay(data6).then(res => {
|
||||
@@ -1108,7 +1284,9 @@
|
||||
this.getPayStatus(this.orderId)
|
||||
}, 400)
|
||||
}
|
||||
|
||||
setTimeout(()=>{
|
||||
this.shake=null
|
||||
},1000)
|
||||
}
|
||||
})
|
||||
},
|
||||
@@ -1172,7 +1350,7 @@
|
||||
oilsStationId: uni.getStorageSync('oilSiteId') //类型：String 必有字段 备注：加油站id
|
||||
}
|
||||
// }
|
||||
console.log(obj)
|
||||
console.log(obj,'**************');
|
||||
oliSiteApi.verifyQrCode(obj).then(res => {
|
||||
if (res.code === 20000) {
|
||||
this.siteData = res.data
|
||||
@@ -1316,7 +1494,7 @@
|
||||
if(e){
|
||||
return e=='2' ?'KG':'L';
|
||||
} else {
|
||||
return 'L'
|
||||
return ''
|
||||
}
|
||||
},
|
||||
moneyVolm(value) {
|
||||
|
||||
@@ -566,8 +566,12 @@
|
||||
},
|
||||
|
||||
numberFilter(value) {
|
||||
value = value - 1 + 1
|
||||
return value.toFixed(2)
|
||||
if(value){
|
||||
value = value - 1 + 1
|
||||
return value.toFixed(2)
|
||||
}else{
|
||||
return '0.00'
|
||||
}
|
||||
},
|
||||
payStateFormat(value) {
|
||||
switch (parseInt(value)) {
|
||||
|
||||
@@ -522,8 +522,13 @@
|
||||
},
|
||||
|
||||
numberFilter(value) {
|
||||
value = value - 1 + 1
|
||||
return value.toFixed(2)
|
||||
if(value){
|
||||
value = value - 1 + 1
|
||||
return value.toFixed(2)
|
||||
}else{
|
||||
return '0.00'
|
||||
}
|
||||
|
||||
},
|
||||
payStateFormat(value) {
|
||||
switch (parseInt(value)) {
|
||||
|
||||
BIN
static/img/oilPrice/add.png
Normal file
BIN
static/img/oilPrice/add.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 162 B |
BIN
static/img/oilPrice/bottom.png
Normal file
BIN
static/img/oilPrice/bottom.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 332 B |
BIN
static/img/oilPrice/oilback.png
Normal file
BIN
static/img/oilPrice/oilback.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
BIN
static/img/oilPrice/time.png
Normal file
BIN
static/img/oilPrice/time.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 843 B |
BIN
static/img/oilPrice/top.png
Normal file
BIN
static/img/oilPrice/top.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 318 B |
BIN
static/img/oilPrice/wz.png
Normal file
BIN
static/img/oilPrice/wz.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 537 B |
@@ -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.31: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({
|
||||
|
||||
Reference in New Issue
Block a user