From 176d0372385428f4c28de9e887083571c8f05662 Mon Sep 17 00:00:00 2001
From: "471615499@qq.com" <sy996996@>
Date: Fri, 27 Sep 2024 21:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

取消后允许编辑
---
 .../meetingReservation/meetingReservation.js  | 42 ++++++++-----------
 .../meetingRecord/meetingRecord.js            |  1 +
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js
index 119fe64..696c896 100644
--- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js
+++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js
@@ -41,31 +41,7 @@ Page({
         value: null,
       },
       personDict: {
-        list: [{
-          text: "人数",
-          value: null
-        }, {
-          text: "0-10",
-          value: 1
-        }, {
-          text: "11-20",
-          value: 2
-        }, {
-          text: "21-30",
-          value: 3
-        }, {
-          text: "31-40",
-          value: 4
-        }, {
-          text: "41-50",
-          value: 5
-        }, {
-          text: "50-100",
-          value: 6
-        }, {
-          text: "100以上",
-          value: 7
-        }],
+        list: [],
         value: null,
       },
       itemDict: {
@@ -170,6 +146,22 @@ Page({
         value: null
       }, ...typeList]
       queryParam.shapeDict.list = typeList
+
+      let numList = []
+      for (let key in dataObj.personNum) {
+        let eachObj = dataObj.personNum[key]
+        // const keys = Object.keys(eachObj)
+        numList.push({
+          text: eachObj,
+          value: eachObj
+        })
+      }
+      numList = [{
+        text: "人数",
+        value: null
+      }, ...numList]
+      queryParam.personDict.list = numList
+
       _this.setData({
         queryParam
       })
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
index 6950dcf..02ee55a 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js
@@ -317,6 +317,7 @@ Page({
         // 取消
         // 状态字体颜色
         statusColor = "#333333"
+        showEdit = true
         statusName = '已取消'
       }
       if (statusValue == 3) {