Skip to content

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

修复合并问题

parent 8618676d
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 34 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 63cc58a8
......@@ -296,7 +296,6 @@
E0F97B0C24516B1F001BD600 /* AddImgCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0F97B0A24516B1F001BD600 /* AddImgCell.swift */; };
E0F97B0D24516B1F001BD600 /* AddImgCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0F97B0B24516B1F001BD600 /* AddImgCell.xib */; };
E0F97B102451728D001BD600 /* AddGuiGeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0F97B0E2451728D001BD600 /* AddGuiGeCell.swift */; };
E0F97B112451728D001BD600 /* AddGuiGeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0F97B0F2451728D001BD600 /* AddGuiGeCell.xib */; };
E0F97B1A2451951D001BD600 /* ShangPinGguiGeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0F97B182451951D001BD600 /* ShangPinGguiGeCell.swift */; };
E0F97B1B2451951D001BD600 /* ShangPinGguiGeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0F97B192451951D001BD600 /* ShangPinGguiGeCell.xib */; };
F9023F62244999F500DD5A63 /* WarehoseMangementCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9023F60244999F500DD5A63 /* WarehoseMangementCell.swift */; };
......@@ -457,6 +456,7 @@
F96A585024790E300070A057 /* TFHpple.m in Sources */ = {isa = PBXBuildFile; fileRef = F96A584B24790E300070A057 /* TFHpple.m */; };
F96A585124790E300070A057 /* TFHppleElement.m in Sources */ = {isa = PBXBuildFile; fileRef = F96A584E24790E300070A057 /* TFHppleElement.m */; };
F96A585224790E300070A057 /* XPathQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = F96A584F24790E300070A057 /* XPathQuery.m */; };
F96A5856247BBFFF0070A057 /* AddGuiGeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F96A5855247BBFFF0070A057 /* AddGuiGeCell.xib */; };
F96E9D59246656A700B5B94A /* HGImageCompleteButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F96E9D54246656A700B5B94A /* HGImageCompleteButton.swift */; };
F96E9D5A246656A700B5B94A /* HGImageCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F96E9D55246656A700B5B94A /* HGImageCollectionViewController.swift */; };
F96E9D5B246656A700B5B94A /* HGImageCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F96E9D56246656A700B5B94A /* HGImageCollectionViewCell.swift */; };
......@@ -801,7 +801,6 @@
E0F97B0A24516B1F001BD600 /* AddImgCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddImgCell.swift; sourceTree = "<group>"; };
E0F97B0B24516B1F001BD600 /* AddImgCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AddImgCell.xib; sourceTree = "<group>"; };
E0F97B0E2451728D001BD600 /* AddGuiGeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddGuiGeCell.swift; sourceTree = "<group>"; };
E0F97B0F2451728D001BD600 /* AddGuiGeCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AddGuiGeCell.xib; sourceTree = "<group>"; };
E0F97B182451951D001BD600 /* ShangPinGguiGeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShangPinGguiGeCell.swift; sourceTree = "<group>"; };
E0F97B192451951D001BD600 /* ShangPinGguiGeCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ShangPinGguiGeCell.xib; sourceTree = "<group>"; };
F9023F60244999F500DD5A63 /* WarehoseMangementCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WarehoseMangementCell.swift; sourceTree = "<group>"; };
......@@ -1009,6 +1008,7 @@
F96A584D24790E300070A057 /* TFHpple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TFHpple.h; sourceTree = "<group>"; };
F96A584E24790E300070A057 /* TFHppleElement.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TFHppleElement.m; sourceTree = "<group>"; };
F96A584F24790E300070A057 /* XPathQuery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPathQuery.m; sourceTree = "<group>"; };
F96A5855247BBFFF0070A057 /* AddGuiGeCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddGuiGeCell.xib; sourceTree = "<group>"; };
F96E9D54246656A700B5B94A /* HGImageCompleteButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HGImageCompleteButton.swift; sourceTree = "<group>"; };
F96E9D55246656A700B5B94A /* HGImageCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HGImageCollectionViewController.swift; sourceTree = "<group>"; };
F96E9D56246656A700B5B94A /* HGImageCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HGImageCollectionViewCell.swift; sourceTree = "<group>"; };
......@@ -1924,7 +1924,7 @@
E0F97B0A24516B1F001BD600 /* AddImgCell.swift */,
E0F97B0B24516B1F001BD600 /* AddImgCell.xib */,
E0F97B0E2451728D001BD600 /* AddGuiGeCell.swift */,
E0F97B0F2451728D001BD600 /* AddGuiGeCell.xib */,
F96A5855247BBFFF0070A057 /* AddGuiGeCell.xib */,
E0F97B182451951D001BD600 /* ShangPinGguiGeCell.swift */,
E0F97B192451951D001BD600 /* ShangPinGguiGeCell.xib */,
E042F7362452766100CDFA12 /* AdressSelectCell.swift */,
......@@ -2544,6 +2544,7 @@
E0DDCB10244AD8C500DF54C7 /* DaiQueRenCell.xib in Resources */,
F94A31652462B21700FEC38E /* EditWorkCViewController.xib in Resources */,
E0BE8A9D245A9E5900E80134 /* YingFuZhangKuanXQCell.xib in Resources */,
F96A5856247BBFFF0070A057 /* AddGuiGeCell.xib in Resources */,
E0A2E82824555B4400D6DB34 /* KuCunShangPinCell.xib in Resources */,
E042F73D245288F800CDFA12 /* WenDuCell.xib in Resources */,
E02DDD92244FE55400ABB707 /* NewCreateHeader.xib in Resources */,
......@@ -2583,7 +2584,6 @@
E02FD9ED2455627300E10E27 /* ChuKuViewController.xib in Resources */,
E0D197D024485649002B080C /* BluetoothConnectViewController.xib in Resources */,
F969BF1F244EE67900C79953 /* GoodsManageListVC.xib in Resources */,
E0F97B112451728D001BD600 /* AddGuiGeCell.xib in Resources */,
F94A316024629DDD00FEC38E /* WorkBannerTableViewCell.xib in Resources */,
F95567AC2453E40B009674AB /* OrderListViewController.xib in Resources */,
E00E48C72457C99900F16545 /* KuCunShangPinXQViewController.xib in Resources */,
......
GeliBusinessPlatform/View/Cell/AddGuiGeCell.swift
View file @ 63cc58a8
......@@ -7,7 +7,7 @@
//
import UIKit
import WebKit
@objc protocol AddGuiGeCellDelegate {
@objc optional func AddGuiGeCellClick(cell:AddGuiGeCell)
......@@ -20,8 +20,8 @@ class AddGuiGeCell: UITableViewCell {
}
@IBOutlet weak var webView: UIWebView!
@IBOutlet weak var webView: WKWebView!
@IBOutlet weak var imgBtn: UIButton!
......
GeliBusinessPlatform/View/Cell/AddGuiGeCell.xib
View file @ 63cc58a8
......@@ -27,22 +27,7 @@
<action selector="btnClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="f2z-zc-fd6"/>
</connections>
</button>
<<<<<<< Updated upstream
<webView hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VPT-Oe-WSi">
<rect key="frame" x="0.0" y="0.0" width="375" height="123.5"/>
<color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="delegate" destination="-1" id="L8I-bk-r9l"/>
</connections>
</webView>
</subviews>
<constraints>
<constraint firstItem="FpT-RN-ad7" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" id="CTD-cA-1jp"/>
<constraint firstItem="VPT-Oe-WSi" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Req-lk-rDq"/>
<constraint firstAttribute="trailing" secondItem="VPT-Oe-WSi" secondAttribute="trailing" id="Xg4-F3-bgr"/>
<constraint firstAttribute="bottom" secondItem="VPT-Oe-WSi" secondAttribute="bottom" id="kSn-lp-ILF"/>
=======
<wkWebView hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CAr-OI-1ll">
<wkWebView hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XTl-7k-tJ9">
<rect key="frame" x="0.0" y="0.0" width="375" height="123.5"/>
<color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<wkWebViewConfiguration key="configuration">
......@@ -52,25 +37,19 @@
</wkWebView>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="XTl-7k-tJ9" secondAttribute="trailing" id="0kl-1v-5pJ"/>
<constraint firstItem="FpT-RN-ad7" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" id="CTD-cA-1jp"/>
<constraint firstItem="CAr-OI-1ll" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="ONc-Hx-udy"/>
<constraint firstAttribute="trailing" secondItem="CAr-OI-1ll" secondAttribute="trailing" id="TDz-Oa-TvQ"/>
<constraint firstItem="CAr-OI-1ll" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="YRm-tl-0No"/>
<constraint firstAttribute="bottom" secondItem="CAr-OI-1ll" secondAttribute="bottom" id="jKB-ok-a3G"/>
>>>>>>> Stashed changes
<constraint firstItem="XTl-7k-tJ9" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Jzh-d3-hFu"/>
<constraint firstItem="XTl-7k-tJ9" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="XU0-dq-ExO"/>
<constraint firstAttribute="bottom" secondItem="FpT-RN-ad7" secondAttribute="bottom" constant="50" id="log-wz-xog"/>
<constraint firstItem="VPT-Oe-WSi" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="z8u-Ne-QN3"/>
<constraint firstAttribute="bottom" secondItem="XTl-7k-tJ9" secondAttribute="bottom" id="pGY-fa-sLW"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="btmH" destination="log-wz-xog" id="axu-Jf-zWN"/>
<outlet property="imgBtn" destination="FpT-RN-ad7" id="DdI-mW-7wW"/>
<<<<<<< Updated upstream
<outlet property="webView" destination="VPT-Oe-WSi" id="zDL-Pq-yMr"/>
=======
<outlet property="webView" destination="CAr-OI-1ll" id="L9y-OD-5rY"/>
>>>>>>> Stashed changes
<outlet property="webView" destination="XTl-7k-tJ9" id="fPC-E0-nGO"/>
</connections>
<point key="canvasLocation" x="131.15942028985509" y="121.875"/>
</tableViewCell>
......
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