Skip to content

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

取消选图弹簧效果

parent 9f3a4b1f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 105 deletions
GeliBusinessPlatform/SceneDelegate.swift
View file @ a55b3ec7
......@@ -10,16 +10,21 @@ import UIKit
import SwiftUI
import ESTabBarController_swift
class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDelegate, loginDelegate {
var window: UIWindow?
var sceneC: UIScene?
func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
sceneC = scene
let UserToken = UserDefaults.standard.value(forKey: "user_token")
if UserToken == nil {
addLoginVc(isAgain: false)
}else{
......@@ -37,12 +42,16 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
}
//MARK:--loginVC
func addLoginVc (isAgain:Bool){
let vc = LoginViewController()
vc.delegate = self
let contentView = vc
//
// let vc = YingFuZhangKuanXQViewController()
// let contentView = vc
// let vc = LoginViewController()
// vc.delegate = self
// let contentView = vc
let vc = ProductDetailViewController()
let contentView = vc
if let windowScene = sceneC as? UIWindowScene {
if isAgain {
......@@ -89,6 +98,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
tabBarController.viewControllers = [v1, v2, v3, v4, v5]
tabBarController.selectedIndex = 1
let contentView = tabBarController
if let windowScene = sceneC as? UIWindowScene {
......@@ -111,11 +121,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
}
//测试代码
// if let tabBarItem = v2.tabBarItem as? ESTabBarItem {
// DispatchQueue.main.asyncAfter(deadline: .now() + 2 ) {
// tabBarItem.badgeValue = "1"
// }
// }
// if let tabBarItem = v2.tabBarItem as? ESTabBarItem {
// DispatchQueue.main.asyncAfter(deadline: .now() + 2 ) {
// tabBarItem.badgeValue = "1"
// }
// }
}
func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) {
//添加通知，才加载数据
......@@ -137,7 +147,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
// Called when the scene will move from an active state to an inactive state.
// This may occur due to temporary interruptions (ex. an incoming phone call).
}
func sceneWillEnterForeground(_ scene: UIScene) {
// Called as the scene transitions from the background to the foreground.
// Use this method to undo the changes made on entering the background.
......
GeliBusinessPlatform/View/Cell/AddImgCell.swift
View file @ a55b3ec7
......@@ -64,6 +64,7 @@ class AddImgCell: UITableViewCell {
if isSingle == false {
addBtn.isHidden = false
scrollView?.isHidden = false
scrollView?.bounces = false
if arr.count < 3 {
scrollView?.contentSize = CGSize(width: arr.count*105, height: 0)
scrollView?.frame = CGRect(x: 15, y: CGFloat(y), width: CGFloat(arr.count)*105, height:h)
......@@ -71,7 +72,7 @@ class AddImgCell: UITableViewCell {
}else if arr.count == 5 {
addBtn.isHidden = true
scrollView?.contentSize = CGSize(width: arr.count*105, height: 0)
scrollView?.frame = CGRect(x: 15, y: CGFloat(y), width: fullScreenWidth, height:h)
scrollView?.frame = CGRect(x: 15, y: CGFloat(y), width: fullScreenWidth-30, height:h)
}else{
scrollView?.contentSize = CGSize(width: arr.count*105, height: 0)
scrollView?.frame = CGRect(x: 15, y: CGFloat(y), width: fullScreenWidth-130, height:h)
......
GeliBusinessPlatform/ViewController/增值服务/ZengZhiServicesViewController.swift
View file @ a55b3ec7
......@@ -9,40 +9,16 @@
import UIKit
class ZengZhiServicesViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndSelectCellDelegate,UITextViewDelegate{
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 3
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 50
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndSelect") as! TitleAndSelectCell
cell.delegate = self
cell.tag = indexPath.row
cell.titleLbl.text = titleArr[indexPath.row]
let line = UIView()
line.backgroundColor = UIColor(named: "灰色分界线")
cell.contentView.addSubview(line)
line.snp.makeConstraints { (make) in
make.bottom.right.equalTo(0)
make.left.equalTo(15)
make.height.equalTo(1)
}
return cell
}
func TitleAndSelectCellClick(content: UIButton, cell: TitleAndSelectCell) {
print(cell.tag)
for item in listView.visibleCells {
let cel = item as! TitleAndSelectCell
cel.selectBtn.isSelected = false
if cel == cell {
cel.selectBtn.isSelected = true
}
}
}
//MARK: - 数据汇总提交
@IBAction func submitAction(_ sender: Any) {
print("submit")
print(selectIdx)//0 送货 1 清真 2 污染
print(fanHuanIdx)//0 无签单 1 纸质 2 电子
print(price)//报价金额
print(commend)//评论
}
var titleArr = ["送货入仓","清真","易污染"]
......@@ -59,6 +35,10 @@ class ZengZhiServicesViewController: BaseViewController,UITableViewDelegate,UITa
@IBOutlet weak var holderLbl: UILabel!
@IBOutlet weak var listView: UITableView!
var selectIdx:Int?
var fanHuanIdx:Int?
var price:String = ""
var commend:String = ""
override func viewDidLoad() {
super.viewDidLoad()
navbar.title = "增值服务"
......@@ -73,15 +53,39 @@ class ZengZhiServicesViewController: BaseViewController,UITableViewDelegate,UITa
listView.separatorStyle = .none
listView.register(UINib(nibName: "TitleAndSelectCell", bundle: nil), forCellReuseIdentifier: "TitleAndSelect")
textView.delegate = self
textView.text = commend
inputTF.addTarget(self, action: #selector(textViewEdit(sender:)), for: .allEditingEvents)
inputTF.text = price
nBtn.isSelected = true
nBtn.backgroundColor = UIColor(named: "蓝色字体颜色")
nBtn.layer.borderWidth = 0
// Do any additional setup after loading the view.
}
//MARK: - CELL DELEGATE
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndSelect") as! TitleAndSelectCell
cell.delegate = self
cell.tag = indexPath.row
cell.titleLbl.text = titleArr[indexPath.row]
cell.selectBtn.isSelected = false
cell.selectBtn.isUserInteractionEnabled = false
if indexPath.row == selectIdx{
cell.selectBtn.isSelected = true
}
let line = UIView()
line.backgroundColor = UIColor(named: "灰色分界线")
cell.contentView.addSubview(line)
line.snp.makeConstraints { (make) in
make.bottom.right.equalTo(0)
make.left.equalTo(15)
make.height.equalTo(1)
}
return cell
}
func textViewDidChange(_ textView: UITextView) {
commend = textView.text
if textView.text.count != 0 {
textViewHolderLbl.isHidden = true
}else{
......@@ -97,15 +101,16 @@ class ZengZhiServicesViewController: BaseViewController,UITableViewDelegate,UITa
return true
}
@objc func textViewEdit(sender:UITextView){
if sender.text.count > 0 {
@objc func textViewEdit(sender:UITextField){
price = sender.text!
if price.count > 0 {
holderLbl.isHidden = true
}else{
holderLbl.isHidden = false
}
}
@IBAction func selectAction(_ sender: UIButton) {
fanHuanIdx = sender.tag
if sender == nBtn{
if nBtn.isSelected == true {
nBtn.isSelected = false
......@@ -160,6 +165,20 @@ class ZengZhiServicesViewController: BaseViewController,UITableViewDelegate,UITa
eBtn.layer.borderWidth = 0
}
}
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 3
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 50
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if indexPath.section == 0 {
if indexPath.row < 3{
selectIdx = indexPath.row
listView.reloadData()
}
}
}
}
GeliBusinessPlatform/ViewController/寄派方式/JiPaiFangShiViewController.swift
View file @ a55b3ec7
......@@ -9,15 +9,7 @@
import UIKit
class JiPaiFangShiViewController: BaseViewController ,SendTimeSelectViewDeleagte{
func SendTimeSelectViewSubmit(date: String) {
print(date)
sendTimeView?.removeFromSuperview()
sendTimeView = nil
}
func SendTimeSelectViewClose() {
sendTimeView?.removeFromSuperview()
sendTimeView = nil
}
var sendTimeView:SendTimeSelectView?
@IBAction func selectTimeAction(_ sender: UIButton) {
if sendTimeView == nil {
......@@ -69,6 +61,18 @@ class JiPaiFangShiViewController: BaseViewController ,SendTimeSelectViewDeleagte
masklayer.path = maskPath.cgPath
sender.layer.mask = masklayer
}
func SendTimeSelectViewSubmit(date: String) {
timeLbl.text = date
sendTimeView?.removeFromSuperview()
sendTimeView = nil
}
func SendTimeSelectViewClose() {
sendTimeView?.removeFromSuperview()
sendTimeView = nil
}
@IBAction func sendAction(_ sender: UIButton) {
if sender == PLeftBtn {
......
GeliBusinessPlatform/ViewController/新增、编辑品牌/PinPaiListViewController.xib
View file @ a55b3ec7
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......
GeliBusinessPlatform/ViewController/新增、编辑品牌/XinZengPinPaiViewController.swift
View file @ a55b3ec7
......@@ -8,13 +8,20 @@
import UIKit
import LGButton
import Photos
class XinZengPinPaiViewController: BaseViewController,UITableViewDataSource,UITableViewDelegate,TitleAndBtnCellDelegate {
class XinZengPinPaiViewController: BaseViewController,UITableViewDataSource,UITableViewDelegate,TitleAndBtnCellDelegate,TitleAndTFCellDelegate,TilteAndTextViewCellDelegate{
let titleArr = ["品牌名称","品牌图标","站点地址","品牌描述"]
let holderArr = ["请输入品牌名称","0","请输入站点地址如：www.gelifood.com","0"]
@IBOutlet weak var btnTitleLbl: UILabel!
@IBOutlet weak var listView: UITableView!
var logoIcon:UIImage?//图片
var pinPaiName:String?//品牌名字
var pinPaiUrl:String?//品牌连接
var commend:String?//品牌描述
var navTitle:String?
override func viewDidLoad() {
super.viewDidLoad()
......@@ -23,60 +30,106 @@ class XinZengPinPaiViewController: BaseViewController,UITableViewDataSource,UITa
navbar.rightTitle = "删除"
}
self.view.addSubview(navbar)
listView.snp.makeConstraints { (make) in
make.top.equalTo(NavCGRect.height)
make.left.right.equalTo(0)
make.height.equalTo(323.5*glscale)
}
SetTopFrameView(view: listView, btmView: btnTitleLbl)
listView.separatorStyle = .none
listView.isScrollEnabled = false
listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTF")
listView.register(UINib(nibName: "TitleAndBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndBtn")
listView.register(UINib(nibName: "TilteAndTextViewCell", bundle: nil), forCellReuseIdentifier: "TilteAndTextView")
// Do any additional setup after loading the view.
}
//MARK: - 删除
func rightBtnClick() {
}
//MARK: - 提交
@IBAction func btnAction(_ sender: Any) {
print("提交")
print(pinPaiName)//名字
print(pinPaiUrl)//链接
print(commend)//描述
print(logoIcon)//图片
}
//MARK: - cell delegate
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
switch indexPath.row {
case 0,2:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTF") as! TitleAndTFCell
cell.nameLbl.text = titleArr[indexPath.row]
cell.textTF.placeholder = holderArr[indexPath.row]
cell.delegate = self
cell.tag = indexPath.row
switch indexPath.row {
case 0:
cell.textTF.text = pinPaiName
break
case 2:
cell.textTF.text = pinPaiUrl
break
default:
break
}
return cell
case 1:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtn") as! TitleAndBtnCell
cell.nameLbl.text = titleArr[indexPath.row]
cell.contentLbl.text = "上传图片"
cell.delegate = self
if logoIcon != nil {
cell.imgView.image = logoIcon
cell.imgView.isHidden = false
cell.contentLbl.isHidden = true
}
return cell
default:
let cell = tableView.dequeueReusableCell(withIdentifier: "TilteAndTextView") as! TilteAndTextViewCell
cell.titleLbl.text = titleArr[indexPath.row]
cell.holderLbl.text = "简述品牌体征。"
cell.textView.text = commend
cell.delegate = self
return cell
}
}
func textFieldContent(content: String, cell: TitleAndTFCell) {
if cell.tag == 0 {
pinPaiName = content
}
pinPaiUrl = content
}
func TilteAndTextViewCellResponseStr(str: String, cell: TilteAndTextViewCell) {
commend = str
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.row == 3 {
return 173.5*glscale
}
if indexPath.row == 1 {
if logoIcon != nil {
return 100
}
}
return 49*glscale
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return titleArr.count
}
func btnClick(content: String, cell: TitleAndBtnCell) {
print(content)
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
switch indexPath.row {
case 0,2:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTF") as! TitleAndTFCell
cell.nameLbl.text = titleArr[indexPath.row]
cell.textTF.placeholder = holderArr[indexPath.row]
return cell
case 1:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtn") as! TitleAndBtnCell
cell.nameLbl.text = titleArr[indexPath.row]
cell.contentLbl.text = "上传图片"
cell.delegate = self
return cell
default:
let cell = tableView.dequeueReusableCell(withIdentifier: "TilteAndTextView") as! TilteAndTextViewCell
cell.titleLbl.text = titleArr[indexPath.row]
cell.holderLbl.text = "简述品牌体征。"
return cell
_ = self.presentHGImagePicker(maxSelected:1) { (assets) in
//结果处理
print("共选择了\(assets.count)张图片，分别如下：")
let option = PHImageRequestOptions()
option.isSynchronous = true
option.isNetworkAccessAllowed = true
for asset in assets {
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize , contentMode: .default , options: option, resultHandler: { (image, _: [AnyHashable : Any]?) in
// print("上传图片==\(image)")
self.logoIcon = image
})
}
self.listView.reloadData()
}
}
}
GeliBusinessPlatform/ViewController/新增、编辑品牌/XinZengPinPaiViewController.xib
View file @ a55b3ec7
......@@ -21,15 +21,8 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="rtS-FJ-o0e">
<rect key="frame" x="0.0" y="44" width="414" height="323.5"/>
<rect key="frame" x="0.0" y="44" width="414" height="769"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="323.5" id="Iz2-Nb-wK2">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
</userDefinedRuntimeAttributes>
</constraint>
</constraints>
<connections>
<outlet property="dataSource" destination="-1" id="fvT-jc-s0a"/>
<outlet property="delegate" destination="-1" id="vyl-Yl-QqR"/>
......@@ -66,13 +59,14 @@
<constraint firstAttribute="bottom" secondItem="bjw-OI-1k0" secondAttribute="bottom" id="4Tc-15-KAu"/>
<constraint firstItem="bjw-OI-1k0" firstAttribute="top" secondItem="Hmi-sA-ntB" secondAttribute="top" id="Hrg-kQ-aXC"/>
<constraint firstAttribute="trailing" secondItem="bjw-OI-1k0" secondAttribute="trailing" id="JOQ-es-5OE"/>
<constraint firstItem="rtS-FJ-o0e" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="Mdp-wM-HJg"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="rtS-FJ-o0e" secondAttribute="trailing" id="QSH-9B-9Y9"/>
<constraint firstItem="rtS-FJ-o0e" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="PEH-9j-tXD"/>
<constraint firstItem="rtS-FJ-o0e" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="Rkf-LH-f3e"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Hmi-sA-ntB" secondAttribute="trailing" id="UaX-7R-TsW"/>
<constraint firstItem="rtS-FJ-o0e" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="crK-Dr-MCm"/>
<constraint firstItem="bjw-OI-1k0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="eZX-P8-KwQ"/>
<constraint firstItem="Hmi-sA-ntB" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="qdx-UJ-DtF"/>
<constraint firstItem="rtS-FJ-o0e" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="tg2-Os-l99"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="Hmi-sA-ntB" secondAttribute="bottom" id="yeB-lK-67v"/>
<constraint firstItem="bjw-OI-1k0" firstAttribute="top" secondItem="rtS-FJ-o0e" secondAttribute="bottom" id="zj7-F2-9E2"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="131.8840579710145" y="121.875"/>
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ a55b3ec7
......@@ -12,8 +12,8 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
var orderId:Int? //订单编号
var isYuShou:Bool = false //是否预售
var dataArr:NSArray = ["a","b"] //订单产品数据
var btmBtnsTitleArr:NSArray = ["修改价格","打印","确认订单"]//底栏按钮数据
var dataArr:Array<Any> = ["a","b"] //订单产品数据
var btmBtnsTitleArr:Array<Any> = ["修改价格","打印","确认订单"]//底栏按钮数据
let yuShouTitleArr = ["定金：","尾款：","商品合计：","物流费用：","其它费用："]
let nonYuShouTitleArr = ["商品合计：","物流费用：","其它费用："]
......
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