Browse Source

upload

shopAdd
HolyKnightIX 2 years ago
parent
commit
f44d379bbd
7 changed files with 81 additions and 83 deletions
  1. +4
    -4
      pages/passCar/showDetail/showDetail.js
  2. +38
    -36
      pages/passCar/showDetail/showDetail.wxml
  3. +18
    -0
      pages/passCar/showDetail/showDetail.wxss
  4. +8
    -39
      pages/passCar/showList/showList.js
  5. +2
    -1
      pages/passCar/showList/showList.json
  6. +5
    -2
      pages/passCar/showList/showList.wxml
  7. +6
    -1
      pages/passCar/showList/showList.wxss

+ 4
- 4
pages/passCar/showDetail/showDetail.js View File

@@ -19,9 +19,10 @@ Page({
*/
onLoad(options) {
const detail = JSON.parse(options.item)
detail.payTime = this.timestampToTime(detail.payTime, 'YYYY-MM-DD hh:mm:ss')
detail.createTime = this.timestampToTime(detail.createTime, 'YYYY-MM-DD hh:mm:ss')
detail.updateTime = this.timestampToTime(detail.updateTime, 'YYYY-MM-DD hh:mm:ss')
console.log(detail, 'detail');
// detail.payTime = this.timestampToTime(detail.payTime, 'YYYY-MM-DD hh:mm:ss')
// detail.createTime = this.timestampToTime(detail.createTime, 'YYYY-MM-DD hh:mm:ss')
// detail.updateTime = this.timestampToTime(detail.updateTime, 'YYYY-MM-DD hh:mm:ss')
this.setData({
detail: detail
})
@@ -106,7 +107,6 @@ Page({
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {

},

/**


+ 38
- 36
pages/passCar/showDetail/showDetail.wxml View File

@@ -1,40 +1,42 @@
<navbar back home text="支付订单详情"></navbar>
<view style="height:{{navigationBarHeight}} "></view>
<view class="detail">
<view>
车牌号:{{detail.carNumber}}
</view>
<view>
支付金额:{{detail.payAmount}}
</view>
<view>
支付时间:{{detail.payTime}}
</view>
<view>
创建时间:{{detail.createTime}}
</view>
<view>
更新时间:{{detail.updateTime}}
</view>
<view>
微信生成的订单号:{{detail.transactionId}}
</view>
<view>
车场订单号:{{detail.parkOrderNo}}
</view>
<view>
商户收款账户:{{detail.merchantAccount}}(尾号)
</view>
<view>
商户名称:{{detail.merchantName}}
</view>
<view>
是否已通知车场:{{detail.parkNotify == 1 ? '是' : '否'}}
</view>
<view>
通知失败原因:{{detail.notifyFailReason}}
</view>
<view>
通知重试次数:{{detail.notifyCount}}
<view style="padding: 30rpx;">
<view class="detail">
<view>
车牌号: <text class="black">{{detail.carNumber}}</text>
</view>
<view>
支付金额:<text class="black">{{detail.payAmount}}</text>
</view>
<view>
支付时间:<text class="black">{{detail.payTime}}</text>
</view>
<view>
创建时间:<text class="black">{{detail.createTime}}</text>
</view>
<view>
更新时间:<text class="black">{{detail.updateTime}}</text>
</view>
<view>
微信生成的订单号:<text class="black">{{detail.transactionId}}</text>
</view>
<view>
车场订单号:<text class="black">{{detail.parkOrderNo}}</text>
</view>
<view>
商户收款账户:<text class="black">{{detail.merchantAccount}}</text>(尾号)
</view>
<view>
商户名称:<text class="black">{{detail.merchantName}}</text>
</view>
<view>
是否已通知车场:<text class="black">{{detail.parkNotify == 1 ? '是' : '否'}}</text>
</view>
<view>
通知失败原因:<text class="black">{{detail.notifyFailReason}}</text>
</view>
<view>
通知重试次数:<text class="black">{{detail.notifyCount}}</text>
</view>
</view>
</view>

+ 18
- 0
pages/passCar/showDetail/showDetail.wxss View File

@@ -1,8 +1,26 @@
/* pages/passCar/showDetail/showDetail.wxss */
page {
background-color: #f4f5f9;
font-size: 28rpx;
}

.detail {
padding: 40rpx;
background-color: #fff;
border-radius: 20rpx;
font-weight: 600;
}

.detail .flex {
display: flex;
justify-content: space-between;
}

.detail view {
margin-bottom: 50rpx;
color: #a5a5a5;
}

.detail .black {
color: #000;
}

+ 8
- 39
pages/passCar/showList/showList.js View File

@@ -1,4 +1,4 @@
const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
const navigationBarHeight = (getApp().statusBarHeight + 40) + 'px'
let config = require("../../../config/config.js");
let Http = require("../../../utils/HttpBasics");
const util = require("../../../utils/util");
@@ -11,40 +11,7 @@ Page({
*/
data: {
navigationBarHeight,
carPayOrderList: [
{
carNumber: '鄂A636VV',
payAmount: '55元',
payTime: '2023-2-20',
createTime: '2023-2-20',
updateTime: '2023-2-20',
parkNotify: 1
},
{
carNumber: '鄂A636VV',
payAmount: '55元',
payTime: '2023-2-20',
createTime: '2023-2-20',
updateTime: '2023-2-20',
parkNotify: 1
},
{
carNumber: '鄂A636VV',
payAmount: '55元',
payTime: '2023-2-20',
createTime: '2023-2-20',
updateTime: '2023-2-20',
parkNotify: 0
},
{
carNumber: '鄂A636VV',
payAmount: '55元',
payTime: '1676877157',
createTime: '1676877157',
updateTime: '1676877157',
parkNotify: 1
},
],
carPayOrderList: [],
pageNum: '1'
},

@@ -55,8 +22,9 @@ Page({
}).then(res => {
console.log(res, 'res');
res.data.list.forEach(item => {
item.payTime = this.timestampToTime(item.payTime)
item.createTime = this.timestampToTime(item.createTime)
item.payTime = this.timestampToTime(item.payTime, 'YYYY-MM-DD hh:mm:ss')
item.createTime = this.timestampToTime(item.createTime, 'YYYY-MM-DD hh:mm:ss')
item.updateTime = this.timestampToTime(item.updateTime, 'YYYY-MM-DD hh:mm:ss')
})
if (pageNum == 1) {
const tempArr = res.data.list
@@ -144,7 +112,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
// this.getList(this.data.pageNum)
this.getList(this.data.pageNum)
},

/**
@@ -179,7 +147,8 @@ Page({
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {

this.getList(this.data.pageNum);
wx.stopPullDownRefresh();
},

/**


+ 2
- 1
pages/passCar/showList/showList.json View File

@@ -5,5 +5,6 @@
"navbar": "../../../components/navbar/navbar"
},
"navigationBarTitleText": "支付订单",
"navigationBarBackgroundColor": "#F4F5F9"
"navigationBarBackgroundColor": "#F4F5F9",
"enablePullDownRefresh": true
}

+ 5
- 2
pages/passCar/showList/showList.wxml View File

@@ -1,6 +1,6 @@
<navbar back home text="支付订单"></navbar>
<view style="height:{{navigationBarHeight}} "></view>
<view class="list">
<view class="list" wx:if="{{carPayOrderList.length>0}}">
<view class="item" wx:for="{{carPayOrderList}}" wx:key="index">
<view data-item="{{item}}" bindtap="goDetial">
<view class="child">车牌号:{{item.carNumber}}</view>
@@ -10,7 +10,6 @@
<view>创建时间:{{item.createTime}}</view>
<view>支付时间:{{item.payTime}}</view>
</view>

</view>

<view class="payFee">支付金额:<text class="highLight">{{item.payAmount}}</text></view>
@@ -22,4 +21,8 @@
</view>
</view>
</view>
</view>

<view wx:else class="noOrder">
暂无支付订单
</view>

+ 6
- 1
pages/passCar/showList/showList.wxss View File

@@ -3,7 +3,12 @@ page {}

.list {
padding-top: 10rpx;
}

.noOrder {
text-align: center;
font-weight: 600;
margin-top: 50%;
}

.list .item {
@@ -22,7 +27,7 @@ page {}
.list .item .payInfo {
display: flex;
padding: 0 0 20rpx 40rpx;
border-bottom: 1px solid #d1d1d1;
border-bottom: 1px solid #f1f1f1;
}

.list .item .payInfo .parking {


Loading…
Cancel
Save