【综合】合并代码

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLoginLeftImageView.swift

@@ -62,7 +62,7 @@ class KMLoginLeftImageView: KMBaseXibView {
             image = NSImage(named: "image_registerSuccess")!
 //            self.subscriptionButton.isHidden = true
         default:
-            image = NSImage(named: "image_other")!
+            image = NSImage(named: "image_Popup")!
 //            self.subscriptionButton.isHidden = false
         }
         self.imageView.image = image

PDF Office/PDF Master/Class/KMLightMember/Source/KMLightMember.xcassets/image_Popup.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Popup.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}