Skip to content

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

1.6.3修正UI（b2.5）

parent c1265a35
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 23 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ a3fc28ac
...@@ -3987,7 +3987,7 @@ ...@@ -3987,7 +3987,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements; CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2.4; CURRENT_PROJECT_VERSION = 2.5;
DEFINES_MODULE = NO; DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH; DEVELOPMENT_TEAM = K48346UACH;
...@@ -4035,7 +4035,7 @@ ...@@ -4035,7 +4035,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib", "$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK", "$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
); );
MARKETING_VERSION = 1.6.2; MARKETING_VERSION = 1.6.3;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
...@@ -4116,7 +4116,7 @@ ...@@ -4116,7 +4116,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements; CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2.4; CURRENT_PROJECT_VERSION = 2.5;
DEFINES_MODULE = NO; DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH; DEVELOPMENT_TEAM = K48346UACH;
...@@ -4164,7 +4164,7 @@ ...@@ -4164,7 +4164,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib", "$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK", "$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
); );
MARKETING_VERSION = 1.6.2; MARKETING_VERSION = 1.6.3;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
......
GeliBusinessPlatform/ViewController/支付账号（设置，修改）/PayViewController.xib
View file @ a3fc28ac
<?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="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <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">
<device id="retina6_1" orientation="portrait" appearance="light"/> <device id="retina5_5" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<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="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>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PayViewController" customModule="GeliBusinessPlatform" customModuleProvider="target"> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PayViewController" customModule="TestClass" customModuleProvider="target">
<connections> <connections>
<outlet property="accountLbl" destination="8zk-ru-La4" id="sNs-yx-2VH"/> <outlet property="accountLbl" destination="8zk-ru-La4" id="sNs-yx-2VH"/>
<outlet property="changeBindBtn" destination="ZQU-rH-u77" id="TE7-D6-7Qr"/> <outlet property="changeBindBtn" destination="ZQU-rH-u77" id="TE7-D6-7Qr"/>
...@@ -22,18 +23,18 @@ ...@@ -22,18 +23,18 @@
</placeholder> </placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT"> <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5ip-zi-hlC"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5ip-zi-hlC">
<rect key="frame" x="0.0" y="44" width="414" height="22.5"/> <rect key="frame" x="0.0" y="0.0" width="414" height="22.666666666666668"/>
<subviews> <subviews>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="p9B-w7-gh7"> <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="p9B-w7-gh7">
<rect key="frame" x="0.0" y="0.0" width="414" height="22.5"/> <rect key="frame" x="0.0" y="0.0" width="414" height="22.666666666666668"/>
<color key="backgroundColor" name="未登录提示背景色"/> <color key="backgroundColor" name="未登录提示背景色"/>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已绑定格利支付账户，请登录支付系统。" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W1j-DE-LL2"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已绑定格利支付账户，请登录支付系统。" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W1j-DE-LL2">
<rect key="frame" x="20" y="4.5" width="203" height="14"/> <rect key="frame" x="20" y="4.3333333333333321" width="203" height="14"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="14" id="J79-1L-JDU"/> <constraint firstAttribute="height" constant="14" id="J79-1L-JDU"/>
<constraint firstAttribute="width" constant="203" id="hcd-eo-qTz"/> <constraint firstAttribute="width" constant="203" id="hcd-eo-qTz"/>
...@@ -55,10 +56,10 @@ ...@@ -55,10 +56,10 @@
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rgd-rh-pDk"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rgd-rh-pDk">
<rect key="frame" x="0.0" y="44" width="414" height="49"/> <rect key="frame" x="0.0" y="0.0" width="414" height="49"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="格利支付账号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gAe-Gc-sbd"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="格利支付账号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gAe-Gc-sbd">
<rect key="frame" x="15" y="16.5" width="93" height="16"/> <rect key="frame" x="15" y="16.666666666666668" width="93" height="16.000000000000004"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="16" id="ZlF-9p-rPB"/> <constraint firstAttribute="height" constant="16" id="ZlF-9p-rPB"/>
<constraint firstAttribute="width" constant="93" id="cW0-hV-5iO"/> <constraint firstAttribute="width" constant="93" id="cW0-hV-5iO"/>
...@@ -68,7 +69,7 @@ ...@@ -68,7 +69,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="未绑定支付账号" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8zk-ru-La4"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="未绑定支付账号" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8zk-ru-La4">
<rect key="frame" x="108" y="16.5" width="291" height="16"/> <rect key="frame" x="108" y="16.666666666666668" width="291" height="16.000000000000004"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="16" id="UO1-eZ-po3"/> <constraint firstAttribute="height" constant="16" id="UO1-eZ-po3"/>
</constraints> </constraints>
...@@ -88,7 +89,7 @@ ...@@ -88,7 +89,7 @@
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dpm-28-Ljh" customClass="LGButton" customModule="LGButton"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dpm-28-Ljh" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="37.5" y="193" width="339" height="44"/> <rect key="frame" x="37.666666666666657" y="149" width="339" height="44"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="44" id="SHF-XC-TVk"/> <constraint firstAttribute="height" constant="44" id="SHF-XC-TVk"/>
...@@ -114,7 +115,7 @@ ...@@ -114,7 +115,7 @@
</connections> </connections>
</view> </view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aJE-2M-4y3"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aJE-2M-4y3">
<rect key="frame" x="37.5" y="257" width="339" height="44"/> <rect key="frame" x="37.666666666666657" y="213" width="339" height="44"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="44" id="eSu-6w-UFn"/> <constraint firstAttribute="height" constant="44" id="eSu-6w-UFn"/>
</constraints> </constraints>
...@@ -138,7 +139,7 @@ ...@@ -138,7 +139,7 @@
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZQU-rH-u77"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZQU-rH-u77">
<rect key="frame" x="37.5" y="321" width="339" height="44"/> <rect key="frame" x="37.666666666666657" y="277" width="339" height="44"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="44" id="1p9-tQ-TTs"/> <constraint firstAttribute="height" constant="44" id="1p9-tQ-TTs"/>
</constraints> </constraints>
...@@ -162,12 +163,12 @@ ...@@ -162,12 +163,12 @@
</connections> </connections>
</button> </button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Jc-QV-Bqa"> <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Jc-QV-Bqa">
<rect key="frame" x="37.5" y="193" width="339" height="44"/> <rect key="frame" x="37.666666666666657" y="149" width="339" height="44"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="44" id="2Io-16-xFS"/> <constraint firstAttribute="height" constant="44" id="2Io-16-xFS"/>
</constraints> </constraints>
<fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="17"/> <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="17"/>
<state key="normal" title="未绑定"> <state key="normal" title="立即绑定格利支付账号">
<color key="titleColor" name="蓝色字体颜色"/> <color key="titleColor" name="蓝色字体颜色"/>
</state> </state>
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
...@@ -186,7 +187,7 @@ ...@@ -186,7 +187,7 @@
</connections> </connections>
</button> </button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wuO-lu-ULv"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wuO-lu-ULv">
<rect key="frame" x="0.0" y="0.0" width="414" height="862"/> <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<color key="backgroundColor" name="app底色"/> <color key="backgroundColor" name="app底色"/>
</view> </view>
</subviews> </subviews>
...@@ -243,7 +244,7 @@ ...@@ -243,7 +244,7 @@
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="蓝色字体颜色"> <namedColor name="蓝色字体颜色">
<color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
</resources> </resources>
</document> </document>
GeliBusinessPlatform/ViewController/货拉拉/运单详情/WaybillDetailViewController.swift
View file @ a3fc28ac
...@@ -530,7 +530,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab ...@@ -530,7 +530,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
} }
if section == 2 { if section == 2 {
headerV.titleLbl.text = dataModel?.order_detail_item?.order_item?.order_time headerV.titleLbl.text = dataModel?.order_detail_item?.order_item?.order_time
headerV.fuTitleLbl.text = "#" + (dataModel?.order_detail_item?.order_item?.order_display_id!)! headerV.fuTitleLbl.text = "#" + (dataModel?.delivery?.wb_no!)!
} }
if section == 4 { if section == 4 {
headerV.titleLbl.text = "订单费用" headerV.titleLbl.text = "订单费用"
......
GeliBusinessPlatform/ViewController/运单列表/YDLBVc.swift
View file @ a3fc28ac
...@@ -779,6 +779,9 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea ...@@ -779,6 +779,9 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
cell.acButton.tag = indexPath.row cell.acButton.tag = indexPath.row
cell.title1.text = "运单号：" + rowModel.lwb_no! cell.title1.text = "运单号：" + rowModel.lwb_no!
if rowModel.lc_name == "货拉拉" {
cell.title1.text = "运单号：" + rowModel.wb_no!
}
cell.title2.text = rowModel.lc_name! cell.title2.text = rowModel.lc_name!
cell.senderLbl.text = rowModel.s_city_name! cell.senderLbl.text = rowModel.s_city_name!
cell.receiverLbl.text = rowModel.r_city_name! cell.receiverLbl.text = rowModel.r_city_name!
......
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