no message

IFS/IFS/Expand/Const/Urls.swift

@@ -28,12 +28,12 @@ import Foundation
 //public let BaseAttachmentUrl: String = "http://222.180.250.18:7090"
 
 //测试环境
-//public let BaseUrl: String="http://222.180.250.18:7080/ifs-server/rest/"
-//public let BaseAttachmentUrl: String="http://222.180.250.18:7080"
+public let BaseUrl: String="http://222.180.250.18:7080/ifs-server/rest/"
+public let BaseAttachmentUrl: String="http://222.180.250.18:7080"
 
 //外网开发环境
-public let BaseUrl: String = "http://dev.gomoretech.com/ifs-server/rest/"
-public let BaseAttachmentUrl: String = "http://dev.gomoretech.com"
+//public let BaseUrl: String = "http://dev.gomoretech.com/ifs-server/rest/"
+//public let BaseAttachmentUrl: String = "http://dev.gomoretech.com"
 
 /// 登录
 public let loginUrl: String = "/user/login/%@"

IFS/IFS/Main/Business/RepairOrder/Controller/RepairOrderAddTableViewController.swift

@@ -82,7 +82,7 @@ class RepairOrderAddTableViewController: BaseTableViewController {
     //设置初始值
     func getUserMobile(){
         originatorTimeLabel.text = Date().toString(format: "yyyy-MM-dd HH:mm:ss")
-        self.repairOrderAddViewModel.saveOrderModel.requestTime = Date().toString(format: "yyyy-MM-dd HH:mm:ss")
+        self.repairOrderAddViewModel.saveOrderModel.receiveTime = Date().toString(format: "yyyy-MM-dd HH:mm:ss")
         self.originatorTimeLabel.textColor = kBlackColor
         
         Network.request(target: Service.queryUserMobile(kUser().userCode), success: {[weak self] (respone) in

IFS/IFS/Main/Business/RepairOrder/ViewModel/RepairOrderAddViewModel.swift

@@ -297,8 +297,8 @@ extension RepairOrderAddViewModel {
 //            let defaultDate = controller.originatorTimeLabel.text == "工单接报时间" ? NSDate().httpParameterString() : controller.originatorTimeLabel.text
             let defaultDate = controller.originatorTimeLabel.text
             var date: Date?
-            if saveOrderModel.requestTime != nil {
-                date = Date(fromString: saveOrderModel.requestTime, format: "yyyy-MM-dd HH:mm:ss")!
+            if saveOrderModel.receiveTime != nil {
+                date = Date(fromString: saveOrderModel.receiveTime, format: "yyyy-MM-dd HH:mm:ss")!
             }
             YXPickerManager.share().showDatePickerView(kMainColor, datePickerModel: UIDatePickerMode.dateAndTime, minimumDate: Date(), maximumDate: nil, defaultDate: defaultDate, commit: {[weak self] (time) in
                 controller.originatorTimeLabel.text = time
@@ -309,8 +309,8 @@ extension RepairOrderAddViewModel {
         case IndexPath(row: 8, section: 0):
             let defaultDate = controller.specifiedTimeLabel.text == "工单指定时间" ? NSDate().httpParameterString() : controller.originatorTimeLabel.text
             var date = Date()
-            if saveOrderModel.receiveTime != nil {
-                date = Date(fromString: saveOrderModel.receiveTime, format: "yyyy-MM-dd HH:mm:ss")!
+            if saveOrderModel.requestTime != nil {
+                date = Date(fromString: saveOrderModel.requestTime, format: "yyyy-MM-dd HH:mm:ss")!
             }
             YXPickerManager.share().showDatePickerView(kMainColor, datePickerModel: UIDatePickerMode.dateAndTime, minimumDate: date, maximumDate: nil, defaultDate: defaultDate, commit: {[weak self] (time) in
                 controller.specifiedTimeLabel.text = time

IFS/IFS/Main/Business/RepairOrder/ViewModel/RepairOrderDetailViewModel.swift

@@ -228,7 +228,7 @@ extension RepairOrderDetailViewModel {
             controller.userLab.text = disposeEmpty(billDetailModel.reportUser.name)
         }
         controller.phoneLab.text = disposeEmpty(billDetailModel.reporterPhone)
-        controller.createTimeLab.text = disposeEmpty(billDetailModel.createTime)
+        controller.createTimeLab.text = disposeEmpty(billDetailModel.receiveTime)
         controller.requestTimeLab.text = disposeEmpty(billDetailModel.requestTime)
         if billDetailModel.device != nil {
             controller.deviceLocationLab.text = disposeEmpty(billDetailModel.deviceadree)

IFS/IFS/Resource/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.3</string>
+	<string>1.1.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.3</string>
+	<string>1.1.6</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>