Commit d2a7ebfb authored by 刘俊宏's avatar 刘俊宏

修改iOS 12 (新增商品和编辑商品,预售问题) 1.6 b 1.9

parent 601c6a5d
...@@ -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 = 1.8; CURRENT_PROJECT_VERSION = 1.9;
DEFINES_MODULE = NO; DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH; DEVELOPMENT_TEAM = K48346UACH;
...@@ -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 = 1.8; CURRENT_PROJECT_VERSION = 1.9;
DEFINES_MODULE = NO; DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH; DEVELOPMENT_TEAM = K48346UACH;
......
...@@ -75,7 +75,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo ...@@ -75,7 +75,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
var selectIdx:IndexPath? = IndexPath(item: 0, section: 0) //多规格状态下点击collectionCell的row记录 var selectIdx:IndexPath? = IndexPath(item: 0, section: 0) //多规格状态下点击collectionCell的row记录
var isYuShouShangPin:Bool?//是否为预售商品 var isYuShouShangPin:Bool? = false//是否为预售商品
var itemTypeArr:Array<Int>? = []//多选 var itemTypeArr:Array<Int>? = []//多选
...@@ -1469,7 +1469,11 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo ...@@ -1469,7 +1469,11 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
case 0: return 7 case 0: return 7
case 1:return 2 case 1:return 2
case 2:return 1 case 2:return 1
case 3:return 4 case 3:
if isYuShouShangPin == false {
return 0
}
return 4
case 4:return 5 case 4:return 5
default:return 1 default:return 1
} }
......
...@@ -1044,7 +1044,11 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl ...@@ -1044,7 +1044,11 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
case 0: return 7 case 0: return 7
case 1:return 2 case 1:return 2
case 2:return 1 case 2:return 1
case 3:return 4 case 3:
if isYuShouShangPin == false {
return 0
}
return 4
case 4:return 5 case 4:return 5
default:return 1 default:return 1
} }
......
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