3.6.6 1.修改品牌信息的相关业务流程

2.新增预约到访，确认到访的功能
3.我的页面新增设置功能
4.修复已知bug，优化用户体验

upAPP.xcodeproj/project.pbxproj

@@ -525,12 +525,14 @@
 		CC928B07254FEE9E00E82724 /* yetaiModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CC928B06254FEE9E00E82724 /* yetaiModel.m */; };
 		CC95328D25885FFA00ABCE00 /* setupVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = CC95328A25885FFA00ABCE00 /* setupVC.xib */; };
 		CC95328E25885FFA00ABCE00 /* setupVC.m in Sources */ = {isa = PBXBuildFile; fileRef = CC95328C25885FFA00ABCE00 /* setupVC.m */; };
+		CCB27FE3258B31D400A6B91D /* subscribePutVC.m in Sources */ = {isa = PBXBuildFile; fileRef = CCB27FE2258B31D400A6B91D /* subscribePutVC.m */; };
 		CCE7D79F213F826A00D60E80 /* XWDetailsCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CCE7D79D213F826900D60E80 /* XWDetailsCell.m */; };
 		CCE7D7A3213F82C400D60E80 /* labelModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CCE7D7A2213F82C400D60E80 /* labelModel.m */; };
 		CCE7D7AC213F87BC00D60E80 /* UILabel+Alignment_h.m in Sources */ = {isa = PBXBuildFile; fileRef = CCE7D7AA213F87BB00D60E80 /* UILabel+Alignment_h.m */; };
 		CCE7D7AF213FA71B00D60E80 /* CustomPointAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = CCE7D7AE213FA71B00D60E80 /* CustomPointAnnotation.m */; };
 		CCE7D7D6213FC37400D60E80 /* follorTableCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CCE7D7D5213FC37400D60E80 /* follorTableCell.m */; };
 		CCE7D7DA213FCBB700D60E80 /* floorCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CCE7D7D9213FCBB700D60E80 /* floorCollectionViewCell.m */; };
+		CCEB6076258C78D0008CFE39 /* SaleWriteReportVC.m in Sources */ = {isa = PBXBuildFile; fileRef = CCEB6075258C78D0008CFE39 /* SaleWriteReportVC.m */; };
 		CCFE408E2550F7BA00F58DC5 /* NewSignVC.m in Sources */ = {isa = PBXBuildFile; fileRef = CCFE408D2550F7BA00F58DC5 /* NewSignVC.m */; };
 		CCFE4091255134AB00F58DC5 /* signPopView.m in Sources */ = {isa = PBXBuildFile; fileRef = CCFE4090255134AB00F58DC5 /* signPopView.m */; };
 		CCFE40942551505200F58DC5 /* NewSaleTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CCFE40932551505200F58DC5 /* NewSaleTableViewCell.m */; };
@@ -1431,6 +1433,8 @@
 		CC95328A25885FFA00ABCE00 /* setupVC.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = setupVC.xib; sourceTree = "<group>"; };
 		CC95328B25885FFA00ABCE00 /* setupVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setupVC.h; sourceTree = "<group>"; };
 		CC95328C25885FFA00ABCE00 /* setupVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = setupVC.m; sourceTree = "<group>"; };
+		CCB27FE1258B31D400A6B91D /* subscribePutVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = subscribePutVC.h; sourceTree = "<group>"; };
+		CCB27FE2258B31D400A6B91D /* subscribePutVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = subscribePutVC.m; sourceTree = "<group>"; };
 		CCE7D79D213F826900D60E80 /* XWDetailsCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XWDetailsCell.m; sourceTree = "<group>"; };
 		CCE7D79E213F826A00D60E80 /* XWDetailsCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XWDetailsCell.h; sourceTree = "<group>"; };
 		CCE7D7A1213F82C400D60E80 /* labelModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = labelModel.h; sourceTree = "<group>"; };
@@ -1443,6 +1447,8 @@
 		CCE7D7D5213FC37400D60E80 /* follorTableCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = follorTableCell.m; sourceTree = "<group>"; };
 		CCE7D7D8213FCBB700D60E80 /* floorCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = floorCollectionViewCell.h; sourceTree = "<group>"; };
 		CCE7D7D9213FCBB700D60E80 /* floorCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = floorCollectionViewCell.m; sourceTree = "<group>"; };
+		CCEB6074258C78D0008CFE39 /* SaleWriteReportVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SaleWriteReportVC.h; sourceTree = "<group>"; };
+		CCEB6075258C78D0008CFE39 /* SaleWriteReportVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SaleWriteReportVC.m; sourceTree = "<group>"; };
 		CCFE408C2550F7BA00F58DC5 /* NewSignVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewSignVC.h; sourceTree = "<group>"; };
 		CCFE408D2550F7BA00F58DC5 /* NewSignVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewSignVC.m; sourceTree = "<group>"; };
 		CCFE408F255134AB00F58DC5 /* signPopView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = signPopView.h; sourceTree = "<group>"; };
@@ -3131,6 +3137,10 @@
 				CCFE4090255134AB00F58DC5 /* signPopView.m */,
 				CCFE40922551505200F58DC5 /* NewSaleTableViewCell.h */,
 				CCFE40932551505200F58DC5 /* NewSaleTableViewCell.m */,
+				CCB27FE1258B31D400A6B91D /* subscribePutVC.h */,
+				CCB27FE2258B31D400A6B91D /* subscribePutVC.m */,
+				CCEB6074258C78D0008CFE39 /* SaleWriteReportVC.h */,
+				CCEB6075258C78D0008CFE39 /* SaleWriteReportVC.m */,
 			);
 			path = AddNewFile;
 			sourceTree = "<group>";
@@ -3848,10 +3858,12 @@
 				CC584120213E66C300ADA6E5 /* LBLoadingView.m in Sources */,
 				CC263552213677D1004687DB /* SalesDetailController.m in Sources */,
 				9CA6A55E214277D9008AB586 /* statusModel.m in Sources */,
+				CCEB6076258C78D0008CFE39 /* SaleWriteReportVC.m in Sources */,
 				CC541FA6216C3F720008E4D8 /* projectStatusModel.m in Sources */,
 				CC250F192147A512000E2E92 /* CustomAnnotationView.m in Sources */,
 				CC175320215B72BF009607AB /* saleTypeModel.m in Sources */,
 				CC1FDA9823B32DB5007DB6E2 /* YSLCustomButton.m in Sources */,
+				CCB27FE3258B31D400A6B91D /* subscribePutVC.m in Sources */,
 				CC25248C21228807008CD0C5 /* HWNewfeatureViewController.m in Sources */,
 				CC18E19A2123248A003556CB /* UIView+EasyNavigationExt.m in Sources */,
 				CC4229C4247519A900DA8AA4 /* GBShareView.m in Sources */,
@@ -4083,7 +4095,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 8SLCM67D6W;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4129,7 +4141,7 @@
 					"$(PROJECT_DIR)/other/SDK/OpenSDK1.8.7.1",
 					"$(PROJECT_DIR)/other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 3.6.5;
+				MARKETING_VERSION = 3.6.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bupts.youpu;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -4151,7 +4163,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 8SLCM67D6W;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4197,7 +4209,7 @@
 					"$(PROJECT_DIR)/other/SDK/OpenSDK1.8.7.1",
 					"$(PROJECT_DIR)/other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 3.6.5;
+				MARKETING_VERSION = 3.6.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bupts.youpu;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";

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

@@ -545,7 +545,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "169"
                   endingLineNumber = "169"
-                  offsetFromSymbolStart = "432">
+                  offsetFromSymbolStart = "411">
                </Location>
                <Location
                   uuid = "4138A0EE-70AC-408A-9E9A-95ABAEA20671 - a24c6829b7faeaa3"
@@ -560,7 +560,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "169"
                   endingLineNumber = "169"
-                  offsetFromSymbolStart = "16">
+                  offsetFromSymbolStart = "12">
                </Location>
             </Locations>
          </BreakpointContent>
@@ -847,8 +847,8 @@
             filePath = "upAPP/main/Business(&#x4e1a;&#x52a1;)/InputInforViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "406"
-            endingLineNumber = "406"
+            startingLineNumber = "407"
+            endingLineNumber = "407"
             landmarkName = "-buttonEvent:"
             landmarkType = "7">
             <Locations>
@@ -863,9 +863,9 @@
                   urlString = "file:///Users/youke/Desktop/%E9%82%93%E8%B6%85%E6%96%87%E7%9A%84%E9%A1%B9%E7%9B%AE/MaiPuBao/upAPP/main/Business(%E4%B8%9A%E5%8A%A1)/InputInforViewController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "406"
-                  endingLineNumber = "406"
-                  offsetFromSymbolStart = "1316">
+                  startingLineNumber = "407"
+                  endingLineNumber = "407"
+                  offsetFromSymbolStart = "1610">
                </Location>
                <Location
                   uuid = "61D06636-E032-4B0D-934F-AE7AA13A6968 - b49d3ab4a461bd74"
@@ -878,8 +878,8 @@
                   urlString = "file:///Users/youke/Desktop/%E9%82%93%E8%B6%85%E6%96%87%E7%9A%84%E9%A1%B9%E7%9B%AE/MaiPuBao/upAPP/main/Business(%E4%B8%9A%E5%8A%A1)/InputInforViewController.m"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "408"
-                  endingLineNumber = "408"
+                  startingLineNumber = "409"
+                  endingLineNumber = "409"
                   offsetFromSymbolStart = "48">
                </Location>
             </Locations>
@@ -895,8 +895,8 @@
             filePath = "upAPP/main/Business(&#x4e1a;&#x52a1;)/InputInforViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "412"
-            endingLineNumber = "412"
+            startingLineNumber = "413"
+            endingLineNumber = "413"
             landmarkName = "-buttonEvent:"
             landmarkType = "7">
          </BreakpointContent>
@@ -929,7 +929,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "784"
                   endingLineNumber = "784"
-                  offsetFromSymbolStart = "1572">
+                  offsetFromSymbolStart = "1886">
                </Location>
                <Location
                   uuid = "479036BC-F2E7-45C3-9495-64C32492D4D1 - a5eb1f2297afd23"
@@ -949,5 +949,181 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "7428A7ED-507D-4EB7-AD03-5C0EE82507B2"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/main/Business(&#x4e1a;&#x52a1;)/InputInforViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "396"
+            endingLineNumber = "396"
+            landmarkName = "-buttonEvent:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "39E673E8-94E8-417F-A035-4AC719725F1C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/main/Business(&#x4e1a;&#x52a1;)/tempsViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "135"
+            endingLineNumber = "135"
+            landmarkName = "-loadStutasList:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "50C883E4-0577-4062-97EC-583BD5743F19"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/main/Business(&#x4e1a;&#x52a1;)/cell/projectsCell.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "237"
+            endingLineNumber = "237"
+            landmarkName = "-fillData:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "CA156FBC-4CFB-4308-8583-AEE567F74E77"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/main/SourceModule(&#x5ba2;&#x6e90;)/Controller/SourcepeopleDetailController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "269"
+            endingLineNumber = "269"
+            landmarkName = "-tableView:didSelectRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "012FDEE1-864A-4A33-B855-74A0085CF6B2"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/main/homePage(&#x9996;&#x9875;)/Controllers/sales(&#x9500;&#x552e;)/controller/reportListViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "154"
+            endingLineNumber = "154"
+            landmarkName = "-loadDataList"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "5FF772D1-BCD1-46F6-9F8B-EFB19691CD5B"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/main/homePage(&#x9996;&#x9875;)/Controllers/sales(&#x9500;&#x552e;)/controller/reportListViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "222"
+            endingLineNumber = "222"
+            landmarkName = "-buttonEvent:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "B1D3B9B4-8DE2-4DF5-B3C4-5637327AB868"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/main/homePage(&#x9996;&#x9875;)/Controllers/sales(&#x9500;&#x552e;)/controller/reportListViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "225"
+            endingLineNumber = "225"
+            landmarkName = "-buttonEvent:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "9BD30AC7-F949-4FA4-B273-2DD1BEADB07E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/main/homePage(&#x9996;&#x9875;)/Controllers/sales(&#x9500;&#x552e;)/controller/reportListViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "234"
+            endingLineNumber = "234"
+            landmarkName = "-buttonEvent:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "BF64F731-3BC8-4DB3-8775-A2A77D8C9F30"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/main/homePage(&#x9996;&#x9875;)/Controllers/sales(&#x9500;&#x552e;)/controller/SalesDetailController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "2018"
+            endingLineNumber = "2018"
+            landmarkName = "-OrderToClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "2A0B1080-CED9-4C90-BD7D-3D4D7900585E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/main/homePage(&#x9996;&#x9875;)/Controllers/sales(&#x9500;&#x552e;)/controller/salesController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "475"
+            endingLineNumber = "475"
+            landmarkName = "-tableView:didSelectRowAtIndexPath:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4A60D504-8C67-40AF-B707-2B6A9747E9DD"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "upAPP/main/SourceModule(&#x5ba2;&#x6e90;)/Controller/SourceModuleController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "102"
+            endingLineNumber = "102"
+            landmarkName = "-topBtnClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

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

@@ -16,7 +16,7 @@
 //卖铺宝测试环境
 //#define RootDomain @"http://test-api-mpb.yingshangchina.com"
 //卓琳
-//#define RootDomain @"http://192.168.1.210:8080"
+//#define RootDomain @"http://192.168.1.217:8080"
 //李冰
 //#define RootDomain @"http://84weyj.natappfree.cc"
 //健哥
@@ -139,6 +139,8 @@
 
 #define getBusinessYeTai @"/dictionary/getBusinessList"   //新增业态接口
 
+#define getOrderTrackId @"/customer/auth/getOrderTrackId"   //新增根据oderno获取ordertrackid接口
+
 
 
 #endif /* All_URL_h */

upAPP/main/AddNewFile/SaleWriteReportVC.h

@@ -0,0 +1,17 @@
+//
+//  writeReportController.h
+//  upAPP
+//
+//  Created by youke on 2018/9/10.
+//  Copyright © 2018年 youke. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface SaleWriteReportVC : UIViewController
+@property(nonatomic,strong)NSString *projectId;
+@property(nonatomic,strong)NSString *brandName;
+@property(nonatomic,strong)NSString *customerId;
+@property(nonatomic,strong)NSString *projectType;
+@property(nonatomic,strong)NSString *signStr;//标识返回页面
+@end

upAPP/main/AddNewFile/SaleWriteReportVC.m

@@ -0,0 +1,400 @@
+//
+//  writeReportController.m
+//  upAPP
+//
+//  Created by youke on 2018/9/10.
+//  Copyright © 2018年 youke. All rights reserved.
+//
+
+#import "SaleWriteReportVC.h"
+#import "DatePickerView.h"
+#import "salesController.h"
+#import "investmentVController.h"
+#import "OrderAirportPayCancelView.h"
+#import "SalesDetailController.h"
+#import "CXDatePickerView.h"
+@interface SaleWriteReportVC ()<UITableViewDelegate,UITableViewDataSource,UITextViewDelegate>
+@property(nonatomic,strong)UILabel *titleLab;
+@property(nonatomic,strong)UITableView *tabView;
+@property(nonatomic,strong)UIButton *senderBtn;
+@property(nonatomic,strong)UIButton *cancleBtn;
+@property(nonatomic,strong)UITextField *brandFeild;
+@property(nonatomic,strong)UILabel *dateLab;
+@property(nonatomic,strong)UITextView *describeText;
+@property(nonatomic,strong)UILabel *lbl;
+@property (nonatomic,strong) CXDatePickerView *datePicker;
+@property(nonatomic,strong)HttpRequestManger *sessionManager;
+@property(nonatomic,strong)OrderAirportPayCancelView *cancelView;
+@end
+
+@implementation SaleWriteReportVC
+
+- (HttpRequestManger*)sessionManager{
+    if (!_sessionManager) {
+        _sessionManager = [[HttpRequestManger alloc]init];
+    }
+    return _sessionManager;
+}
+- (void)viewDidLoad {
+    
+    [super viewDidLoad];
+    
+    [self.navigationView removeAllLeftButton];
+    
+    _titleLab = [[UILabel alloc]init];
+    
+    _titleLab.frame = CGRectMake(0,0, kGScreenWidth-60, 30);
+    
+    _titleLab.text = @"客户报备";
+    
+    [self.navigationView addTitleView:_titleLab];
+    
+    kWeakSelf(self);
+    
+    [self.navigationView addLeftButtonWithImage:[UIImage imageNamed:@"btn_back"] clickCallBack:^(UIView *view) {
+        
+        [weakself.navigationController popViewControllerAnimated:YES];
+//        UIWindow *window = [[[UIApplication sharedApplication] delegate] window];
+//        [window addSubview: weakself.cancelView];
+        
+    }];
+//    [self.navigationView addRightButtonWithImage:[UIImage imageNamed:@"icon_search"] clickCallBack:^(UIView *view) {
+//        NSLog(@"搜索");
+//    }];
+    _tabView = [[UITableView alloc] initWithFrame:CGRectMake(0,NaviHeight, kGScreenWidth, kGScreenHeight-NaviHeight-50) style:UITableViewStyleGrouped];
+    _tabView.delegate = self;
+    _tabView.dataSource = self;
+    _tabView.backgroundColor = [UIColor colorWithHexValue:0xf7f8fa];
+    
+    //    self.tabView.separatorInset = UIEdgeInsetsMake(0, 15, 0, 15);//cell不对齐
+    [self.view addSubview:_tabView];
+    if (@available(iOS 11.0, *)) {
+        _tabView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    }else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
+    
+    UIView *headView =[[UIView alloc]initWithFrame:CGRectMake(0, 0,kGScreenWidth, 100)];
+    headView.backgroundColor = [UIColor colorWithHexValue:0xf7f8fa];
+    UIImageView *headImageView = [[UIImageView alloc]init];
+    headImageView.image = [UIImage imageNamed:@"writeReport"];
+    [headView addSubview:headImageView];
+    [headImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(headView.mas_left);
+        make.top.equalTo(headView.mas_top);
+        make.size.mas_equalTo(CGSizeMake(kGScreenWidth, 100));
+        
+    }];
+    self.tabView.tableHeaderView = headView;
+    UIView *bottomView = [[UIView alloc]initWithFrame:CGRectMake(0, kGScreenHeight -50, kGScreenWidth, 50)];
+    bottomView.backgroundColor = [UIColor colorWithHexValue:0x64ABFF];
+    [self.view addSubview:bottomView];
+    _senderBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    _senderBtn.frame = CGRectMake(kGScreenWidth/2, 0, kGScreenWidth/2, 50);
+    [_senderBtn setTitle:@"提交" forState:UIControlStateNormal];
+    _senderBtn.backgroundColor = [UIColor colorWithHexValue:0x64ABFF];
+    [_senderBtn setTintColor:[UIColor whiteColor]];
+    [_senderBtn addTarget:self action:@selector(buttonEvent:) forControlEvents:UIControlEventTouchUpInside];
+    [bottomView addSubview:_senderBtn];
+    
+    _cancleBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    _cancleBtn.frame = CGRectMake(0, 0, kGScreenWidth/2, 50);
+    [_cancleBtn setTitle:@"取消预约" forState:UIControlStateNormal];
+    _cancleBtn.backgroundColor = [UIColor colorWithHexValue:0xE9E9E9];
+    [_cancleBtn setTitleColor:[UIColor colorWithHexValue:0x898989] forState:UIControlStateNormal];
+    [_cancleBtn addTarget:self action:@selector(cancleEvent:) forControlEvents:UIControlEventTouchUpInside];
+    [bottomView addSubview:_cancleBtn];
+    
+    // Do any additional setup after loading the view.
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return 1;
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    
+    return 2;
+    
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (indexPath.row == 1) {
+        
+        return 160;
+    }else{
+        
+        return 50;
+    }
+   
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    UITableViewCell *cell =[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+                                                  reuseIdentifier:@"cell13"];
+    if (cell ==nil) {
+        cell =
+        [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+                               reuseIdentifier:@"cell13"];
+    }
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    tableView.separatorColor = [UIColor colorWithHexValue:0xEAEAEA];
+    tableView.separatorInset = UIEdgeInsetsMake(0, 10, 0, 10);
+    tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
+    if (indexPath.row == 0) {
+        
+        UILabel *titleLa = [[UILabel alloc]initWithFrame:CGRectMake(16, 20, 100, 14)];
+        titleLa.textColor = [UIColor blackColor];
+        titleLa.font = TextFont(15);
+        [cell addSubview:titleLa];
+        titleLa.text = @"预计到访时间";
+        
+        _dateLab = [[UILabel alloc]init];
+        _dateLab.textColor = [UIColor blackColor];
+        _dateLab.font = TextFont(15);
+        _dateLab.text = @"请选择";
+        _dateLab.textAlignment = NSTextAlignmentRight;
+        [cell addSubview:_dateLab];
+        [_dateLab mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.size.mas_equalTo(CGSizeMake(150,18));
+            make.right.equalTo(cell.mas_right).offset(-35);
+            make.top.equalTo(cell.mas_top).offset(16);
+        }];
+        cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+        
+    }else{
+        UILabel *titleLa = [[UILabel alloc]initWithFrame:CGRectMake(16, 20, 45, 14)];
+        titleLa.textColor = [UIColor blackColor];
+        titleLa.font = TextFont(15);
+        [cell addSubview:titleLa];
+        titleLa.text = @"备注:";
+        _describeText =[[UITextView alloc]init];
+        
+        _describeText.textColor = [UIColor blackColor];
+        
+        _describeText.font = TextFont(15);
+        
+        _describeText.textAlignment = NSTextAlignmentLeft;
+        
+        _describeText.backgroundColor = [UIColor colorWithHexValue:0xF7F8FA];
+        
+        _describeText.textContainerInset = UIEdgeInsetsMake(20, 20, 20, 20);
+        
+        _describeText.editable = YES;
+        
+        [cell addSubview:_describeText];
+        
+        [_describeText mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.size.mas_equalTo(CGSizeMake(kGScreenWidth-90, 120));
+            make.left.equalTo(titleLa.mas_right).offset(10);
+            make.top.equalTo(cell.mas_top).offset(15);
+        }];
+        
+        _lbl = [[UILabel alloc]initWithFrame:CGRectMake(20, 20, 60, 20)];
+        _lbl.enabled = NO;
+        _lbl.text = @"请填写...";
+        _lbl.font =  [UIFont systemFontOfSize:15];
+        _lbl.textColor = [[UIColor colorWithHexValue:0xD3D6DD]colorWithAlphaComponent:0.5];
+        [_describeText addSubview:_lbl];
+        _describeText.delegate = self;
+    }
+    return cell;
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
+    return 0.0001;
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
+    
+    return 0.0001;
+}
+-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
+    
+    return nil;
+}
+-(UIView*)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{
+    return nil;
+}
+
+-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    
+    if (indexPath.row == 0) {
+         [self creatDatePicker];
+    }
+}
+-(void)creatDatePicker
+{
+    __weak SaleWriteReportVC * weakself=self;
+//    if (!self.datePicker) {
+        
+//        self.datePicker =[[[NSBundle mainBundle] loadNibNamed:@"DatePickerView" owner:self options:0] lastObject];
+//        self.datePicker.frame =CGRectMake(0, self.view.frame.size.height-260, self.view.frame.size.width, 260);
+//        self.datePicker.Datetitle =@"日期选择";
+//        self.datePicker.cancelBlock = ^{
+//            [UIView animateWithDuration:5 animations:^{
+//                [weakself.datePicker removeFromSuperview];
+//                weakself.datePicker = nil;
+//            }];
+//        };
+//        self.datePicker.sureBlock = ^(NSString *selectDateStr) {
+//            [weakself.dateLab setText:selectDateStr];
+//            [UIView animateWithDuration:5 animations:^{
+//                [weakself.datePicker removeFromSuperview];
+//                 weakself.datePicker = nil;
+//            }];
+//        };
+        
+       _datePicker = [[CXDatePickerView alloc] initWithDateStyle:CXDateStyleShowYearMonthDayHourMinute CompleteBlock:^(NSDate *selectDate) {
+            
+        NSString *dateString = [selectDate stringWithFormat:@"yyyy-MM-dd HH:mm"];
+            [weakself.dateLab setText:dateString];
+            [UIView animateWithDuration:5 animations:^{
+                    [weakself.datePicker removeFromSuperview];
+                        weakself.datePicker = nil;
+            }];
+          
+        }];
+        _datePicker.dateLabelColor = [UIColor lightGrayColor];//年-月-日-时-分 颜色
+        _datePicker.datePickerColor = [UIColor blackColor];//滚轮日期颜色
+        _datePicker.headerViewColor =  [UIColor colorWithHexValue:0xf7f8fa]; // 顶部视图背景颜色
+        _datePicker.doneButtonColor = [UIColor blackColor]; // 确认按钮字体颜色
+        _datePicker.cancelButtonColor = [UIColor blackColor]; // 取消按钮颜色
+        _datePicker.shadeViewAlphaWhenShow = 0.3;
+        _datePicker.showAnimationTime = 0.4;
+        [_datePicker show];
+
+//        [self.view addSubview:self.datePicker];
+        
+//    }
+    
+}
+#pragma mark - UITextView的代理方法
+
+- (void)textViewDidChange:(UITextView *)textView
+{
+    
+    if ([textView.text length] == 0) {
+        
+        [_lbl setHidden:NO];
+        
+    }else{
+        
+        [_lbl setHidden:YES];
+        
+    }
+    
+}
+
+-(void)buttonEvent:(UIButton *)sender{
+    
+//    if ([self.projectType isEqualToString:@"2"] && [self.brandFeild.text length] == 0) {
+//
+//        [ToastView showToast:@"请输入品牌名称"];
+//        return;
+//    }else
+        
+    if ([_dateLab.text isEqualToString:@"请选择"]){
+        
+        [ToastView showToast:@"请选择预约时间"];
+        return;
+    }
+    _senderBtn.backgroundColor = [UIColor lightGrayColor];
+    _senderBtn.userInteractionEnabled = NO;
+    NSMutableDictionary *dic =[NSMutableDictionary dictionary];
+    dic[@"projectId"] = _projectId;
+    dic[@"customerId"] = _customerId;
+    dic[@"appointmentTime"] = _dateLab.text;
+    dic[@"brandName"] = @"";
+//    dic[@"brandName"] = _brandFeild.text;
+    
+    kWeakSelf(self);
+    [ProgressHUD show];
+    [self.sessionManager sendPostHttpRequestWithUrl:sendCustomerInfo params:dic bodyBlock:nil progress:nil success:^(NSDictionary *response) {
+        [ProgressHUD hide];
+        NSLog(@"%@",response);
+//        if ([self.projectType isEqualToString:@"1"]) {
+//            [MBProgressHUD showSuccess:@"客户报备成功"];
+//            [self.navigationController popViewControllerAnimated:YES];
+//        }else{
+//            [MBProgressHUD showSuccess:@"客户报备成功"];
+//            [self.navigationController popViewControllerAnimated:YES];
+//        }
+        if([self.signStr isEqualToString:@"1"]){
+            [MBProgressHUD showSuccess:@"客户报备成功"];
+            for (UIViewController *controller in weakself.navigationController.viewControllers) {
+                if ([controller isKindOfClass:[SalesDetailController class]]) {
+                    [weakself.navigationController popToViewController:controller animated:YES];
+                    return;
+                }
+            }
+        }else{
+            [MBProgressHUD showSuccess:@"客户报备成功"];
+            [self.navigationController popViewControllerAnimated:YES];
+        }
+        
+    } failure:^(NSError *error) {
+        [ProgressHUD hide];
+    }];
+    
+    
+}
+
+- (OrderAirportPayCancelView*)cancelView{
+    if (!_cancelView) {
+        _cancelView = [[NSBundle mainBundle]loadNibNamed:@"OrderAirportPayCancelView" owner:self options:nil].firstObject;
+        _cancelView.frame = self.view.bounds;
+        //        _cancelView.isFromOrder = self.isFromOrder;
+        _cancelView.titleLabel.text = @"确定要取消报备吗";
+        [_cancelView.rightBtn setTitle:@"继续报备" forState:UIControlStateNormal];
+        _cancelView.tipLabel.hidden = YES;
+        _cancelView.contentLabel.hidden = YES;
+        _cancelView.titleLabelTop.constant = 35;
+        kWeakSelf(self);
+        _cancelView.leftBtnCallback = ^{
+            for (UIViewController *controller in weakself.navigationController.viewControllers) {
+                if ([controller isKindOfClass:[SalesDetailController class]]) {
+                    [weakself.navigationController popToViewController:controller animated:YES];
+                    return;
+                }
+            }
+
+            
+        };
+    }
+    return _cancelView;
+}
+
+-(void)cancleEvent:(UIButton *)sender{
+    
+    UIWindow *window = [[[UIApplication sharedApplication] delegate] window];
+    
+    [window addSubview: self.cancelView];
+
+}
+
+- (void)dealloc {
+    if (_sessionManager) {
+        [_sessionManager cancelAllTask];
+    }
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    DebugLog(@"%@没有造成循环引用", [self class]);
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

upAPP/main/AddNewFile/subscribePutVC.h

@@ -0,0 +1,24 @@
+//
+//  InputInforViewController.h
+//  upAPP
+//
+//  Created by youke on 2018/9/18.
+//  Copyright © 2018年 youke. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface subscribePutVC : UIViewController
+
+@property(nonatomic,strong)NSString *typeString;
+@property(nonatomic,strong)NSString *orderNo;
+@property(nonatomic,strong)NSString *isSearch;
+
+@property(nonatomic,strong)NSString *projectID;
+@property(nonatomic,strong)NSString *projectType;
+@property(nonatomic,strong)NSString *projectName;
+@property(nonatomic,strong)NSString *name;
+@property(nonatomic,strong)NSString *phone;
+@property(nonatomic,strong)NSString *orderTrackId;
+@property(nonatomic,strong)NSString *addStr;
+@end

upAPP/main/AddNewFile/subscribePutVC.m

@@ -0,0 +1,360 @@
+//
+//  InputInforViewController.m
+//  upAPP
+//
+//  Created by youke on 2018/9/18.
+//  Copyright © 2018年 youke. All rights reserved.
+//
+#import "subscribePutVC.h"
+#import "ACMediaFrame.h"
+#import "UIView+ACMediaExt.h"
+#import "OSSImageUploader.h"
+#import "ProjectControlsVC.h"
+#import "DatePickerView.h"
+#import "CXDatePickerView.h"
+@interface subscribePutVC ()<UITableViewDelegate,UITableViewDataSource,UITextViewDelegate>
+@property(nonatomic,strong)UILabel *titleLab;
+@property(nonatomic,strong)UITableView *tab;
+@property(nonatomic,strong)NSMutableArray *imageArr;
+@property(nonatomic,strong)UIButton *sendBtn;
+
+@property(nonatomic,strong)UITextView *describeText;
+@property(nonatomic,strong)UILabel *lbl;
+@property(nonatomic,strong)NSMutableArray *uploadImages;
+@property(nonatomic,strong)UIView *headView;
+@property(nonatomic,strong)HttpRequestManger *sessionManager;
+@property(nonatomic,strong)UITextField *nameField;
+@property(nonatomic,strong)UITextField *phoneField;
+@property(nonatomic,strong)UILabel *dateLab;
+@property (nonatomic,strong) CXDatePickerView *datePicker;
+
+
+@end
+
+@implementation subscribePutVC
+
+- (HttpRequestManger*) sessionManager{
+    if (!_sessionManager) {
+        _sessionManager = [[HttpRequestManger alloc]init];
+    }
+    return _sessionManager;
+}
+
+- (void)viewDidLoad {
+    
+    [super viewDidLoad];
+    [self getTrackID];
+    [self.navigationView removeAllLeftButton];
+    
+    self.view.backgroundColor = [UIColor colorWithHexValue:0xF7F8FA];
+    
+    _titleLab = [[UILabel alloc]init];
+    
+    _titleLab.frame = CGRectMake(0,0, kGScreenWidth-60, 30);
+    
+    _titleLab.text = @"预约到访";
+    
+    [self.navigationView addTitleView:_titleLab];
+    
+    kWeakSelf(self);
+    
+    [self.navigationView addLeftButtonWithImage:[UIImage imageNamed:@"btn_back"] clickCallBack:^(UIView *view) {
+        
+        [weakself.navigationController popViewControllerAnimated:YES];
+        
+    }];
+    _tab = [[UITableView alloc]initWithFrame:CGRectMake(0, NaviHeight, kGScreenWidth, kGScreenHeight -NaviHeight -70) style:UITableViewStylePlain];
+    _tab.delegate = self;
+    _tab.dataSource = self;
+    _tab.scrollEnabled = NO;
+    _tab.backgroundColor = KRGB_COLOR(247, 249,251);
+    //    self.tab.separatorInset = UIEdgeInsetsMake(0, 10, 0, 10);
+    [self.view addSubview:_tab];
+    if (@available(iOS 11.0, *)) {
+        _tab.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    }else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
+    
+    _headView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, kGScreenWidth, 100)];
+    _headView.backgroundColor = [UIColor whiteColor];
+    _tab.tableHeaderView = _headView;
+   
+    UIView *view1 =[[UIView alloc]initWithFrame:CGRectMake(0,0, kGScreenWidth, 80)];
+
+    view1.backgroundColor = [UIColor whiteColor];
+
+    [_headView addSubview:view1];
+    
+    UILabel *titleLa2 = [[UILabel alloc]init];
+    titleLa2.textColor = [UIColor blackColor];
+    titleLa2.font = TextFont(15);
+    titleLa2.textAlignment = NSTextAlignmentRight;
+    [view1 addSubview:titleLa2];
+    titleLa2.text = @"客户姓名";
+
+    [titleLa2 mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(_headView.mas_left).offset(4);
+        make.top.equalTo(view1.mas_top).offset(15);
+        make.size.mas_equalTo(CGSizeMake(70, 15));
+    }];
+    
+    _nameField = [[UITextField alloc]init];
+    _nameField.placeholder = @"请输入客户姓名";
+    _nameField.text = self.name;
+    _nameField.textAlignment = NSTextAlignmentLeft;
+    _nameField.textColor = [UIColor blackColor];
+    _nameField.clearButtonMode = UITextFieldViewModeWhileEditing;
+    _nameField.font = TextFont(15);
+    [view1 addSubview:_nameField];
+    [_nameField mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 150, 20));
+        make.left.equalTo(titleLa2.mas_right).offset(18);
+        make.top.equalTo(view1.mas_top).offset(13);
+    }];
+    
+    UIView *line1 = [[UIView alloc]init];
+    line1.backgroundColor = [UIColor colorWithHexValue:0xf7f8fa];
+    [view1 addSubview:line1];
+    [line1 mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(view1.mas_left);
+        make.top.equalTo(titleLa2.mas_bottom).offset(15);
+        make.size.mas_equalTo(CGSizeMake(kGScreenWidth, 0.8));
+        
+    }];
+    
+    UILabel *titleLa3 = [[UILabel alloc]init];
+    titleLa3.textColor = [UIColor blackColor];
+    titleLa3.font = TextFont(15);
+    titleLa3.textAlignment = NSTextAlignmentRight;
+    [view1 addSubview:titleLa3];
+    titleLa3.text = @"联系方式";
+    
+    [titleLa3 mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(_headView.mas_left).offset(4);
+        make.top.equalTo(line1.mas_top).offset(15);
+        make.size.mas_equalTo(CGSizeMake(70, 15));
+    }];
+    
+    _phoneField = [[UITextField alloc]init];
+    _phoneField.placeholder = @"请输入联系方式";
+    _phoneField.text = self.phone;
+    _phoneField.textAlignment = NSTextAlignmentLeft;
+    _phoneField.textColor = [UIColor blackColor];
+    _phoneField.font = TextFont(15);
+    _phoneField.clearButtonMode = UITextFieldViewModeWhileEditing;
+    [view1 addSubview:_phoneField];
+    [_phoneField mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 150, 30));
+        make.left.equalTo(titleLa3.mas_right).offset(18);
+        make.top.equalTo(line1.mas_top).offset(8);
+    }];
+    
+    
+    UIView *line2 = [[UIView alloc]init];
+    line2.backgroundColor = [UIColor colorWithHexValue:0xf7f8fa];
+    [view1 addSubview:line2];
+    [line2 mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(view1.mas_left);
+        make.top.equalTo(titleLa3.mas_bottom).offset(15);
+        make.size.mas_equalTo(CGSizeMake(kGScreenWidth, 1));
+        
+    }];
+    
+    UIView *bottomView = [[UIView alloc]initWithFrame:CGRectMake(15, kGScreenHeight -70, kGScreenWidth-30, 50)];
+    bottomView.backgroundColor = [UIColor colorWithHexValue:0x64ABFF];
+    [self.view addSubview:bottomView];
+    _sendBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    _sendBtn.frame = CGRectMake(0, 0, kGScreenWidth-30, 50);
+    [_sendBtn setTitle:@"提交" forState:UIControlStateNormal];
+    _sendBtn.backgroundColor = [UIColor colorWithHexValue:0x64ABFF];
+    [_sendBtn setTintColor:[UIColor whiteColor]];
+    [_sendBtn addTarget:self action:@selector(buttonEvent:) forControlEvents:UIControlEventTouchUpInside];
+    [bottomView addSubview:_sendBtn];
+}
+
+-(void)getTrackID{
+    NSMutableDictionary *dic =[NSMutableDictionary dictionary];
+    dic[@"orderNo"] = self.orderNo;
+                [ProgressHUD show];
+                kWeakSelf(self);
+     [self.sessionManager sendPostHttpRequestWithUrl:getOrderTrackId params:dic bodyBlock:^(id<AFMultipartFormData> formData) {
+    
+                                } progress:^(NSProgress *progressValue) {
+    
+                                } success:^(NSDictionary *response) {
+                                    [ProgressHUD hide];
+                                    self.orderTrackId = response[@"orderTrackId"];
+                                    NSLog(@"%@",response);
+                                return;
+    
+                                } failure:^(NSError *error) {
+                                    NSLog(@"%@",error);
+                                    [ProgressHUD hide];
+                                }];
+}
+
+-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
+
+    return 1;
+}
+
+-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+    
+    
+    return 1;
+    
+}
+
+-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    
+    return 40;
+}
+-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    
+    UITableViewCell *cell =[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+                                                  reuseIdentifier:@"cell12"];
+    if (cell ==nil) {
+        cell =
+        [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+                               reuseIdentifier:@"cell12"];
+    }
+    
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    
+    tableView.separatorColor = [UIColor colorWithHexValue:0xEAEAEA];
+    
+    tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+    
+    UILabel *titleLa = [[UILabel alloc]initWithFrame:CGRectMake(13,10, 100, 14)];
+       titleLa.textColor = [UIColor blackColor];
+       titleLa.font = TextFont(15);
+       [cell addSubview:titleLa];
+       titleLa.text = @"预计到访时间";
+       
+       _dateLab = [[UILabel alloc]init];
+       _dateLab.textColor = [UIColor blackColor];
+       _dateLab.font = TextFont(15);
+       _dateLab.text = @"请选择";
+       _dateLab.textAlignment = NSTextAlignmentRight;
+       [cell addSubview:_dateLab];
+       [_dateLab mas_makeConstraints:^(MASConstraintMaker *make) {
+           
+           make.size.mas_equalTo(CGSizeMake(150,18));
+           make.right.equalTo(cell.mas_right).offset(-35);
+           make.top.equalTo(cell.mas_top).offset(10);
+       }];
+       cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+    return cell;
+    
+}
+
+-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
+    
+    return 0.0001;
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
+    
+    return 0.0001;
+}
+
+-(UIView*)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{
+    return nil;
+}
+
+-(UIView*)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
+    
+    return nil;
+}
+-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    
+    if (indexPath.row == 0) {
+         [self creatDatePicker];
+    }
+}
+
+-(void)creatDatePicker
+{
+    __weak subscribePutVC * weakself=self;
+       _datePicker = [[CXDatePickerView alloc] initWithDateStyle:CXDateStyleShowYearMonthDayHourMinute CompleteBlock:^(NSDate *selectDate) {
+            
+        NSString *dateString = [selectDate stringWithFormat:@"yyyy-MM-dd HH:mm"];
+            [weakself.dateLab setText:dateString];
+            [UIView animateWithDuration:5 animations:^{
+                    [weakself.datePicker removeFromSuperview];
+                        weakself.datePicker = nil;
+            }];
+          
+        }];
+        _datePicker.dateLabelColor = [UIColor lightGrayColor];//年-月-日-时-分 颜色
+        _datePicker.datePickerColor = [UIColor blackColor];//滚轮日期颜色
+        _datePicker.headerViewColor =  [UIColor colorWithHexValue:0xf7f8fa]; // 顶部视图背景颜色
+        _datePicker.doneButtonColor = [UIColor blackColor]; // 确认按钮字体颜色
+        _datePicker.cancelButtonColor = [UIColor blackColor]; // 取消按钮颜色
+        _datePicker.shadeViewAlphaWhenShow = 0.3;
+        _datePicker.showAnimationTime = 0.4;
+        [_datePicker show];
+}
+-(void)buttonEvent:(UIButton *)sender{
+    if ([_nameField.text length] == 0) {
+        [ToastView showToast:@"请输入客户姓名"];
+        return;
+    }else if ([_phoneField.text length] == 0){
+        
+        [ToastView showToast:@"请输入联系方式"];
+        return;
+    }else if([_dateLab.text isEqualToString:@"请选择"]){
+        
+        [ToastView showToast:@"请选择预约时间"];
+        return;
+    }
+    NSMutableDictionary *param =[NSMutableDictionary dictionary];
+        param[@"customerName"] = _nameField.text;
+        param[@"mobile"] = _phoneField.text;
+        param[@"orderTrackId"] = self.orderTrackId;
+        param[@"appointTimeStr"] = _dateLab.text;
+        param[@"appointStatus"] = @"0";
+        param[@"orderNo"] = self.orderNo;
+        param[@"description"] = @"";
+        param[@"picPath"] = @"";
+      [self.sessionManager sendPostHttpRequestWithUrl:addDescrInfo params:param bodyBlock:^(id<AFMultipartFormData> formData) {
+    
+                    } progress:^(NSProgress *progressValue) {
+    
+                    } success:^(NSDictionary *response) {
+                        [ProgressHUD hide];
+                        NSLog(@"%@",response);
+                        NSString* code = [NSString stringWithFormat:@"%@",response[@"code"]];
+                        if (code.intValue == 101){
+                            [ToastView showToast:@"预约到访成功"];
+                            [self.navigationController popViewControllerAnimated:true];
+                        }else{
+                            [ToastView showToast:@"预约到访失败"];
+                        }
+                    } failure:^(NSError *error) {
+                        [ToastView showToast:@"服务器繁忙，请稍后重试"];
+                        _sendBtn.backgroundColor = [UIColor colorWithHexValue:0x64ABFF];
+                        _sendBtn.userInteractionEnabled = YES;
+                        NSLog(@"%@",error);
+                        [ProgressHUD hide];
+                    }];
+    
+    
+}
+
+- (void)dealloc {
+    if (_sessionManager) {
+        [_sessionManager cancelAllTask];
+    }
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    DebugLog(@"%@没有造成循环引用", [self class]);
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+
+@end

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

@@ -50,7 +50,7 @@
     
     if ([_typeString isEqualToString:@"待到访"]) {
         
-        _titleLab.text = @"录到访";
+        _titleLab.text = @"确认到访";
         
     }else if([_typeString isEqualToString:@"待认购"]){
         
@@ -58,7 +58,7 @@
         
     }else{
         
-         _titleLab.text = @"录意向";
+         _titleLab.text = @"确认到访";
     }
     
     [self.navigationView addTitleView:_titleLab];
@@ -373,14 +373,15 @@
             NSLog(@"%@",_uploadImages);
             NSMutableDictionary *dic =[NSMutableDictionary dictionary];
             dispatch_async(dispatch_get_main_queue(), ^{
-                dic[@"orderNo"] = self.orderNo;;
-                dic[@"orderStatus"] = str;;
+                dic[@"orderNo"] = self.orderNo;
+                dic[@"orderStatus"] = str;
                 dic[@"picPath"] =[_uploadImages  componentsJoinedByString:@","];
                 dic[@"customerName"] = _nameField.text;
                 dic[@"mobile"] = _phone;
                 dic[@"description"] = _describeText.text;
                 dic[@"orderTrackId"] = self.orderTrackId;
-
+                dic[@"appointStatus"] = @"1";
+                //0 显示  1 隐藏
             });
             
             [ProgressHUD show];

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

@@ -172,7 +172,7 @@
     }];
     _explainBtn = [[UIButton alloc]init];
     [_explainBtn setBackgroundColor:UIColor.blueColor];
-   [_explainBtn setTitle:@"录到访" forState:UIControlStateNormal];
+   [_explainBtn setTitle:@"确认到访" forState:UIControlStateNormal];
     _explainBtn.layer.masksToBounds = true;
     _explainBtn.layer.cornerRadius = 5;
     _explainBtn.titleLabel.font = TextFont(15);
@@ -233,22 +233,44 @@
     
     _expectLable.text = _model.appointment_time;
     if ([model.order_status isEqualToString:@"待意向"]||[model.order_status isEqualToString:@"待认购"]){
-        _explainBtn.hidden = false;
+        if([model.appoint_status isEqualToString:@"0"]){
+            _explainBtn.hidden = false;
+            _expectLable.text = _model.appoint_time_str;
+        }else{
+            _explainBtn.hidden = true;
+        }
     }else{
         _explainBtn.hidden = true;
     }
+    //3.6.5+版本 +字段判断explainBtn显示隐藏
     
-    if ([model.order_status isEqualToString:@"待审核"] || [model.order_status isEqualToString:@"待到访"]) {
+    if ([model.order_status isEqualToString:@"待审核"] || [model.order_status isEqualToString:@"待到访"] || [model.order_status isEqualToString:@"待认购"] || [model.order_status isEqualToString:@"待意向"]) {
+        if([model.appoint_status isEqualToString:@"0"]){
+                   _explainBtn.hidden = false;
+                  _expectLab.hidden = NO;
+                  _expectLable.hidden = NO;
+            [_backView mas_updateConstraints:^(MASConstraintMaker *make) {
+                       make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 30, 155));
+                       make.left.equalTo(self.mas_left).offset(15);
+                       make.top.equalTo(self.mas_top).offset(15);
+                   }];
+               }else{
+                   _explainBtn.hidden = true;
+                   _expectLab.hidden = true;
+                   _expectLable.hidden = true;
+                   [_backView mas_updateConstraints:^(MASConstraintMaker *make) {
+                              make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 30, 125));
+                              make.left.equalTo(self.mas_left).offset(15);
+                              make.top.equalTo(self.mas_top).offset(15);
+                              
+                          }];
+               }
         
-        _expectLab.hidden = NO;
-        _expectLable.hidden = NO;
-        [_backView mas_updateConstraints:^(MASConstraintMaker *make) {
-            make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 30, 155));
-            make.left.equalTo(self.mas_left).offset(15);
-            make.top.equalTo(self.mas_top).offset(15);
-            
-            
-        }];
+//        [_backView mas_updateConstraints:^(MASConstraintMaker *make) {
+//            make.size.mas_equalTo(CGSizeMake(kGScreenWidth - 30, 155));
+//            make.left.equalTo(self.mas_left).offset(15);
+//            make.top.equalTo(self.mas_top).offset(15);
+//        }];
         
     }else{
         

upAPP/main/Business(业务)/model/projectStatusModel.h

@@ -30,6 +30,13 @@
 
 @property(nonatomic,copy)NSString *pot_id;
 
+@property(nonatomic,copy)NSString *appoint_status;//控制确认到访显示隐藏/控制预计到访时间显示隐藏
+
+@property(nonatomic,copy)NSString *appoint_time_str;//待意向 待 认购 的预计到访时间
+
+
+
+
 
 @end
 

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

@@ -198,10 +198,12 @@
 {
      projectStatusModel *model =_dataArr[indexPath.row];
     
-    if ([model.order_status isEqualToString:@"待审核"] || [model.order_status isEqualToString:@"待到访"]) {
-        
-        
-        return 165;
+    if ([model.order_status isEqualToString:@"待审核"] || [model.order_status isEqualToString:@"待到访"]|| [model.order_status isEqualToString:@"待认购"] || [model.order_status isEqualToString:@"待意向"]) {
+        if([model.appoint_status isEqualToString:@"0"]){
+            return 165;
+        }else{
+            return 135;
+        }
     }else{
         
         return 135;

upAPP/main/SourceModule(客源)/Controller/SourcepeopleDetailController.m

@@ -14,6 +14,7 @@
 #import "sourceDetailHeaderModel.h"
 #import "sourceDetailCellModel.h"
 #import "OrderListEmptyView.h"
+#import "subscribePutVC.h"
 @interface SourcepeopleDetailController ()<UITableViewDelegate,UITableViewDataSource>
 {
     CGFloat viewHeight;
@@ -180,6 +181,15 @@
 {
     _cellModel = self.ListDataSource[indexPath.row];
     keyuanpeopleDetailCell *cell = [keyuanpeopleDetailCell keyuanpeopleDetailCellWithTableView:tableView];
+    cell.subscribBlock = ^(NSString *selectDateStr) {
+            subscribePutVC *subscribeVC = [[subscribePutVC alloc]init];
+          subscribeVC.name = self.HeaderModel.customerName;
+           subscribeVC.phone = self.HeaderModel.mobile;
+        _cellModel = self.ListDataSource[indexPath.row];
+        subscribeVC.orderNo = _cellModel.order_no;
+            subscribeVC.addStr = @"1";
+           [self.navigationController pushViewController:subscribeVC animated:YES];
+        };
     cell.selectionStyle = UITableViewCellEditingStyleNone;
     if ([_cellModel.isEnd isEqualToString:@"0"]) {
         cell.downView.backgroundColor = [UIColor colorWithHexValue:0xdcecff];
@@ -194,36 +204,50 @@
         case 1:
         {
             cell.topViewWidth.constant = (SCREEN_WIDTH - 50)/10 * 0;
+            cell.blueBtn.hidden = YES;
+            cell.subscribeBtn.hidden = YES;
             break;
         }
         case 2:
         {
             cell.topViewWidth.constant = (SCREEN_WIDTH - 50)/10 * 1;
+            cell.blueBtn.hidden = YES;
+            cell.subscribeBtn.hidden = YES;
              break;
         }
         case 3:
         {
             cell.topViewWidth.constant = (SCREEN_WIDTH - 50)/10 * 2;
+            cell.blueBtn.hidden = NO;
+            cell.subscribeBtn.hidden = NO;
               break;
         }
         case 4:
         {
             cell.topViewWidth.constant = (SCREEN_WIDTH - 50)/10 * 4;
+            cell.blueBtn.hidden = YES;
+            cell.subscribeBtn.hidden = YES;
             break;
         }
         case 5:
         {
             cell.topViewWidth.constant = (SCREEN_WIDTH - 50)/10 * 6;
+            cell.blueBtn.hidden = YES;
+            cell.subscribeBtn.hidden = YES;
             break;
         }
         case 6:
         {
             cell.topViewWidth.constant = (SCREEN_WIDTH - 50)/10 * 8;
+            cell.blueBtn.hidden = YES;
+            cell.subscribeBtn.hidden = YES;
             break;
         }
         case 7:
         {
             cell.topViewWidth.constant = (SCREEN_WIDTH - 50)/10 * 10;
+            cell.blueBtn.hidden = YES;
+            cell.subscribeBtn.hidden = YES;
             break;
         }
         default:

upAPP/main/SourceModule(客源)/Model/processModel.h

@@ -15,6 +15,7 @@
 @property (nonatomic, copy) NSString *year;
 @property (nonatomic, copy) NSString *md;
 @property (nonatomic, copy) NSString *createTime;
+@property (nonatomic, copy) NSString *orderTrackId;
 
 
 @end

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

@@ -7,9 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-
+typedef void(^subscribeBtnButtonBlock)(NSString * selectDateStr);
 @interface keyuanpeopleDetailCell : UITableViewCell
-
+@property (nonatomic,strong) subscribeBtnButtonBlock subscribBlock;
 @property (weak, nonatomic) IBOutlet UILabel *projectNameLabel;
 @property (weak, nonatomic) IBOutlet UILabel *projectPeoplelabel;
 @property (weak, nonatomic) IBOutlet UILabel *needTypeLabel;
@@ -23,6 +23,9 @@
 @property (weak, nonatomic) IBOutlet UILabel *label5;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *topViewWidth;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *downViewWidth;
+@property (weak, nonatomic) IBOutlet UIButton *subscribeBtn;
+@property (weak, nonatomic) IBOutlet UIImageView *blueBtn;
+
 
 
 + (instancetype)keyuanpeopleDetailCellWithTableView:(UITableView *)tableView;

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

@@ -34,6 +34,15 @@
     }
     return cell;
 }
+- (IBAction)subscribeClick:(id)sender {
+    //    if (self.resultIndex) {
+    //        self.resultIndex(sender.tag);
+    //    }
+        NSString *resultString = @"1";
+        if (self.subscribBlock) {
+            self.subscribBlock(resultString);
+        }
+}
 
 
 

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,31 @@
             <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">
-                                <rect key="frame" x="15" y="15.5" width="270" height="18"/>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="blueMore" translatesAutoresizingMaskIntoConstraints="NO" id="zPa-zk-phA">
+                                <rect key="frame" x="280" y="27" width="5" height="10"/>
+                            </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">
+                                <rect key="frame" x="15" y="15" width="270" height="18.5"/>
                                 <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">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" 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"/>
                                 <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="253" 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,7 +47,7 @@
                                 <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"/>
@@ -72,42 +72,50 @@
                                     <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">
-                                <rect key="frame" x="0.0" y="125" width="50" height="16"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="254" text="报备" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SpM-mK-apI">
+                                <rect key="frame" x="0.0" y="125.5" 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">
-                                <rect key="frame" x="50" y="125" width="50" height="16"/>
+                                <rect key="frame" x="50" y="125.5" 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">
-                                <rect key="frame" x="100" y="125" width="50" height="16"/>
+                                <rect key="frame" x="100" y="125.5" 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">
-                                <rect key="frame" x="150" y="125" width="50" height="16"/>
+                                <rect key="frame" x="150" y="125.5" 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">
-                                <rect key="frame" x="200" y="125" width="50" height="16"/>
+                                <rect key="frame" x="200" y="125.5" 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">
-                                <rect key="frame" x="250" y="125" width="50" height="16"/>
+                                <rect key="frame" x="250" y="125.5" 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>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EfR-vs-9eB">
+                                <rect key="frame" x="217" y="17" width="54" height="28"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                <state key="normal" title="预约到访"/>
+                                <connections>
+                                    <action selector="subscribeClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="7Jg-iO-h7c"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <constraints>
                             <constraint firstItem="2Vh-0h-ptu" firstAttribute="leading" secondItem="u4S-i0-exv" secondAttribute="trailing" constant="9" id="0I0-hv-MYw"/>
@@ -122,11 +130,14 @@
                             <constraint firstItem="SpM-mK-apI" firstAttribute="top" secondItem="sVm-3X-3pS" secondAttribute="bottom" constant="13" id="Iji-Ws-N5i"/>
                             <constraint firstItem="2IT-W1-10V" firstAttribute="leading" secondItem="P54-M1-BOb" secondAttribute="trailing" id="KBN-LE-err"/>
                             <constraint firstItem="2IT-W1-10V" firstAttribute="centerY" secondItem="SpM-mK-apI" secondAttribute="centerY" id="KzD-ar-TyK"/>
+                            <constraint firstItem="2Vh-0h-ptu" firstAttribute="top" secondItem="zPa-zk-phA" secondAttribute="bottom" constant="35.5" id="PII-z7-0iR"/>
                             <constraint firstItem="sVm-3X-3pS" firstAttribute="top" secondItem="Lz7-pL-w4L" secondAttribute="bottom" constant="15" id="PkX-3K-XfZ"/>
                             <constraint firstItem="sVm-3X-3pS" firstAttribute="leading" secondItem="noI-gN-NBL" secondAttribute="leading" constant="15" id="SBA-SD-6Tp"/>
                             <constraint firstItem="SpM-mK-apI" firstAttribute="leading" secondItem="noI-gN-NBL" secondAttribute="leading" id="SaY-yN-ciq"/>
+                            <constraint firstItem="zPa-zk-phA" firstAttribute="leading" secondItem="EfR-vs-9eB" secondAttribute="trailing" constant="9" id="SrA-gg-HgD"/>
                             <constraint firstItem="1zP-jP-ILD" firstAttribute="width" secondItem="SpM-mK-apI" secondAttribute="width" id="VHE-lH-o21"/>
                             <constraint firstItem="1zP-jP-ILD" firstAttribute="centerY" secondItem="SpM-mK-apI" secondAttribute="centerY" id="WT3-gS-T0m"/>
+                            <constraint firstItem="u4S-i0-exv" firstAttribute="top" secondItem="EfR-vs-9eB" secondAttribute="bottom" constant="24" id="YXd-SQ-Ipc"/>
                             <constraint firstItem="xJN-Em-N0i" firstAttribute="top" secondItem="noI-gN-NBL" secondAttribute="top" constant="15" id="bVS-fz-njC"/>
                             <constraint firstItem="Lz7-pL-w4L" firstAttribute="top" secondItem="4n5-yU-lAh" secondAttribute="bottom" constant="11" id="d8m-LZ-7NL"/>
                             <constraint firstItem="Lz7-pL-w4L" firstAttribute="leading" secondItem="noI-gN-NBL" secondAttribute="leading" constant="15" id="dfT-C1-LQe"/>
@@ -156,9 +167,11 @@
                     <constraint firstAttribute="bottom" secondItem="noI-gN-NBL" secondAttribute="bottom" id="NHH-lK-BaO"/>
                     <constraint firstAttribute="trailing" secondItem="noI-gN-NBL" secondAttribute="trailing" constant="10" id="TlB-fs-onH"/>
                     <constraint firstItem="noI-gN-NBL" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="5" id="UOb-AV-2UV"/>
+                    <constraint firstAttribute="trailing" secondItem="EfR-vs-9eB" secondAttribute="trailing" constant="39" id="wqd-95-tAN"/>
                 </constraints>
             </tableViewCellContentView>
             <connections>
+                <outlet property="blueBtn" destination="zPa-zk-phA" id="Gbh-Wl-sjr"/>
                 <outlet property="downView" destination="sVm-3X-3pS" id="fDK-9j-BSl"/>
                 <outlet property="downViewWidth" destination="heL-oy-zZZ" id="aHb-ff-Koh"/>
                 <outlet property="label0" destination="SpM-mK-apI" id="Mzl-B6-BMB"/>
@@ -170,14 +183,15 @@
                 <outlet property="needTypeLabel" destination="Lz7-pL-w4L" id="VXv-Ki-vQp"/>
                 <outlet property="projectNameLabel" destination="xJN-Em-N0i" id="BpW-ol-U9y"/>
                 <outlet property="projectPeoplelabel" destination="4n5-yU-lAh" id="1Fh-am-Mfo"/>
+                <outlet property="subscribeBtn" destination="EfR-vs-9eB" id="tFG-xs-aff"/>
                 <outlet property="topView" destination="qTV-m4-PZG" id="HEm-2x-oWa"/>
                 <outlet property="topViewWidth" destination="t3p-JB-Yds" id="KFj-BR-d3q"/>
             </connections>
-            <point key="canvasLocation" x="34" y="44"/>
+            <point key="canvasLocation" x="33.600000000000001" y="43.178410794602705"/>
         </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/sales(销售)/controller/CustomerInputVController.h

@@ -12,4 +12,5 @@
 
 @property (nonatomic, copy) NSString *waySignStr;
 @property (nonatomic, copy) NSString *projectID;
+@property (nonatomic, copy) NSString *projectType;//区分销售/招商项目
 @end

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

@@ -14,6 +14,7 @@
 #import "OrderAirportPayCancelView.h"
 #import "SalesDetailController.h"
 #import "BaseSearchController.h"
+#import "SaleWriteReportVC.h"
 @interface reportListViewController ()<UITableViewDelegate,UITableViewDataSource>
 @property(nonatomic,strong)UILabel *titleLab;
 @property(nonatomic,strong)UITableView *tabView;
@@ -217,13 +218,24 @@
     if (IsStrEmpty(self.customerId)) {
         [ToastView showToast:@"请先选择您要报备的客户"];
     }else{
-        writeReportController *writeVC = [[writeReportController alloc]init];
-        writeVC.projectId = self.projectID;
-        writeVC.brandName = self.brandName;
-        writeVC.customerId = self.customerId;
-        writeVC.projectType = self.projectType;
-        writeVC.signStr = @"1";
-        [self.navigationController pushViewController:writeVC animated:YES];
+        //1代表销售
+        if ([self.projectType isEqualToString:@"1"]){
+                  SaleWriteReportVC *saleWriteVC = [[SaleWriteReportVC alloc]init];
+                  saleWriteVC.projectId = self.projectID;
+                  saleWriteVC.brandName = self.brandName;
+                  saleWriteVC.customerId = self.customerId;
+                  saleWriteVC.projectType = self.projectType;
+                  saleWriteVC.signStr = @"1";
+                  [self.navigationController pushViewController:saleWriteVC animated:YES];
+               }else{
+                  writeReportController *writeVC = [[writeReportController alloc]init];
+                   writeVC.projectId = self.projectID;
+                   writeVC.brandName = self.brandName;
+                   writeVC.customerId = self.customerId;
+                   writeVC.projectType = self.projectType;
+                   writeVC.signStr = @"1";
+                   [self.navigationController pushViewController:writeVC animated:YES];
+               }
     }
    
 }
@@ -231,6 +243,7 @@
     //项目中跳转客户录入
     CustomerInputVController *customerVC = [[CustomerInputVController alloc]init];
     customerVC.projectID = self.projectID;
+    customerVC.projectType = self.projectType;
     [self.navigationController pushViewController:customerVC animated:YES];
     
 }

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

@@ -215,7 +215,7 @@
 
 -(void)loadTypeList{
     
-    
+    //销售  1111
     kWeakSelf(self);
     NSMutableDictionary *parms = [NSMutableDictionary dictionary];
     parms[@"cityId"] = [UserDefaults objectForKey:@"cityId"];