1，地址列表，提交订单页面显示国家

iCemarose/Class/UI/ShopCart/Cell/KWMAddressCell.m

@@ -24,10 +24,10 @@
         _address = address;
         _lbName.text = address.lastName;
         _lbPhone.text = address.phone;
-        if(address.province != nil){
-            _lbAddress.text = [NSString stringWithFormat:@"%@, %@",address.city,address.province];
+        if(address.province){//省份有可能为空
+            _lbAddress.text = [NSString stringWithFormat:@"%@, %@, %@",address.city,address.province,address.country];
         }else{
-            _lbAddress.text = address.city;
+            _lbAddress.text = [NSString stringWithFormat:@"%@, %@",address.city,address.country];
         }
         _lbAddressDetail.text = [NSString stringWithFormat:@"%@  %@",address.address1,address.address2 == nil?@"":address.address2];
     }

iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m

@@ -103,12 +103,12 @@
         self.lbNoAddress.hidden = YES;
         _lbName.text = address.lastName;
         _lbPhone.text = address.phone;
-        if(address.province != nil){
+        if(address.province){ //省份有可能为空
             //城市 省份
-            _lbAddress.text = [NSString stringWithFormat:@"%@, %@",address.city,address.province];
+            _lbAddress.text = [NSString stringWithFormat:@"%@, %@, %@",address.city,address.province,address.country];
         }else{
             //具体地址 补充
-            _lbAddress.text = address.city;
+            _lbAddress.text = [NSString stringWithFormat:@"%@, %@",address.city,address.country];
         }
         _lbAddressDetail.text = [NSString stringWithFormat:@"%@  %@",address.address1,address.address2 == nil?@"":address.address2];
         self.lbShippingRate.textColor = [UIColor sam_colorWithHex:@"393939"];