diff --git a/common/include/dialog_ui/js/pages/index/index.css b/common/include/dialog_ui/js/pages/index/index.css
index 997f0c8af087e0a65c72efeeddec3f8fd665cbf6..024615c3806a6534e933fafd9fa5b8585e2064fb 100644
--- a/common/include/dialog_ui/js/pages/index/index.css
+++ b/common/include/dialog_ui/js/pages/index/index.css
@@ -7,35 +7,34 @@
 }
 
 .title {
-    font-size: 80px;
+    font-size: 70px;
     line-height: 150px;
     font-weight: 800;
 }
 
 .but {
-    width: 85%;
+    width: 90%;
     margin-top: 10%;
     text-align: center;
     height: 100px;
 }
 
 .but1 {
-    width: 30%;
+    width: 70%;
     height: 80px;
-    font-size: 50px;
-    margin-left: 10%;
+    font-size: 40px;
 }
 
 .but2 {
     width: 30%;
     height: 80px;
-    font-size: 50px;
-    margin-left: 55%;
+    font-size: 40px;
+    margin-left: 10%;
 }
 
 
 .title-list {
-    font-size: 70px;
+    font-size: 60px;
     line-height: 100px;
-    font-weight: 800;
+    font-weight: 500;
 }
diff --git a/common/include/dialog_ui/js/pages/index/index.hml b/common/include/dialog_ui/js/pages/index/index.hml
index 0ab94e3af4aafb49db32d01fe08e57ae2e3c2835..4a689e272e87c59f32f11fb626795649dbb3f722 100644
--- a/common/include/dialog_ui/js/pages/index/index.hml
+++ b/common/include/dialog_ui/js/pages/index/index.hml
@@ -7,7 +7,7 @@
     </text>
     <div class="but">
     <button class="but1" onclick="onCancel" type="text">
-        取消
+        取消({{seconds}}秒)
     </button>
     <button class="but2" onclick="onConfirm" type="capsule">
         允许
diff --git a/common/include/dialog_ui/js/pages/index/index.js b/common/include/dialog_ui/js/pages/index/index.js
index 5597a1fb8ada44b09d3b87c5f8ea3a7c1461ae80..f579f6a3e554e0dcb02bd8e95b2e1e5577304402 100644
--- a/common/include/dialog_ui/js/pages/index/index.js
+++ b/common/include/dialog_ui/js/pages/index/index.js
@@ -1,12 +1,26 @@
 import router from '@ohos.router'
 
+var timel = null;
 export default {
     data: {
         message: router.getParams().targetPkgName,
+        seconds:60,
     },
     onInit() {
         console.info('getParams: ' + router.getParams());
     },
+    onShow() {
+        timel = setInterval(this.run,1000)
+    },
+    run() {
+        this.seconds--;
+        if (this.seconds == 0) {
+            clearInterval(timel);
+            timel = null;
+            console.info('click cancel');
+            callNativeHandler("EVENT_CONFIRM", "1");
+        }
+    },
     onConfirm() {
         console.info('click confirm');
         callNativeHandler("EVENT_CONFIRM", "0");
diff --git a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.css b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.css
index fc2207c2f9f7e3d00aa2e2d32073cbfbf2ea34ec..4ef6358fe1480d9328b653b36d2efc590d5e3e93 100644
--- a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.css
+++ b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.css
@@ -15,13 +15,13 @@
 .title-list {
     font-size: 60px;
     line-height: 60px;
-    font-weight: 800;
+    font-weight: 600;
 }
 
 .title-error {
     font-size: 30px;
     line-height: 40px;
-    font-weight: 800;
+    font-weight: 500;
     color: #ff0000;
 }
 
@@ -41,13 +41,13 @@
 .but1 {
     width: 30%;
     height: 80px;
-    font-size: 50px;
+    font-size: 40px;
     margin-left: 10%;
 }
 
 .but2 {
     width: 30%;
     height: 80px;
-    font-size: 50px;
+    font-size: 40px;
     margin-left: 55%;
 }
\ No newline at end of file
diff --git a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.hml b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.hml
index c8edca3fb50de19ccbca16b9436c9f148c42cafb..84f217637922f7f11220581ad95ca82c435abbf6 100644
--- a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.hml
+++ b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.hml
@@ -6,11 +6,14 @@
         请输入另一个设备显示的PIN码进行验证
     </text>
     <input class="title-pin" id="input" type="number" onchange="onChange"></input>
+    <text class="title-error" id="error" show="{{isShow}}">
+        PIN码输入错误，请重新输入(3次：还有{{isTimes}}次机会)
+    </text>
     <div class="but">
-        <button class="but1" onclick="onCancel">
+        <button class="but1" onclick="onCancel" type="text">
             取消
         </button>
-        <button class="but2" onclick="onConfirm">
+        <button class="but2" onclick="onConfirm" type="capsule">
             确定
         </button>
     </div>
diff --git a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.js b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.js
index c68e1a3dd639e7f449fd306401e046a139abdc45..514b6ec77625f87c10ea936fcd20191c9f544f72 100644
--- a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.js
+++ b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.js
@@ -6,24 +6,32 @@ var inputVal = 0;
 export default {
     data: {
         pincode: router.getParams().pinCode,
+        isShow:false,
+        isTimes:3,
     },
     onInit() {
         code = router.getParams().pinCode;
+        callNativeHandler("EVENT_CONFIRM", "2");
     },
     onChange(e){ 
         inputVal = e.value; 
     }, 
     onConfirm() {
         numbs = numbs + 1;
-        if(numbs < 3){
+        if(numbs <= 3){
             console.info('click cancel numbs < 3 ');
             console.info('code: ' + code);
             console.info('inputVal: ' + inputVal);
             if(code == inputVal){
-            console.info('click cancel code == inputVal');
-            callNativeHandler("EVENT_INPUT", "0");
+                console.info('click cancel code == inputVal');
+                callNativeHandler("EVENT_INPUT", "0");
             }else{
-            console.info('click cancel code != inputVal');
+                if(numbs == 3){
+                    callNativeHandler("EVENT_CONFIRM", "1");
+                }
+                console.info('click cancel code != inputVal');
+                this.isShow = true;
+                this.isTimes = 3 - numbs;
             }
         }else{
             console.info('click cancel numbs > 3 ');
diff --git a/ext/pin_auth/src/pin_auth_ui.cpp b/ext/pin_auth/src/pin_auth_ui.cpp
index 51f76bdb4ce70a6218f42bd8850ef686cadeea7f..9fc3459cda10a015720e9c8184833825b398c14f 100644
--- a/ext/pin_auth/src/pin_auth_ui.cpp
+++ b/ext/pin_auth/src/pin_auth_ui.cpp
@@ -68,9 +68,14 @@ int32_t PinAuthUi::InputPinDialog(int32_t code, std::shared_ptr<DmAuthManager> a
         OHOS::Rosen::WindowType::WINDOW_TYPE_SYSTEM_ALARM_WINDOW,
         ACE_X, ACE_Y, ACE_WIDTH, ACE_HEIGHT,
         [authManager](int32_t id, const std::string& event, const std::string& params) {
-            Ace::UIServiceMgrClient::GetInstance()->CancelDialog(id);
-            LOGI("CancelDialog start id:%d,event:%s,parms:%s", id, event.c_str(), params.c_str());
-            authManager->VerifyPinAuthAuthentication(params.c_str());
+            if (strcmp(params.c_str(), "2") == 0) {
+                authManager->ClosePage(id);
+            }
+            if (strcmp(params.c_str(), "0") == 0 || strcmp(params.c_str(), "1") == 0) {
+                Ace::UIServiceMgrClient::GetInstance()->CancelDialog(id);
+                LOGI("CancelDialog start id:%d,event:%s,parms:%s", id, event.c_str(), params.c_str());
+                authManager->VerifyPinAuthAuthentication(params.c_str());
+            }
         });
     LOGI("ShowConfigDialog end");
     return DM_OK;
diff --git a/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css
index 4e83197eb87599519a190b689eceb3182591d24c..08279e9a3fdc796a6018f761a1fa9777b439bab2 100644
--- a/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css
+++ b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css
@@ -15,7 +15,7 @@
 .title-list {
     font-size: 60px;
     line-height: 100px;
-    font-weight: 800;
+    font-weight: 600;
 }
 
 .title-pin {
@@ -26,6 +26,6 @@
 
 .but {
     width: 30%;
-    font-size: 50px;
+    font-size: 40px;
     height: 80px;
 }
\ No newline at end of file
diff --git a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp
index 2805e98ab691cf3c4bde1a3b792610dc008288e7..777697438f31f96c294578e5d0fbf338895e2c17 100644
--- a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp
+++ b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp
@@ -335,8 +335,6 @@ void DmAuthManager::OnGroupCreated(int64_t requestId, const std::string &groupId
 
 void DmAuthManager::OnMemberJoin(int64_t requestId, int32_t status)
 {
-    LOGI("DmAuthManager OnMemberJoin start");
-    CancelDisplay();
     LOGE("DmAuthManager OnMemberJoin start");
     if (authRequestState_ != nullptr) {
         timerMap_[ADD_TIMEOUT_TASK]->Stop(SESSION_CANCEL_TIMEOUT);
@@ -570,7 +568,7 @@ void DmAuthManager::AuthenticateFinish()
         }
 
         if (authResponseContext_->state == AuthState::AUTH_REQUEST_INPUT) {
-            CancelDisplay();
+            Ace::UIServiceMgrClient::GetInstance()->CancelDialog(authResponseContext_->aceId);
         }
 
         listener_->OnAuthResult(authRequestContext_->hostPkgName, authRequestContext_->deviceId,