From 742f7d11557526038d332e60a8c8ca18177bc4e4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 十月 2023 15:51:58 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/card/double-data-card/options.jsx |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/menu/components/card/double-data-card/options.jsx b/src/menu/components/card/double-data-card/options.jsx
index 3bdc566..1941d17 100644
--- a/src/menu/components/card/double-data-card/options.jsx
+++ b/src/menu/components/card/double-data-card/options.jsx
@@ -91,6 +91,7 @@
       controlFields: [
         {field: 'selected', values: ['radio', 'checkbox']},
         {field: 'selStyle', values: ['radio', 'checkbox']},
+        {field: 'pickup', values: ['radio', 'checkbox']},
       ],
     },
     {
@@ -125,6 +126,19 @@
     },
     {
       type: 'radio',
+      field: 'pickup',
+      label: '鏀惰捣寮�鍏�',
+      initval: wrap.pickup || 'false',
+      tooltip: '鏁版嵁鍗″彸涓婅浼氭樉绀烘敹璧峰紑鍏炽��',
+      required: false,
+      options: [
+        {value: 'false', label: '鏃�'},
+        {value: 'true', label: '鏈�'},
+      ],
+      forbid: appType === 'mob'
+    },
+    {
+      type: 'radio',
       field: 'parity',
       label: '濂囧伓鑳屾櫙',
       initval: wrap.parity || 'false',

--
Gitblit v1.8.0