merged

src/qml/components/JobTicketProcess.qml

@@ -286,33 +286,19 @@ Rectangle {
                     }
                 }
             }
-<<<<<<< HEAD
-
-            onVisibleChanged: {
-                if (visible) {
-                    InteractiveCAN.updateKeyAndLockStatus();
-                }
-            }
-=======
->>>>>>> 6eebf46312ef459bc45c100787bb5fe9667b57ed
         }
         Rectangle {
             width: stackLayout.width
             height: stackLayout.height
             color: "transparent"
 
-<<<<<<< HEAD
-            // 第二步提示文字（居中显示，优化样式和排版）
-            Rectangle {
-                id: __lockTipsContainer
-=======
             onVisibleChanged: {
                 InteractiveCAN.updateKeyAndLockStatus();
             }
 
-            MButton {
-                id: __lockTips
->>>>>>> 6eebf46312ef459bc45c100787bb5fe9667b57ed
+            // 第二步提示文字（居中显示，优化样式和排版）
+            Rectangle {
+                id: __lockTipsContainer
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.top: parent.top
                 anchors.topMargin: 120  // 向下调整，从40改为120