// 我的名片

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyNameCardAvatarInfoCell.swift

@@ -106,6 +106,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         let view = UIView()
         view.layer.cornerRadius = 3.0
         view.backgroundColor = .white
+        view.clipsToBounds = true
         return view
     }()
     
@@ -189,12 +190,12 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         self.backgroundColor = .clear
         self.contentView.backgroundColor = .clear
         
-//        self.contentView.addSubview(self.bgImgV)
         self.contentView.addSubview(self.cardView)
         self.contentView.addSubview(self.headBgImgV)
         self.contentView.addSubview(self.headImgV)
         self.contentView.addSubview(self.signImgV)
         
+        cardView.addSubview(self.bgImgV)
         cardView.addSubview(self.nameTextView)
         cardView.addSubview(self.professionalLabel)
         cardView.addSubview(self.detailLabel)
@@ -205,9 +206,10 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
             make.top.equalTo(headWidth/2.0)
         }
         
-//        self.bgImgV.snp.makeConstraints { make in
-//            make.edges.equalTo(self.cardView)
-//        }
+        self.bgImgV.snp.makeConstraints { make in
+            make.left.right.right.equalToSuperview()
+            make.height.equalTo(160)
+        }
         
         self.editBtn.snp.makeConstraints { make in
             make.width.height.equalTo(20)

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHNameCardInfoView.swift

@@ -23,32 +23,32 @@ class YHNameCardInfoView: DragCardView {
                 self.headImgV.image = UIImage(named: "people_head_default")
             }
             self.nameLabel.text = self.userModel.username
-            var result = ""
-            var isFirst = true
-            if !self.userModel.address.city.isEmpty {
-                if isFirst {
-                    result += self.userModel.address.city
-                    isFirst = false
-                }
+            var resultArr:[String] = []
+            
+            // 城市文字
+            var cityStr = self.userModel.address.city
+            if cityStr.contains("区") {
+                cityStr = self.userModel.address.province
+            }
+            if !cityStr.isEmpty {
+                resultArr.append(cityStr)
             }
+            
+            // 职位
             if !self.userModel.position.isEmpty {
-                if isFirst {
-                    result += self.userModel.position
-                    isFirst = false
-                } else {
-                    result += " | " + self.userModel.position
-                }
+                resultArr.append(self.userModel.position)
             }
             
+            // 行业
             if !self.userModel.industry.isEmpty {
-                if isFirst {
-                    result += self.userModel.industry
-                    isFirst = false
-                } else {
-                    result += " | " + self.userModel.industry
-                }
+                resultArr.append(self.userModel.industry)
+            }
+            var resultStr = ""
+            if resultArr.count > 0 {
+                resultStr = resultArr.joined(separator: " | ")
             }
-            self.professionalLabel.text = result
+        
+            self.professionalLabel.text = resultStr
             let detail = self.userModel.signature
             self.detailLabel.text = detail
             self.grayContentView.isHidden = detail.isEmpty
@@ -98,8 +98,6 @@ class YHNameCardInfoView: DragCardView {
         return view
     }()
     
-    
-    
     lazy var signImgV:UIImageView = {
         let view = UIImageView()
         view.image = UIImage(named: "people_sign")