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

修复绑定和确认收货问题

Browse Source
This commit is contained in:
geng.tang@qq.com
2024-01-06 15:27:56 +08:00
parent da5a7dfa05
commit a1d0e825ef
5 changed files with 33 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/enum/order/DeliveryStatus.js
View File

@@ -6,5 +6,6 @@ import Enum from '../enum'
*/ */
export default new Enum([ export default new Enum([
{ key: 'NOT_DELIVERED', name: '未发货', value: 10 }, { key: 'NOT_DELIVERED', name: '未发货', value: 10 },
{ key: 'DELIVERED', name: '已发货', value: 20 } { key: 'DELIVERED', name: '已发货', value: 20 },
{ key: 'ACCEPT', name: '已绑定', value: 20 }
]) ])

3
common/enum/order/ReceiptStatus.js
View File

@@ -6,5 +6,6 @@ import Enum from '../enum'
*/ */
export default new Enum([ export default new Enum([
{ key: 'NOT_RECEIVED', name: '未收货', value: 10 }, { key: 'NOT_RECEIVED', name: '未收货', value: 10 },
{ key: 'RECEIVED', name: '已收货', value: 20 } { key: 'RECEIVED', name: '已收货', value: 20 },
{ key: 'BINDED', name: '已绑定', value: 40 },
]) ])

5
pages/order/delivery.vue
View File

@@ -189,14 +189,9 @@
phone: that.receiptPhone, phone: that.receiptPhone,
type: 'RECEIPT' type: 'RECEIPT'
}).then(function (result) { }).then(function (result) {
console.log(result)
if(result){ if(result){
if(result.code == 0) { if(result.code == 0) {
that.$success("发送短信验证码成功") that.$success("发送短信验证码成功")
that.orderSourceData = []
// 刷新订单列表
that.getData()
that.disabled = true that.disabled = true
that.setInterValFunc() that.setInterValFunc()
} else { } else {

5
pages/order/detail.vue
View File

@@ -34,8 +34,9 @@
<text class="state-text" <text class="state-text"
v-if="order.payStatus == 20 && (order.receiptStatus == 30 || ( order.equipmentGoods.equipmentCategory != 10 && order.currPeriods >= order.periods))">已完成</text> v-if="order.payStatus == 20 && (order.receiptStatus == 30 || ( order.equipmentGoods.equipmentCategory != 10 && order.currPeriods >= order.periods))">已完成</text>
<text class="state-text" v-else-if="order.payStatus == 10">待支付</text> <text class="state-text" v-else-if="order.payStatus == 10">待支付</text>
<text class="state-text" v-else-if="order.payStatus == 20 && order.receiptStatus == 10">待绑定</text> <text class="state-text" v-else-if="order.orderStatus == 30 && order.payStatus == 20 && order.deliveryStatus == 10">待收货</text>
<text class="state-text" v-else-if="order.orderStatus == 30 && order.receiptStatus == 20">进行中</text> <text class="state-text" v-else-if="order.orderStatus == 30 && order.payStatus == 20 && order.deliveryStatus == 20">待绑定</text>
<text class="state-text" v-else-if="order.orderStatus == 30 && order.deliveryStatus == 20">进行中</text>
<text class="state-text" v-else-if="order.receiptStatus == 21">进行中</text> <text class="state-text" v-else-if="order.receiptStatus == 21">进行中</text>
<!-- <text>{{ order.stateText }}</text> --> <!-- <text>{{ order.stateText }}</text> -->
</view> </view>

56
pages/order/index.vue
View File

@@ -13,14 +13,16 @@
<text class="order-time">{{ item.merchantName }}</text> <text class="order-time">{{ item.merchantName }}</text>
</view> </view>
<view class="item-top-right"> <view class="item-top-right">
<text class="state-text" v-if="item.orderStatus == 40">已完成</text> <text class="state-text" v-if="item.payStatus == 10">待支付</text>
<text class="state-text" v-else-if="item.payStatus == 10">待支付</text> <text class="state-text" v-else-if="item.orderStatus == 40">已完成</text>
<text class="state-text" <view v-if="item.orderStatus == 30 && item.payStatus == 20">
v-else-if="item.payStatus == 20 && item.receiptStatus == 10">待绑定</text> <text class="state-text" v-if="item.deliveryStatus == DeliveryStatusEnum.DELIVERED.value">待绑定</text>
<text class="state-text" <text class="state-text" v-else-if="item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value">待收货</text>
v-else-if="item.orderStatus == 30 && item.receiptStatus == 20">进行中</text> <!-- <text class="state-text" v-else-if="item.receiptStatus == 21">进行中</text> -->
<text class="state-text" v-else-if="item.receiptStatus == 21">进行中</text> <text class="state-text" v-else>已绑定</text>
</view>
<text class="state-text" v-if="item.payStatus == 20 && item.receiptStatus == 21">进行中</text>
</view> </view>
</view> </view>
<!-- 商品列表 --> <!-- 商品列表 -->
@@ -46,8 +48,7 @@
<text class="twoline-hide" <text class="twoline-hide"
v-if="item.orderStatus == 30">到期时间：{{ item.expirationTime }}</text> v-if="item.orderStatus == 30">到期时间：{{ item.expirationTime }}</text>
<text class="twoline-hide" v-else>下单时间：{{ item.payTime }}</text> <text class="twoline-hide" v-else>下单时间：{{ item.payTime }}</text>
<text class="twoline-hide" <text class="twoline-hide">设备编号：{{ item.equipment.equipmentCode ? item.equipment.equipmentCode : ''}}</text>
v-if="item.orderStatus == 30">设备编号：{{ item.equipment.equipmentCode }}</text>
<text class="twoline-hide">设备名称：{{ item.equipmentGoods.goodsName }}</text> <text class="twoline-hide">设备名称：{{ item.equipmentGoods.goodsName }}</text>
<text class="twoline-hide">设备型号：{{ item.equipmentGoods.batteryModel }}</text> <text class="twoline-hide">设备型号：{{ item.equipmentGoods.batteryModel }}</text>
<text class="twoline-hide yuqi-text" v-if="item.payStatus == 10 && item.expirationDay < 0">逾期状态: <text class="twoline-hide yuqi-text" v-if="item.payStatus == 10 && item.expirationDay < 0">逾期状态:
@@ -55,11 +56,6 @@
<text class="twoline-hide yuqi-text" <text class="twoline-hide yuqi-text"
v-if="item.payStatus == 10 && item.expirationDay < 7 && item.expirationDay > 0">逾期状态: 即将过期</text> v-if="item.payStatus == 10 && item.expirationDay < 7 && item.expirationDay > 0">逾期状态: 即将过期</text>
</view> </view>
<view class="goods-props clearfix">
<!-- <view class="goods-props-item">
<text>props.value.name</text>
</view> -->
</view>
</view> </view>
<!-- 交易信息 --> <!-- 交易信息 -->
<!-- <view class="goods-trade"> <!-- <view class="goods-trade">
@@ -89,12 +85,8 @@
</block> </block>
<!-- 已支付进行中的订单 --> <!-- 已支付进行中的订单 -->
<block v-if="item.orderStatus != OrderStatusEnum.APPLY_CANCEL.value"> <block v-if="item.orderStatus != OrderStatusEnum.APPLY_CANCEL.value">
<!-- <block v-if="item.payStatus == PayStatusEnum.SUCCESS.value && item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value">
<view class="btn-item" @click="onCancel(item.orderId)">申请取消</view>
</block> -->
<!-- 订单核销码 --> <!-- 订单核销码 -->
<block v-if="item.payStatus == PayStatusEnum.SUCCESS.value && item.deliveryType == DeliveryTypeEnum.EXTRACT.value <block v-if="item.payStatus == PayStatusEnum.SUCCESS.value && item.deliveryType == DeliveryTypeEnum.EXTRACT.value && item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value">
&& item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value">
<view class="btn-item active" @click="onExtractQRCode(item.orderId)"> <view class="btn-item active" @click="onExtractQRCode(item.orderId)">
<text class="iconfont icon-qr-extract"></text> <text class="iconfont icon-qr-extract"></text>
<text class="m-l-10">核销码</text> <text class="m-l-10">核销码</text>
@@ -108,20 +100,22 @@
<view class="btn-item active" @click="onPay(item.orderId)">去支付</view> <view class="btn-item active" @click="onPay(item.orderId)">去支付</view>
</block> </block>
<!-- 确认收货 --> <!-- 确认收货 -->
<block <block v-if="item.payStatus == PayStatusEnum.SUCCESS.value && item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value">
v-if="item.payStatus == PayStatusEnum.SUCCESS.value && item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value && item.receiptStatus == ReceiptStatusEnum.NOT_RECEIVED.value"> <!-- <view class="btn-item active"
<view class="btn-item active"
v-if="(item.orderSourceData && JSON.parse(item.orderSourceData).length == 5) || item.equipmentGoods.equipmentCategory == '10'" v-if="(item.orderSourceData && JSON.parse(item.orderSourceData).length == 5) || item.equipmentGoods.equipmentCategory == '10'"
@click="onBind(item)">绑定设备</view> @click="onBind(item)">绑定设备</view> -->
<view class="btn-item active" v-else @click="onReceipt(item.orderId)">确认收货</view> <view class="btn-item active" @click="onReceipt(item.orderId)">确认收货</view>
</block>
<block v-if="item.orderStatus == 30 && item.payStatus == PayStatusEnum.SUCCESS.value && item.deliveryStatus == DeliveryStatusEnum.DELIVERED.value">
<view class="btn-item active" @click="onBind(item)">绑定设备</view>
</block> </block>
<!-- 订单评价 --> <!-- 订单评价 -->
<block v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0"> <block v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0">
<view class="btn-item" v-if="item.equipmentGoods.equipmentCategory == '40'" <view class="btn-item" v-if="item.equipmentGoods.equipmentCategory == '40' && item.deliveryStatus == DeliveryStatusEnum.ACCEPT.value"
@click="handleChangeEquipment(item.orderId,item.equipment.equipmentId)">换电</view> @click="handleChangeEquipment(item.orderId,item.equipment.equipmentId)">换电</view>
<!-- <view class="btn-item" v-if="item.equipmentGoods.equipmentCategory == '锂电池租赁' || item.equipmentGoods.equipmentCategory == '电动车租赁'" @click="handleTargetDetail(item.orderId)">续费</view> --> <!-- <view class="btn-item" v-if="item.equipmentGoods.equipmentCategory == '锂电池租赁' || item.equipmentGoods.equipmentCategory == '电动车租赁'" @click="handleTargetDetail(item.orderId)">续费</view> -->
<view class="btn-item" @click="handleTargetDetail(item.orderId)">详情</view>
</block> </block>
<view class="btn-item" @click="handleTargetDetail(item.orderId)">详情</view>
<block <block
v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0 && item.receiptStatus != 30"> v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0 && item.receiptStatus != 30">
<view class="btn-item" @click="handleTargetDetail(item.orderId)" <view class="btn-item" @click="handleTargetDetail(item.orderId)"
@@ -198,9 +192,9 @@
addOrder, addOrder,
getOrderPayByOrderId getOrderPayByOrderId
} from '@/websoft/api/order.js' } from '@/websoft/api/order.js'
import { /* import {
bindEquipment bindEquipment
} from '@/websoft/api/equipment.js' } from '@/websoft/api/equipment.js' */
import { import {
uploadFile uploadFile
} from '@/websoft/api/upload.js' } from '@/websoft/api/upload.js'
@@ -548,7 +542,7 @@
equipment, equipment,
bindValue bindValue
} = this } = this
bindEquipment({ EquipmentApi.bindEquipment({
equipmentCode: bindValue, equipmentCode: bindValue,
orderId: equipment.orderId orderId: equipment.orderId
}).then(result => { }).then(result => {
@@ -744,8 +738,8 @@
font-size: 26rpx; font-size: 26rpx;
vertical-align: bottom; vertical-align: bottom;
text-align: right; text-align: right;
height: 50rpx; height: 80rpx;
padding-top: 20rpx; padding-top: 60rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
.unit { .unit {