From eb791f6d27d0264a01cb9b4e6dceae9927396893 Mon Sep 17 00:00:00 2001
From: jevononlie <728254585@qq.com>
Date: Thu, 9 May 2024 17:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=A1=B5=E9=9D=A2fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/dzOrder/dzOrder.vue     |  4 ++--
 src/pages/timeOrder/timeOrder.vue | 35 ++++++++++++++++++-------------
 src/payment/detail/detail.vue     |  4 ++--
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/pages/dzOrder/dzOrder.vue b/src/pages/dzOrder/dzOrder.vue
index d53bbbd..35ef797 100644
--- a/src/pages/dzOrder/dzOrder.vue
+++ b/src/pages/dzOrder/dzOrder.vue
@@ -104,7 +104,7 @@ const handlePayment = async () => {
   }
   const arrFlag = siteProductList.value.map((q) => {
     const childFlag = q.children.some(q => {
-      return q?.productActualWeight
+      return q?.productActualWeight && q?.actualRecoveryPrice
     })
     return childFlag
   })
@@ -160,7 +160,7 @@ const handlePayment = async () => {
     uni.showToast({
       icon: 'none',
       duration: 3000,
-      title: '请输入商品的实际重量',
+      title: '请输入商品完整的实际重量或实际价格',
     })
   }
 }
diff --git a/src/pages/timeOrder/timeOrder.vue b/src/pages/timeOrder/timeOrder.vue
index 615c3b4..669e9e0 100644
--- a/src/pages/timeOrder/timeOrder.vue
+++ b/src/pages/timeOrder/timeOrder.vue
@@ -2,7 +2,7 @@
  * @Author: 王文杰
  * @Date: 2024-01-25 10:55:51
  * @LastEditors: jevononlie 728254585@qq.com
- * @LastEditTime: 2024-05-09 16:10:52
+ * @LastEditTime: 2024-05-09 17:40:46
  * @FilePath: /app-nx-recycle/src/payment/success/success.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -167,11 +167,13 @@ const sumVal = computed(() => {
 const handlePayment = async () => {
   const arrFlag = siteProductList.value.map((q) => {
     const childFlag = q.children?.some(q => {
-      return q?.productActualWeight
+      return q?.productActualWeight && q?.actualRecoveryPrice
     })
     return childFlag
   })
   const flag = arrFlag.some((e) => e)
+
+
   if (flag) {
     uni.showModal({
       title: '提示',
@@ -209,7 +211,7 @@ const handlePayment = async () => {
     uni.showToast({
       icon: 'none',
       duration: 3000,
-      title: '请输入商品的实际重量',
+      title: '请输入商品完整的实际重量或实际价格',
     })
   }
 }
@@ -299,17 +301,22 @@ const popupShow = (item) => {
   }
   popupWeight.value.open()
 }
-const popupClose = () => {
-  const flag = Number(categoryVal.value)
-  if (flag) {
-    siteProductList.value.forEach((q) => {
-      q.children?.forEach((e) => {
-        if (e.id == activeItem.value.id) {
-          e.productActualWeight = categoryVal.value
-        }
+// 关闭
+const handelPopChange = (e) => {
+  if (!e.show) {
+    const flag = Number(categoryVal.value)
+    if (flag) {
+      siteProductList.value.forEach((q) => {
+        q.children?.forEach((e) => {
+          if (e.id == activeItem.value.id) {
+            e.productActualWeight = categoryVal.value
+          }
+        })
       })
-    })
+    }
   }
+}
+const popupSave = () => {
   popupWeight.value.close()
 }
 const popupAdd = () => {
@@ -423,11 +430,11 @@ const popupDel = (idx) => {
         </view>
         <view class="pay-action" @click="handlePayment"> 确认结算 </view>
       </uni-popup>
-      <uni-popup ref="popupWeight" :mask-click="false" type="right" background-color="#fff">
+      <uni-popup ref="popupWeight" type="right" background-color="#fff" @change="handelPopChange">
         <view class="popup-root">
           <view class="title">
             <view class="text">多次称重(单位Kg)</view>
-            <view class="close" @click="popupClose">保存</view>
+            <view class="close" @click="popupSave">保存</view>
           </view>
           <view class="popup-cont">
             <view class="weight-item" v-for="(item, index) in weightArr" :key="item.id">
diff --git a/src/payment/detail/detail.vue b/src/payment/detail/detail.vue
index ab88e73..e858c18 100644
--- a/src/payment/detail/detail.vue
+++ b/src/payment/detail/detail.vue
@@ -62,7 +62,7 @@ const isLoadingPay = ref(false)
 const handlePayment = async () => {
   const arrFlag = siteProductList.value.map((q) => {
     const childFlag = q.children.some(q => {
-      return q?.productActualWeight
+      return q?.productActualWeight && q?.actualRecoveryPrice
     })
     return childFlag
   })
@@ -109,7 +109,7 @@ const handlePayment = async () => {
     uni.showToast({
       icon: 'none',
       duration: 3000,
-      title: '请输入商品的实际重量',
+      title: '请输入商品完整的实际重量或实际价格',
     })
   }
 }