分账设置修改

GeliBusinessPlatform/Define/Define.swift

@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
 
 //接口地址
 //test
-//let SERVERCE_ImageHost = "https://z.gelifood.com/"
-//let SERVERCE_HOST = "https://z.gelifood.com/admin/"
-let SERVERCE_ImageHost = "https://zx.gelifood.com/"
-let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
+let SERVERCE_ImageHost = "https://z.gelifood.com/"
+let SERVERCE_HOST = "https://z.gelifood.com/admin/"
+//let SERVERCE_ImageHost = "https://zx.gelifood.com/"
+//let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
 ////online
 
 //视图常量

GeliBusinessPlatform/ViewController/分销商分账设置/DistributorSettingViewController.swift

@@ -9,6 +9,7 @@
 import UIKit
 
 class DistributorSettingViewController: BaseViewController {
+    @IBOutlet weak var share_intro_lbl: UILabel!
     @IBOutlet weak var intro_lbl: UILabel!
     @IBOutlet weak var topLbl: UILabel!
     var dataM:getDbtRuleDataModel? = nil
@@ -36,15 +37,17 @@ class DistributorSettingViewController: BaseViewController {
                 dbt_type = "2"
             }
             
-//            if dataM?.share_type == 1 {
-//                sharetypeBtn1 .setImage(UIImage.init(named: "yuxuan"), for: .normal)
-//                sharetypeBtn2 .setImage(UIImage.init(named: "daixuan"), for: .normal)
-//                share_type = "1"
-//            }else if dataM?.share_type == 2 {
+            if dataM?.share_type == 1 {
+                share_intro_lbl.text = "即用户进入分销员发送链接绑定关系，随后所买的分销商品只结算给该绑定分销员"
                 sharetypeBtn1 .setImage(UIImage.init(named: "daixuan"), for: .normal)
                 sharetypeBtn2 .setImage(UIImage.init(named: "yuxuan"), for: .normal)
+                share_type = "1"
+            }else if dataM?.share_type == 2 {
+                sharetypeBtn1 .setImage(UIImage.init(named: "yuxuan"), for: .normal)
+                sharetypeBtn2 .setImage(UIImage.init(named: "daixuan"), for: .normal)
+                share_intro_lbl.text = "即用户在哪个链接购买分销商品就结算给哪个发送链接的分销员"
                 share_type = "2"
-//            }
+            }
         }
      }
   
@@ -68,17 +71,18 @@ class DistributorSettingViewController: BaseViewController {
     @IBOutlet weak var sharetypeBtn2: UIButton!
     
     @IBAction func sharetypeAction(_ sender: UIButton) {
-//        if sharetypeBtn1 == sender {
-//            sharetypeBtn1 .setImage(UIImage.init(named: "yuxuan"), for: .normal)
-//            sharetypeBtn2 .setImage(UIImage.init(named: "daixuan"), for: .normal)
-//            share_type = "1"
-//
-//        }else if sharetypeBtn2 == sender{
+        if sharetypeBtn1 == sender {
+            sharetypeBtn1 .setImage(UIImage.init(named: "yuxuan"), for: .normal)
+            sharetypeBtn2 .setImage(UIImage.init(named: "daixuan"), for: .normal)
+            share_type = "2"
+            share_intro_lbl.text = "即用户在哪个链接购买分销商品就结算给哪个发送链接的分销员"
+        }else if sharetypeBtn2 == sender{
+            share_intro_lbl.text = "即用户进入分销员发送链接绑定关系，随后所买的分销商品只结算给该绑定分销员"
             sharetypeBtn1 .setImage(UIImage.init(named: "daixuan"), for: .normal)
             sharetypeBtn2 .setImage(UIImage.init(named: "yuxuan"), for: .normal)
-            share_type = "2"
-
-//        }
+            share_type = "1"
+            
+        }
     }
     @IBAction func submitAction(_ sender: Any) {
         //保存
@@ -91,7 +95,6 @@ class DistributorSettingViewController: BaseViewController {
         } failture: { (error) in
             
         }
-
     }
     
 

GeliBusinessPlatform/ViewController/分销商分账设置/DistributorSettingViewController.xib

@@ -13,6 +13,7 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DistributorSettingViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="intro_lbl" destination="rdF-Hk-QO2" id="QxI-s7-k0v"/>
+                <outlet property="share_intro_lbl" destination="120-wO-RM3" id="ePZ-fJ-hFb"/>
                 <outlet property="sharetypeBtn1" destination="7Jf-Vg-Ti2" id="dPC-FK-G2x"/>
                 <outlet property="sharetypeBtn2" destination="kUr-sL-blR" id="g8o-jB-DgV"/>
                 <outlet property="topLbl" destination="M3H-QL-Wkh" id="ArN-vW-hMc"/>
@@ -138,25 +139,25 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kUr-sL-blR">
-                    <rect key="frame" x="110" y="277" width="85" height="19"/>
+                    <rect key="frame" x="110" y="277" width="78" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
-                    <state key="normal" title="  1对多结算" image="yuxuan">
+                    <state key="normal" title="  1对1结算" image="daixuan">
                         <color key="titleColor" name="标题字颜色"/>
                     </state>
                     <connections>
                         <action selector="sharetypeAction:" destination="-1" eventType="touchUpInside" id="QAV-Pp-TsC"/>
                     </connections>
                 </button>
-                <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="120-wO-RM3">
+                <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="120-wO-RM3">
                     <rect key="frame" x="110" y="306" width="294" height="36.5"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <color key="textColor" name="灰色字体颜色"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7Jf-Vg-Ti2">
-                    <rect key="frame" x="218" y="277" width="78" height="19"/>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7Jf-Vg-Ti2">
+                    <rect key="frame" x="211" y="277" width="85" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
-                    <state key="normal" title="  1对1结算" image="daixuan">
+                    <state key="normal" title="  1对多结算" image="yuxuan">
                         <color key="titleColor" name="标题字颜色"/>
                     </state>
                     <connections>