// 城市显示

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

@@ -28,10 +28,18 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
                 self.headImgV.image = UIImage(named: "people_head_default")
             }
             
-            let city = self.userModel.address.city
-            self.cityLabel.text = city
-            let cityWidth = self.getWith(font: self.cityLabel.font, height: 20, string: city)
+            var cityStr = self.userModel.address.city
+            var specialArea = ["北京市", "上海市", "天津市", "重庆市", "香港", "澳门", "台湾"]
+            for provinceName in specialArea {
+                if self.userModel.address.province.contains(provinceName) {
+                    cityStr = self.userModel.address.province
+                    break
+                }
+            }
+            self.cityLabel.text = cityStr
+            let cityWidth = self.getWith(font: self.cityLabel.font, height: 20, string: cityStr)
             self.cityLabel.frame = CGRectMake(0, 0, cityWidth+8, 20)
+            
             self.zodiacLabel.text = self.userModel.zodiac
             self.signImgV.isHidden = !self.userModel.isSigned
 
@@ -39,7 +47,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
             let cityTag: ASAttributedString = "  \(.view(self.cityLabel, .original(.center)))"
             let zodiacTag: ASAttributedString = "  \(.view(self.zodiacLabel, .original(.center)))"
             
-            if !self.userModel.address.city.isEmpty {
+            if !cityStr.isEmpty {
                 name += cityTag
             }
             if !self.userModel.zodiac.isEmpty {

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

@@ -27,8 +27,12 @@ class YHNameCardInfoView: DragCardView {
             
             // 城市文字
             var cityStr = self.userModel.address.city
-            if cityStr.contains("区") {
+            var specialArea = ["北京市", "上海市", "天津市", "重庆市", "香港", "澳门", "台湾"]
+            for provinceName in specialArea {
+                if self.userModel.address.province.contains(provinceName) {
                     cityStr = self.userModel.address.province
+                    break
+                }
             }
             if !cityStr.isEmpty {
                 resultArr.append(cityStr)