路桥费报销

OrderScheduling.xcodeproj/project.pbxproj

@@ -1158,7 +1158,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1187,7 +1187,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.0.2;
+				MARKETING_VERSION = 4.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1373,7 +1373,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Haifeng Cen (F2QAMRC42Q)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
@@ -1404,7 +1404,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.0.2;
+				MARKETING_VERSION = 4.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1432,7 +1432,7 @@
 				CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1461,7 +1461,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.0.2;
+				MARKETING_VERSION = 4.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -746,8 +746,8 @@
             filePath = "OrderScheduling/Common/WebView/WebViewTool.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "56"
+            startingLineNumber = "57"
-            endingLineNumber = "56"
+            endingLineNumber = "57"
             landmarkName = "init()"
             landmarkType = "7">
          </BreakpointContent>
@@ -4535,8 +4535,8 @@
             filePath = "OrderScheduling/Common/WebView/WebViewTool.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "59"
+            startingLineNumber = "60"
-            endingLineNumber = "59"
+            endingLineNumber = "60"
             landmarkName = "init()"
             landmarkType = "7">
          </BreakpointContent>

OrderScheduling/Common/WebView/WebViewTool.swift

@@ -26,6 +26,7 @@ open class WebViewTool : NSObject {
         case vehicleManage = "车辆管理"
         case driverManage = "司机管理"
         case invoicingNotify = "开票通知"
+        case roadAndbridgeTollReimbursement = "路桥费报销"
         case reporting = "报备"
         case reportingList = "报备查看"
         case supplySettlement = "补结算单"
@@ -94,6 +95,9 @@ open class WebViewTool : NSObject {
         case .invoicingNotify:
             vc = WebViewController(showNavBar:false, title: WebViewNameEnum.invoicingNotify.rawValue, url: "\((h5Models?.invoicingNotify)!)?token=\((USER.token)!)")
             break
+        case .roadAndbridgeTollReimbursement:
+            vc = WebViewController(showNavBar:false, title: WebViewNameEnum.invoicingNotify.rawValue, url: "\("\(DOCMENT_HOST)/h5/supplier/dispatch/caseList")?token=\((USER.token)!)")
+            break
         case .reporting:
             vc = WebViewController(title: WebViewNameEnum.reporting.rawValue, url: "\((h5Models?.reporting)!)?token=\((USER.token)!)"+(appending ?? ""))
             break

OrderScheduling/Mine/ViewController/MineController.swift

@@ -97,6 +97,13 @@ extension MineController {
             })
             .disposed(by: disposeBag)
         
+        mineView.luqiaofeibaoxiaoGes.rx.event
+            .observe(on: MainScheduler.instance)
+            .subscribe(onNext: { _ in
+                WEBTOOL.open(name: .roadAndbridgeTollReimbursement, appending: nil)
+            })
+            .disposed(by: disposeBag)
+        
         mineView.wendangziliaoGes.rx.event
             .observe(on: MainScheduler.instance)
             .subscribe(onNext: { _ in
@@ -167,6 +174,7 @@ open class MineController : ZDViewController {
 
         mineView.gongdanduizhang.titleLabel.text = "工单对账"
         mineView.kaipiaotongzhi.titleLabel.text = "开票通知"
+        mineView.luqiaofeibaoxiao.titleLabel.text = "路桥费报销"
         mineView.peixunwendang.titleLabel.text = "培训文档"
         mineView.wendangziliao.titleLabel.text = "文档资料"
         mineView.banbenjiance.titleLabel.text = "版本检测"
@@ -200,6 +208,8 @@ open class MineView : DDView {
     public let gongdanduizhang : MineCell
     public let kaipiaotongzhiGes : UITapGestureRecognizer
     public let kaipiaotongzhi : MineCell
+    public let luqiaofeibaoxiaoGes : UITapGestureRecognizer
+    public let luqiaofeibaoxiao : MineCell
     public let peixunwendangGes : UITapGestureRecognizer
     public let peixunwendang : MineCell
     public let wendangziliaoGes : UITapGestureRecognizer
@@ -227,6 +237,8 @@ open class MineView : DDView {
         settingsRadiusView = DDView()
         gongdanduizhangGes = UITapGestureRecognizer()
         gongdanduizhang = MineCell()
+        luqiaofeibaoxiaoGes = UITapGestureRecognizer()
+        luqiaofeibaoxiao = MineCell()
         kaipiaotongzhiGes = UITapGestureRecognizer()
         kaipiaotongzhi = MineCell()
         peixunwendangGes = UITapGestureRecognizer()
@@ -270,9 +282,11 @@ open class MineView : DDView {
         scrollContentView.addSubview(settingsRadiusView)
         gongdanduizhang.addGestureRecognizer(gongdanduizhangGes)
         orderRadiusView.addSubview(gongdanduizhang)
-        kaipiaotongzhi.line.isHidden = true
         kaipiaotongzhi.addGestureRecognizer(kaipiaotongzhiGes)
         orderRadiusView.addSubview(kaipiaotongzhi)
+        luqiaofeibaoxiao.addGestureRecognizer(luqiaofeibaoxiaoGes)
+        luqiaofeibaoxiao.line.isHidden = true
+        orderRadiusView.addSubview(luqiaofeibaoxiao)
         peixunwendang.addGestureRecognizer(peixunwendangGes)
         materialRadiusView.addSubview(peixunwendang)
         wendangziliao.line.isHidden = true
@@ -341,7 +355,7 @@ open class MineView : DDView {
             make.top.equalTo(infoRadiusView.snp.bottom).offset(auto(10))
             make.width.equalTo(infoRadiusView)
             make.centerX.equalToSuperview()
-            make.height.equalTo(auto(110))
+            make.height.equalTo(auto(165))
         }
         
         materialRadiusView.snp.makeConstraints { make in
@@ -365,6 +379,12 @@ open class MineView : DDView {
         
         kaipiaotongzhi.snp.makeConstraints { make in
             make.top.equalTo(gongdanduizhang.snp.bottom)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(gongdanduizhang)
+        }
+        
+        luqiaofeibaoxiao.snp.makeConstraints { make in
+            make.top.equalTo(kaipiaotongzhi.snp.bottom)
             make.left.bottom.right.equalToSuperview()
         }
         

fastlane/report.xml

@@ -5,17 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000177">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000184">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: gym" time="75.197299">
+      <testcase classname="fastlane.lanes" name="1: gym" time="78.69457">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: pgyer" time="11.711155">
+      <testcase classname="fastlane.lanes" name="2: pgyer" time="15.37012">
         
       </testcase>