From eb0cb2a0a6813299a32e4018ab9fb18fd7e1d7b0 Mon Sep 17 00:00:00 2001
From: lzhizhao <790086754@qq.com>
Date: Sat, 10 May 2025 13:48:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E7=BD=AE=E5=AE=9A=E9=87=91?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E9=80=80=E9=85=8D=E7=BD=AE=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../marketing/points-mall/popup/add-or-update.vue  |  4 ++--
 .../presale/products/popup/add-or-update.vue       |  9 +++++----
 .../presale/products/popup/view-products.vue       | 14 +++++++-------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/marketing/points-mall/popup/add-or-update.vue b/src/views/modules/marketing/points-mall/popup/add-or-update.vue
index bcdbc87..e38cfcf 100644
--- a/src/views/modules/marketing/points-mall/popup/add-or-update.vue
+++ b/src/views/modules/marketing/points-mall/popup/add-or-update.vue
@@ -312,7 +312,7 @@ export default {
       modalData: {},
       ruleForm: {
         productList: [],
-        isRefundEarnestMoney: 1, //定金可退 1是 2否
+        isRefundEarnestMoney: 1, //定金可退 1是 0
       },
       tableData: [],
       rules: {},
@@ -450,4 +450,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/presale/products/popup/add-or-update.vue b/src/views/modules/presale/products/popup/add-or-update.vue
index a2a8212..ea97f05 100644
--- a/src/views/modules/presale/products/popup/add-or-update.vue
+++ b/src/views/modules/presale/products/popup/add-or-update.vue
@@ -76,7 +76,7 @@
             <el-radio v-model="ruleForm.isRefundEarnestMoney" :label="1"
               >是</el-radio
             >
-            <el-radio v-model="ruleForm.isRefundEarnestMoney" :label="2"
+            <el-radio v-model="ruleForm.isRefundEarnestMoney" :label="0"
               >否</el-radio
             >
             <span>
@@ -406,7 +406,7 @@ export default {
       modalData: {},
       ruleForm: {
         productList: [],
-        isRefundEarnestMoney: 1 //定金可退 1是 2否
+        isRefundEarnestMoney: 1 //定金可退 1是 0
       },
       pickerOptions: {
         disabledDate(time) {
@@ -517,7 +517,7 @@ export default {
             estimatedStartDeliveryTime: '',
             estimatedEndDeliveryTime: '',
             productList: [],
-            isRefundEarnestMoney: 1 //定金可退 1是 2否
+            isRefundEarnestMoney: 1 //定金可退 1是 0
           }
           this.modalConfig.title = '新增预售'
           this.isAdd = true
@@ -546,7 +546,7 @@ export default {
         balancePaymentEndTime: row.balancePaymentEndTime,
         estimatedStartDeliveryTime: row.estimatedStartDeliveryTime,
         estimatedEndDeliveryTime: row.estimatedEndDeliveryTime,
-        isRefundEarnestMoney: row.isRefundEarnestMoney,
+        isRefundEarnestMoney: Number(row.isRefundEarnestMoney),
         productSpecificationList: row.productSpecificationList
       })
       // (this.ruleForm = {
@@ -562,6 +562,7 @@ export default {
       //   isRefundEarnestMoney: row.isRefundEarnestMoney,
       //   productSpecificationList: row.productSpecificationList,
       // }),
+      console.log(this.ruleForm)
       console.log(this.orderTime, this.arrears, this.delivery)
 
       // this.ruleForm = row;
diff --git a/src/views/modules/presale/products/popup/view-products.vue b/src/views/modules/presale/products/popup/view-products.vue
index 6d0f2e7..451ef40 100644
--- a/src/views/modules/presale/products/popup/view-products.vue
+++ b/src/views/modules/presale/products/popup/view-products.vue
@@ -38,8 +38,8 @@
               >
                 <el-date-picker
                   @change="getArrearsTime"
-                  format="yyyy-MM-dd"
-                  data-format="yyyy-MM-dd"
+                  format="yyyy-MM-dd HH:mm"
+                  data-format="yyyy-MM-dd HH:mm"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   v-model="arrears"
                   type="datetimerange"
@@ -73,7 +73,7 @@
             <el-radio v-model="ruleForm.isRefundEarnestMoney" :label="1"
               >是</el-radio
             >
-            <el-radio v-model="ruleForm.isRefundEarnestMoney" :label="2"
+            <el-radio v-model="ruleForm.isRefundEarnestMoney" :label="0"
               >否</el-radio
             >
             <span>
@@ -217,7 +217,7 @@ export default {
       modalData: {},
       ruleForm: {
         productList: [],
-        isRefundEarnestMoney: 1, //定金可退 1是 2否
+        isRefundEarnestMoney: 1, //定金可退 1是 0
       },
       pickerOptions: {
         disabledDate(time) {
@@ -264,7 +264,7 @@ export default {
             estimatedStartDeliveryTime: "",
             estimatedEndDeliveryTime: "",
             productList: [],
-            isRefundEarnestMoney: 1, //定金可退 1是 2否
+            isRefundEarnestMoney: 1, //定金可退 1是 0
           };
           this.modalConfig.title = "新增预售";
           this.isAdd = true;
@@ -293,7 +293,7 @@ export default {
         balancePaymentEndTime: row.balancePaymentEndTime,
         estimatedStartDeliveryTime: row.estimatedStartDeliveryTime,
         estimatedEndDeliveryTime: row.estimatedEndDeliveryTime,
-        isRefundEarnestMoney: row.isRefundEarnestMoney,
+        isRefundEarnestMoney: Number(row.isRefundEarnestMoney),
         productSpecificationList: row.productSpecificationList,
       }),
         console.log(this.orderTime, this.arrears, this.delivery);
@@ -381,4 +381,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-</style>
\ No newline at end of file
+</style>