From a1d0e825ef304db2b43f61f6a84bcf2b578075b8 Mon Sep 17 00:00:00 2001
From: "geng.tang@qq.com" <foxes2004>
Date: Sat, 6 Jan 2024 15:27:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=91=E5=AE=9A=E5=92=8C?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/enum/order/DeliveryStatus.js |  3 +-
 common/enum/order/ReceiptStatus.js  |  3 +-
 pages/order/delivery.vue            |  5 ---
 pages/order/detail.vue              |  5 ++-
 pages/order/index.vue               | 58 +++++++++++++----------------
 5 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/common/enum/order/DeliveryStatus.js b/common/enum/order/DeliveryStatus.js
index ed55f95..3a24f0e 100755
--- a/common/enum/order/DeliveryStatus.js
+++ b/common/enum/order/DeliveryStatus.js
@@ -6,5 +6,6 @@ import Enum from '../enum'
  */
 export default new Enum([
   { key: 'NOT_DELIVERED', name: '未发货', value: 10 },
-  { key: 'DELIVERED', name: '已发货', value: 20 }
+  { key: 'DELIVERED', name: '已发货', value: 20 },
+  { key: 'ACCEPT', name: '已绑定', value: 20 }
 ])
diff --git a/common/enum/order/ReceiptStatus.js b/common/enum/order/ReceiptStatus.js
index 34916a0..a775b8f 100755
--- a/common/enum/order/ReceiptStatus.js
+++ b/common/enum/order/ReceiptStatus.js
@@ -6,5 +6,6 @@ import Enum from '../enum'
  */
 export default new Enum([
   { key: 'NOT_RECEIVED', name: '未收货', value: 10 },
-  { key: 'RECEIVED', name: '已收货', value: 20 }
+  { key: 'RECEIVED', name: '已收货', value: 20 },
+  { key: 'BINDED', name: '已绑定', value: 40 },
 ])
diff --git a/pages/order/delivery.vue b/pages/order/delivery.vue
index 16dda19..c7d9d94 100755
--- a/pages/order/delivery.vue
+++ b/pages/order/delivery.vue
@@ -189,14 +189,9 @@
 					phone: that.receiptPhone,
 					type: 'RECEIPT'
 				}).then(function (result) {
-					console.log(result)
 					if(result){
 						if(result.code == 0) {
 							that.$success("发送短信验证码成功")
-							that.orderSourceData = []
-							// 刷新订单列表
-							that.getData()
-							
 							that.disabled = true
 							that.setInterValFunc()
 						} else {
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 7aae80a..99bad3d 100755
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -34,8 +34,9 @@
 					<text class="state-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 == 20 && order.receiptStatus == 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 == 10">待收货</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>{{ order.stateText }}</text> -->
 				</view>
diff --git a/pages/order/index.vue b/pages/order/index.vue
index bac515d..74f1146 100755
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -13,14 +13,16 @@
 							<text class="order-time">{{ item.merchantName }}</text>
 						</view>
 						<view class="item-top-right">
-							<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.receiptStatus == 21">进行中</text>
-
+							<text class="state-text" v-if="item.payStatus == 10">待支付</text>
+							<text class="state-text" v-else-if="item.orderStatus == 40">已完成</text>
+							<view v-if="item.orderStatus == 30 && item.payStatus == 20">
+								<text class="state-text" v-if="item.deliveryStatus == DeliveryStatusEnum.DELIVERED.value">待绑定</text>
+								<text class="state-text" v-else-if="item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value">待收货</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>
 					<!-- 商品列表 -->
@@ -46,8 +48,7 @@
 									<text class="twoline-hide"
 										v-if="item.orderStatus == 30">到期时间：{{ item.expirationTime }}</text>
 									<text class="twoline-hide" v-else>下单时间：{{ item.payTime }}</text>
-									<text class="twoline-hide"
-										v-if="item.orderStatus == 30">设备编号：{{ item.equipment.equipmentCode }}</text>
+									<text class="twoline-hide">设备编号：{{ item.equipment.equipmentCode ? 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.payStatus == 10 && item.expirationDay < 0">逾期状态:
@@ -55,11 +56,6 @@
 									<text class="twoline-hide yuqi-text"
 										v-if="item.payStatus == 10 && item.expirationDay < 7 && item.expirationDay > 0">逾期状态: 即将过期</text>
 								</view>
-								<view class="goods-props clearfix">
-									<!-- <view class="goods-props-item">
-                    <text>props.value.name</text>
-                  </view> -->
-								</view>
 							</view>
 							<!-- 交易信息 -->
 							<!-- <view class="goods-trade">
@@ -89,12 +85,8 @@
 							</block>
 							<!-- 已支付进行中的订单 -->
 							<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
-                 && item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value">
+								<block v-if="item.payStatus == PayStatusEnum.SUCCESS.value && item.deliveryType == DeliveryTypeEnum.EXTRACT.value && item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value">
 									<view class="btn-item active" @click="onExtractQRCode(item.orderId)">
 										<text class="iconfont icon-qr-extract"></text>
 										<text class="m-l-10">核销码</text>
@@ -108,20 +100,22 @@
 								<view class="btn-item active" @click="onPay(item.orderId)">去支付</view>
 							</block>
 							<!-- 确认收货 -->
-							<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"
+							<block v-if="item.payStatus == PayStatusEnum.SUCCESS.value && item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.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-else @click="onReceipt(item.orderId)">确认收货</view>
+									@click="onBind(item)">绑定设备</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 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>
 								<!-- <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>
+							<view class="btn-item" @click="handleTargetDetail(item.orderId)">详情</view>
 							<block
 								v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0 && item.receiptStatus != 30">
 								<view class="btn-item" @click="handleTargetDetail(item.orderId)"
@@ -198,9 +192,9 @@
 		addOrder,
 		getOrderPayByOrderId
 	} from '@/websoft/api/order.js'
-	import {
+	/* import {
 		bindEquipment
-	} from '@/websoft/api/equipment.js'
+	} from '@/websoft/api/equipment.js' */
 	import {
 		uploadFile
 	} from '@/websoft/api/upload.js'
@@ -548,7 +542,7 @@
 					equipment,
 					bindValue
 				} = this
-				bindEquipment({
+				EquipmentApi.bindEquipment({
 					equipmentCode: bindValue,
 					orderId: equipment.orderId
 				}).then(result => {
@@ -744,8 +738,8 @@
 		font-size: 26rpx;
 		vertical-align: bottom;
 		text-align: right;
-		height: 50rpx;
-		padding-top: 20rpx;
+		height: 80rpx;
+		padding-top: 60rpx;
 		margin-bottom: 30rpx;
 
 		.unit {