b2894lxlx/yunxinwei-uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

乱七八糟

Browse Source
This commit is contained in:
weicw
2023-10-23 15:21:33 +08:00
parent 0256bd355d
commit 686c1ae304
29 changed files with 2571 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
pages/order/index.vue
View File

@@ -13,12 +13,14 @@
<text class="order-time">{{ item.merchantName }}</text>
</view>
<view class="item-top-right">
<text class="state-text" v-if="item.payStatus == 20 && (item.receiptStatus == 30 || item.currPeriods >= item.periods)">已完成</text>
<text class="state-text" v-if="item.orderStatus == 40">已完成</text>
<text class="state-text" v-else-if="item.payStatus == 10">待支付</text>
<text class="state-text" v-else-if="item.payStatus == 20 && item.receiptStatus == 10">待绑定</text>
<text class="state-text" v-else-if="item.orderStatus == 30 && item.receiptStatus == 20">进行中</text>
<text class="state-text"
v-else-if="item.payStatus == 20 && item.receiptStatus == 10">待绑定</text>
<text class="state-text"
v-else-if="item.orderStatus == 30 && item.receiptStatus == 20">进行中</text>
<text class="state-text" v-else-if="item.receiptStatus == 21">进行中</text>
</view>
</view>
<!-- 商品列表 -->
@@ -48,8 +50,10 @@
v-if="item.orderStatus == 30">设备编号：{{ item.equipment.equipmentCode }}</text>
<text class="twoline-hide">设备名称：{{ item.equipmentGoods.goodsName }}</text>
<text class="twoline-hide">设备型号：{{ item.equipmentGoods.batteryModel }}</text>
<text class="twoline-hide yuqi-text" v-if="item.expirationDay < 0">逾期状态: (已逾期{{ Math.abs(item.expirationDay) }}天)</text>
<text class="twoline-hide yuqi-text" v-if="item.expirationDay < 7 && item.expirationDay > 0">逾期状态: 即将过期</text>
<text class="twoline-hide yuqi-text" v-if="item.expirationDay < 0">逾期状态:
(已逾期{{ Math.abs(item.expirationDay) }}天)</text>
<text class="twoline-hide yuqi-text"
v-if="item.expirationDay < 7 && item.expirationDay > 0">逾期状态: 即将过期</text>
</view>
<view class="goods-props clearfix">
<!-- <view class="goods-props-item">
@@ -106,7 +110,9 @@
<!-- 确认收货 -->
<block
v-if="item.payStatus == PayStatusEnum.SUCCESS.value && item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value && item.receiptStatus == ReceiptStatusEnum.NOT_RECEIVED.value">
<view class="btn-item active" v-if="(item.orderSourceData && JSON.parse(item.orderSourceData).length == 5) || item.equipmentGoods.equipmentCategory == '10'" @click="onBind(item)">绑定设备</view>
<view class="btn-item active"
v-if="(item.orderSourceData && JSON.parse(item.orderSourceData).length == 5) || item.equipmentGoods.equipmentCategory == '10'"
@click="onBind(item)">绑定设备</view>
<view class="btn-item active" v-else @click="chooseImage(item.orderId)">确认收货</view>
</block>
<!-- 订单评价 -->
@@ -120,7 +126,7 @@
v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0 && item.receiptStatus != 30">
<view class="btn-item" @click="handleTargetDetail(item.orderId)"
v-if="item.equipmentGoods.equipmentCategory != '10' && !orderEnd">我要续费 </view>
</block>
</view>
</view>
@@ -189,7 +195,8 @@
pageOrder,
removeOrder,
receiptOrder,
addOrder
addOrder,
getOrderPayByOrderId
} from '@/websoft/api/order.js'
import {
bindEquipment
@@ -197,33 +204,37 @@
import {
uploadFile
} from '@/websoft/api/upload.js'
import { fileUrl } from '@/config.js';
import {
createOrderNo,dateFormat
import {
fileUrl
} from '@/config.js';
import {
createOrderNo,
dateFormat
} from '@/utils/util.js'
// 每页记录数量
const pageSize = 15
// tab栏数据
const tabs = [{
name: `全部`,
value: 'all'
}, {
name: `待支付`,
value: 'payment'
},
{
name: `待绑定`,
value: 'delivery'
},
{
name: `进行中`,
value: 'comment'
},
{
name: `已完成`,
value: 'refund'
}]
name: `全部`,
value: 'all'
}, {
name: `待支付`,
value: 'payment'
},
{
name: `待绑定`,
value: 'delivery'
},
{
name: `进行中`,
value: 'comment'
},
{
name: `已完成`,
value: 'refund'
}
]
export default {
components: {
@@ -319,7 +330,7 @@ import {
app.curTab = index > -1 ? index : 0
}
},
/**
* 上拉加载的回调 (页面初始化时也会执行一次)
* 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10
@@ -367,20 +378,21 @@ import {
app.where.userId = uni.getStorageSync('userId');
app.where.isRenew = 0;
app.where.isApp = true;
app.where.isFreeze = 1;
pageOrder(app.where).then(res => {
app.list = res.data.list
const curPageLen = res.data.list.length
const totalSize = res.data.count
console.log("totalSize: ", totalSize);
app.mescroll.endBySize(curPageLen, totalSize)
app.list.map((d,index) => {
app.list.map((d, index) => {
const setTime = new Date(d.expirationTime);
const nowTime = new Date();
const restSec = setTime.getTime() - nowTime.getTime();
// 剩余天数
const day = parseInt(restSec / (60*60*24*1000));
console.log("逾期天数: ",Math.abs(day));
const day = parseInt(restSec / (60 * 60 * 24 * 1000));
console.log("逾期天数: ", Math.abs(day));
app.list[index].expirationDay = day
})
})
@@ -561,9 +573,14 @@ import {
// 点击去支付
onPay(orderId) {
this.$navTo('pages/checkout/cashier/index', {
orderId
getOrderPayByOrderId(orderId).then(res => {
this.$navTo('pages/checkout/cashier/index', {
orderId: res.data.id
})
})
},
// 跳转到订单详情页
@@ -821,8 +838,8 @@ import {
margin-top: 30rpx;
}
}
.yuqi-text{
.yuqi-text {
color: #ff0000;
}
</style>
</style>