Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHFormItemExpireDateCell.swift

@@ -89,8 +89,10 @@ class YHFormItemExpireDateCell: UITableViewCell {
         btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(UIColor.mainTextColor, for: .normal)
         btn.iconInLeft(spacing: 6)
-        btn.setImage(UIImage(named: "form_square_unselect"), for: .normal)
-        btn.setImage(UIImage(named: "form_square_select"), for: .selected)
+        let unselectImg = UIImage(named: "login_privacy_disagree")
+        let selectImg = UIImage(named: "login_privacy_agree")
+        btn.setImage(unselectImg, for: .normal)
+        btn.setImage(selectImg, for: .selected)
         return btn
     }()
     

galaxy/galaxy/Res/Assets.xcassets/Form/form_square_select.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Group 3040@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

galaxy/galaxy/Res/Assets.xcassets/Form/form_square_unselect.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "Rectangle 2471@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}