Merge remote-tracking branch 'origin/main'

@@ -9,17 +9,18 @@ export struct MergeRecordDialog {
   build() {
     Column() {
       Text("合并游客记录到当前账号，可避免信息丢失")
-        .fontColor("#222222")
+        .fontColor("#333333")
         .fontSize(18)
         .width("100%")
         .fontWeight(FontWeight.Bold)
         .textAlign(TextAlign.Center)
-        .margin({ top: 20 })
+        .margin({ top: 25 })
+        .padding({left:24,right:24})
 
-      Divider().color("#999999").width("100%").margin({ top: 20 }).height('1vp')
+      Divider().color("#08000000").width("100%").margin({ top: 20 }).height('2vp')
       Row() {
         Text('取消')
-          .fontSize(16)
+          .fontSize(18)
           .fontColor("#648DF2")
           .layoutWeight(1)
           .fontWeight(FontWeight.Medium)
@@ -31,28 +32,22 @@ export struct MergeRecordDialog {
             }
 
           })
-          .height('100%')
-        // Divider().color("#999999").height('100%').width('0.5vp')
+          .height(50)
+        Divider().color("#eeeeee").height(44).width(1).margin({top:3}).strokeWidth(1).vertical(true)
         Text('一键合并')
-          .fontSize(16)
+          .fontSize(18)
           .fontColor("#648DF2")
           .layoutWeight(1)
           .fontWeight(FontWeight.Medium)
           .textAlign(TextAlign.Center)
-          .border({
-            width: { left: 1 },
-            color: "#999999",
-            style: { left: BorderStyle.Solid }
-
-          })
           .onClick(() => {
             this.controller.close()
             if (this.confirm) {
               this.confirm()
             }
           })
-          .height('100%')
+          .height(50)
       }.layoutWeight(1).justifyContent(FlexAlign.Center)
-    }.height(140).backgroundColor(Color.White).borderRadius(10).width('74%')
+    }.height(140).backgroundColor(Color.White).borderRadius(14).width('75%')
   }
 }
\ No newline at end of file