Compare commits
2 Commits
6150eb2b67
...
lc
| Author | SHA1 | Date | |
|---|---|---|---|
|
8ecd248e26 | ||
|
|
05622744a9 |
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name" : "星油云站",
|
||||
"appid" : "__UNI__EA8D131",
|
||||
"appid" : "__UNI__F1ED4B9",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.0",
|
||||
"versionCode" : "100",
|
||||
|
||||
103
package-lock.json
generated
103
package-lock.json
generated
@@ -1,109 +1,8 @@
|
||||
{
|
||||
"name": "lsm_oil_site",
|
||||
"version": "1.0.0",
|
||||
"lockfileVersion": 2,
|
||||
"lockfileVersion": 1,
|
||||
"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",
|
||||
|
||||
@@ -30,9 +30,9 @@
|
||||
<view class="margin text-center">
|
||||
<button class="cu-btn round bg-main-oil lg text-lg" open-type="getPhoneNumber"
|
||||
@getphonenumber="decryptPhoneNumber">
|
||||
<!-- <text class="cuIcon-weixin padding-right-xs"> </text> -->
|
||||
<text class="cuIcon-weixin padding-right-xs"> </text>
|
||||
<text>
|
||||
手机号快捷登录
|
||||
微信用户一键登录
|
||||
</text>
|
||||
</button>
|
||||
<!-- <button class="cu-btn round btnSize" open-type="getPhoneNumber"
|
||||
|
||||
@@ -21,21 +21,18 @@
|
||||
<text>请勿离开当前页面,等待支付完成</text>
|
||||
</view>
|
||||
<view class="payStatue_p" v-if="payState == 2">
|
||||
<button style="width: 500upx;margin-bottom: 40upx;" v-if="payState == 2"
|
||||
class="round large cu-btn bg-main-oil" @tap="singleCheck(orderId)">手动刷新</button>
|
||||
<button style="width: 500upx;margin-bottom: 40upx;" v-if="payState == 2" class="round large cu-btn bg-main-oil" @tap="singleCheck(orderId)">手动刷新</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class="margin-bottom-sm" @tap="copyId(orderInfos.customerId,'司机编号')">
|
||||
司机编号
|
||||
<text class="fr">{{orderInfos.customerId}}<text :class="orderInfos.customerId?'cuIcon-copy':''"
|
||||
class="flex-sub padding-left-sm text-right text-lg text-red">
|
||||
<text class="fr">{{orderInfos.customerId}}<text :class="orderInfos.customerId?'cuIcon-copy':''" class="flex-sub padding-left-sm text-right text-lg text-red">
|
||||
</text></text>
|
||||
</view>
|
||||
<view class="margin-bottom-sm">
|
||||
加油司机
|
||||
<view class="fr">
|
||||
<text>{{ orderInfos.customerName ? orderInfos.customerName : '丰油用户' }}</text> <text
|
||||
class="padding-left-sm">{{orderInfos.plateNumber|plateFilter}}
|
||||
<text>{{ orderInfos.customerName ? orderInfos.customerName : '丰油用户' }}</text> <text class="padding-left-sm">{{orderInfos.plateNumber|plateFilter}}
|
||||
</text>
|
||||
</view>
|
||||
|
||||
@@ -98,8 +95,7 @@
|
||||
<view class="radius bg-white margin margin-bottom-0 padding">
|
||||
<view class="margin-bottom-sm" @tap="copyId(orderInfos.orderSerialNumber,'订单号')">
|
||||
订单号
|
||||
<text class=" fr">{{orderInfos.orderSerialNumber}}<text
|
||||
class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
|
||||
<text class=" fr">{{orderInfos.orderSerialNumber}}<text class="flex-sub padding-left-sm text-right cuIcon-copy text-lg text-red">
|
||||
</text></text>
|
||||
</view>
|
||||
<view class="margin-bottom-sm">
|
||||
@@ -138,12 +134,9 @@
|
||||
<!-- <button v-show="formQr" @tap="scanQr" class="bg-main-oil margin-bottom">
|
||||
<text class="cuIcon-scan padding-right-xs"></text>
|
||||
继续加油</button> -->
|
||||
<button v-if="payState == 1" class="round large cu-btn bg-main-oil btn-oils"
|
||||
@tap="toDetails(orderId)">前往订单</button>
|
||||
<button v-if="payState == 2" class="round large cu-btn bg-main-oil btn-oils"
|
||||
@tap="getScanning()">重新扫码下单</button>
|
||||
<button v-if="payState != 0" class="round large cu-btn bg-main-oil btn-oils"
|
||||
@tap="gotoHome()">返回首页</button>
|
||||
<button v-if="payState == 1" class="round large cu-btn bg-main-oil btn-oils" @tap="toDetails(orderId)">前往订单</button>
|
||||
<button v-if="payState == 2" class="round large cu-btn bg-main-oil btn-oils" @tap="getScanning()">重新扫码下单</button>
|
||||
<button v-if="payState != 0" class="round large cu-btn bg-main-oil btn-oils" @tap="gotoHome()">返回首页</button>
|
||||
<!-- <button class="bg-red light margin-bottom" @tap="backHome">
|
||||
<text class="cuIcon-home padding-right-xs"></text>
|
||||
返回首页</button> -->
|
||||
@@ -221,8 +214,7 @@
|
||||
orderInfos:{}
|
||||
}
|
||||
},
|
||||
filters: {
|
||||
numberFormat(value) {
|
||||
filters:{numberFormat(value) {
|
||||
if (value != 'xxx.x') {
|
||||
console.log('old:',value)
|
||||
let realAmount =value.toFixed(2)
|
||||
@@ -259,13 +251,15 @@
|
||||
getScanning(){ //支付取消 或失败 前往重新下单
|
||||
uni.redirectTo({
|
||||
url: '/pages/stationDetail/stationDetail',
|
||||
fail: (err) => {}
|
||||
fail: (err) => {
|
||||
}
|
||||
})
|
||||
},
|
||||
gotoHome(){ // 返回首页
|
||||
uni.reLaunch({
|
||||
url: '/pages/index/index',
|
||||
fail: (err) => {}
|
||||
fail: (err) => {
|
||||
}
|
||||
})
|
||||
},
|
||||
singleCheck(ids){ //单独调用check 订单状态
|
||||
@@ -273,7 +267,7 @@
|
||||
oilFinanceApi.checkOrderState(ids).then( (res)=>{
|
||||
console.log(res)
|
||||
if(res.code == 20000){
|
||||
_that.displayMoney = res.data.sitePriceAmount
|
||||
_that.displayMoney =res.data.payRealAmount
|
||||
_that.orderInfos = res.data
|
||||
console.log(_that.orderInfos)
|
||||
_that.payState = res.data.orderStatus
|
||||
@@ -378,7 +372,6 @@
|
||||
page{
|
||||
background-color: #efefef;
|
||||
}
|
||||
|
||||
.page-content {
|
||||
background-color: #f1f2f7;
|
||||
min-height: 100%;
|
||||
@@ -436,7 +429,6 @@
|
||||
display: block;
|
||||
border-radius: 0 0 0 100upx;
|
||||
}
|
||||
|
||||
.payStatue_text{
|
||||
font-size: 36rpx;
|
||||
color: #737373;
|
||||
@@ -445,7 +437,6 @@
|
||||
text-align: center;
|
||||
margin-top: 6rpx;
|
||||
}
|
||||
|
||||
.payStatue_p{
|
||||
font-size: 26rpx;
|
||||
color: #888888;
|
||||
@@ -454,7 +445,6 @@
|
||||
margin-bottom: 30rpx;
|
||||
margin-top: 20rpx;
|
||||
}
|
||||
|
||||
.btn-oils{
|
||||
width: 100%;
|
||||
border-radius: 14rpx;
|
||||
@@ -463,17 +453,14 @@
|
||||
/* padding: 14rpx; */
|
||||
height: 80rpx;
|
||||
}
|
||||
|
||||
.showimgs{
|
||||
width: 130rpx;
|
||||
height: 130rpx;
|
||||
}
|
||||
|
||||
.boxsings_main_top{
|
||||
position: relative;
|
||||
margin-top: 90rpx;
|
||||
}
|
||||
|
||||
.showIcons{
|
||||
background-color: #fff;
|
||||
background-size: cover;
|
||||
|
||||
Reference in New Issue
Block a user