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

galaxy/galaxy/Classes/Modules/Plan(方案)/C/YHCustomerInformationQuestionnaireVC.swift

@@ -140,9 +140,9 @@ class YHCustomerInformationQuestionnaireVC: YHBaseViewController {
             make.left.equalToSuperview()
             make.right.equalToSuperview()
             make.top.equalToSuperview()
-            make.bottom.equalTo(bottomView.snp.top).offset(-24)
+            make.bottom.equalTo(bottomView.snp.top).offset(-8)
         }
-        tableView.contentInset = UIEdgeInsets(top: imageHeight - 110, left: 0, bottom: 0, right: 0)
+        tableView.contentInset = UIEdgeInsets(top: imageHeight - 115, left: 0, bottom: 0, right: 0)
         tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 0.01))
     }
 

galaxy/galaxy/Classes/Modules/Plan(方案)/C/YHSurveyMatchResultViewController.swift

@@ -78,7 +78,7 @@ class YHSurveyMatchResultViewController: YHBaseViewController {
         button.addTarget(self, action: #selector(matchButtonClicked), for: .touchUpInside)
         button.backgroundColor = .mainTextColor
         button.setTitleColor(.white, for: .normal)
-        button.titleLabel?.font = .PFSC_R(ofSize: 14)
+        button.titleLabel?.font = .PFSC_M(ofSize: 16)
         button.layer.cornerRadius = 3
         button.clipsToBounds = true
         return button

galaxy/galaxy/Classes/Modules/Plan(方案)/C/YHSurveySubmitDoneViewController.swift

@@ -77,7 +77,7 @@ class YHSurveySubmitDoneViewController: YHBaseViewController {
         view.addSubview(backHomeButton)
         topImageView.snp.makeConstraints { make in
             make.width.equalTo(127)
-            make.height.equalTo(92)
+            make.height.equalTo(127)
             make.top.equalToSuperview().offset(129 + k_Height_NavigationtBarAndStatuBar)
             make.centerX.equalToSuperview()
         }

galaxy/galaxy/Res/Assets.xcassets/Plan/plan_question_submitted.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "plan_question_submitted@2x.png",
+      "filename" : "提交成功@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "plan_question_submitted@3x.png",
+      "filename" : "提交成功@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Plan/plan_question_top_new.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "plan_question_top_new@2x.png",
+      "filename" : "问卷头图-新客户@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "plan_question_top_new@3x.png",
+      "filename" : "问卷头图-新客户@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Plan/plan_question_top_old.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "plan_question_top_old@2x.png",
+      "filename" : "问卷头图-老客户@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "plan_question_top_old@3x.png",
+      "filename" : "问卷头图-老客户@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }