1.6.9

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -4188,7 +4188,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3.3;
+				CURRENT_PROJECT_VERSION = 3.5;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4238,7 +4238,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.6.8;
+				MARKETING_VERSION = 1.6.9;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -4319,7 +4319,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3.3;
+				CURRENT_PROJECT_VERSION = 3.5;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
 				DEVELOPMENT_TEAM = K48346UACH;
@@ -4369,7 +4369,7 @@
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
 					"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
 				);
-				MARKETING_VERSION = 1.6.8;
+				MARKETING_VERSION = 1.6.9;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

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

@@ -9,6 +9,7 @@
 import UIKit
 
 class DistributorSettingViewController: BaseViewController {
+    @IBOutlet weak var intro_lbl: UILabel!
     @IBOutlet weak var topLbl: UILabel!
     var dataM:getDbtRuleDataModel? = nil
     var dbt_type = "2"
@@ -55,12 +56,12 @@ class DistributorSettingViewController: BaseViewController {
             typeBtn1 .setImage(UIImage.init(named: "yuxuan"), for: .normal)
             typeBtn2 .setImage(UIImage.init(named: "daixuan"), for: .normal)
             dbt_type = "1"
-
+            intro_lbl.text = "需要你自行与分销员进行业绩结算，通过线下转账方式发放佣金。"
         }else if typeBtn2 == sender{
             typeBtn1 .setImage(UIImage.init(named: "daixuan"), for: .normal)
             typeBtn2 .setImage(UIImage.init(named: "yuxuan"), for: .normal)
             dbt_type = "2"
-
+            intro_lbl.text = "系统根据你设置的比例，自动与分销员进行结算。"
         }
     }
     @IBOutlet weak var sharetypeBtn1: UIButton!

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

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<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="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+        <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"/>
@@ -12,6 +12,7 @@
     <objects>
         <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="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"/>
@@ -91,53 +92,53 @@
                         <action selector="typeAction:" destination="-1" eventType="touchUpInside" id="vXK-mL-4go"/>
                     </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="rdF-Hk-QO2">
-                    <rect key="frame" x="110" y="93" width="294" height="18.5"/>
+                <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="rdF-Hk-QO2">
+                    <rect key="frame" x="110" y="93" width="294" height="36.5"/>
                     <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="NCh-yY-mA1">
-                    <rect key="frame" x="15" y="131.5" width="399" height="1"/>
+                    <rect key="frame" x="15" y="149.5" width="399" height="1"/>
                     <color key="backgroundColor" name="灰色分界线"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1" id="O4O-5A-JCd"/>
                     </constraints>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="佣金结算时间:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Yp-84-pY1">
-                    <rect key="frame" x="13.5" y="152.5" width="81.5" height="19"/>
+                    <rect key="frame" x="13.5" y="170.5" width="81.5" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <color key="textColor" name="标题字颜色"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sJn-mb-uqO">
-                    <rect key="frame" x="110" y="152.5" width="119" height="19"/>
+                    <rect key="frame" x="110" y="170.5" width="119" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <state key="normal" title="  交易完成后结算" image="yuxuan">
                         <color key="titleColor" name="标题字颜色"/>
                     </state>
                 </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="HfM-JI-5kt">
-                    <rect key="frame" x="110" y="181.5" width="294" height="36.5"/>
+                    <rect key="frame" x="110" y="199.5" width="294" height="36.5"/>
                     <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="abH-an-xUL">
-                    <rect key="frame" x="15" y="238" width="399" height="1"/>
+                    <rect key="frame" x="15" y="256" width="399" height="1"/>
                     <color key="backgroundColor" name="灰色分界线"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1" id="UVe-Sm-4Pq"/>
                     </constraints>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="商品分享结算:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cd1-Ru-T4p">
-                    <rect key="frame" x="13.5" y="259" width="81.5" height="19"/>
+                    <rect key="frame" x="13.5" y="277" width="81.5" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <color key="textColor" name="标题字颜色"/>
                     <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="259" width="85" height="19"/>
+                    <rect key="frame" x="110" y="277" width="85" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <state key="normal" title="  1对多结算" image="yuxuan">
                         <color key="titleColor" name="标题字颜色"/>
@@ -147,13 +148,13 @@
                     </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">
-                    <rect key="frame" x="110" y="288" width="294" height="36.5"/>
+                    <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="259" width="78" height="19"/>
+                    <rect key="frame" x="218" y="277" width="78" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <state key="normal" title="  1对1结算" image="daixuan">
                         <color key="titleColor" name="标题字颜色"/>

GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageHeaderView.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<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="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+        <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"/>

GeliBusinessPlatform/ViewController/地图/SJMapViewController.swift

@@ -60,16 +60,11 @@ class SJMapViewController: UIViewController,AMapLocationManagerDelegate,MAMapVie
     override func viewDidLoad() {
         super.viewDidLoad()
         
-
         AMapServices.shared().apiKey = "ca417b43e3d031db9c29382cc09a174a"
         manger.delegate = self
         manger.startUpdatingLocation()
         manger.requestAlwaysAuthorization()
         
-        
-        
-        
-       
     }
     
     //MARK: - 自定义delegate
@@ -297,11 +292,6 @@ class SJMapViewController: UIViewController,AMapLocationManagerDelegate,MAMapVie
         }
         initBtmView(view: btmView)
         
-        
-//        locationM.desiredAccuracy = kCLLocationAccuracyBest
-//        locationM.locationTimeout = 2
-//        locationM.reGeocodeTimeout = 2
-        
         AMapServices.shared().enableHTTPS = true
         mapView = MAMapView()
         mapView.delegate = self
@@ -326,9 +316,7 @@ class SJMapViewController: UIViewController,AMapLocationManagerDelegate,MAMapVie
             make.bottom.equalTo(btmView.snp_top).offset(-13.5)
         }
     }
-//    deinit {
-//        locationM.stopUpdatingLocation()
-//    }
+
     func initSearch() {
         search = AMapSearchAPI()
         search.delegate = self