13.14.15修改

GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3,26 +3,4 @@
    uuid = "4EFF3422-0342-402A-BFF0-17B15851B3EC"
    type = "0"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            uuid = "46523EDE-134D-4CC0-9B0D-03CF99ED75C4"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            scope = "1"
-            stopOnStyle = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
-         <BreakpointContent
-            uuid = "07A0A3DD-FE69-427B-BC36-C6421ABF6B4E"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

GeliBusinessPlatform/ViewController/商家信息/ShopInfoViewController.swift

@@ -74,11 +74,16 @@ class ShopInfoViewController: BaseViewController {
         if sender.tag == 1001 {
             //商家协议
             url = URL(string:SERVERCE_ImageHost + (self.dataModel?.data?.agreement)!)
+            
             print(SERVERCE_ImageHost + (self.dataModel?.data?.agreement)!)
             browser.reloadCellAtIndex = { context in
                 let browserCell = context.cell as? JXPhotoBrowserImageCell
                 // 用SDWebImage加载
                 browserCell?.imageView.sd_setImage(with: url, placeholderImage: nil, options: [], completed: { (_, _, _, _) in
+                    let lbl = UILabel(frame: CGRect(x: 20, y: 0, width: 100, height: 100))
+                    lbl.text = "返回"
+                    lbl.textColor = UIColor.white
+                    browserCell?.scrollView.addSubview(lbl)
                     browserCell?.setNeedsLayout()
                 })
             }
@@ -90,6 +95,10 @@ class ShopInfoViewController: BaseViewController {
                 let browserCell = context.cell as? JXPhotoBrowserImageCell
                 // 用SDWebImage加载
                 browserCell?.imageView.sd_setImage(with: url, placeholderImage: nil, options: [], completed: { (_, _, _, _) in
+                    let lbl = UILabel(frame: CGRect(x: 20, y: 0, width: 100, height: 100))
+                    lbl.text = "返回"
+                    lbl.textColor = UIColor.white
+                    browserCell?.scrollView.addSubview(lbl)
                     browserCell?.setNeedsLayout()
                 })
             }
@@ -100,6 +109,10 @@ class ShopInfoViewController: BaseViewController {
                 let browserCell = context.cell as? JXPhotoBrowserImageCell
                 // 用SDWebImage加载
                 browserCell?.imageView.sd_setImage(with: url, placeholderImage: nil, options: [], completed: { (_, _, _, _) in
+                    let lbl = UILabel(frame: CGRect(x: 20, y: 0, width: 100, height: 100))
+                    lbl.text = "返回"
+                    lbl.textColor = UIColor.white
+                    browserCell?.scrollView.addSubview(lbl)
                     browserCell?.setNeedsLayout()
                 })
             }

GeliBusinessPlatform/ViewController/商家信息/ShopInfoViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" 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="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
         <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"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -241,7 +243,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="020-3658417" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hlb-VW-onX">
-                                            <rect key="frame" x="275.5" y="17" width="84.5" height="16"/>
+                                            <rect key="frame" x="276" y="17" width="84" height="16"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                             <color key="textColor" name="标题字颜色"/>
                                             <nil key="highlightedColor"/>
@@ -605,7 +607,7 @@
                                             </connections>
                                         </button>
                                     </subviews>
-                                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                     <constraints>
                                         <constraint firstItem="iyE-E4-Dko" firstAttribute="leading" secondItem="0MU-KP-5sW" secondAttribute="trailing" constant="15" id="1wg-fr-R1V"/>
                                         <constraint firstItem="raL-jM-J2W" firstAttribute="leading" secondItem="e34-8U-86R" secondAttribute="leading" constant="15" id="4CP-8m-Lj3">
@@ -657,7 +659,7 @@
                                                 <constraint firstAttribute="height" constant="1" id="JG4-yv-bFb"/>
                                             </constraints>
                                         </view>
-                                        <button opaque="NO" tag="1001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uPt-SA-4Xb">
+                                        <button opaque="NO" tag="1001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uPt-SA-4Xb">
                                             <rect key="frame" x="330" y="11" width="30" height="28"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                             <state key="normal" title="查看">
@@ -812,7 +814,7 @@
                                                 <constraint firstAttribute="height" constant="1" id="zOF-1y-DFD"/>
                                             </constraints>
                                         </view>
-                                        <button opaque="NO" tag="1002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cVC-DE-cX7">
+                                        <button opaque="NO" tag="1002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cVC-DE-cX7">
                                             <rect key="frame" x="330" y="11" width="30" height="28"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                             <state key="normal" title="查看">
@@ -863,7 +865,7 @@
                                                 <constraint firstAttribute="height" constant="1" id="lVF-JM-bRv"/>
                                             </constraints>
                                         </view>
-                                        <button opaque="NO" tag="1003" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sr7-Bz-f2w">
+                                        <button opaque="NO" tag="1003" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sr7-Bz-f2w">
                                             <rect key="frame" x="330" y="11" width="30" height="28"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                             <state key="normal" title="查看">
@@ -966,14 +968,14 @@
                     <viewLayoutGuide key="frameLayoutGuide" id="Bzl-i0-HHq"/>
                 </scrollView>
             </subviews>
-            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+            <viewLayoutGuide key="safeArea" id="mXG-iJ-FEQ"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
                 <constraint firstItem="Dpc-ae-H9y" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="4Gx-qM-nZJ"/>
                 <constraint firstItem="mXG-iJ-FEQ" firstAttribute="bottom" secondItem="Dpc-ae-H9y" secondAttribute="bottom" id="Pfn-LU-wZe"/>
                 <constraint firstItem="Dpc-ae-H9y" firstAttribute="trailing" secondItem="i5M-Pr-FkT" secondAttribute="trailing" id="eOF-H5-ZBg"/>
                 <constraint firstItem="Dpc-ae-H9y" firstAttribute="top" secondItem="mXG-iJ-FEQ" secondAttribute="top" id="r5m-dm-nQ5"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="mXG-iJ-FEQ"/>
             <point key="canvasLocation" x="-234" y="-70"/>
         </view>
     </objects>
@@ -996,5 +998,8 @@
         <namedColor name="蓝色字体颜色">
             <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>