卖房云 修改如下内容：1.时代芳华文案 2.上传图片问题校验https 3.团队文案

upAPP.xcodeproj/project.pbxproj

@@ -1419,6 +1419,7 @@
 		CC6A51662154F39F002A896E /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; };
 		CC6A51682154F3AA002A896E /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		CC6A516A2154F3BD002A896E /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
+		CC8E1C9225876D00002E1B2C /* 卖房云Debug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "卖房云Debug.entitlements"; sourceTree = "<group>"; };
 		CC928AFD254F9ECC00E82724 /* NewListVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewListVC.h; sourceTree = "<group>"; };
 		CC928AFE254F9ECC00E82724 /* NewListVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewListVC.m; sourceTree = "<group>"; };
 		CC928B00254FE65B00E82724 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -2607,6 +2608,7 @@
 		CC2523B221227653008CD0C5 /* upAPP */ = {
 			isa = PBXGroup;
 			children = (
+				CC8E1C9225876D00002E1B2C /* 卖房云Debug.entitlements */,
 				CC24BCA6217EAE5100568C3C /* upAPP.entitlements */,
 				CC2523E521227C68008CD0C5 /* AppDelegate */,
 				CC2523E621227C89008CD0C5 /* main */,
@@ -3282,7 +3284,7 @@
 					CC2523AF21227653008CD0C5 = {
 						CreatedOnToolsVersion = 9.2;
 						LastSwiftMigration = 1130;
-						ProvisioningStyle = Automatic;
+						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -4083,12 +4085,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-2";
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = upAPP/upAPP.entitlements;
+				CODE_SIGN_ENTITLEMENTS = "upAPP/卖房云Debug.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 10;
-				DEVELOPMENT_TEAM = N4WTU4JYW2;
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 2;
+				DEVELOPMENT_TEAM = NF8DV8S8G6;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4159,11 +4161,11 @@
 					"$(USER_LIBRARY_DIR)/Containers/com.tencent.xinWeChat/Data/Library/Application\\ Support/com.tencent.xinWeChat/2.0b4.0.9/0de5f16c63dd09a35ead8584ef85fd69/Message/MessageTemp/8c198fb4aa75625bc7b181d6dd22213c/File/归档/ShareSDK/Support/PlatformSDK/WeChatSDK",
 					"$(PROJECT_DIR)/other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.maifangyun.com;
 				PRODUCT_NAME = "卖房云";
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = 111111111;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -4181,8 +4183,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 10;
-				DEVELOPMENT_TEAM = N4WTU4JYW2;
+				CURRENT_PROJECT_VERSION = 2;
+				DEVELOPMENT_TEAM = NF8DV8S8G6;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4253,11 +4255,11 @@
 					"$(USER_LIBRARY_DIR)/Containers/com.tencent.xinWeChat/Data/Library/Application\\ Support/com.tencent.xinWeChat/2.0b4.0.9/0de5f16c63dd09a35ead8584ef85fd69/Message/MessageTemp/8c198fb4aa75625bc7b181d6dd22213c/File/归档/ShareSDK/Support/PlatformSDK/WeChatSDK",
 					"$(PROJECT_DIR)/other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.maifangyun.com;
 				PRODUCT_NAME = "卖房云";
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = mfyprovision;
+				PROVISIONING_PROFILE_SPECIFIER = 22222222;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};

upAPP.xcworkspace/xcuserdata/youke.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -559,5 +559,69 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "259BD58D-8F24-4022-806B-FBE6D5DE2911"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/Category(&#x7c7b;&#x522b;)/Common/tool/OSSImageUploader.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "80"
+            endingLineNumber = "80"
+            landmarkName = "+uploadImages:isAsync:complete:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "DDAFFA23-0903-4475-9A3A-DA770A8F68A9"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/AppDelegate/AppDelegate.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "173"
+            endingLineNumber = "173"
+            landmarkName = "-application:didReceiveRemoteNotification:fetchCompletionHandler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E81EF790-89B5-48DD-9FC6-E1EF8787CD19"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/AppDelegate/AppDelegate.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "177"
+            endingLineNumber = "177"
+            landmarkName = "-application:didReceiveRemoteNotification:fetchCompletionHandler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "FFAF69AC-A790-4CA4-85B2-8021988ED979"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/AppDelegate/AppDelegate.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "183"
+            endingLineNumber = "183"
+            landmarkName = "-userNotificationCenter:willPresentNotification:withCompletionHandler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

upAPP/Assets.xcassets/SHFH.imageset/Contents.json

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

upAPP/Category(类别)/Common/tool/OSSImageUploader.m

@@ -39,8 +39,13 @@ static NSString *kTempFolder = FOLDER;
 {
     id<OSSCredentialProvider> credential = [[OSSPlainTextAKSKPairCredentialProvider alloc] initWithPlainTextAccessKey:AccessKey                                                                                                            secretKey:SecretKey];
     
-    OSSClient *client = [[OSSClient alloc] initWithEndpoint:AliYunHost credentialProvider:credential];
-    
+    //阿里云的配置信息
+    OSSClientConfiguration *clientConfigure = [OSSClientConfiguration new];
+    clientConfigure.maxRetryCount = 3;      //网络请求遇到异常失败后的重试次数
+    clientConfigure.timeoutIntervalForRequest = 30;     //网络请求的超时时间
+    clientConfigure.timeoutIntervalForResource = 24 * 60 * 60;  //允许资源传输的最长时间
+    clientConfigure.isHttpdnsEnable = NO;
+    OSSClient *client = [[OSSClient alloc] initWithEndpoint:AliYunHost credentialProvider:credential clientConfiguration:clientConfigure];
     NSOperationQueue *queue = [[NSOperationQueue alloc] init];
     queue.maxConcurrentOperationCount = images.count;
     
@@ -52,11 +57,14 @@ static NSString *kTempFolder = FOLDER;
                 //任务执行
                 OSSPutObjectRequest * put = [OSSPutObjectRequest new];
                 put.bucketName = BucketName;
-                
+                // 配置可选字段。
                 //文件路径及名称拼接
                 NSString *imageName = [kTempFolder stringByAppendingPathComponent:[[NSUUID UUID].UUIDString stringByAppendingString:@".png"]];
                 put.objectKey = imageName;
                 put.contentType = @"image/jpeg";
+                put.uploadProgress = ^(int64_t bytesSent, int64_t totalByteSent, int64_t totalBytesExpectedToSend) {
+                    NSLog(@"%lld, %lld, %lld", bytesSent, totalByteSent, totalBytesExpectedToSend);
+                };
                 //添加到数组回传
                 [callBackNames addObject:imageName];
                 
@@ -99,3 +107,4 @@ static NSString *kTempFolder = FOLDER;
 }
 
 @end
+

upAPP/PrefixHeader(宏文件)/All_URL.h

@@ -9,14 +9,11 @@
 #ifndef All_URL_h
 #define All_URL_h
 #define upload_form_upload @"/upload/formUpload"
-//#define RootDomain @"http://api.zpb.yingshangchina.com"
 #define RootDimainForFlight @"http://api.gobonni.com/api"
-//正式环境
-//#define RootDomain @"http://api.youpuglobal.com"
 //卖房云正式环境
-#define RootDomain @"http://api.maifangyun.net"
+//#define RootDomain @"http://api.maifangyun.net"
 //卖房云测试环境
-//#define RootDomain @"http://test-api.maifangyun.net"
+#define RootDomain @"http://test-api.maifangyun.net"
 //卓琳
 //#define RootDomain @"http://192.168.1.210:8080"
 //李冰
@@ -25,18 +22,11 @@
 //#define RootDomain @"http://192.168.1.55:8200"
 //思伟
 //#define RootDomain  @"http://192.168.1.198:8200"
-//测试服务器
-//#define RootDomain @"http://59.110.226.236:9090"
 //测试H5ip
 //#define tuijiantuanduiIp  @"http://test-m.maifangyun.net"
 //卖房云线上M站
 #define tuijiantuanduiIp  @"http://m.maifangyun.net"
 
-//颜冰月ip
-//#define tuijiantuanduiIp  @"http://test-m-mpb.yingshangchina.com"
-//田瑞慈ip
-//#define tuijiantuanduiIp  @"http://192.168.1.91:8090"
-
 
 #define yanzhengma @"/sendsms"
 #define login  @"/login"

upAPP/main/Business(业务)/BusinessViewController.m

@@ -154,7 +154,7 @@
     // Do any additional setup after loading the view.
 }
 -(void)loadDataList{
-    
+    [self.dataArr removeAllObjects];
     if (_backgroundView) {
         
         [_backgroundView removeFromSuperview];

upAPP/main/Business(业务)/cell/BusinessHomeCell.m

@@ -25,7 +25,7 @@
 -(void)makeUI{
     
     _homeIamgeView = [[UIImageView alloc]init];
-    _homeIamgeView.image = [UIImage imageNamed:@"projectItem"];
+    _homeIamgeView.image = [UIImage imageNamed:@"SHFH"];
     [self.contentView addSubview:_homeIamgeView];
     [_homeIamgeView mas_makeConstraints:^(MASConstraintMaker *make) {
        
@@ -231,7 +231,7 @@
 -(void)fillData:(BussinessModel*)model{
     
     _model = model;
-   [_homeIamgeView sd_setImageWithURL:[NSURL URLWithString:_model.pictures] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+   [_homeIamgeView sd_setImageWithURL:[NSURL URLWithString:_model.pictures] placeholderImage:[UIImage imageNamed:@"SHFH"]];
     _typeNameLab.text = [NSString stringWithFormat:@"%@-累计",_model.project_type];
     _nameLab.text = _model.project_name;
     _baoBeiLab.text = _model.order_status_2;

upAPP/main/Business(业务)/cell/DealDetailCellC.xib

@@ -22,8 +22,8 @@
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dealDetailBg" translatesAutoresizingMaskIntoConstraints="NO" id="K7z-D3-Y6i">
                                 <rect key="frame" x="0.0" y="0.0" width="302" height="186"/>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公司：北京优铺网络科技有限公司" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZXc-3l-re3">
-                                <rect key="frame" x="15" y="124" width="230" height="18"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公司：北京时代芳华资产管理有限公司" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZXc-3l-re3">
+                                <rect key="frame" x="15" y="124" width="260.5" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.53725490200000003" green="0.53725490200000003" blue="0.53725490200000003" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>

upAPP/main/Me(个人中心)/Controller/LogInViewController.m

@@ -236,36 +236,41 @@
     [ProgressHUD show];
     [self.sessionManager sendPostHttpRequestWithUrl:login params:params bodyBlock:nil progress:nil success:^(NSDictionary *response) {
         [ProgressHUD hide];
-        DebugLog(@"登录成功~~~~~");
-        
-        [ToastView showToast:@"登录成功"];
-        [DKGlobal sharedInstance].token = [response objectForKeySafely:@"access-token"];
-        NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
-        [userDefaults setObject:response[@"access-token"] forKey:@"usertoken"];
-        [userDefaults synchronize];
-        
-        [DKGlobal sharedInstance].phone = response[@"memberInfo"] [@"mobile"];
-        [userDefaults setObject:response[@"memberInfo"] [@"mobile"] forKey:@"phoneNumber"];
-        [userDefaults synchronize];
-        
-        [DKGlobal sharedInstance].personalId = response[@"memberInfo"] [@"id"];
-        [userDefaults setObject:response[@"memberInfo"] [@"id"] forKey:@"personalId"];
-        [userDefaults synchronize];
-        
-        [DKGlobal sharedInstance].isProjectManager = [NSString stringWithFormat:@"%@",response[@"memberInfo"] [@"isProjectManager"]];
-        [userDefaults setObject:response[@"memberInfo"] [@"isProjectManager"] forKey:@"isProjectManager"];
-        [userDefaults synchronize];
-        
-        self.isProjectManager = [NSString stringWithFormat:@"%@",response[@"memberInfo"] [@"isProjectManager"]];
-        [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"ChangeTabbarCenter" object:nil userInfo:@{@"isProjectManager": self.isProjectManager}]];
-        
-        if ([_isLogin isEqualToString:@"1"]) {
-            [self.navigationController popViewControllerAnimated:YES];
+        NSString* code = [NSString stringWithFormat:@"%@",response[@"code"]];
+        if (code.intValue == 101){
+            DebugLog(@"登录成功~~~~~");
+                   
+           [ToastView showToast:@"登录成功"];
+           [DKGlobal sharedInstance].token = [response objectForKeySafely:@"access-token"];
+           NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+           [userDefaults setObject:response[@"access-token"] forKey:@"usertoken"];
+           [userDefaults synchronize];
+           
+           [DKGlobal sharedInstance].phone = response[@"memberInfo"] [@"mobile"];
+           [userDefaults setObject:response[@"memberInfo"] [@"mobile"] forKey:@"phoneNumber"];
+           [userDefaults synchronize];
+           
+           [DKGlobal sharedInstance].personalId = response[@"memberInfo"] [@"id"];
+           [userDefaults setObject:response[@"memberInfo"] [@"id"] forKey:@"personalId"];
+           [userDefaults synchronize];
+           
+           [DKGlobal sharedInstance].isProjectManager = [NSString stringWithFormat:@"%@",response[@"memberInfo"] [@"isProjectManager"]];
+           [userDefaults setObject:response[@"memberInfo"] [@"isProjectManager"] forKey:@"isProjectManager"];
+           [userDefaults synchronize];
+           
+           self.isProjectManager = [NSString stringWithFormat:@"%@",response[@"memberInfo"] [@"isProjectManager"]];
+           [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"ChangeTabbarCenter" object:nil userInfo:@{@"isProjectManager": self.isProjectManager}]];
+           
+           if ([_isLogin isEqualToString:@"1"]) {
+               [self.navigationController popViewControllerAnimated:YES];
+           }else{
+               [self dismissViewControllerAnimated:YES completion:^{
+               }];
+           }
+            
         }else{
-            [self dismissViewControllerAnimated:YES completion:^{
-            }];
+            [ToastView showToast: [NSString stringWithFormat:@"%@",response[@"message"]]];
         }
-        
     } failure:^(NSError *error) {
         [ProgressHUD hide];
         NSLog(@"%@",error);

upAPP/main/Me(个人中心)/Controller/MyAttentionController.m

@@ -373,7 +373,7 @@
     if (tableView == self.SalesTableView) {
         _saleModel = self.SalesListDataSource[indexPath.row];
         attentionTableViewCell *cell = [attentionTableViewCell attentionTableViewCellWithTableView:tableView];
-        [cell.iconImg sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_saleModel.pictures]] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+        [cell.iconImg sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_saleModel.pictures]] placeholderImage:[UIImage imageNamed:@"SHFH"]];
         cell.titleLabel.text =_saleModel.project_name;
         cell.adressLabel.text = _saleModel.address;
         cell.areaLabel.text = [NSString stringWithFormat:@"商业面积：%@㎡",_saleModel.acreage];
@@ -393,7 +393,7 @@
     }else if (tableView == self.InvestmentTableView){
         _saleModel = self.InvestmentListDataSource[indexPath.row];
         attentionTableViewCell *cell = [attentionTableViewCell attentionTableViewCellWithTableView:tableView];
-        [cell.iconImg sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_saleModel.pictures]] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+        [cell.iconImg sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_saleModel.pictures]] placeholderImage:[UIImage imageNamed:@"SHFH"]];
         cell.titleLabel.text =_saleModel.project_name;
         cell.adressLabel.text = _saleModel.address;
         cell.areaLabel.text = [NSString stringWithFormat:@"商业面积：%@㎡",_saleModel.acreage];

upAPP/main/Me(个人中心)/Controller/MyVipViewController.xib

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -55,17 +53,17 @@
                                         <constraint firstItem="L6n-DW-isH" firstAttribute="top" secondItem="0Yy-p7-1LR" secondAttribute="top" id="wi9-wf-0Mc"/>
                                     </constraints>
                                 </view>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="优铺昵称" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bhU-EK-QH8">
-                                    <rect key="frame" x="152.5" y="127" width="69.5" height="21"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="时代芳华昵称" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bhU-EK-QH8">
+                                    <rect key="frame" x="135.5" y="127" width="104" height="21"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fRN-en-zsP">
-                                    <rect key="frame" x="77" y="153" width="220" height="30"/>
+                                    <rect key="frame" x="77.5" y="153" width="220" height="30"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="白金会员" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kg8-P3-6Cc">
-                                            <rect key="frame" x="0.0" y="8.5" width="60" height="14.5"/>
+                                            <rect key="frame" x="0.0" y="8" width="60" height="14.5"/>
                                             <color key="backgroundColor" red="1" green="0.70588235294117641" blue="0.32941176470588235" alpha="1" colorSpace="calibratedRGB"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="60" id="aOm-7s-sgW"/>
@@ -92,7 +90,7 @@
                                     </constraints>
                                 </view>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日剩余查看次数：100" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B8k-Cu-lVW">
-                                    <rect key="frame" x="111" y="191" width="152.5" height="17"/>
+                                    <rect key="frame" x="111.5" y="191" width="152.5" height="17"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     <nil key="highlightedColor"/>

upAPP/main/Me(个人中心)/Controller/TeamProtocolController.xib

@@ -158,11 +158,11 @@
 一、协议范围
 1.     北京时代芳华资产管理有限公司（以下简称“卖房云平台”）及其关联公司提供的互联网相关服务，均受本协议约束。如果您不同意本协议的约定，您应立即停止使用发展团队电子签服务。
 2.     本协议内容包括协议正文及卖房云将要发布的关于发展团队的各类规则、公告或通知（以下合称“发展团队规则”）。所有规则均为本协议不可分割的组成部分，和协议正文具有同等法律效力。
-3.     卖房云平台有权根据发展需要制定、修改本协议的各类规则，并以包括但不限于优铺平台公示的方式进行变更告知，无需另行通知您。变更后的协议一经公布后即生效。若您在变更后未对变更内容提出疑义，即表示您已经阅读、理解并接受经修订的协议。
+3.     卖房云平台有权根据发展需要制定、修改本协议的各类规则，并以包括但不限于时代芳华平台公示的方式进行变更告知，无需另行通知您。变更后的协议一经公布后即生效。若您在变更后未对变更内容提出疑义，即表示您已经阅读、理解并接受经修订的协议。
 二、准入条件和权利义务
-1.     承诺您不是优铺平台合作公司一级人员下的团队人员，不损害第三方利益。
+1.     承诺您不是时代芳华平台合作公司一级人员下的团队人员，不损害第三方利益。
 2.     团队发展人数不低于2人（含），以卖房云APP更新数据为准。
-3.     积极参加优铺业务例会
+3.     积极参加时代芳华业务例会
 三、发展团队操作流程
 1.      点击同意本协议后，APP内生成您个人的发展二维码，新用户扫描您的发展二维码注册登录，可成功绑定到您的名下，变成您的团队成员。
 2.      已注册登录的用户，当用户无其他团队关系时，可通过扫描您的发展二维码绑定到您发展的团队。
@@ -170,12 +170,12 @@
 
 四、协议终止
 1.      卖房云有权自行决定不经事先通知的中止、终止向您提供的服务，且无须为此您或任何第三方承担任何责任。
-2.      出现以下情况时，优铺有权直接以注销账号ID的方式终止本协议。
+2.      出现以下情况时，时代芳华有权直接以注销账号ID的方式终止本协议。
 a)      您提供的用户信息内容不真实
 b)      本协议内容变更时，您明确通知卖房云平台不接受协议内容
 c)      其它卖房云认为应当终止服务的情况。
-3.      您同意，您与卖房云的协议关系终止后，优铺仍享有下列权利：
-继续保存您的用户信息及您在使用优铺平台产品期间的所有交易信息。
+3.      您同意，您与卖房云的协议关系终止后，时代芳华仍享有下列权利：
+继续保存您的用户信息及您在使用时代芳华平台产品期间的所有交易信息。
 五、争议解决及法律适用条款
 1.      本协议的成立、生效、履行、解释及纠纷解决，适用中华人民共和国大陆地区法律（不包括冲突法）。
 因本协议而产生的一切争议，卖房云平台将与您通过友好协商解决。协商不成的，您同意将纠纷或争议协议签订选择城市的人民法院管辖。</mutableString>

upAPP/main/Me(个人中心)/Controller/VipWebViewController.m

@@ -25,7 +25,7 @@
     [self.navigationView addLeftButtonWithImage:[UIImage imageNamed:@"btn_back"] clickCallBack:^(UIView *view) {
         [weakself.navigationController popViewControllerAnimated:YES];
     }];
-    [self.navigationView setTitle:@"卖房云会员"];
+    [self.navigationView setTitle:@"时代芳华会员"];
 //    self.navigationView.hidden = YES;
     CGFloat viewHeight;
     if (isFullScreen) {

upAPP/main/Me(个人中心)/Controller/brandCorrectionController.m

@@ -87,7 +87,7 @@
     self.brandNameLabel.text = self.signModel.brand_name;
     self.brandBusinessLabel.text = self.signModel.brand_business;
     self.brandAreaLabel.text = self.signModel.expand_area;
-    [self.brandImg sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",self.signModel.logo]] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+    [self.brandImg sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",self.signModel.logo]] placeholderImage:[UIImage imageNamed:@"SHFH"]];
     NSArray *arr = @[self.signModel.brand_positioning];
     [self setApartmentTag:arr];
 }

upAPP/main/Me(个人中心)/Controller/brandCorrectionController.xib

@@ -53,8 +53,8 @@
                                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="等待优铺审核" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GoB-CH-HcC">
-                                    <rect key="frame" x="261" y="95" width="74" height="14.5"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="等待时代芳华审核" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GoB-CH-HcC">
+                                    <rect key="frame" x="236.5" y="95" width="98.5" height="14.5"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>

upAPP/main/Me(个人中心)/Controller/brandManagementController.m

@@ -521,7 +521,7 @@
     _brandListModel = self.ListDataSource[indexPath.row];
     BrandTableViewCell *cell = [BrandTableViewCell BrandTableViewCellWithTableView:tableView];
     cell.selectionStyle = UITableViewCellEditingStyleNone;
-    [cell.iconImg sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_brandListModel.logo]] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+    [cell.iconImg sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_brandListModel.logo]] placeholderImage:[UIImage imageNamed:@"SHFH"]];
     if ([_brandListModel.top_flag isEqualToString:@"1"]) {
         cell.topImg.hidden = NO;
     }else{

upAPP/main/Me(个人中心)/Controller/cardManagementController.m

@@ -250,7 +250,7 @@
 {
     _cardMangeModel = self.ListDataSource[indexPath.row];
     CardManagementCell *cell = [CardManagementCell CardManagementCellWithTableView:tableView];
-    [cell.cardBgImg sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_cardMangeModel.imgUrl]] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+    [cell.cardBgImg sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_cardMangeModel.imgUrl]] placeholderImage:[UIImage imageNamed:@"SHFH"]];
     cell.numLabel.text = _cardMangeModel.cardNoShort;
     cell.selectionStyle = UITableViewCellEditingStyleNone;
     return cell;

upAPP/main/Me(个人中心)/View/BrandTableViewCell.xib

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,14 +13,14 @@
             <rect key="frame" x="0.0" y="0.0" width="356" height="113"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="356" height="112.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="356" height="113"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bGK-2t-dId">
-                        <rect key="frame" x="15" y="8" width="326" height="104.5"/>
+                        <rect key="frame" x="15" y="8" width="326" height="105"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="projectItem" translatesAutoresizingMaskIntoConstraints="NO" id="inL-RD-Dht">
-                                <rect key="frame" x="10" y="10" width="108" height="84.5"/>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="SHFH" translatesAutoresizingMaskIntoConstraints="NO" id="inL-RD-Dht">
+                                <rect key="frame" x="10" y="10" width="108" height="85"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="108" id="0th-7o-kAz"/>
                                 </constraints>
@@ -37,7 +35,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="海贝贝" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="znb-Me-DJT">
-                                <rect key="frame" x="199.5" y="10.5" width="126.5" height="17"/>
+                                <rect key="frame" x="199.5" y="10" width="126.5" height="17"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -49,7 +47,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="早教机构" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mlW-0m-3sj">
-                                <rect key="frame" x="199.5" y="35.5" width="126.5" height="17"/>
+                                <rect key="frame" x="199.5" y="35" width="126.5" height="17"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -61,13 +59,13 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全国" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YNg-Jf-cFp">
-                                <rect key="frame" x="199.5" y="60.5" width="126.5" height="17"/>
+                                <rect key="frame" x="199.5" y="60" width="126.5" height="17"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rST-KG-QSx">
-                                <rect key="frame" x="128" y="77.5" width="198" height="20"/>
+                                <rect key="frame" x="128" y="77" width="198" height="20"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="vGd-KL-A0m"/>
@@ -131,7 +129,7 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="ZhiDing" width="36" height="40"/>
-        <image name="projectItem" width="139" height="105"/>
+        <image name="SHFH" width="900" height="383"/>
+        <image name="ZhiDing" width="36.5" height="40"/>
     </resources>
 </document>

upAPP/main/Me(个人中心)/View/ERJIjoinTeamHeader.xib

@@ -37,8 +37,8 @@
                             <color key="textColor" red="0.53725490200000003" green="0.53725490200000003" blue="0.53725490200000003" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="创 始 人 ：优铺 " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a10-lq-7AQ">
-                            <rect key="frame" x="15" y="46" width="108" height="18"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="创 始 人 ：时代芳华" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a10-lq-7AQ">
+                            <rect key="frame" x="15" y="46" width="134.5" height="18"/>
                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
@@ -50,7 +50,7 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="T1y-vt-Cp4">
-                            <rect key="frame" x="138" y="43" width="24" height="24"/>
+                            <rect key="frame" x="164.5" y="43" width="24" height="24"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="24" id="L3b-BE-EBe"/>
                                 <constraint firstAttribute="height" constant="24" id="ggG-B1-2P2"/>

upAPP/main/Me(个人中心)/View/MyNewsTableViewCell.xib

@@ -29,8 +29,8 @@
                             <constraint firstAttribute="height" constant="6" id="dx5-Ug-bQ9"/>
                         </constraints>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="优铺" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1i0-gV-9te">
-                        <rect key="frame" x="15" y="47.5" width="27" height="16"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="时代芳华" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1i0-gV-9te">
+                        <rect key="frame" x="15" y="47.5" width="53.5" height="16"/>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" red="0.53725490196078429" green="0.53725490196078429" blue="0.53725490196078429" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
@@ -41,7 +41,7 @@
                         <color key="textColor" red="0.53725490200000003" green="0.53725490200000003" blue="0.53725490200000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="欢迎您进入到优铺平台，这里面将提供给您多种服务， 满足您。" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2jt-5Y-2fy">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="欢迎您进入到时代芳华平台，这里面将提供给您多种服务， 满足您。" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2jt-5Y-2fy">
                         <rect key="frame" x="15" y="73.5" width="268" height="34"/>
                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <color key="textColor" red="1" green="0.51078612180000005" blue="0.16857369859999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

upAPP/main/Me(个人中心)/View/OrderTableViewCell.xib

@@ -26,8 +26,8 @@
                                     <constraint firstAttribute="height" constant="1" id="oUZ-5A-F9y"/>
                                 </constraints>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="优铺会员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="boT-ky-WGg">
-                                <rect key="frame" x="10" y="15" width="65.5" height="19.5"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="时代芳华会员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="boT-ky-WGg">
+                                <rect key="frame" x="10" y="15" width="98" height="19.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>

upAPP/main/Me(个人中心)/View/attentionTableViewCell.m

@@ -66,7 +66,7 @@
 
 -(void)cell1WithProjectModel:(projectListModel *)model{
     _projectModel = model;
-    [_iconImg sd_setImageWithURL:[NSURL URLWithString:_projectModel.pictures] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+    [_iconImg sd_setImageWithURL:[NSURL URLWithString:_projectModel.pictures] placeholderImage:[UIImage imageNamed:@"SHFH"]];
     self.titleLabel.text = _projectModel.project_name;
     self.adressLabel.text = _projectModel.address;
     self.areaLabel.text = [NSString stringWithFormat:@"建筑面积:  %@㎡",_projectModel.acreage];
@@ -81,7 +81,7 @@
 -(void)cell2WithProjectModel:(projectListModel *)model{
     
     _projectModel = model;
-    [_iconImg sd_setImageWithURL:[NSURL URLWithString:_projectModel.pictures] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+    [_iconImg sd_setImageWithURL:[NSURL URLWithString:_projectModel.pictures] placeholderImage:[UIImage imageNamed:@"SHFH"]];
     self.titleLabel.text = _projectModel.project_name;
     self.adressLabel.text = _projectModel.address;
     self.areaLabel.text = [NSString stringWithFormat:@"建筑面积:  %@㎡",_projectModel.acreage];

upAPP/main/Me(个人中心)/View/attentionTableViewCell.xib

@@ -16,7 +16,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="355" height="141"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="1.jpg" translatesAutoresizingMaskIntoConstraints="NO" id="moM-RE-cde">
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="SHFH" translatesAutoresizingMaskIntoConstraints="NO" id="moM-RE-cde">
                         <rect key="frame" x="15" y="20" width="128" height="97"/>
                         <color key="backgroundColor" red="0.3921568627" green="0.6705882353" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
@@ -109,7 +109,7 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="1.jpg" width="828" height="1472"/>
+        <image name="SHFH" width="900" height="383"/>
         <image name="attentionImg" width="14" height="9"/>
     </resources>
 </document>

upAPP/main/Me(个人中心)/View/joinTeamHeader.xib

@@ -19,8 +19,8 @@
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teamBG" translatesAutoresizingMaskIntoConstraints="NO" id="PEe-kQ-ueT">
                             <rect key="frame" x="0.0" y="0.0" width="345" height="83"/>
                         </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="团队名称：优铺 " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vgr-T0-c9C">
-                            <rect key="frame" x="15" y="15" width="111.5" height="18"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="团队名称：时代芳华" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vgr-T0-c9C">
+                            <rect key="frame" x="15" y="15" width="138" height="18"/>
                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>

upAPP/main/Me(个人中心)/View/joinTeamTableViewCell.xib

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,11 +13,11 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="111"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="110.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="111"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Bfr-F2-XCm">
-                        <rect key="frame" x="15" y="0.0" width="290" height="110.5"/>
+                        <rect key="frame" x="15" y="0.0" width="290" height="111"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="peopleNum" translatesAutoresizingMaskIntoConstraints="NO" id="yI4-Tm-yNf">
                                 <rect key="frame" x="10" y="15" width="22" height="22"/>
@@ -33,8 +31,8 @@
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teamMenberName" translatesAutoresizingMaskIntoConstraints="NO" id="xSn-k2-LZT">
                                 <rect key="frame" x="10" y="50" width="22" height="22"/>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上级姓名：优铺" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PX9-t1-hi4">
-                                <rect key="frame" x="42" y="52" width="107.5" height="18"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上级姓名：时代芳华" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PX9-t1-hi4">
+                                <rect key="frame" x="42" y="52" width="138" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -49,7 +47,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="M57-lQ-OAa">
-                                <rect key="frame" x="208" y="80" width="72" height="27"/>
+                                <rect key="frame" x="208" y="79.5" width="72" height="27"/>
                                 <color key="backgroundColor" red="0.3921568627" green="0.6705882353" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="27" id="Ecg-wA-3KQ"/>
@@ -64,7 +62,7 @@
                                 </connections>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y16-aS-cQq">
-                                <rect key="frame" x="0.0" y="109.5" width="290" height="1"/>
+                                <rect key="frame" x="0.0" y="110" width="290" height="1"/>
                                 <color key="backgroundColor" red="0.91764705882352937" green="0.91764705882352937" blue="0.91764705882352937" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="1" id="j4H-90-f9l"/>

upAPP/main/Me(个人中心)/View/recommandCell.xib

@@ -110,8 +110,8 @@
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="more" translatesAutoresizingMaskIntoConstraints="NO" id="3gV-9b-m6a">
                                 <rect key="frame" x="331" y="80" width="11" height="11"/>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公司：北京优铺网络科技有限公司" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Ql-T2-QvK">
-                                <rect key="frame" x="10" y="100" width="153.5" height="12"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公司：北京时代芳华资产管理有限公司" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Ql-T2-QvK">
+                                <rect key="frame" x="10" y="100" width="174" height="12"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="10"/>
                                 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>

upAPP/main/Me(个人中心)/View/teamHeader.xib

@@ -19,8 +19,8 @@
                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teamBG" translatesAutoresizingMaskIntoConstraints="NO" id="Dh2-HR-ukQ">
                             <rect key="frame" x="0.0" y="0.0" width="345" height="83"/>
                         </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="团队名称：优铺 " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tv9-0D-7g2">
-                            <rect key="frame" x="15" y="15" width="111.5" height="18"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="团队名称：时代芳华" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tv9-0D-7g2">
+                            <rect key="frame" x="15" y="15" width="138" height="18"/>
                             <fontDescription key="fontDescription" type="system" pointSize="15"/>
                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
@@ -42,7 +42,7 @@
                             <color key="backgroundColor" red="1" green="0.51078612180000005" blue="0.16857369859999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <fontDescription key="fontDescription" type="system" pointSize="10"/>
                             <color key="tintColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
-                            <state key="normal" title="修改/完善团队资料"/>
+                            <state key="normal" title="填写团队资料"/>
                         </button>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DuF-f6-xgt">
                             <rect key="frame" x="18" y="48.5" width="20" height="20"/>

upAPP/main/SourceModule(客源)/View/keyuanPeopleDetailHeader.xib

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -18,14 +16,14 @@
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="keyuanpeopleDetailHeader" translatesAutoresizingMaskIntoConstraints="NO" id="eyn-AZ-7Y1">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="165"/>
                 </imageView>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="优铺" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zar-nE-u0h">
-                    <rect key="frame" x="169.5" y="60" width="35" height="21"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="时代芳华" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zar-nE-u0h">
+                    <rect key="frame" x="153" y="60" width="69.5" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="keyuanNan" translatesAutoresizingMaskIntoConstraints="NO" id="9g7-bY-zu4">
-                    <rect key="frame" x="217.5" y="62.5" width="15" height="15"/>
+                    <rect key="frame" x="235.5" y="63" width="15" height="15"/>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="联系方式：155 5555 5555" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TyT-Ey-LL1">
                     <rect key="frame" x="96.5" y="94" width="182" height="18"/>

upAPP/main/SourceModule(客源)/View/keyuanpeopleDetailCell.xib

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,28 +13,28 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="160"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="159.5"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="160"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="noI-gN-NBL">
-                        <rect key="frame" x="10" y="5" width="300" height="154.5"/>
+                        <rect key="frame" x="10" y="5" width="300" height="155"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="keyuanXiaoJU" translatesAutoresizingMaskIntoConstraints="NO" id="OuE-TJ-X2o">
-                                <rect key="frame" x="0.0" y="0.0" width="300" height="154.5"/>
+                                <rect key="frame" x="0.0" y="0.0" width="300" height="155"/>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="项目名称：三亚一万棵森林度假公园" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xJN-Em-N0i">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="项目名称：三亚一万棵森林度假公园" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xJN-Em-N0i">
                                 <rect key="frame" x="15" y="15.5" width="270" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="项目经理：优铺" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4n5-yU-lAh">
-                                <rect key="frame" x="15" y="44.5" width="107.5" height="18"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="项目经理：时代芳华" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4n5-yU-lAh">
+                                <rect key="frame" x="15" y="44.5" width="138" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="需求类型：销售" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lz7-pL-w4L">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="需求类型：销售" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lz7-pL-w4L">
                                 <rect key="frame" x="15" y="73.5" width="107.5" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
@@ -47,12 +44,12 @@
                                 <rect key="frame" x="280" y="72.5" width="5" height="10"/>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="详情" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u4S-i0-exv">
-                                <rect key="frame" x="242" y="69.5" width="29" height="17"/>
+                                <rect key="frame" x="242" y="69" width="29" height="17"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.3921568627" green="0.6705882353" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sVm-3X-3pS">
+                            <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sVm-3X-3pS">
                                 <rect key="frame" x="15" y="106.5" width="270" height="6"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qTV-m4-PZG">
@@ -72,37 +69,37 @@
                                     <constraint firstAttribute="height" constant="6" id="qpZ-Bt-qKo"/>
                                 </constraints>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="报备" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SpM-mK-apI">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="报备" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SpM-mK-apI">
                                 <rect key="frame" x="0.0" y="125" width="50" height="16"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="到访" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1zP-jP-ILD">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="到访" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1zP-jP-ILD">
                                 <rect key="frame" x="50" y="125" width="50" height="16"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="认购" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="chQ-Jf-yDf">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="认购" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="chQ-Jf-yDf">
                                 <rect key="frame" x="100" y="125" width="50" height="16"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="签约" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z75-5r-BNU">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="签约" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z75-5r-BNU">
                                 <rect key="frame" x="150" y="125" width="50" height="16"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="结佣" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P54-M1-BOb">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="结佣" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P54-M1-BOb">
                                 <rect key="frame" x="200" y="125" width="50" height="16"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="完成" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2IT-W1-10V">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="完成" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2IT-W1-10V">
                                 <rect key="frame" x="250" y="125" width="50" height="16"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
@@ -177,7 +174,7 @@
         </tableViewCell>
     </objects>
     <resources>
-        <image name="blueMore" width="5" height="10"/>
-        <image name="keyuanXiaoJU" width="351" height="96"/>
+        <image name="blueMore" width="5.5" height="10"/>
+        <image name="keyuanXiaoJU" width="351.5" height="96"/>
     </resources>
 </document>

upAPP/main/homePage(首页)/Controllers/LocationViewController.m

@@ -102,9 +102,9 @@
     
     if ([self.titleValue isEqualToString:model.city_name]) {
         
-        cell.cityLab.layer.borderColor = [[UIColor colorWithHexValue:0x64ABFF]CGColor];
-        cell.cityLab.textColor =[UIColor colorWithHexValue:0x64ABFF];
-        cell.cityLab.backgroundColor = [UIColor colorWithHexValue:0xEDF5FF];
+        cell.cityLab.layer.borderColor = MTextColor1.CGColor;
+        cell.cityLab.textColor = MTextColor1;
+        cell.cityLab.backgroundColor = MTextColor3;
         
     }else{
         

upAPP/main/homePage(首页)/Controllers/news(资讯)/XWWebVC.m

@@ -88,7 +88,7 @@
     NSString *urlString = [NSString stringWithFormat:@"%@",_imgURL];
     UIImage *img = [[UIImage alloc]init];
     if (IsStrEmpty(urlString)) {
-        img =[UIImage imageNamed:@"projectItem"];
+        img =[UIImage imageNamed:@"SHFH"];
     }else{
         UIImage *image = [UIImage imageWithData:[NSData dataWithContentsOfURL:[NSURL URLWithString:urlString]]];
         img = [UIImage imageWithData:[[DKGlobal sharedInstance]imageWithImage:image scaledToSize:CGSizeMake(300, 300)]];
@@ -104,7 +104,7 @@
     if (arr) {
         
         NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
-        [shareParams SSDKSetupShareParamsByText:@"优铺资讯"
+        [shareParams SSDKSetupShareParamsByText:@"时代芳华资讯"
                                          images:arr
                                             url:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_shareUrl]]
                                           title:_shareTitle

upAPP/main/homePage(首页)/Controllers/news(资讯)/newsCell.m

@@ -21,7 +21,7 @@
 }
 -(void)makeUI{
     _iconImage = [[UIImageView alloc]init];
-    _iconImage.image = [UIImage imageNamed:@"projectItem"];
+    _iconImage.image = [UIImage imageNamed:@"SHFH"];
     [self.contentView addSubview:_iconImage];
     [_iconImage mas_makeConstraints:^(MASConstraintMaker *make) {
        
@@ -98,7 +98,7 @@
 }
 -(void)fillData:(newsModel *)model{
     _model = model;
-    [_iconImage sd_setImageWithURL:[NSURL URLWithString:_model.img_path] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+    [_iconImage sd_setImageWithURL:[NSURL URLWithString:_model.img_path] placeholderImage:[UIImage imageNamed:@"SHFH"]];
     _nameLab.text = _model.title;
     [_nameLab setVerticalAlignment:VerticalAlignmentTop];
     _numberLab.text = _model.reading_quantity;

upAPP/main/homePage(首页)/Controllers/sales(销售)/cell/floorCollectionViewCell.m

@@ -41,14 +41,14 @@
         
     }];
     
-    _floorIamgeView.image =[UIImage imageNamed:@"projectItem"];
+    _floorIamgeView.image =[UIImage imageNamed:@"SHFH"];
     
 }
 
 -(void)cellWithProjectModel:(projecFloorModel *)model{
     
     _model = model;
-    [_floorIamgeView sd_setImageWithURL:[NSURL URLWithString:_model.pic_path] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+    [_floorIamgeView sd_setImageWithURL:[NSURL URLWithString:_model.pic_path] placeholderImage:[UIImage imageNamed:@"SHFH"]];
     _floorLab.text = _model.descriptionStr;
 }
 

upAPP/main/homePage(首页)/Controllers/sales(销售)/cell/floorCollectionViewCell2.m

@@ -44,7 +44,7 @@
         
     }];
     
-    _floorIamgeView.image =[UIImage imageNamed:@"projectItem"];
+    _floorIamgeView.image =[UIImage imageNamed:@"SHFH"];
     
     _floorLab = [[UILabel alloc]init];
     _floorLab.text = @"三室一厅";
@@ -81,7 +81,7 @@
 -(void)cellWithProjectModel:(projecFloorModel *)model{
     
     _model = model;
-    [_floorIamgeView sd_setImageWithURL:[NSURL URLWithString:_model.pic_path] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+    [_floorIamgeView sd_setImageWithURL:[NSURL URLWithString:_model.pic_path] placeholderImage:[UIImage imageNamed:@"SHFH"]];
     _floorLab.text = _model.descriptionStr;
 //    _priceLab.text =[NSString stringWithFormat:@"%@万元/套", _model.price];
 }

upAPP/main/homePage(首页)/Controllers/sales(销售)/controller/GBShare/GBShareActionSheet.m

@@ -138,7 +138,7 @@ static char kStateCodeKey;
       
         UIImage *img = [[UIImage alloc]init];
         if (IsStrEmpty(_share.imgUrl)) {
-            img =[UIImage imageNamed:@"projectItem"];
+            img =[UIImage imageNamed:@"SHFH"];
             
         }else{
             img = [UIImage imageWithData:[NSData dataWithContentsOfURL:[NSURL URLWithString:_share.imgUrl]]];
@@ -208,7 +208,7 @@ static char kStateCodeKey;
     UIImage *img = [[UIImage alloc]init];
     
     if (IsStrEmpty(_share.imgUrl)) {
-        img =[UIImage imageNamed:@"projectItem"];
+        img =[UIImage imageNamed:@"SHFH"];
         
     }else{
         img = [UIImage imageWithData:[NSData dataWithContentsOfURL:[NSURL URLWithString:_share.imgUrl]]];
@@ -216,7 +216,7 @@ static char kStateCodeKey;
         
     }
     [ProgressHUD hide];
-    [shareParams SSDKSetupWeChatMiniProgramShareParamsByTitle:_share.titile description:_share.content webpageUrl:_shareUrl path:[NSString stringWithFormat:@"%@",_shareLittlePath] thumbImage:[UIImage imageNamed:@"projectItem"] hdThumbImage:img userName:@"gh_db6bac43329c" withShareTicket:YES miniProgramType:0 forPlatformSubType:SSDKPlatformSubTypeWechatSession];
+    [shareParams SSDKSetupWeChatMiniProgramShareParamsByTitle:_share.titile description:_share.content webpageUrl:_shareUrl path:[NSString stringWithFormat:@"%@",_shareLittlePath] thumbImage:[UIImage imageNamed:@"SHFH"] hdThumbImage:img userName:@"gh_db6bac43329c" withShareTicket:YES miniProgramType:0 forPlatformSubType:SSDKPlatformSubTypeWechatSession];
 //    
       // 调用shareSDK的无UI分享类型
         [ShareSDK share:SSDKPlatformSubTypeWechatSession parameters:shareParams onStateChanged:^(SSDKResponseState state, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error) {

upAPP/main/homePage(首页)/Controllers/sales(销售)/view/KScrollView.m

@@ -42,7 +42,7 @@
         
         imageView.frame = CGRectMake(i * _headScroll.bounds.size.width, 0, self.bounds.size.width, 300);
         
-        [imageView sd_setImageWithURL:[NSURL URLWithString:_imagesArray[i]] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+        [imageView sd_setImageWithURL:[NSURL URLWithString:_imagesArray[i]] placeholderImage:[UIImage imageNamed:@"SHFH"]];
         
         [_headScroll addSubview:imageView];
         

upAPP/main/homePage(首页)/View/homeCollectionCell.m

@@ -23,7 +23,7 @@
     
     [self.contentView addSubview:_homeIamgeView];
     
-    _homeIamgeView.image = [UIImage imageNamed:@"projectItem"];
+    _homeIamgeView.image = [UIImage imageNamed:@"SHFH"];
 
     [_homeIamgeView mas_makeConstraints:^(MASConstraintMaker *make) {
        
@@ -103,7 +103,7 @@
         
         _model = nil;
         _model = model;
-        [_homeIamgeView sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_model.pictures]] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+        [_homeIamgeView sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_model.pictures]] placeholderImage:[UIImage imageNamed:@"SHFH"]];
         _nameLab.text = _model.project_name;
 //        _priceLab.text = _model.price;
         _adressLab.text = model.address;
@@ -122,7 +122,7 @@
         
         _model = nil;
         _model = model;
-        [_homeIamgeView sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_model.pictures]] placeholderImage:[UIImage imageNamed:@"projectItem"]];
+        [_homeIamgeView sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",_model.pictures]] placeholderImage:[UIImage imageNamed:@"SHFH"]];
         _nameLab.text = _model.project_name;
         //        _priceLab.text = _model.price;
         _adressLab.text = model.address;

upAPP/main/homePage(首页)/View/homeHeaderView.m

@@ -401,7 +401,7 @@ minimumInteritemSpacingForSectionAtIndex:(NSInteger)section
     //添加时间控制器
     _cycleSV.backgroundColor = [UIColor whiteColor];
     _cycleSV.autoScrollTimeInterval =3;
-    _cycleSV.placeholderImage = [UIImage imageNamed:@"projectItem"];
+    _cycleSV.placeholderImage = [UIImage imageNamed:@"SHFH"];
     [SDCycleScrollView clearImagesCache];
     
     for (int i = 0; i <arr.count; i++) {

upAPP/卖房云Debug.entitlements

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:www.maifangyun.net</string>
+	</array>
+</dict>
+</plist>