From a64a5707d2573c042cd9bb16d6f7fecba9a38291 Mon Sep 17 00:00:00 2001
From: xuqingkai <xuqingkai@hd123.com>
Date: Tue, 23 Jul 2024 13:49:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8DButton?=
 =?UTF-8?q?=E4=B8=BAdisabled=E7=8A=B6=E6=80=81=E6=97=B6=E4=BB=8D=E8=83=BD?=
 =?UTF-8?q?=E8=A7=A6=E5=8F=91open-type=E6=8C=87=E5=AE=9A=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Closes: #458
---
 docs/component/button.md                         |  2 ++
 .../wd-privacy-popup/wd-privacy-popup.vue        | 16 +++++++++-------
 .../wot-design-uni/components/wd-button/types.ts | 11 +++++++----
 .../components/wd-button/wd-button.vue           |  4 ++--
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/docs/component/button.md b/docs/component/button.md
index 1bfba96b4..588800c50 100644
--- a/docs/component/button.md
+++ b/docs/component/button.md
@@ -119,6 +119,8 @@
 | app-parameter | 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效 | string | - | - | - |
 | show-message-card	| 是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，用户点击后可以快速发送小程序消息，open-type="contact"时有效 | boolean | - | false | - |
 | classPrefix | 类名前缀，用于使用自定义图标，参见[icon](/component/icon#自定义图标) | string | - | 'wd-icon' | 0.1.27 |
+| button-id | 按钮的唯一标识，可用于设置隐私同意授权按钮的id | string | - | - | $LOWEST_VERSION$ |
+
 ## Events
 
 | 事件名称 | 说明 | 参数 | 最低版本 |
diff --git a/src/components/wd-privacy-popup/wd-privacy-popup.vue b/src/components/wd-privacy-popup/wd-privacy-popup.vue
index 4c3b43aa8..3aa1cdbfc 100644
--- a/src/components/wd-privacy-popup/wd-privacy-popup.vue
+++ b/src/components/wd-privacy-popup/wd-privacy-popup.vue
@@ -11,17 +11,19 @@
         <text>{{ subDesc }}</text>
       </view>
       <view class="wd-privacy-popup__footer">
-        <button class="wd-privacy-popup__footer-disagree wd-button is-block is-round is-medium is-plain" id="disagree-btn" @click="handleDisagree">
+        <wd-button custom-class="wd-privacy-popup__footer-disagree " size="medium" round plain buttonId="disagree-btn" @click="handleDisagree">
           拒绝
-        </button>
-        <button
-          class="wd-privacy-popup__footer-agree wd-button is-primary is-block is-round is-medium"
-          id="agree-btn"
+        </wd-button>
+        <wd-button
+          class="wd-privacy-popup__footer-agree"
+          round
+          size="medium"
+          buttonId="agree-btn"
           open-type="agreePrivacyAuthorization"
           @agreeprivacyauthorization="handleAgree"
         >
           同意
-        </button>
+        </wd-button>
       </view>
     </wd-popup>
   </view>
@@ -51,7 +53,7 @@ interface Props {
 withDefaults(defineProps<Props>(), {
   title: '用户隐私保护提示',
   desc: '感谢您使用本应用，您使用本应用的服务之前请仔细阅读并同意',
-  subDesc: '。当您点击同意并开始时用产品服务时，即表示你已理解并同息该条款内容，该条款将对您产生法律约束力。如您拒绝，将无法使用相应服务。',
+  subDesc: '。当您点击同意并开始使用产品服务时，即表示你已理解并同息该条款内容，该条款将对您产生法律约束力。如您拒绝，将无法使用相应服务。',
   protocol: '《用户隐私保护指引》'
 })
 const emit = defineEmits(['agree', 'disagree'])
diff --git a/src/uni_modules/wot-design-uni/components/wd-button/types.ts b/src/uni_modules/wot-design-uni/components/wd-button/types.ts
index ca6f192d9..74e0e5fb1 100644
--- a/src/uni_modules/wot-design-uni/components/wd-button/types.ts
+++ b/src/uni_modules/wot-design-uni/components/wd-button/types.ts
@@ -1,10 +1,10 @@
 /*
  * @Author: weisheng
  * @Date: 2024-03-15 11:36:12
- * @LastEditTime: 2024-07-19 21:31:44
+ * @LastEditTime: 2024-07-23 11:38:09
  * @LastEditors: weisheng
  * @Description:
- * @FilePath: /wot-design-uni/src/uni_modules/wot-design-uni/components/wd-button/types.ts
+ * @FilePath: \wot-design-uni\src\uni_modules\wot-design-uni\components\wd-button\types.ts
  * 记得注释
  */
 import type { ExtractPropTypes } from 'vue'
@@ -63,7 +63,6 @@ export const buttonProps = {
    * 开放能力
    */
   openType: String,
-  formType: String,
   /**
    * 指定是否阻止本节点的祖先节点出现点击态
    */
@@ -95,7 +94,11 @@ export const buttonProps = {
   /**
    * 是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，用户点击后可以快速发送小程序消息，open-type="contact"时有效
    */
-  showMessageCard: Boolean
+  showMessageCard: Boolean,
+  /**
+   * 按钮的唯一标识，可用于设置隐私同意授权按钮的id
+   */
+  buttonId: String
 }
 
 export type ButtonProps = ExtractPropTypes<typeof buttonProps>
diff --git a/src/uni_modules/wot-design-uni/components/wd-button/wd-button.vue b/src/uni_modules/wot-design-uni/components/wd-button/wd-button.vue
index 38a16ac26..75db3076d 100644
--- a/src/uni_modules/wot-design-uni/components/wd-button/wd-button.vue
+++ b/src/uni_modules/wot-design-uni/components/wd-button/wd-button.vue
@@ -1,5 +1,6 @@
 <template>
   <button
+    :id="buttonId"
     :hover-class="`${disabled || loading ? '' : 'wd-button--active'}`"
     :style="customStyle"
     :class="[
@@ -16,7 +17,7 @@
     ]"
     :hover-start-time="hoverStartTime"
     :hover-stay-time="hoverStayTime"
-    :open-type="openType"
+    :open-type="disabled || loading ? '' : openType"
     :send-message-title="sendMessageTitle"
     :send-message-path="sendMessagePath"
     :send-message-img="sendMessageImg"
@@ -25,7 +26,6 @@
     :session-from="sessionFrom"
     :lang="lang"
     :hover-stop-propagation="hoverStopPropagation"
-    :form-type="formType"
     @click="handleClick"
     @getuserinfo="handleGetuserinfo"
     @contact="handleConcat"