From a3e91dcb8ce76e50c669046d179d1233b7a52d10 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 16 Oct 2024 23:09:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                                         |  9 +++
 mixins/order.js                                    |  4 +-
 pages/index/order.vue                              |  2 +-
 .../components/product/submitUnitSelect.vue        |  1 +
 pages_order/order/damageReport.vue                 | 91 ++++++++++++++--------
 pages_order/order/orderDetail.vue                  |  2 +-
 6 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/api/api.js b/api/api.js
index 8c3fb5d..cd89b66 100644
--- a/api/api.js
+++ b/api/api.js
@@ -267,6 +267,15 @@ const config = {
 		limit: 500,
 		auth: true,
 	},
+	// 订单详情列表
+	detailList: {
+	// order/detail/list
+		url: '/order/detail/list',
+		method: 'GET',
+		showLoading : true,
+		limit: 500,
+		auth: true,
+	},
 	// 根据商品id获取规格
 	goodsSku: {
 		url: '/goods/sku',
diff --git a/mixins/order.js b/mixins/order.js
index 2f6ad27..791e5b6 100644
--- a/mixins/order.js
+++ b/mixins/order.js
@@ -4,10 +4,10 @@ export default {
 	methods: {
 		// 酒店支付订单
 		payOrder(id, orderId, replacePay){
+			console.log(id, orderId);
 			let self = this
 			this.$api(replacePay ? 'replacePay' : 'orderPay', {
-				id,
-				orderId
+				id : replacePay ? orderId : id,
 			}, res => {
 				if (res.code == 200) {
 					uni.requestPayment({
diff --git a/pages/index/order.vue b/pages/index/order.vue
index a2b65f8..68589ea 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -103,7 +103,7 @@
 					<template v-if="item.status == 5">
 						<view @click.stop="orderConfirmedDamage(item, 1)" class="b2"
 						>
-							确认无破损
+							确认下一步
 						</view>
 						
 						<!-- <view @click.stop="$utils.navigateTo
diff --git a/pages_order/components/product/submitUnitSelect.vue b/pages_order/components/product/submitUnitSelect.vue
index c2f6add..b2736d5 100644
--- a/pages_order/components/product/submitUnitSelect.vue
+++ b/pages_order/components/product/submitUnitSelect.vue
@@ -231,6 +231,7 @@
 				this.$api('cartAdd', {
 					id: this.detail.id,
 					skuId: this.unit.id,
+					num : this.num,
 				}, res => {
 					if (res.code == 200) {
 						uni.showToast({
diff --git a/pages_order/order/damageReport.vue b/pages_order/order/damageReport.vue
index 98de3f8..e706291 100644
--- a/pages_order/order/damageReport.vue
+++ b/pages_order/order/damageReport.vue
@@ -3,42 +3,55 @@
 	<view class="help">
 		<navbar title="破损上报" leftClick @leftClick="$utils.navigateBack" />
 		
-		<view class="flex">
-			<view class="server-item"
-			v-for="(p, i) in order.orderDetails"
-			:key="i">
-		
-				<view class="img-box">
-					<image :src="p.pic" mode="aspectFill"></image>
-				</view>
-		
-				<view class="server-info">
-		
-					<view class="server-title">
-						产品名称：{{p.goodsName}}
+			
+		<uv-radio-group 
+		@change="change"
+		v-model="form.orderDetailId">
+			<view class="flex">
+				<view class="server-item"
+				v-for="(p, i) in list"
+				:key="i">
+			
+					<view class="radio">
+						<uv-radio :name="p.id" 
+						:disabled="!!p.status"
+						activeColor="#FA5A0A" size="40rpx"
+						icon-size="35rpx"></uv-radio>
 					</view>
-		
-					<view class="sales-volume" style="margin-top: 5px;">
-						<view class="desc">规格：{{p.sku}}</view>
+			
+					<view class="img-box">
+						<image :src="p.pic" mode="aspectFill"></image>
 					</view>
-		
-					<view class="sales-volume" style="margin-top: 5px;">
-						<view class="desc">数量：{{p.num}}</view>
+			
+					<view class="server-info">
+			
+						<view class="server-title">
+							产品名称：{{p.goodsName}}
+						</view>
+			
+						<view class="sales-volume" style="margin-top: 5px;">
+							<view class="desc">规格：{{p.sku}}</view>
+						</view>
+			
+						<view class="sales-volume" style="margin-top: 5px;">
+							<view class="desc">数量：{{p.num}}</view>
+						</view>
+			
 					</view>
-		
+			
 				</view>
-		
 			</view>
-		</view>
+		</uv-radio-group>
+		
 		
-		<!-- <view class="type">
+		<view class="type">
 			<span>破损数量</span>
 			<span>
 				<uv-number-box 
 				v-model="form.num" :min="1" 
-				:max="order.num"></uv-number-box>
+				:max="max"></uv-number-box>
 			</span>
-		</view> -->
+		</view>
 		
 		<view class="help-box">
 			<view>
@@ -81,11 +94,13 @@
 			return {
 				fileList: [],
 				form : {
+					orderDetailId : 0,
 					num : 1,
 					info : '',
 				},
-				order: {},
+				list: {},
 				orderId: 0,
+				max : 1,
 			}
 		},
 		onLoad(agrs) {
@@ -95,6 +110,13 @@
 			this.getData()
 		},
 		methods: {
+			change(e){
+				this.list.forEach(n => {
+					if(n.id == e){
+						this.max = n.num
+					}
+				})
+			},
 			deleteImage(e){
 				this.fileList.splice(e.index, 1)
 			},
@@ -110,24 +132,25 @@
 			},
 			// 查询订单详情
 			getData() {
-				this.$api('orderOne', {
+				this.$api('detailList', {
 					id: this.orderId
 				}, res => {
 					uni.stopPullDownRefresh()
 					if (res.code == 200) {
-						this.order = res.result
+						this.list = res.result
 					}
 				})
 			},
 			submit(){
 				this.form.pic = this.fileList.map(item=>item.url).join(",")
 				if (this.$utils.verificationAll(this.form, {
+						orderDetailId : '请选择产品',
 						info: '请输入破损的细节部位',
 						pic: '请上传图片',
 					})) {
 					return
 				}
-				this.orderConfirmedDamage(this.order, 2, this.form, 
+				this.orderConfirmedDamage({id : this.orderId}, 2, this.form, 
 				() => {
 					uni.redirectTo({
 						url:'/pages/index/order'
@@ -144,12 +167,19 @@
 			display: flex;
 			flex-wrap: wrap;
 			align-items: center;
-			justify-content: space-between;
 			background: white;
 			border-radius: 15rpx;
 			box-sizing: border-box;
 			margin: 30rpx;
 			width: 690rpx;
+			
+			.radio{
+				width: 100rpx;
+				height: 180rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
 		
 			.img-box {
 				width: 180rpx;
@@ -167,7 +197,6 @@
 				display: flex;
 				flex-direction: column;
 				justify-content: space-around;
-				width: calc(100% - 180rpx);
 				box-sizing: border-box;
 				padding: 10rpx 15rpx;
 		
diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue
index 1ad2502..a9e98d8 100644
--- a/pages_order/order/orderDetail.vue
+++ b/pages_order/order/orderDetail.vue
@@ -39,7 +39,7 @@
 					<template v-if="order.status == 5">
 						<view @click.stop="orderConfirmedDamage(order, 1)"
 						>
-							确认无破损
+							确认下一步
 						</view>
 						
 						<view @click.stop="$utils.navigateTo