新增分销退款提示面板

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -66,6 +66,8 @@
 		E0206335246CE45A007A40C4 /* HeaderOnlyTitleView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0206334246CE45A007A40C4 /* HeaderOnlyTitleView.xib */; };
 		E0228BB0246FDA9A005812FA /* TitleAndLblCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0228BAE246FDA9A005812FA /* TitleAndLblCell.swift */; };
 		E0228BB1246FDA9A005812FA /* TitleAndLblCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0228BAF246FDA9A005812FA /* TitleAndLblCell.xib */; };
+		E0232D6425C260A800FB56D4 /* Refund_Commend_View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0232D6325C260A800FB56D4 /* Refund_Commend_View.swift */; };
+		E0232D6925C260B200FB56D4 /* Refund_Commend_View.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0232D6825C260B200FB56D4 /* Refund_Commend_View.xib */; };
 		E0239202249069FD00C4C632 /* CGDXQVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0239200249069FD00C4C632 /* CGDXQVc.swift */; };
 		E0239203249069FD00C4C632 /* CGDXQVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0239201249069FD00C4C632 /* CGDXQVc.xib */; };
 		E02392062490819600C4C632 /* CGDListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02392042490819600C4C632 /* CGDListCell.swift */; };
@@ -779,6 +781,8 @@
 		E0206334246CE45A007A40C4 /* HeaderOnlyTitleView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HeaderOnlyTitleView.xib; sourceTree = "<group>"; };
 		E0228BAE246FDA9A005812FA /* TitleAndLblCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleAndLblCell.swift; sourceTree = "<group>"; };
 		E0228BAF246FDA9A005812FA /* TitleAndLblCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TitleAndLblCell.xib; sourceTree = "<group>"; };
+		E0232D6325C260A800FB56D4 /* Refund_Commend_View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Refund_Commend_View.swift; sourceTree = "<group>"; };
+		E0232D6825C260B200FB56D4 /* Refund_Commend_View.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Refund_Commend_View.xib; sourceTree = "<group>"; };
 		E0239200249069FD00C4C632 /* CGDXQVc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDXQVc.swift; sourceTree = "<group>"; };
 		E0239201249069FD00C4C632 /* CGDXQVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CGDXQVc.xib; sourceTree = "<group>"; };
 		E02392042490819600C4C632 /* CGDListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDListCell.swift; sourceTree = "<group>"; };
@@ -3242,6 +3246,8 @@
 				F97E73312552A22000A11F98 /* DistributorSettingAlertView.xib */,
 				E0F038FB2599C5F500721011 /* GLTimeSelectView.swift */,
 				E0F039002599C60200721011 /* GLTimeSelectView.xib */,
+				E0232D6325C260A800FB56D4 /* Refund_Commend_View.swift */,
+				E0232D6825C260B200FB56D4 /* Refund_Commend_View.xib */,
 			);
 			path = AlertView;
 			sourceTree = "<group>";
@@ -3799,6 +3805,7 @@
 				E0A7548B244A8F0F00A84B67 /* CheckWareHourseViewController.xib in Resources */,
 				F956D5A4246A2D9C003FF510 /* .gitignore in Resources */,
 				E0BE8A80245A740600E80134 /* ChengGongCell.xib in Resources */,
+				E0232D6925C260B200FB56D4 /* Refund_Commend_View.xib in Resources */,
 				E0190A2E2487696F00B1E067 /* NewSelectItemVc.xib in Resources */,
 				F95D9B5024484FAE0080D6E3 /* GeliAlertView.xib in Resources */,
 				F91E9EBF2579D00900FAFCFA /* RetailListMgVC.xib in Resources */,
@@ -4181,6 +4188,7 @@
 				E02392062490819600C4C632 /* CGDListCell.swift in Sources */,
 				F950FDAB2451634B00C40530 /* LocationGeliPayModel.swift in Sources */,
 				E0CC84802482378D009B1FE9 /* IoGoodsDetailModel.swift in Sources */,
+				E0232D6425C260A800FB56D4 /* Refund_Commend_View.swift in Sources */,
 				E0D197C6244845FD002B080C /* PersonCenterViewController.swift in Sources */,
 				E0F1BE4824692379003015B2 /* ItemCell.swift in Sources */,
 				E09B03AB2445B0A300211A51 /* LoginModel.swift in Sources */,

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -91,6 +91,7 @@ class OrderDetailResModel: Mappable {
     var pay_type_cn : String?     //支付方式中文
     var pay_status_cn : String?  //支付状态中文
     var order_type : Int?//订单类型 1普通2期货3团购4预售
+    var commission_time_type:Int?//佣金退款类型
     var order_status : Int?//订单状态
     var order_status_d : Int?//订单详细状态
     var shipping_type : Int?//配送方式：1派送,2自提
@@ -139,6 +140,7 @@ class OrderDetailResModel: Mappable {
         pay_type_cn <- map["pay_type_cn"]
         pay_status_cn <- map["pay_status_cn"]
         order_type <- map["order_type"]
+        commission_time_type <- map["commission_time_type"]
         order_status <- map["order_status"]
         order_status_d <- map["order_status_d"]
         logistics_price <- map["logistics_price"]

GeliBusinessPlatform/Model/OrderManageModel/OrderListModel.swift

@@ -33,6 +33,7 @@ class OrderListDataModel: Mappable {
     var order_status_d : Int? //订单详细状态
     var goods_before_pay :Int? //是否为先货后款：0否 1是
     var order_type : Int? //订单类型 1普通2期货3团购4预售5分销商品
+    var commission_time_type:Int?//佣金退款类型
     var pay_status : Int? //支付状态
     var pay_type : Int? //支付类型
     var apply_cancel:Int?  //申请取消订单标识：0待申请 1申请取消中 2已取消
@@ -65,7 +66,7 @@ class OrderListDataModel: Mappable {
         cus_name <- map["cus_name"]
         goods_number <- map["goods_number"]
         order_goods <- map["order_goods"]
-
+        commission_time_type <- map["commission_time_type"]
     }
     
 }

GeliBusinessPlatform/View/AlertView/Refund_Commend_View.swift

+//
+//  Refund_Commend_View.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2021/1/28.
+//  Copyright © 2021 junye lu. All rights reserved.
+//
+
+import UIKit
+protocol Refund_Commend_View_Delegate {
+    func Refund_Commend_View_submit(type:Int)
+}
+class Refund_Commend_View: UIView {
+    var delegate:Refund_Commend_View_Delegate?
+    var is_pay_own = 1
+    @IBAction func submit_action(_ sender: UIButton) {
+        delegate?.Refund_Commend_View_submit(type: is_pay_own)
+    }
+    @IBAction func btn_click(_ sender: UIButton) {
+        btns_select_bg.isHidden = true
+        status_lbl.text = sender.titleLabel?.text
+        is_pay_own = sender.tag
+    }
+    @IBOutlet weak var btns_select_bg: UIView!
+    @IBAction func show_hide_action(_ sender: UIButton) {
+        btns_select_bg.isHidden = !btns_select_bg.isHidden
+    }
+    @IBOutlet weak var status_lbl: UILabel!
+    @IBAction func closet_action(_ sender: UIButton) {
+        self.removeFromSuperview()
+    }
+    var contentView:UIView!
+    //初始化时将xib中的view添加进来
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        contentView = loadViewFromNib()
+        addSubview(contentView)
+        contentView.snp.makeConstraints { (make) in
+            make.left.top.right.bottom.equalToSuperview()
+        }
+        
+    }
+    //    /初始化时将xib中的view添加进来
+    required init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        contentView = loadViewFromNib()
+        addSubview(contentView)
+        contentView.snp.makeConstraints { (make) in
+            make.left.top.right.bottom.equalToSuperview()
+        }
+    }
+    //加载xib
+    func loadViewFromNib() -> UIView {
+        let className = type(of: self)
+        let bundle = Bundle(for: className)
+        let name = NSStringFromClass(className).components(separatedBy: ".").last
+        let nib = UINib(nibName: name!, bundle: bundle)
+        let view = nib.instantiate(withOwner: self, options: nil).first as! UIView
+        return view
+    }
+
+}

GeliBusinessPlatform/View/AlertView/Refund_Commend_View.xib

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina5_5" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="Refund_Commend_View" customModule="TestClass" customModuleProvider="target">
+            <connections>
+                <outlet property="btns_select_bg" destination="G5J-T2-MMQ" id="bOR-mi-nyB"/>
+                <outlet property="status_lbl" destination="Jvn-Nt-y4o" id="X8i-St-Aa8"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <button opaque="NO" alpha="0.40000000000000002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jkA-MK-WS5">
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                    <color key="backgroundColor" name="标题字颜色"/>
+                    <connections>
+                        <action selector="closet_action:" destination="-1" eventType="touchUpInside" id="Ef2-oh-e0p"/>
+                    </connections>
+                </button>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gkq-vF-Z2Y">
+                    <rect key="frame" x="40" y="238" width="334" height="260"/>
+                    <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="H2d-4z-wbz">
+                            <rect key="frame" x="25" y="25" width="284" height="84"/>
+                            <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
+                            <color key="textColor" name="标题字颜色"/>
+                            <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="zmL-SU-3Z8">
+                            <rect key="frame" x="25.000000000000007" y="137.66666666666669" width="94.666666666666686" height="18.333333333333343"/>
+                            <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
+                            <color key="textColor" name="标题字颜色"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MzJ-d0-rri">
+                            <rect key="frame" x="0.0" y="211" width="334" height="1"/>
+                            <color key="backgroundColor" name="灰色分界线"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="1" id="NAz-B2-wMO"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zwp-fc-BoA">
+                            <rect key="frame" x="166.66666666666666" y="212" width="1" height="48"/>
+                            <color key="backgroundColor" name="灰色分界线"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="1" id="8hB-Re-TDZ"/>
+                            </constraints>
+                        </view>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AeS-it-35l">
+                            <rect key="frame" x="124.66666666666664" y="129.33333333333331" width="184.33333333333337" height="35"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="垫付佣金" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Jvn-Nt-y4o">
+                                    <rect key="frame" x="10" y="8.3333333333333695" width="52" height="18.333333333333329"/>
+                                    <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
+                                    <color key="textColor" name="个人中心灰色字体"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jinru" translatesAutoresizingMaskIntoConstraints="NO" id="ibD-4W-WD3">
+                                    <rect key="frame" x="171.33333333333334" y="14" width="3" height="7"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="7" id="lMg-Js-2Wk"/>
+                                        <constraint firstAttribute="width" constant="3" id="srD-w0-h4w"/>
+                                    </constraints>
+                                </imageView>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Tc-lb-qOD">
+                                    <rect key="frame" x="0.0" y="0.0" width="184.33333333333334" height="35"/>
+                                    <connections>
+                                        <action selector="show_hide_action:" destination="-1" eventType="touchUpInside" id="PTZ-eR-H6v"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" name="搜索框背景色"/>
+                            <constraints>
+                                <constraint firstItem="ibD-4W-WD3" firstAttribute="centerY" secondItem="AeS-it-35l" secondAttribute="centerY" id="6Y6-aw-K9C"/>
+                                <constraint firstItem="9Tc-lb-qOD" firstAttribute="top" secondItem="AeS-it-35l" secondAttribute="top" id="9XU-bi-NGB"/>
+                                <constraint firstAttribute="trailing" secondItem="9Tc-lb-qOD" secondAttribute="trailing" id="Xb4-lp-4S2"/>
+                                <constraint firstItem="Jvn-Nt-y4o" firstAttribute="leading" secondItem="AeS-it-35l" secondAttribute="leading" constant="10" id="Z5T-oN-8ho"/>
+                                <constraint firstItem="Jvn-Nt-y4o" firstAttribute="centerY" secondItem="AeS-it-35l" secondAttribute="centerY" id="c5K-Kd-u27"/>
+                                <constraint firstAttribute="height" constant="35" id="ck6-nF-Zks"/>
+                                <constraint firstItem="9Tc-lb-qOD" firstAttribute="leading" secondItem="AeS-it-35l" secondAttribute="leading" id="df5-42-fFA"/>
+                                <constraint firstAttribute="trailing" secondItem="ibD-4W-WD3" secondAttribute="trailing" constant="10" id="rpR-Xv-9le"/>
+                                <constraint firstAttribute="bottom" secondItem="9Tc-lb-qOD" secondAttribute="bottom" id="uVh-Tg-Gcb"/>
+                            </constraints>
+                        </view>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8na-4K-sFD">
+                            <rect key="frame" x="0.0" y="212" width="166.66666666666666" height="48"/>
+                            <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
+                            <state key="normal" title="取消">
+                                <color key="titleColor" name="个人中心灰色字体"/>
+                            </state>
+                            <connections>
+                                <action selector="closet_action:" destination="-1" eventType="touchUpInside" id="kPI-ux-MNS"/>
+                            </connections>
+                        </button>
+                        <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5u0-hy-eGq">
+                            <rect key="frame" x="167.66666666666663" y="212" width="166.33333333333337" height="48"/>
+                            <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
+                            <state key="normal" title="确认">
+                                <color key="titleColor" name="蓝色字体颜色"/>
+                            </state>
+                            <connections>
+                                <action selector="submit_action:" destination="-1" eventType="touchUpInside" id="2oX-aZ-nfg"/>
+                            </connections>
+                        </button>
+                        <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G5J-T2-MMQ">
+                            <rect key="frame" x="125" y="164.33333333333331" width="184" height="70"/>
+                            <subviews>
+                                <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xJL-P8-IeF">
+                                    <rect key="frame" x="0.0" y="0.0" width="184" height="35"/>
+                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
+                                    <state key="normal" title="垫付佣金">
+                                        <color key="titleColor" name="个人中心灰色字体"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="btn_click:" destination="-1" eventType="touchUpInside" id="5x9-hY-gsJ"/>
+                                    </connections>
+                                </button>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Bbl-AH-WHT">
+                                    <rect key="frame" x="0.0" y="34.333333333333371" width="184" height="1"/>
+                                    <color key="backgroundColor" name="灰色分界线"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="1" id="ioh-JI-7xV"/>
+                                    </constraints>
+                                </view>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MU2-5n-crv">
+                                    <rect key="frame" x="0.0" y="35" width="184" height="35"/>
+                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
+                                    <state key="normal" title="不垫付佣金">
+                                        <color key="titleColor" name="个人中心灰色字体"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="btn_click:" destination="-1" eventType="touchUpInside" id="xS5-m2-Sbr"/>
+                                    </connections>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" systemColor="systemGray2Color"/>
+                            <constraints>
+                                <constraint firstItem="MU2-5n-crv" firstAttribute="leading" secondItem="G5J-T2-MMQ" secondAttribute="leading" id="4g3-4k-A2G"/>
+                                <constraint firstItem="Bbl-AH-WHT" firstAttribute="leading" secondItem="G5J-T2-MMQ" secondAttribute="leading" id="MPf-BY-KXi"/>
+                                <constraint firstItem="MU2-5n-crv" firstAttribute="top" secondItem="xJL-P8-IeF" secondAttribute="bottom" id="YJ7-S5-1es"/>
+                                <constraint firstItem="Bbl-AH-WHT" firstAttribute="centerY" secondItem="G5J-T2-MMQ" secondAttribute="centerY" id="ZUy-cs-MmI"/>
+                                <constraint firstAttribute="trailing" secondItem="xJL-P8-IeF" secondAttribute="trailing" id="apY-DN-fzs"/>
+                                <constraint firstItem="MU2-5n-crv" firstAttribute="height" secondItem="xJL-P8-IeF" secondAttribute="height" id="ci4-IW-HxZ"/>
+                                <constraint firstAttribute="trailing" secondItem="Bbl-AH-WHT" secondAttribute="trailing" id="heq-W7-HPe"/>
+                                <constraint firstAttribute="bottom" secondItem="MU2-5n-crv" secondAttribute="bottom" id="iOf-pr-5E3"/>
+                                <constraint firstAttribute="trailing" secondItem="MU2-5n-crv" secondAttribute="trailing" id="igC-sh-1H9"/>
+                                <constraint firstAttribute="height" constant="70" id="mbn-RM-WRl"/>
+                                <constraint firstItem="xJL-P8-IeF" firstAttribute="top" secondItem="G5J-T2-MMQ" secondAttribute="top" id="qdJ-So-Ep8"/>
+                                <constraint firstItem="xJL-P8-IeF" firstAttribute="leading" secondItem="G5J-T2-MMQ" secondAttribute="leading" id="qpR-eH-Hm5"/>
+                            </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" name="灰色分界线"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="0.5"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="3"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <constraints>
+                        <constraint firstItem="G5J-T2-MMQ" firstAttribute="top" secondItem="AeS-it-35l" secondAttribute="bottom" id="0Ms-Ds-28b"/>
+                        <constraint firstItem="G5J-T2-MMQ" firstAttribute="width" secondItem="9Tc-lb-qOD" secondAttribute="width" multiplier="0.998192" id="7Kn-sW-xit"/>
+                        <constraint firstItem="zwp-fc-BoA" firstAttribute="top" secondItem="MzJ-d0-rri" secondAttribute="bottom" id="9A7-RG-vd9"/>
+                        <constraint firstItem="8na-4K-sFD" firstAttribute="leading" secondItem="gkq-vF-Z2Y" secondAttribute="leading" id="9TL-dn-j8B"/>
+                        <constraint firstAttribute="height" constant="260" id="9xf-BM-sFk"/>
+                        <constraint firstAttribute="trailing" secondItem="MzJ-d0-rri" secondAttribute="trailing" id="ANp-Ms-VY0"/>
+                        <constraint firstItem="H2d-4z-wbz" firstAttribute="top" secondItem="gkq-vF-Z2Y" secondAttribute="top" constant="25" id="ARy-z6-dH5"/>
+                        <constraint firstItem="zwp-fc-BoA" firstAttribute="leading" secondItem="8na-4K-sFD" secondAttribute="trailing" id="BKo-Jp-2H0"/>
+                        <constraint firstItem="zwp-fc-BoA" firstAttribute="centerX" secondItem="gkq-vF-Z2Y" secondAttribute="centerX" id="Bxb-re-SEQ"/>
+                        <constraint firstItem="MzJ-d0-rri" firstAttribute="top" secondItem="gkq-vF-Z2Y" secondAttribute="bottom" constant="-49" id="EW9-dM-w10"/>
+                        <constraint firstAttribute="trailing" secondItem="H2d-4z-wbz" secondAttribute="trailing" constant="25" id="L1x-pN-uPG"/>
+                        <constraint firstItem="AeS-it-35l" firstAttribute="leading" secondItem="zmL-SU-3Z8" secondAttribute="trailing" constant="5" id="NfH-YF-f9M"/>
+                        <constraint firstAttribute="bottom" secondItem="5u0-hy-eGq" secondAttribute="bottom" id="Pb9-QK-C9f"/>
+                        <constraint firstAttribute="trailing" secondItem="5u0-hy-eGq" secondAttribute="trailing" id="RcU-9b-QIF"/>
+                        <constraint firstItem="5u0-hy-eGq" firstAttribute="top" secondItem="MzJ-d0-rri" secondAttribute="bottom" id="XiM-OS-dtE"/>
+                        <constraint firstItem="AeS-it-35l" firstAttribute="centerY" secondItem="zmL-SU-3Z8" secondAttribute="centerY" id="Xmn-aZ-Kui"/>
+                        <constraint firstAttribute="bottom" secondItem="zwp-fc-BoA" secondAttribute="bottom" id="YA7-fJ-tkJ"/>
+                        <constraint firstAttribute="bottom" secondItem="8na-4K-sFD" secondAttribute="bottom" id="b9u-la-UIF"/>
+                        <constraint firstItem="G5J-T2-MMQ" firstAttribute="centerX" secondItem="9Tc-lb-qOD" secondAttribute="centerX" id="boT-0j-Gjo"/>
+                        <constraint firstItem="H2d-4z-wbz" firstAttribute="leading" secondItem="gkq-vF-Z2Y" secondAttribute="leading" constant="25" id="eQA-Og-31b"/>
+                        <constraint firstItem="8na-4K-sFD" firstAttribute="top" secondItem="MzJ-d0-rri" secondAttribute="bottom" id="fXU-ub-4lo"/>
+                        <constraint firstItem="5u0-hy-eGq" firstAttribute="leading" secondItem="zwp-fc-BoA" secondAttribute="trailing" id="hk1-Kv-wlg"/>
+                        <constraint firstItem="zmL-SU-3Z8" firstAttribute="leading" secondItem="gkq-vF-Z2Y" secondAttribute="leading" constant="25" id="mFC-Ze-Oer"/>
+                        <constraint firstItem="zmL-SU-3Z8" firstAttribute="top" secondItem="H2d-4z-wbz" secondAttribute="bottom" constant="28.5" id="qSe-pV-w89"/>
+                        <constraint firstItem="MzJ-d0-rri" firstAttribute="leading" secondItem="gkq-vF-Z2Y" secondAttribute="leading" id="rsC-UO-Jvf"/>
+                        <constraint firstAttribute="trailing" secondItem="AeS-it-35l" secondAttribute="trailing" constant="25" id="u9j-H4-9Ew"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                            <real key="value" value="10"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
+                </view>
+            </subviews>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstItem="jkA-MK-WS5" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="7kM-tU-6pL"/>
+                <constraint firstItem="jkA-MK-WS5" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="8Zb-0s-lCM"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="jkA-MK-WS5" secondAttribute="trailing" id="UXt-o7-3L0"/>
+                <constraint firstItem="gkq-vF-Z2Y" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="YjV-af-4vp"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="gkq-vF-Z2Y" secondAttribute="trailing" constant="40" id="c8X-CS-IUA"/>
+                <constraint firstAttribute="bottom" secondItem="jkA-MK-WS5" secondAttribute="bottom" id="rtS-6c-gg2"/>
+                <constraint firstItem="gkq-vF-Z2Y" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="40" id="slp-zo-xea"/>
+            </constraints>
+            <point key="canvasLocation" x="40.579710144927539" y="84.782608695652186"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="jinru" width="13" height="23"/>
+        <namedColor name="个人中心灰色字体">
+            <color red="0.38823529411764707" green="0.38823529411764707" blue="0.38823529411764707" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="搜索框背景色">
+            <color red="0.9137254901960784" green="0.90588235294117647" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="标题字颜色">
+            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="灰色分界线">
+            <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="蓝色字体颜色">
+            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemGray2Color">
+            <color red="0.68235294117647061" green="0.68235294117647061" blue="0.69803921568627447" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
+    </resources>
+</document>

GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift

@@ -9,10 +9,14 @@
 import UIKit
 import ViewAnimator //cell动效
 
-class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSource, GeliAlertViewDelegate, OrderDViewControllerDelegate,CGDListCellDelegate{
-    let UserToken = UserDefaults.standard.value(forKey: "user_token")
+class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSource, GeliAlertViewDelegate, OrderDViewControllerDelegate,CGDListCellDelegate, Refund_Commend_View_Delegate{
+    func Refund_Commend_View_submit(type: Int) {
+        is_pay_own = type
+    }
     
+    let UserToken = UserDefaults.standard.value(forKey: "user_token")
     //MARK:--基础数据
+    var is_pay_own = 0
     var keyword: String = ""
     var startTime : Int = 0
     var endTime : Int = 0
@@ -150,7 +154,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
     var tableV :UITableView!
     var tableSearchV :UITableView! = nil
     
-//    private let animations = [AnimationType.from(direction: .bottom, offset: 300*glscale)]
+    //    private let animations = [AnimationType.from(direction: .bottom, offset: 300*glscale)]
     private let animations = [AnimationType.vector(CGVector(dx: 0, dy: 300*glscale))]
     func setTabv() {
         tableV = UITableView()
@@ -374,6 +378,12 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             self.view.window?.addSubview(alertView)
         }else if sender.titleLabel?.text == "退款" || sender.titleLabel?.text == "取消订单并退款"{
             isSrueOrder = 3
+            if rowModel.commission_time_type == 1 && rowModel.order_type == 5 {
+                let alertView = Refund_Commend_View(frame: self.view.window!.bounds)
+                alertView.delegate = self
+                self.view.window?.addSubview(alertView)
+                return
+            }
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
@@ -577,7 +587,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
             }
             break
         case 3:
-            orderRefund(["user_token":UserToken as Any,"order_id" : sender.tag as Any], success: { (data) in
+            orderRefund(["user_token":UserToken as Any,"order_id" : sender.tag as Any , "is_pay_own":is_pay_own as Any], success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
                 

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -11,7 +11,11 @@ import Photos
 protocol OrderDViewControllerDelegate {
     func refishingOrderDchange()
 }
-class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GuanLianKehuVCDelegate,OrderDViewFooterViewDelegate,TitleAndTFCellDelegate,GeliAlertViewDelegate,GLAlertSelectViewDelegate,XiuGaiYuShouJiaViewControllerDelegate,ChangeGoodsPriceVCDelegate,GeliAlertTextFiledDelegate,GeliAlertTextViewDelegate,UpBillDataTableViewCellDelegate, DaiKeXiaDanGouWuCellDelegate, S_Y_View_Delegate{
+class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GuanLianKehuVCDelegate,OrderDViewFooterViewDelegate,TitleAndTFCellDelegate,GeliAlertViewDelegate,GLAlertSelectViewDelegate,XiuGaiYuShouJiaViewControllerDelegate,ChangeGoodsPriceVCDelegate,GeliAlertTextFiledDelegate,GeliAlertTextViewDelegate,UpBillDataTableViewCellDelegate, DaiKeXiaDanGouWuCellDelegate, S_Y_View_Delegate, Refund_Commend_View_Delegate{
+    func Refund_Commend_View_submit(type: Int) {
+        is_pay_own = type
+    }
+    var is_pay_own = 0
     func S_Y_View_Check_Detail() {
         print("查看溯源")
         let vc = S_Y_Detail_Vc()
@@ -1451,6 +1455,13 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             self.view.window?.addSubview(alertView)
             break
         case "退款","取消订单并退款":
+            
+            if self.dataMdoel?.order_res?.commission_time_type == 1 && self.dataMdoel?.order_res?.order_type == 5 {
+                let alertView = Refund_Commend_View(frame: self.view.window!.bounds)
+                alertView.delegate = self
+                self.view.window?.addSubview(alertView)
+                return
+            }
             let alertView = GeliAlertView(frame: self.view.window!.bounds)
             alertView.delegate = self;
             alertView.tishiLbl.text = ""
@@ -1633,7 +1644,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             }
         }else if sender.tag == 1004 {
             HUD.flash(.progress)
-            orderRefund(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
+            orderRefund(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"is_pay_own":is_pay_own as Any], success: { (data) in
                 HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
                 self.delegate?.refishingOrderDchange()