4月修改

ADHTuanCan.xcworkspace/xcuserdata/aodeheng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -179,21 +179,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "7AD50092-98D1-4C8E-900B-12BA21033452"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ADHTuanCan/Class/&#x8ba2;&#x5355;/&#x8ba2;&#x5355;&#x8be6;&#x60c5;/OrderDetailViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "163"
-            endingLineNumber = "163"
-            landmarkName = "setNavBtn()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

ADHTuanCan/AppDelegate.swift

@@ -46,12 +46,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         
         //默认域名
 //        Defaults[\.BaseUrl] = "http://47.108.114.127:10888"
-        Defaults[\.BaseUrl] = "http://47.109.38.72:10887"
+//        Defaults[\.BaseUrl] = "http://47.109.38.72:10887"
 //        Defaults[\.BaseUrl] = "http://www.gzzzyd.com/gm-api"
 //        Defaults[\.BaseUrl] = "http://wine.gzzzyd.com/api"
 //        Defaults[\.BaseUrl] = "https://kcapp.kiansengculinary.com/api"
 //        Defaults[\.BaseUrl] = "https://kcapp.gzzzyd.com/api"
-//        Defaults[\.BaseUrl] = "https://kscapp.kiansengculinary.com/api"
+        Defaults[\.BaseUrl] = "https://kscapp.kiansengculinary.com/api"
 //    https://kscapp.kiansengculinary.com/api/
 //        Defaults[\.BaseUrl] = "https://kcapp.gzzzyd.com/api"
         

ADHTuanCan/Class/地址/view/zh-Hans.lproj/AddresViewCell.strings

@@ -18,4 +18,4 @@
 "fhv-7n-3Hh.text" = "贵州省贵阳市云岩区威清路30号中建四局大";
 
 /* Class = "UILabel"; text = "default"; ObjectID = "uak-U0-thZ"; */
-"uak-U0-thZ.text" = "default";
+"uak-U0-thZ.text" = "默认";

ADHTuanCan/Class/我的/Base.lproj/MyViewController.xib

@@ -15,6 +15,7 @@
                 <outlet property="balanceLb" destination="gqQ-FU-cnw" id="3gG-hG-7Bv"/>
                 <outlet property="bottomCons" destination="DIG-V7-qZk" id="JYe-R1-lNC"/>
                 <outlet property="brokerageLab" destination="ZwI-Lh-zY9" id="d1b-wq-hCn"/>
+                <outlet property="companyLb" destination="9VX-qH-lD3" id="YUQ-dc-8dd"/>
                 <outlet property="headImg" destination="CQK-bV-mSX" id="7Dy-ek-EjY"/>
                 <outlet property="integralLab" destination="fRF-IZ-oQS" id="Uhk-hv-lJI"/>
                 <outlet property="leftViewW" destination="VgQ-5m-b39" id="6eP-sa-Yzv"/>

ADHTuanCan/Class/我的/MyViewController.swift

@@ -58,6 +58,9 @@ class MyViewController: ADHBaseVC {
     
     @IBOutlet weak var applyView: UIView!
     
+    
+    @IBOutlet weak var companyLb: UILabel!
+    
     let brokerageSheetView = Bundle.main.loadNibNamed("BrokerageSheetView", owner: nil, options: nil)?.last as? BrokerageSheetView
     
     let promotionSheetView = Bundle.main.loadNibNamed("PromotionSheetView", owner: nil, options: nil)?.last as? PromotionSheetView
@@ -321,9 +324,9 @@ class MyViewController: ADHBaseVC {
         self.InvitationBtn.setTitle(LanguagesUtil.createTextBy(Ctext: "邀请码:\(self.dataModel?.inviteCode ?? "")", Etext: "InviteCode:\(self.dataModel?.inviteCode ?? "")"), for: .normal)
         
         if  Defaults[\.userType] === 1{
-            self.applyView.isHidden = false
+            self.companyLb.text = LanguagesUtil.createTextBy(Ctext: "白团申请", Etext: "Team application")
         }else{
-            self.applyView.isHidden = true
+            self.companyLb.text = LanguagesUtil.createTextBy(Ctext: "公司信息", Etext: "Company profile")
         }
         self.applyView.isHidden = false
         self.uiView1.isHidden = false

ADHTuanCan/Class/我的/成员/TeamMembersViewController.swift

@@ -8,6 +8,7 @@
 import UIKit
 import RxCocoa
 import RxSwift
+import SwiftyUserDefaults
 
 class TeamMembersViewController: ADHBaseVC {
 
@@ -109,9 +110,13 @@ class TeamMembersViewController: ADHBaseVC {
             self.hud.hidden()
             self.dataSource = []
             self.dataSource = self.viewModel.teamMembersList
-            let model : TeamMembersDetail = TeamMembersDetail()
-            model.isAdd = true
-            self.dataSource?.append(model)
+            
+            if  Defaults[\.userType] === 3{
+                let model : TeamMembersDetail = TeamMembersDetail()
+                model.isAdd = true
+                self.dataSource?.append(model)
+            }
+            
             
             self.collectView.reloadData()
 

ADHTuanCan/Class/我的/成员/view/TeamMembersCell.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import SwiftyUserDefaults
 
 class TeamMembersCell: UICollectionViewCell {
 
@@ -47,6 +48,13 @@ class TeamMembersCell: UICollectionViewCell {
             self.debtn.isHidden = false
             self.addImg.isHidden = true
         }
+        
+        if  Defaults[\.userType] === 3{
+            self.debtn.isHidden = false
+        }else{
+            self.debtn.isHidden = true
+        }
+        
         self.nameLab.text = "\(model.name ?? "")"
         self.headImg.sd_setImage(url: URL.init(string: model.avatar ?? "") ,placeHolderImage: UIImage.init(named: "默认头像"))
     }

ADHTuanCan/Class/我的/白团权限申请/ApplyWhiteManagerController.swift

@@ -114,7 +114,7 @@ class ApplyWhiteManagerController: ADHBaseVC {
         let navStyle = MCNavBarStyle()
         navStyle.styleForBackImage = UIImage.init(named: "黑色返回")!
         navStyle.styleForTitleColor = UIColor.black
-        self.navBar = MCNavBarView.init(title: LanguagesUtil.createTextBy(Ctext: "白团销售申请", Etext: "Team application"), subTitle: nil,style: navStyle)
+        self.navBar = MCNavBarView.init(title: LanguagesUtil.createTextBy(Ctext: "公司信息", Etext: "Company information"), subTitle: nil,style: navStyle)
         self.navBar?.backgroundColor = UIColor.white
         
         companyTF.inputText(maxLength: 50) {
@@ -193,6 +193,12 @@ class ApplyWhiteManagerController: ADHBaseVC {
     }
     
     func reSetUI(){
+        if  Defaults[\.userType] === 1{
+            self.saveBtn.isHidden = false
+        }else{
+            self.saveBtn.isHidden = true
+        }
+        
         if self.dataModel?.status === 1{
             ///审批中
             self.companyTF.isUserInteractionEnabled = false

ADHTuanCan/Class/我的/白团权限申请/Base.lproj/ApplyWhiteManagerController.xib

@@ -34,7 +34,7 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Eww-UH-ptK">
-                    <rect key="frame" x="0.0" y="88" width="393" height="694"/>
+                    <rect key="frame" x="0.0" y="88" width="393" height="764"/>
                     <subviews>
                         <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="vGi-j9-l6G">
                             <rect key="frame" x="24" y="24" width="65.333333333333329" height="19.333333333333329"/>
@@ -396,7 +396,7 @@
                     </constraints>
                 </scrollView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kty-ic-agf">
-                    <rect key="frame" x="24" y="793" width="345" height="48"/>
+                    <rect key="frame" x="24" y="782" width="345" height="48"/>
                     <color key="backgroundColor" red="0.77647058820000003" green="0.1333333333" blue="0.13725490200000001" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="48" id="Qmi-Ai-MYQ"/>
@@ -419,12 +419,12 @@
             <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="calibratedRGB"/>
             <constraints>
                 <constraint firstItem="Eww-UH-ptK" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="0Mz-N0-ff0"/>
-                <constraint firstAttribute="bottom" secondItem="Eww-UH-ptK" secondAttribute="bottom" constant="70" id="2Aw-Da-C8h"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="kty-ic-agf" secondAttribute="trailing" constant="24" id="4Gh-9R-dWM"/>
                 <constraint firstItem="Eww-UH-ptK" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="BVg-Qy-zQe"/>
-                <constraint firstItem="kty-ic-agf" firstAttribute="top" secondItem="Eww-UH-ptK" secondAttribute="bottom" constant="11" id="Eg7-k4-vd3"/>
                 <constraint firstItem="kty-ic-agf" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="24" id="VST-e4-hxH"/>
+                <constraint firstAttribute="bottom" secondItem="kty-ic-agf" secondAttribute="bottom" constant="22" id="aA8-ju-WKX"/>
                 <constraint firstItem="Eww-UH-ptK" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="88" id="eLr-6M-F0l"/>
+                <constraint firstAttribute="bottom" secondItem="Eww-UH-ptK" secondAttribute="bottom" id="yc9-9j-wcv"/>
             </constraints>
             <point key="canvasLocation" x="-63.358778625954194" y="0.0"/>
         </view>

ADHTuanCan/Class/支付类/en.lproj/PayMentSelectView.strings

@@ -6,4 +6,4 @@
 "bBW-cC-iZs.text" = "Select a settlement method";
 
 /* Class = "UILabel"; text = "结算方式"; ObjectID = "Dxy-xz-dtR"; */
-"Dxy-xz-dtR" = "means of payments";
+"Dxy-xz-dtR.text" = "means of payments";

ADHTuanCan/Class/支付类/zh-Hans.lproj/PayMentSelectView.strings

@@ -6,4 +6,4 @@
 "bBW-cC-iZs.text" = "选择结算方式";
 
 /* Class = "UILabel"; text = "结算方式"; ObjectID = "Dxy-xz-dtR"; */
-"Dxy-xz-dtR" = "结算方式";
+"Dxy-xz-dtR.text" = "结算方式";

ADHTuanCan/Class/订单/OrderManagerVC.swift

@@ -447,7 +447,7 @@ extension OrderManagerVC : UITableViewDelegate,UITableViewDataSource{
             
             if type == 5{
                 //去支付
-                self?.userPayTypeView?.priceLab.text = "\(self?.nowOrderListModel!.orderPrice ?? "")"
+                self?.userPayTypeView?.priceLab.text = "\(self?.nowOrderListModel!.payable ?? "")"
                 self?.getPayMent()
             }
             if type == 6{

ADHTuanCan/Class/订单/model/OrderDataModel.swift

@@ -47,6 +47,9 @@ class OrderListModel : MCBaseModel{
     /// 订单价格
     var orderPrice : String?
     
+    /// 应付金额
+    var payable : String?
+    
     ///1待付款，2待接单，3待配送，4已完成，5取消，6退款中，7已退款，8已完成且已评价，9已支付定金，10延后支付
     var status : String?
     
@@ -123,6 +126,9 @@ class OrderOutDetailModel : MCBaseModel{
     ///  价格
     var price : String?
     
+    /// 应付金额
+    var payable : String?
+    
     ///  收货手机号
     var phoneNum : String?
     

ADHTuanCan/Class/订单/订单详情/OrderDetailViewController.swift

@@ -90,7 +90,7 @@ class OrderDetailViewController: ADHBaseVC {
         ///type =  1去支付  2修改地址  3再来一单 4确认收货 5去评价 6联系商家 7取消订单
         self.headView?.headBtnBlock = {[unowned self] type in
             if type == 1{
-                self.userPayTypeView?.priceLab.text = "\(self.viewModel.orderOutDataModel?.price ?? "")"
+                self.userPayTypeView?.priceLab.text = "\(self.viewModel.orderOutDataModel?.payable ?? "")"
                 self.getPayMent()
             }
             if type == 2{
@@ -159,7 +159,7 @@ class OrderDetailViewController: ADHBaseVC {
         
         self.navBar = MCNavBarView.init(title: LanguagesUtil.createTextBy(Ctext: "订单详情", Etext: "Order detail"), subTitle: nil)
         
-        self.navBar?.insertNavRightBtn(LanguagesUtil.createTextBy(Ctext: "预览  ", Etext: "Preview  "), image: nil, tap: {[unowned self] in
+        self.navBar?.insertNavRightBtn(LanguagesUtil.createTextBy(Ctext: "税单  ", Etext: "Preview  "), image: nil, tap: {[unowned self] in
             let urlString = "\(self.viewModel.orderOutDataModel?.invoiceLink ?? "")"
             if let url = URL(string: urlString) {
                 //根据iOS系统版本，分别处理

ADHTuanCan/Class/购物车/model/ShopCarModel.swift

@@ -360,6 +360,10 @@ class GetPayPaymentTypeModel: MCBaseRequestModel {
     ///订单id，由订单列表拉起支付必传
     var orderId : NSNumber?
     
+    ///结算方式id，
+    var settleId : NSNumber?
+
+    
     ///获取支付方式来源，1由购物车发起购买，2由订单列表拉起支付，3用户充值
     var source : String?
     

ADHTuanCan/Class/购物车/确认订单/CheckOrderViewController.swift

@@ -177,6 +177,7 @@ class CheckOrderViewController: ADHBaseVC {
             self.viewModel.paySetModel = self.paySetModel
             self.setHeadViewPay()
             self.getPriceWithType()
+            self.getPayMent()
         }
         
         //去支付
@@ -383,6 +384,8 @@ class CheckOrderViewController: ADHBaseVC {
         self.viewModel.getPriceWithTypeModel.shopcartId = self.viewModel.getShoppingCarMsgResultMeal.shopcartId
         self.viewModel.signalGetPriceWithTypeRequest()?.on(success: { dd in
             self.userPayTypeView?.priceLab.text = "\(self.viewModel.priceWithTypeModel?.price ?? "")"
+            self.priceLab.text = "\(self.viewModel.priceWithTypeModel?.price ?? "")"
+            self.successModel.money = "\(self.viewModel.priceWithTypeModel?.price ?? "")"
             self.hud.hidden()
         }, error: { error in
             self.hud.showFailure(error.msg ?? LanguagesUtil.createTextBy(Ctext: "网络错误", Etext: "network error"))
@@ -410,6 +413,7 @@ class CheckOrderViewController: ADHBaseVC {
     //MARK: 获取支付方式列表
     func getPayMent(){
         self.hud.showLoading()
+        self.viewModel.getPayPayMentTypeModel.settleId = self.paySetModel?.id
         self.viewModel.signalGetPayMentType()?.on(success: { dd in
             self.userPayTypeView?.configDataSource(dataSource: self.viewModel.payMentList)
             self.hud.hidden()