From 533898960745e3c234adc96b7f6d191ae6e4a1c1 Mon Sep 17 00:00:00 2001
From: lcaidm <lichen139@huawei.com>
Date: Mon, 14 Feb 2022 17:25:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=80=92=E8=AE=A1=E6=97=B6/?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=EF=BC=8C=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lcaidm <lichen139@huawei.com>
---
 .../include/dialog_ui/js/pages/index/index.css   | 16 ++++++++--------
 .../include/dialog_ui/js/pages/index/index.hml   |  2 +-
 common/include/dialog_ui/js/pages/index/index.js | 14 ++++++++++++++
 .../dialog_ui/js/pages/index/index.css           | 10 +++++-----
 .../dialog_ui/js/pages/index/index.hml           |  7 +++++--
 .../dialog_ui/js/pages/index/index.js            |  6 +++++-
 .../dialog_ui/js/pages/index/index.css           |  4 ++--
 7 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/common/include/dialog_ui/js/pages/index/index.css b/common/include/dialog_ui/js/pages/index/index.css
index 997f0c8af..c33aa3aa6 100644
--- a/common/include/dialog_ui/js/pages/index/index.css
+++ b/common/include/dialog_ui/js/pages/index/index.css
@@ -7,35 +7,35 @@
 }
 
 .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;
+    font-size: 40px;
     margin-left: 10%;
 }
 
 .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 0ab94e3af..4a689e272 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 5597a1fb8..f579f6a3e 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 fc2207c2f..98f9c4fdc 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;
+    font-size: 20px;
     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 c8edca3fb..84f217637 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 c68e1a3dd..e0939720e 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,6 +6,8 @@ var inputVal = 0;
 export default {
     data: {
         pincode: router.getParams().pinCode,
+        isShow:false,
+        isTimes:3,
     },
     onInit() {
         code = router.getParams().pinCode;
@@ -15,7 +17,7 @@ export default {
     }, 
     onConfirm() {
         numbs = numbs + 1;
-        if(numbs < 3){
+        if(numbs <= 3){
             console.info('click cancel numbs < 3 ');
             console.info('code: ' + code);
             console.info('inputVal: ' + inputVal);
@@ -24,6 +26,8 @@ export default {
             callNativeHandler("EVENT_INPUT", "0");
             }else{
             console.info('click cancel code != inputVal');
+            this.isShow = true;
+            this.isTimes = 3 - numbs;
             }
         }else{
             console.info('click cancel numbs > 3 ');
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 4e83197eb..08279e9a3 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
-- 
Gitee