Skip to content

G
GeliBusinessPlatform
Commit 3b26fe5e authored by 刘俊宏's avatar 刘俊宏
Browse files
Options

标签把销售下单改成代客下单

parent 5acdc77a
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 26 deletions
GeliBusinessPlatform/View/Cell/CGDListCell2.xib
View file @ 3b26fe5e
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
</label> </label>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="销售下单" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zir-Fk-Cq5"> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="代客下单" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zir-Fk-Cq5">
<rect key="frame" x="67" y="15" width="54" height="18"/> <rect key="frame" x="67" y="15" width="54" height="18"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="54" id="78U-nU-5I5"/> <constraint firstAttribute="width" constant="54" id="78U-nU-5I5"/>
......
GeliBusinessPlatform/View/Cell/DaiQueRenCell.xib
View file @ 3b26fe5e
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<capability name="Named colors" minToolsVersion="9.0"/> <capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" 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"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
...@@ -115,7 +116,7 @@ ...@@ -115,7 +116,7 @@
<constraint firstAttribute="height" constant="1" id="3zH-mD-4dk"/> <constraint firstAttribute="height" constant="1" id="3zH-mD-4dk"/>
</constraints> </constraints>
</view> </view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="R3b-6k-iUu"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="R3b-6k-iUu">
<rect key="frame" x="151" y="168.5" width="82" height="30"/> <rect key="frame" x="151" y="168.5" width="82" height="30"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="82" id="qwi-Kw-TXJ"> <constraint firstAttribute="width" constant="82" id="qwi-Kw-TXJ">
...@@ -148,7 +149,7 @@ ...@@ -148,7 +149,7 @@
<action selector="cancelClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="fY9-gL-9zn"/> <action selector="cancelClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="fY9-gL-9zn"/>
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zm2-s9-DRT"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zm2-s9-DRT">
<rect key="frame" x="248" y="168.5" width="82" height="30"/> <rect key="frame" x="248" y="168.5" width="82" height="30"/>
<color key="backgroundColor" name="按钮背景颜色"/> <color key="backgroundColor" name="按钮背景颜色"/>
<constraints> <constraints>
...@@ -176,7 +177,7 @@ ...@@ -176,7 +177,7 @@
<action selector="submitClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="RLX-ry-ohi"/> <action selector="submitClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="RLX-ry-ohi"/>
</connections> </connections>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="销售下单" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3z1-vN-y0a"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="代客下单" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3z1-vN-y0a">
<rect key="frame" x="129" y="62" width="54" height="18"/> <rect key="frame" x="129" y="62" width="54" height="18"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="54" id="6Zg-Ut-Gaa"/> <constraint firstAttribute="width" constant="54" id="6Zg-Ut-Gaa"/>
...@@ -198,7 +199,7 @@ ...@@ -198,7 +199,7 @@
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
</label> </label>
</subviews> </subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints> <constraints>
<constraint firstAttribute="trailing" secondItem="O7t-Fb-Wvu" secondAttribute="trailing" constant="15" id="4dX-er-uZT"/> <constraint firstAttribute="trailing" secondItem="O7t-Fb-Wvu" secondAttribute="trailing" constant="15" id="4dX-er-uZT"/>
<constraint firstItem="M0x-Nm-BAc" firstAttribute="top" secondItem="nLT-tE-vtc" secondAttribute="bottom" constant="10" id="64X-jQ-4P4"/> <constraint firstItem="M0x-Nm-BAc" firstAttribute="top" secondItem="nLT-tE-vtc" secondAttribute="bottom" constant="10" id="64X-jQ-4P4"/>
...@@ -259,8 +260,8 @@ ...@@ -259,8 +260,8 @@
</constraint> </constraint>
</constraints> </constraints>
</tableViewCellContentView> </tableViewCellContentView>
<color key="backgroundColor" name="app底色"/>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/> <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<color key="backgroundColor" name="app底色"/>
<connections> <connections>
<outlet property="accountLbl" destination="XiS-He-UoI" id="3Kk-vf-U46"/> <outlet property="accountLbl" destination="XiS-He-UoI" id="3Kk-vf-U46"/>
<outlet property="cancelBtn" destination="R3b-6k-iUu" id="hCY-gG-iv2"/> <outlet property="cancelBtn" destination="R3b-6k-iUu" id="hCY-gG-iv2"/>
...@@ -305,5 +306,8 @@ ...@@ -305,5 +306,8 @@
<namedColor name="蓝色字体颜色"> <namedColor name="蓝色字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources> </resources>
</document> </document>
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ 3b26fe5e
...@@ -645,23 +645,23 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -645,23 +645,23 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
return return
case 139: //分销分账设置 case 139: //分销分账设置
//只有当其为供应商才可以进入 //只有当其为供应商才可以进入
HUD.flash(.label("敬请期待"),delay: 1.2) // HUD.flash(.label("敬请期待"),delay: 1.2)
// HUD.flash(.progress) HUD.flash(.progress)
// let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
// getDbtRule(["user_token":UserToken as Any]) { (data) in getDbtRule(["user_token":UserToken as Any]) { (data) in
// let dataM = data as! getDbtRuleModel let dataM = data as! getDbtRuleModel
// if dataM.data?.is_sup == 1 { if dataM.data?.is_sup == 1 {
// HUD.hide() HUD.hide()
// let vc = DistributorSettingViewController() let vc = DistributorSettingViewController()
// vc.dataM = dataM.data vc.dataM = dataM.data
// self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
// }else{ }else{
// HUD.flash(.label("仅供应商可使用该功能"),delay: 2.0) HUD.flash(.label("仅供应商可使用该功能"),delay: 2.0)
// } }
//
// } failture: { (error) in } failture: { (error) in
//
// } }
return return
case 140: //分销订单管理 case 140: //分销订单管理
......
GeliBusinessPlatform/ViewController/采购单详情/CGDListCell.xib
View file @ 3b26fe5e
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="销售" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EYa-rE-5f1"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="代客" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EYa-rE-5f1">
<rect key="frame" x="181" y="14" width="30" height="18"/> <rect key="frame" x="181" y="14" width="30" height="18"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="30" id="4h9-IX-zzQ"/> <constraint firstAttribute="width" constant="30" id="4h9-IX-zzQ"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment