7 Commits

Author SHA1 Message Date
xiaozhiyong
6150eb2b67 更新 2023-07-24 10:16:59 +08:00
xiaozhiyong
1da4c2de7a 更新 2023-07-04 16:54:48 +08:00
xiaozhiyong
7be8276544 格式化 2023-07-04 16:54:24 +08:00
ea5b71c1ae Merge pull request 'g7加油逻辑' (#5) from lc into master
Reviewed-on: #5
2023-04-07 08:46:47 +00:00
fb2f8fcd64 Merge pull request 'g7加油逻辑' (#4) from lc into master
Reviewed-on: #4
2023-04-06 07:08:07 +00:00
c916caf705 Merge pull request 'g7加油逻辑' (#3) from ccaolc into master
Reviewed-on: #3
2023-04-03 08:30:06 +00:00
dcac2db1fa Merge pull request 'ccaolc' (#2) from ccaolc into master
Reviewed-on: #2
2022-11-09 08:28:34 +00:00
2 changed files with 213 additions and 200 deletions

View File

@@ -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"

View File

@@ -21,18 +21,21 @@
<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>
@@ -95,7 +98,8 @@
<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">
@@ -134,9 +138,12 @@
<!-- <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> -->
@@ -214,7 +221,8 @@
orderInfos: {}
}
},
filters:{numberFormat(value) {
filters: {
numberFormat(value) {
if (value != 'xxx.x') {
console.log('old:', value)
let realAmount = value.toFixed(2)
@@ -251,15 +259,13 @@
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 订单状态
@@ -267,7 +273,7 @@
oilFinanceApi.checkOrderState(ids).then((res) => {
console.log(res)
if (res.code == 20000) {
_that.displayMoney =res.data.payRealAmount
_that.displayMoney = res.data.sitePriceAmount
_that.orderInfos = res.data
console.log(_that.orderInfos)
_that.payState = res.data.orderStatus
@@ -372,6 +378,7 @@
page {
background-color: #efefef;
}
.page-content {
background-color: #f1f2f7;
min-height: 100%;
@@ -429,6 +436,7 @@
display: block;
border-radius: 0 0 0 100upx;
}
.payStatue_text {
font-size: 36rpx;
color: #737373;
@@ -437,6 +445,7 @@
text-align: center;
margin-top: 6rpx;
}
.payStatue_p {
font-size: 26rpx;
color: #888888;
@@ -445,6 +454,7 @@
margin-bottom: 30rpx;
margin-top: 20rpx;
}
.btn-oils {
width: 100%;
border-radius: 14rpx;
@@ -453,14 +463,17 @@
/* padding: 14rpx; */
height: 80rpx;
}
.showimgs {
width: 130rpx;
height: 130rpx;
}
.boxsings_main_top {
position: relative;
margin-top: 90rpx;
}
.showIcons {
background-color: #fff;
background-size: cover;