Merged in madoka_igarashi/sba19aw/19AW/develop (pull request wangjwch…

…n#38) 19AW/develop
GroupVantageApps · May 17, 2019 · 21d7463 · 21d7463
2 parents 42a0627 + 1725771
commit 21d7463
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Share Beauty App/Controllers/LifeStyleBeauty/LifeStyleViewController.swift b/Share Beauty App/Controllers/LifeStyleBeauty/LifeStyleViewController.swift
@@ -572,8 +572,8 @@ class LifeStyleViewController: UIViewController, NavigationControllerAnnotation,
 
 
         var hasMakComment: Bool = false
-        let itemIds = [616, 617, 618, 619, 625, 626]
-        let itemIdSentences = [616: 8160, 617: 8161, 618: 8162, 619: 8163, 625: 8165, 626: 8165]
+        let itemIds = [616, 618, 619, 623, 625, 626]
+        let itemIdSentences = [616: 8160, 618: 8162, 619: 8163, 623: 8164, 625: 8165, 626: 8165]
         for (index, item) in itemIds.enumerated() {
             let productId = item
 

diff --git a/Share Beauty App/Controllers/ProductDetailViewController.swift b/Share Beauty App/Controllers/ProductDetailViewController.swift
@@ -336,13 +336,13 @@ class ProductDetailViewController: UIViewController, NavigationControllerAnnotat
         if [617, 618].contains(self.product.productId) {
             self.efficacyScrollV.delegate = self
             self.efficacyScrollV.frame.size = CGSize(width: self.mVContent.frame.width, height: self.mVContent.height)
-            self.efficacyScrollV.contentSize = CGSize(width: efficacyScrollV.frame.width, height: (efficacyScrollV.frame.height)*3)
+            self.efficacyScrollV.contentSize = CGSize(width: efficacyScrollV.frame.width, height: (efficacyScrollV.frame.height)*1)
             self.efficacyScrollV.isPagingEnabled = true
             self.efficacyScrollV.bounces = false
 
             let efficacyV: EyeTreatEffView = UINib(nibName: "EyeTreatEffView", bundle: nil).instantiate(withOwner: self, options: nil)[0] as! EyeTreatEffView
             efficacyV.setEffency19AW(productId: productId)
-            self.mVContent.addSubview(efficacyV)
+            self.efficacyScrollV.addSubview(efficacyV)
         }
 
         if [619, 620].contains(self.product.productId) {

diff --git a/Share Beauty App/Views/EyeTreatTechView.xib b/Share Beauty App/Views/EyeTreatTechView.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>