Skip to content

G
GeliBusinessPlatform
Commit 561d82d1 authored by lujunye's avatar lujunye
Browse files
Options

sdwebimage包

parent 8a937c02
Show whitespace changes
Inline Side-by-side
Showing with 182 additions and 64 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 561d82d1
......@@ -99,6 +99,8 @@
E03984942468F2CA00DFA56F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E03984932468F2CA00DFA56F /* UIKit.framework */; };
E03984962468F2D100DFA56F /* Photos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E03984952468F2D100DFA56F /* Photos.framework */; };
E03984982468F2DA00DFA56F /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E03984972468F2DA00DFA56F /* SafariServices.framework */; };
E0404F822476355500D9ACE8 /* SDWebImage in Frameworks */ = {isa = PBXBuildFile; productRef = E0404F812476355500D9ACE8 /* SDWebImage */; };
E0404F842476355500D9ACE8 /* SDWebImageMapKit in Frameworks */ = {isa = PBXBuildFile; productRef = E0404F832476355500D9ACE8 /* SDWebImageMapKit */; };
E042F730245272FF00CDFA12 /* XiaYunDanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E042F72E245272FF00CDFA12 /* XiaYunDanViewController.swift */; };
E042F731245272FF00CDFA12 /* XiaYunDanViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E042F72F245272FF00CDFA12 /* XiaYunDanViewController.xib */; };
E042F734245274F200CDFA12 /* YunDanLieBiaoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E042F732245274F200CDFA12 /* YunDanLieBiaoCell.swift */; };
......@@ -1018,6 +1020,7 @@
buildActionMask = 2147483647;
files = (
E0707DC72462457200E039A8 /* libz.tbd in Frameworks */,
E0404F842476355500D9ACE8 /* SDWebImageMapKit in Frameworks */,
F93E32092473CD6500524DFC /* libresolv.tbd in Frameworks */,
E03984982468F2DA00DFA56F /* SafariServices.framework in Frameworks */,
E03984962468F2D100DFA56F /* Photos.framework in Frameworks */,
......@@ -1047,6 +1050,7 @@
F93E32062473C9C200524DFC /* jcore-ios-2.2.5.a in Frameworks */,
F905A7D8246CF82400E3A74D /* SwipeCellKit in Frameworks */,
E0707DC32462456100E039A8 /* SystemConfiguration.framework in Frameworks */,
E0404F822476355500D9ACE8 /* SDWebImage in Frameworks */,
F93E32052473C9C200524DFC /* jpush-extension-ios-1.1.2.a in Frameworks */,
E0707DC12462455B00E039A8 /* CoreTelephony.framework in Frameworks */,
E0F1BE3D2469220D003015B2 /* RongSight.framework in Frameworks */,
......@@ -1129,7 +1133,6 @@
E00D85DD244561FD00F5F816 /* GeliBusinessPlatform */,
E00D85F4244561FE00F5F816 /* GeliBusinessPlatformTests */,
E00D85FF244561FE00F5F816 /* GeliBusinessPlatformUITests */,
E00D85DC244561FD00F5F816 /* Products */,
DF5E2D4347DC5B979757A244 /* Pods */,
824621C23DA37CD28A2F345F /* Frameworks */,
);
......@@ -1143,6 +1146,7 @@
E00D85FC244561FE00F5F816 /* GeliBusinessPlatformUITests.xctest */,
);
name = Products;
path = ../..;
sourceTree = "<group>";
};
E00D85DD244561FD00F5F816 /* GeliBusinessPlatform */ = {
......@@ -1499,6 +1503,7 @@
E09B03A92445B09200211A51 /* Model */ = {
isa = PBXGroup;
children = (
E00D85DC244561FD00F5F816 /* Products */,
E0B5308224728D5600FFCC15 /* WarehouseManageModel */,
F956D5BE246A3649003FF510 /* OrderManageModel */,
F956D5BD246A3629003FF510 /* PersonCenterModel */,
......@@ -2398,6 +2403,8 @@
packageProductDependencies = (
F905A7D4246CF57700E3A74D /* Parchment */,
F905A7D7246CF82400E3A74D /* SwipeCellKit */,
E0404F812476355500D9ACE8 /* SDWebImage */,
E0404F832476355500D9ACE8 /* SDWebImageMapKit */,
);
productName = GeliBusinessPlatform;
productReference = E00D85DB244561FD00F5F816 /* GeliBusinessPlatform.app */;
......@@ -2475,6 +2482,7 @@
packageReferences = (
F905A7D3246CF57700E3A74D /* XCRemoteSwiftPackageReference "Parchment" */,
F905A7D6246CF82400E3A74D /* XCRemoteSwiftPackageReference "SwipeCellKit" */,
E0404F802476355500D9ACE8 /* XCRemoteSwiftPackageReference "SDWebImage" */,
);
productRefGroup = E00D85DC244561FD00F5F816 /* Products */;
projectDirPath = "";
......@@ -3334,6 +3342,14 @@
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
E0404F802476355500D9ACE8 /* XCRemoteSwiftPackageReference "SDWebImage" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/SDWebImage/SDWebImage";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 5.8.0;
};
};
F905A7D3246CF57700E3A74D /* XCRemoteSwiftPackageReference "Parchment" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/rechsteiner/Parchment";
......@@ -3353,6 +3369,16 @@
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
E0404F812476355500D9ACE8 /* SDWebImage */ = {
isa = XCSwiftPackageProductDependency;
package = E0404F802476355500D9ACE8 /* XCRemoteSwiftPackageReference "SDWebImage" */;
productName = SDWebImage;
};
E0404F832476355500D9ACE8 /* SDWebImageMapKit */ = {
isa = XCSwiftPackageProductDependency;
package = E0404F802476355500D9ACE8 /* XCRemoteSwiftPackageReference "SDWebImage" */;
productName = SDWebImageMapKit;
};
F905A7D4246CF57700E3A74D /* Parchment */ = {
isa = XCSwiftPackageProductDependency;
package = F905A7D3246CF57700E3A74D /* XCRemoteSwiftPackageReference "Parchment" */;
......
GeliBusinessPlatform.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file @ 561d82d1
......@@ -10,6 +10,15 @@
"version": "2.3.0"
}
},
{
"package": "SDWebImage",
"repositoryURL": "https://github.com/SDWebImage/SDWebImage",
"state": {
"branch": null,
"revision": "5818cf70fde7e9e07e24196d0d54350bc8526f26",
"version": "5.8.0"
}
},
{
"package": "SwipeCellKit",
"repositoryURL": "https://github.com/SwipeCellKit/SwipeCellKit",
......
GeliBusinessPlatform/Define/Define.swift
View file @ 561d82d1
......@@ -27,7 +27,7 @@ let systemVersion = (UIDevice.current.systemVersion as String)
//接口地址
//test
//let SERVERCE_ImageHost = "http://admin.lgw.com/"
let SERVERCE_ImageHost = "http://z.gelifood.com/"
let SERVERCE_HOST = "http://z.gelifood.com/admin/"
//online
......@@ -246,3 +246,17 @@ func dataChangeString(sender:Array<Any>) -> String{
return str
}
//MARK:--字典转字符串
func dictChangeString(sender:Dictionary<String, String>) -> String{
var str = ""
do {
let json = JSON(sender)
let data = try! JSONEncoder().encode(json)
str = String(data: data, encoding: .utf8)!
}catch {
str = ""
}
return str
}
GeliBusinessPlatform/Model/GoodsManageMoel/GoodsDetailModel.swift
View file @ 561d82d1
......@@ -43,6 +43,7 @@ class GoodsDetailDataModel: Mappable {
class GoodsDetailGoodsResModel: Mappable {
var goods_id : Int? //商品id
var goods_name : String? //商品名
var keywords : String? //关键字
var cat_id : Int? //分类id
var cat_name : String? //分类名
var brand_id : Int? //品牌id
......@@ -63,6 +64,7 @@ class GoodsDetailGoodsResModel: Mappable {
var specifications : String? //(默认)规格
var logistics : String? //物流费用
var gs_id : Int? //商品状态
var gs_name:String? //商品状态中文
var is_check : Int? //是否通过审核
var shelf_life : Int? //保质期，单位：月
var transportation : Int? //运输方式
......@@ -114,7 +116,8 @@ class GoodsDetailGoodsResModel: Mappable {
is_qz <- map["is_qz"]
brand_name <- map["brand_name"]
cat_name <- map["cat_name"]
keywords <- map["keywords"]
gs_name <- map["gs_name"]
}
}
......
GeliBusinessPlatform/Other/LMNote/LMNoteViewController.m
View file @ 561d82d1
......@@ -15,7 +15,7 @@
#import "LMNImageView.h"
#import "LMNImageInputViewController.h"
#import "LMNWebViewController.h"
#import "TestClass-Swift.h"
//#import "TestClass-Swift.h"
// 屏幕宽度
#define SCREEN_WIDTH [UIScreen mainScreen].bounds.size.width
// 屏幕高度
......@@ -423,21 +423,21 @@
imageView.image = result;
}
//请求上传图片
TestClass *model = [[TestClass alloc]init];
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:10];
[dict setValue:@"RQdwz5QKpeg=" forKey:@"user_token"];
[model saveFileWithImage:result params:dict success:^(NSDictionary<NSString *,id> * data) {
if ([[NSString stringWithFormat:@"%@",data[@"code"]]isEqualToString:@"1"]) {
NSDictionary *dataDic = data[@"data"];
NSString *url = dataDic[@"url"];
[self.textView.imgArr addObject:url];
imageView.imageUrl = url;
}
} failture:^(NSError * error) {
}];
// TestClass *model = [[TestClass alloc]init];
// NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:10];
// [dict setValue:@"RQdwz5QKpeg=" forKey:@"user_token"];
// [model saveFileWithImage:result params:dict success:^(NSDictionary<NSString *,id> * data) {
// if ([[NSString stringWithFormat:@"%@",data[@"code"]]isEqualToString:@"1"]) {
//
// NSDictionary *dataDic = data[@"data"];
// NSString *url = dataDic[@"url"];
// [self.textView.imgArr addObject:url];
// imageView.imageUrl = url;
// }
//
// } failture:^(NSError * error) {
//
// }];
}];
}
......
GeliBusinessPlatform/SceneDelegate.swift
View file @ 561d82d1
......@@ -49,9 +49,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
// let vc = LMNoteViewController()
// //
// let contentView = vc
if let windowScene = sceneC as? UIWindowScene {
......
GeliBusinessPlatform/View/Cell/AddImgCell.swift
View file @ 561d82d1
......@@ -7,6 +7,8 @@
//
import UIKit
import SDWebImage
protocol AddImgCellDelegate {
func AddImgCellBtnClick(cell:AddImgCell)
func DelImgCellBtnClick(sender:UIButton,cell:AddImgCell)
......@@ -25,7 +27,7 @@ class AddImgCell: UITableViewCell {
}
var isSingle:Bool?
var imgs:Array<UIImage> = []{
var imgs:Array<String> = []{
didSet{
print(imgs.count)
if imgs.count > 0{
......@@ -58,7 +60,7 @@ class AddImgCell: UITableViewCell {
@IBOutlet weak var nameLbl: UILabel!
@IBOutlet weak var addBtnX: NSLayoutConstraint!
func setImgUI(arr:Array<UIImage>){
func setImgUI(arr:Array<String>){
let y = addBtn.frame.minY
let h:CGFloat = addBtn.frame.size.height
if isSingle == false {
......@@ -84,7 +86,10 @@ class AddImgCell: UITableViewCell {
img.layer.cornerRadius = 3
img.layer.masksToBounds = true
scrollView!.addSubview(img)
img.image = arr[i]
let imgStr = arr[i]
print(SERVERCE_ImageHost + imgStr)
img.sd_setImage(with: URL(string: SERVERCE_ImageHost + imgStr))
img.isUserInteractionEnabled = true
img.snp.makeConstraints { (make) in
make.centerY.equalTo(scrollView!.snp_centerY)
......
GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift
View file @ 561d82d1
......@@ -25,7 +25,7 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
let UserToken = UserDefaults.standard.value(forKey: "user_token")
adminInfo(["user_token":UserToken as Any], success: { (data) in
self.dataModel = (data as! AdminInfoModel)
// self.iconImg.kf.setImage(with: URL(string: SERVERCE_HOST + (self.dataModel?.data?.shop_img)!))
// self.iconImg.kf.setImage(with: URL(string: SERVERCE_ImageHost + (self.dataModel?.data?.shop_img)!))
self.shopNameLbl.text = self.dataModel?.data?.stall_name
self.nameLbl.text = self.dataModel?.data?.admin_name
}) { (error) in
......
GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift
View file @ 561d82d1
......@@ -376,7 +376,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
cell.delegate = self
cell.goodsName.text = rowModel.goods_name
cell.priceLbl.text = "￥" + rowModel.price!
// cell.goodsImgV.kf.setImage(with: URL.init(string:SERVERCE_HOST + rowModel.goods_thumb!)!, placeholder: nil, options: nil, progressBlock: nil, completionHandler: nil)
// cell.goodsImgV.kf.setImage(with: URL.init(string:SERVERCE_ImageHost + rowModel.goods_thumb!)!, placeholder: nil, options: nil, progressBlock: nil, completionHandler: nil)
if rowModel.is_show == 0 {
cell.leftBtn.setTitle("下架", for: .normal)
......@@ -408,18 +408,22 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
}
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
print("选中===\(indexPath)")
let vc = EPViewController()
let data = items[indexPath.row]
vc.goods_id = data.goods_id
self.navigationController?.pushViewController(vc, animated: true)
// let vc = EPViewController()
// let data = items[indexPath.row]
// vc.goods_id = data.goods_id
// self.navigationController?.pushViewController(vc, animated: true)
}
//MARK:---cell delegate 选中
func selectListsIndex(index: Int) {
let vc = EPViewController()
let data = items[index]
vc.goods_id = data.goods_id
self.navigationController?.pushViewController(vc, animated: true)
let idx = IndexPath(item: index, section: 0)
let item = collection?.cellForItem(at: idx) as! GoodsCollectionViewCell
// let vc = EPViewController()
// vc.titleStrArr = [item.leftBtn.titleLabel!.text!,item.rightBtn.titleLabel!.text!]
// let data = items[index]
// vc.goods_id = data.goods_id
// self.navigationController?.pushViewController(vc, animated: true)
}
//MARK:-- cell delegate 上下架，入库
func changeGoodsIsShow(isTrue: Bool, byIndex: Int) {
......
GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
View file @ 561d82d1
This source diff could not be displayed because it is too large. You can view the blob instead.
GeliBusinessPlatform/ViewController/商品详情/EPViewController.xib
View file @ 561d82d1
......@@ -12,7 +12,7 @@
<connections>
<outlet property="btmBtnBGView" destination="H2x-8q-Enj" id="zfZ-07-szf"/>
<outlet property="btmBtnViewH" destination="zvU-A1-Wlq" id="gZn-F8-1hh"/>
<outlet property="tbvBGView" destination="ZLj-69-KvE" id="sHZ-SL-tOh"/>
<outlet property="listTbv" destination="pjO-Zv-8Xp" id="K9d-qK-6Qg"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections>
</placeholder>
......@@ -27,37 +27,53 @@
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="H2x-8q-Enj">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<color key="backgroundColor" systemColor="systemBlueColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="H4T-Vc-LT1">
<rect key="frame" x="0.0" y="0.0" width="414" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="2vd-kV-jwa"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="H4T-Vc-LT1" secondAttribute="trailing" id="gMO-l5-X4c"/>
<constraint firstItem="H4T-Vc-LT1" firstAttribute="leading" secondItem="H2x-8q-Enj" secondAttribute="leading" id="gji-ae-evc"/>
<constraint firstItem="H4T-Vc-LT1" firstAttribute="top" secondItem="H2x-8q-Enj" secondAttribute="top" id="mt4-fp-PTo"/>
<constraint firstAttribute="height" constant="49" id="zvU-A1-Wlq"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZLj-69-KvE">
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="pjO-Zv-8Xp">
<rect key="frame" x="0.0" y="44" width="414" height="769"/>
<color key="backgroundColor" name="app底色"/>
</view>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="Qxe-3c-Jdc"/>
<outlet property="delegate" destination="-1" id="h9F-Bd-Mqm"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="ZLj-69-KvE" secondAttribute="trailing" id="3Jk-Tc-TKn"/>
<constraint firstAttribute="bottom" secondItem="8BW-ln-Nxl" secondAttribute="bottom" id="4Gl-Yg-o45"/>
<constraint firstItem="8BW-ln-Nxl" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="8oR-Lt-pCU"/>
<constraint firstAttribute="trailing" secondItem="8BW-ln-Nxl" secondAttribute="trailing" id="NbR-OX-9fd"/>
<constraint firstItem="H2x-8q-Enj" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="Pcj-8n-w37"/>
<constraint firstItem="ZLj-69-KvE" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="Y3r-3J-qfn"/>
<constraint firstItem="pjO-Zv-8Xp" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="Rar-ba-akA"/>
<constraint firstItem="pjO-Zv-8Xp" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="TnE-By-RLc"/>
<constraint firstItem="8BW-ln-Nxl" firstAttribute="top" secondItem="pjO-Zv-8Xp" secondAttribute="bottom" id="a72-R5-vNw"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="H2x-8q-Enj" secondAttribute="bottom" id="bNX-52-VdE"/>
<constraint firstItem="8BW-ln-Nxl" firstAttribute="top" secondItem="ZLj-69-KvE" secondAttribute="bottom" id="biy-r5-iTE"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="H2x-8q-Enj" secondAttribute="trailing" id="f4A-MP-LP5"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="pjO-Zv-8Xp" secondAttribute="trailing" id="q2T-Md-gwK"/>
<constraint firstItem="8BW-ln-Nxl" firstAttribute="top" secondItem="H2x-8q-Enj" secondAttribute="top" id="qVu-HU-nQk"/>
<constraint firstItem="ZLj-69-KvE" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="w6v-Bv-ydF"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="131.8840579710145" y="101.78571428571428"/>
</view>
</objects>
<resources>
<namedColor name="app底色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
View file @ 561d82d1
......@@ -62,8 +62,8 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
var itemTypeArr:Array<Int>? = []//多选
var shangPinStatus:Int? = 0//商品状态
var yunShuType:Int? = 0//运输类型
var maxFiveImgsArr:Array<UIImage> = []//多图
var singleImgArr:Array<UIImage> = []//单张图
var maxFiveImgsArr:Array<String> = []//多图
var singleImgArr:Array<String> = []//单张图
var itemName = ""//商品名称
var qiMaiShuLiang = ""//起卖数量
var shiFouQZ = false//是否清真
......@@ -633,7 +633,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
for asset in assets {
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize , contentMode: .default , options: option, resultHandler: { (image, _: [AnyHashable : Any]?) in
// print("上传图片==\(image)")
self.singleImgArr.append(image!)
self.uploadImg(imge: image!, isOriginal: true, tag: 0)
})
......@@ -651,9 +651,9 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
for asset in assets {
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize , contentMode: .default , options: option, resultHandler: { (image, _: [AnyHashable : Any]?) in
// print("上传图片==\(image)")
self.maxFiveImgsArr.append(image!)
let index = Dollar.indexOf(self.maxFiveImgsArr, value: image!)
self.uploadImg(imge: image!, isOriginal: false, tag: index!)
// self.maxFiveImgsArr.append(image!)
// let index = Dollar.indexOf(self.maxFiveImgsArr, value: image!)
self.uploadImg(imge: image!, isOriginal: false, tag: self.maxFiveImgsArr.count)
})
}
......@@ -675,7 +675,6 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize , contentMode: .default , options: option, resultHandler: { (image, _: [AnyHashable : Any]?) in
// print("上传图片==\(image)")
self.singleImgArr.removeAll()
self.singleImgArr.append(image!)
self.uploadImg(imge: image!, isOriginal: true, tag: 0)
})
......@@ -692,8 +691,6 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
for asset in assets {
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize , contentMode: .default , options: option, resultHandler: { (image, _: [AnyHashable : Any]?) in
// print("上传图片==\(image)")
self.maxFiveImgsArr.insert(image!, at: sender.tag)
self.maxFiveImgsArr.remove(at: sender.tag+1)
self.uploadImg(imge: image!, isOriginal: false, tag: sender.tag)
})
}
......@@ -714,11 +711,20 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
print("图片上传成功\(dataM.data?.url)")
if isOriginal {
self.original_img = dataM.data?.url!
self.singleImgArr.append(self.original_img!)
}else{
self.goods_banner?.insert((dataM.data?.url!)!, at: tag)
self.goods_banner?.remove(at: tag + 1)
self.maxFiveImgsArr.removeAll()
self.goods_banner?.forEach({ (str) in
if str.count > 0 {
self.maxFiveImgsArr.append(str)
}
})
}
self.listTbv.reloadData()
}
}) { (error) in
print("图片上传失败\(error)")
}
......@@ -727,13 +733,15 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
//MARK: - 删除图片处理
func DelImgCellBtnClick(sender:UIButton, cell: AddImgCell) {
if cell.isSingle == true {
singleImgArr.remove(at:sender.tag)
singleImgArr.removeAll()
self.original_img = ""
listTbv.reloadData()
}else{
maxFiveImgsArr.remove(at:sender.tag)
self.goods_banner?.insert("", at: 5)
self.goods_banner?.remove(at: sender.tag)
listTbv.reloadData()
}
}
......@@ -1081,6 +1089,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
//普通阶梯价
var is_tiered = 0
var tiered_pri:Dictionary<String, String> = [:]
if md.isJieTiOpen {
......@@ -1154,10 +1163,12 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
adsale_inventory = md.ysKuCun
pct = md.DJBiLi
}
let packAttrStr = dictChangeString(sender: pack_attr)
var sku = ["sku_sn":"",
"spec_id":"1",
"attr":md.guiGe,
"pack_attr":pack_attr,
"pack_attr":packAttrStr,
"refrigerate":md.wenDu,
"unit":md.danWei,
"price":md.price,
......@@ -1169,13 +1180,16 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
"is_adsale_tiered":is_adsale_tiered] as [String : Any]
if tiered_pri.keys.count > 0{
sku.updateValue(tiered_pri, forKey: "tiered_pri")
let tieredPriStr = dictChangeString(sender: tiered_pri)
sku.updateValue(tieredPriStr, forKey: "tiered_pri")
}else{
sku.updateValue("", forKey: "tiered_pri")
}
if adsale_tiered_pri.keys.count > 0 {
sku.updateValue(adsale_tiered_pri, forKey: "adsale_tiered_pri")
let adsaletieredPriStr = dictChangeString(sender: adsale_tiered_pri)
sku.updateValue(adsaletieredPriStr, forKey: "adsale_tiered_pri")
}else{
sku.updateValue("", forKey: "adsale_tiered_pri")
}
......
GeliBusinessPlatform/ViewController/商家信息/ShopInfoViewController.swift
View file @ 561d82d1
......@@ -28,7 +28,7 @@ class ShopInfoViewController: BaseViewController {
shopInfo(["user_token":UserToken as Any], success: { (data) in
self.dataModel = (data as! ShopInfoModel)
// self.shopImgV.kf.setImage(with: URL(string: SERVERCE_HOST + (self.dataModel?.data?.shop_img)!))
// self.shopImgV.kf.setImage(with: URL(string: SERVERCE_ImageHost + (self.dataModel?.data?.shop_img)!))
self.shopNameLbl.text = self.dataModel?.data?.shop_name
self.compAddressLbl.text = self.dataModel?.data?.addr_str
self.addressDetLbl.text = self.dataModel?.data?.address
......@@ -43,7 +43,7 @@ class ShopInfoViewController: BaseViewController {
self.emailLbl.text = self.dataModel?.data?.shop_email
self.businessNumLbl.text = self.dataModel?.data?.business_licence_number
self.businessSphereLbl.text = self.dataModel?.data?.business_sphere
// self.idCardImgV.kf.setImage(with: URL(string: SERVERCE_HOST + (self.dataModel?.data?.identity_card_front)!))
// self.idCardImgV.kf.setImage(with: URL(string: SERVERCE_ImageHost + (self.dataModel?.data?.identity_card_front)!))
}) { (error) in
//缺省数据，隐藏滚动视图，展示错误视图
......@@ -51,12 +51,12 @@ class ShopInfoViewController: BaseViewController {
}
@IBAction func previousAction(_ sender: UIButton) {
// self.idCardImgV.kf.setImage(with: URL(string: SERVERCE_HOST + (self.dataModel?.data?.identity_card_front)!))
// self.idCardImgV.kf.setImage(with: URL(string: SERVERCE_ImageHost + (self.dataModel?.data?.identity_card_front)!))
rightChangeImgBtn.setImage(UIImage.init(named: "idCard2"), for: .normal)
leftChangeImgBtn.setImage(UIImage.init(named: "idCard1"), for: .normal)
}
@IBAction func nextAction(_ sender: UIButton) {
// self.idCardImgV.kf.setImage(with: URL(string: SERVERCE_HOST + (self.dataModel?.data?.identity_card_back)!))
// self.idCardImgV.kf.setImage(with: URL(string: SERVERCE_ImageHost + (self.dataModel?.data?.identity_card_back)!))
rightChangeImgBtn.setImage(UIImage.init(named: "idCard4"), for: .normal)
leftChangeImgBtn.setImage(UIImage.init(named: "idCard3"), for: .normal)
}
......
GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.swift
View file @ 561d82d1
......@@ -38,6 +38,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
let titleArray = ["售价：","规格：","重量：","温藏：","单位："]
let pliceHolderArr = ["请输入商品售价","请输入商品规格","请输入商品重量","请选择商品温藏","请选择商品单位"]
@IBOutlet weak var btmLbl: UILabel!
@IBOutlet weak var bottomBtn: LGButton!
@IBOutlet weak var listTbv: UITableView!
var selectIdx:IndexPath?
......@@ -49,6 +50,8 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
var isOpenYSSetting = false//是否打开预售设置
var selectYuShou = false//是否选择设置预售价格
var isAllEditing = true//全局控制编辑
//选择页面
var selectView:GLAlertSelectView? = nil
var selectListArr:Array<String> = ["冷冻","冷藏","常温"]
......@@ -83,6 +86,11 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
super.viewDidLoad()
navbar.title = barTitle
self.view.addSubview(navbar)
if barTitle == "查看规格"{
isAllEditing = false
bottomBtn.isHidden = true
btmLbl.isHidden = true
}
if datasArr.count > 1 && barTitle!.contains("编辑") == true {//展示topbar
SetTopFrame(view: topBarView, height: 41)
......@@ -199,6 +207,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
datasArr.insert(dataModel, at: selectIdx!.item)
datasArr.remove(at: selectIdx!.item+1)
}else{
dataModel.sku_id = 0
datasArr.append(dataModel)
selectIdx?.item = datasArr.count - 1
}
......@@ -258,6 +267,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
if indexPath.row < 3 {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTF") as! TitleAndTFCell
cell.nameLbl.text = titleArray[indexPath.row]
cell.textTF.isUserInteractionEnabled = isAllEditing
cell.tag = indexPath.row
cell.textTF.tag = cell.tag
//keyboardType
......@@ -284,6 +294,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
}else{
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtn") as! TitleAndBtnCell
cell.tag = indexPath.row
cell.btn.isUserInteractionEnabled = isAllEditing
cell.delegate = self
cell.nameLbl.text = titleArray[indexPath.row]
cell.contentLbl.text = pliceHolderArr[indexPath.row]
......@@ -333,6 +344,9 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
if indexPath.section == 1 {
if isYuShouSetting == true {
let cell = tableView.dequeueReusableCell(withIdentifier: "YuShou") as! YuShouCell
cell.inputTF1.isUserInteractionEnabled = isAllEditing
cell.inputTF2.isUserInteractionEnabled = isAllEditing
cell.inputTF3.isUserInteractionEnabled = isAllEditing
cell.tag = indexPath.row
cell.infoSw.isOn = isOpenYSSetting
cell.delegate = self
......@@ -345,9 +359,13 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
if indexPath.section == 2 {
let cell = tableView.dequeueReusableCell(withIdentifier: "PuTongJieTi") as! PuTongJieTiCell
cell.btn.isUserInteractionEnabled = isAllEditing
cell.delegate = self
cell.titleLbl.text = "\(indexPath.row+1).数量≥"
cell.tag = indexPath.row
cell.countTF.isUserInteractionEnabled = isAllEditing
cell.priceTF.isUserInteractionEnabled = isAllEditing
cell.countTF.text = ""
cell.priceTF.text = ""
var item:NSString = ""
......@@ -367,12 +385,16 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
}
if indexPath.section == 3 {
let cell = tableView.dequeueReusableCell(withIdentifier: "DelGuiGe") as! DelGuiGeCell
return cell
}
return cell
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if isAllEditing == false {
return
}
if indexPath.section == 3 {
//删除
datasArr.remove(at: selectIdx!.item)
......@@ -578,6 +600,9 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
}
func footerClickAction() {
if isAllEditing == false {
return
}
print(jieTiArr)
if selectYuShou {//预售
specalArr.append("")
......
GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.xib
View file @ 561d82d1
......@@ -11,6 +11,7 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CreatNewSpecsViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
<connections>
<outlet property="bottomBtn" destination="Y0N-V9-rbQ" id="cyL-aV-aEN"/>
<outlet property="btmLbl" destination="cfi-M7-imX" id="nul-AS-3bD"/>
<outlet property="listTbv" destination="bSh-mx-Kzg" id="xwd-1s-qv3"/>
<outlet property="topBarView" destination="58G-5f-0zb" id="HDH-SB-fbX"/>
<outlet property="topBarViewH" destination="BMm-7O-bZv" id="ygO-Sq-gGh"/>
......
GeliBusinessPlatform/ViewController/新增规格/PuTongJieTiCell.swift
View file @ 561d82d1
......@@ -21,6 +21,8 @@ class PuTongJieTiCell: UITableViewCell,UITextFieldDelegate {
@IBOutlet weak var priceTF: UITextField!
@IBOutlet weak var countTF: UITextField!
@IBOutlet weak var titleLbl: UILabel!
@IBOutlet weak var btn: UIButton!
override func awakeFromNib() {
super.awakeFromNib()
selectionStyle = .none
......
GeliBusinessPlatform/ViewController/新增规格/PuTongJieTiCell.xib
View file @ 561d82d1
......@@ -117,6 +117,7 @@
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="btn" destination="7H6-Et-Mew" id="NMW-5k-MRI"/>
<outlet property="countTF" destination="DMW-oR-f6E" id="SSR-pc-LuB"/>
<outlet property="priceTF" destination="GZ7-X2-hIF" id="oZI-xp-ed5"/>
<outlet property="titleLbl" destination="dEb-Pr-hmY" id="B1t-aG-1n8"/>
......
Podfile
View file @ 561d82d1
......@@ -27,5 +27,5 @@ pod 'SnapKit'
pod 'LGButton'
pod 'WYAutoLayout'
pod 'SVProgressHUD'
pod 'RongCloudIM'
pod 'SDWebImage'
end
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