2 Achegas 4cc23449bf ... 692ca0332e

Autor SHA1 Mensaxe Data
  tangchao 692ca0332e Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew hai 2 días
  tangchao 6f3f75d33f 【综合】7天领取流程调试 hai 2 días

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.swift

@@ -1051,7 +1051,7 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
                         if success {
                             KMProductCompareWC.shared.orientation = false
                             let winC = KMProductCompareWC.shared
-                            if self.convertType == .Word || convertType == .AdvancedWord {
+                            if self.convertType == .Word || self.convertType == .AdvancedWord {
                                 winC.kEventName = "Reading_PDFtoWord_BuyNow"
                             } else if self.convertType == .Excel {
                                 winC.kEventName = "Reading_PDFtoExcel_BuyNow"

+ 1 - 1
PDF Office/PDF Master/MemberCenter/ViewModel/DMG/KMOpenDMGPopBootModel.swift

@@ -10,7 +10,7 @@ import Foundation
 @objcMembers
 class KMOpenDMGPopBootModel: ObservableObject {
     func getVipFree() -> Void {
-        
+        KMLoginWindowsController.shared.showWindow(nil)
     }
     
     func signUpAction() -> Void {

+ 7 - 2
PDF Office/PDF Master/MemberCenter/WindowsController/DMG/KMOpenDMGPopupBootWC.swift

@@ -64,8 +64,13 @@ class KMOpenDMGPopupBootWC: NSWindowController {
         signInTextView.isSelectable = true
         signInTextView.textColor = NSColor.black
         signInTextView.font = NSFont.SFProTextRegularFont(12)
-        signInTextView.bounds = signInTextView.enclosingScrollView?.contentView.bounds ?? .zero
-        signInTextView.autoresizingMask = [.width, .height]
+
+        if let _ =  signInTextView.superview {
+            signInTextView.km_add_left_constraint()
+            signInTextView.km_add_top_constraint()
+            signInTextView.km_add_trailing_constraint()
+            signInTextView.km_add_height_constraint(constant: 30)
+        }
         let tipsString = NSLocalizedString("Already have an account? %@", tableName: "MemberCenterLocalizable", comment: "")
         let specialOffer = NSLocalizedString("Sign in", tableName: "MemberCenterLocalizable", comment: "")
         let fullString = String(format: tipsString, specialOffer)