Commit cacbdcd173fa2e8047cb7b5d0dda57b16a69cdc9
Exists in
parentassistant
Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan…
…t into parentassistant
Showing
5 changed files
with
242 additions
and
2 deletions
Show diff stats
ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
| ... | ... | @@ -113,6 +113,7 @@ |
| 113 | 113 | BF7A4C85204E338500460463 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF7A4C7F204E338400460463 /* LaunchScreen.storyboard */; }; |
| 114 | 114 | BF7A4C86204E338500460463 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BF7A4C81204E338400460463 /* Main.storyboard */; }; |
| 115 | 115 | BF7A4C87204E338500460463 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BF7A4C83204E338400460463 /* Info.plist */; }; |
| 116 | + BFA7443A207DB6EE00845D30 /* ActivationSchoolCardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFA74439207DB6EE00845D30 /* ActivationSchoolCardViewController.swift */; }; | |
| 116 | 117 | BFBC06C52063AE8900CCFAFF /* ZLaunchAd.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBC06BB2063AE8800CCFAFF /* ZLaunchAd.swift */; }; |
| 117 | 118 | BFBC06C62063AE8900CCFAFF /* ZLaunchAdAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBC06BC2063AE8800CCFAFF /* ZLaunchAdAnimation.swift */; }; |
| 118 | 119 | BFBC06C72063AE8900CCFAFF /* ZLaunchAdButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFBC06BD2063AE8800CCFAFF /* ZLaunchAdButton.swift */; }; |
| ... | ... | @@ -280,6 +281,7 @@ |
| 280 | 281 | BF7A4C80204E338400460463 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; |
| 281 | 282 | BF7A4C82204E338400460463 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; |
| 282 | 283 | BF7A4C83204E338400460463 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; |
| 284 | + BFA74439207DB6EE00845D30 /* ActivationSchoolCardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivationSchoolCardViewController.swift; sourceTree = "<group>"; }; | |
| 283 | 285 | BFBC06BB2063AE8800CCFAFF /* ZLaunchAd.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLaunchAd.swift; sourceTree = "<group>"; }; |
| 284 | 286 | BFBC06BC2063AE8800CCFAFF /* ZLaunchAdAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLaunchAdAnimation.swift; sourceTree = "<group>"; }; |
| 285 | 287 | BFBC06BD2063AE8800CCFAFF /* ZLaunchAdButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZLaunchAdButton.swift; sourceTree = "<group>"; }; |
| ... | ... | @@ -721,6 +723,7 @@ |
| 721 | 723 | BF406CDB2057C110000A6681 /* OrderDetailViewController.swift */, |
| 722 | 724 | BFF9B7EC2057776100F39B3E /* MyChildrenViewController.swift */, |
| 723 | 725 | BFF9B7F52057A4C900F39B3E /* ChildrenDetailViewController.swift */, |
| 726 | + BFA74439207DB6EE00845D30 /* ActivationSchoolCardViewController.swift */, | |
| 724 | 727 | BF621CAB205660E90040D2C1 /* My.storyboard */, |
| 725 | 728 | ); |
| 726 | 729 | path = Controller; |
| ... | ... | @@ -1064,6 +1067,7 @@ |
| 1064 | 1067 | BFBC06CD2063AE8900CCFAFF /* ZLaunchImageView.swift in Sources */, |
| 1065 | 1068 | BF406CDC2057C110000A6681 /* OrderDetailViewController.swift in Sources */, |
| 1066 | 1069 | BFEAAAC4205257460072FAAF /* LXCalendarMonthModel.m in Sources */, |
| 1070 | + BFA7443A207DB6EE00845D30 /* ActivationSchoolCardViewController.swift in Sources */, | |
| 1067 | 1071 | BF38847E205CDE2D00A240EF /* JSViewController.swift in Sources */, |
| 1068 | 1072 | ADE33B312062202300BEA6E6 /* Macro.swift in Sources */, |
| 1069 | 1073 | ADF159612069E00000A9485D /* CalendarView.swift in Sources */, | ... | ... |
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/ActivationSchoolCardViewController.swift
0 → 100644
| ... | ... | @@ -0,0 +1,43 @@ |
| 1 | +// | |
| 2 | +// ActivationSchoolCardViewController.swift | |
| 3 | +// ParentAssistant | |
| 4 | +// | |
| 5 | +// Created by 葛建军 on 2018/4/11. | |
| 6 | +// Copyright © 2018年 HANGZHOUTEAM. All rights reserved. | |
| 7 | +// | |
| 8 | + | |
| 9 | +import UIKit | |
| 10 | +//校卡激活页面 | |
| 11 | +class ActivationSchoolCardViewController: UINavigationController { | |
| 12 | + var info:StudentClassInfo!//孩子信息 | |
| 13 | + @IBOutlet var nameLabel: UILabel!//孩子姓名 | |
| 14 | + @IBOutlet var cardNumberTextField: UITextField!//卡号 | |
| 15 | + override func viewDidLoad() { | |
| 16 | + super.viewDidLoad() | |
| 17 | + nameLabel.text = info.studentName | |
| 18 | + } | |
| 19 | + // MARK: - 确定按钮 | |
| 20 | + @IBAction func activationAction(_ sender: UIButton) { | |
| 21 | + if cardNumberTextField.text == "" { | |
| 22 | + self.view.makeToast("卡号不能为空") | |
| 23 | + } | |
| 24 | + | |
| 25 | + } | |
| 26 | + | |
| 27 | + override func didReceiveMemoryWarning() { | |
| 28 | + super.didReceiveMemoryWarning() | |
| 29 | + // Dispose of any resources that can be recreated. | |
| 30 | + } | |
| 31 | + | |
| 32 | + | |
| 33 | + /* | |
| 34 | + // MARK: - Navigation | |
| 35 | + | |
| 36 | + // In a storyboard-based application, you will often want to do a little preparation before navigation | |
| 37 | + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { | |
| 38 | + // Get the new view controller using segue.destinationViewController. | |
| 39 | + // Pass the selected object to the new view controller. | |
| 40 | + } | |
| 41 | + */ | |
| 42 | + | |
| 43 | +} | ... | ... |
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/ChildrenDetailViewController.swift
| ... | ... | @@ -15,7 +15,7 @@ class ChildrenDetailViewController: UIViewController { |
| 15 | 15 | @IBOutlet var classTextField: UITextField!//班级 |
| 16 | 16 | @IBOutlet var placeTextField: UITextField!//学校所属地区 |
| 17 | 17 | @IBOutlet var numberTextField: UITextField!//学生账号 |
| 18 | - var info:StudentClassInfo! | |
| 18 | + var info:StudentClassInfo!//孩子信息 | |
| 19 | 19 | override func viewDidLoad() { |
| 20 | 20 | super.viewDidLoad() |
| 21 | 21 | setUpWithInfo() |
| ... | ... | @@ -27,6 +27,42 @@ class ChildrenDetailViewController: UIViewController { |
| 27 | 27 | placeTextField.text = info.cityName+info.areaName |
| 28 | 28 | numberTextField.text = info.studentCode |
| 29 | 29 | } |
| 30 | + // MARK: - 校卡激活 | |
| 31 | + @IBAction func activationSchoolCardAction(_ sender: UIButton) { | |
| 32 | + let vc = Story.instantiateViewControllerWithIdentifier("ActivationSchoolCardViewController", storyName: "My") as! ActivationSchoolCardViewController | |
| 33 | + vc.info = info | |
| 34 | + self.navigationController?.pushViewController(vc, animated: true) | |
| 35 | + } | |
| 36 | + // MARK: - 解除绑定 | |
| 37 | + @IBAction func unbundlingAction(_ sender: UIButton) { | |
| 38 | + //登录并返回页面 | |
| 39 | + let alertVC = UIAlertController(title: "提示", message: "是否解除 \(info.studentName) 绑定?", preferredStyle: UIAlertControllerStyle.alert) | |
| 40 | + let backBtn = UIAlertAction(title: "取消", style: UIAlertActionStyle.default) { (action) in | |
| 41 | + } | |
| 42 | + let showBtn = UIAlertAction(title: "确定", style: UIAlertActionStyle.default) { (action) in | |
| 43 | + self.unbundlingAction() | |
| 44 | + } | |
| 45 | + alertVC.addAction(backBtn) | |
| 46 | + alertVC.addAction(showBtn) | |
| 47 | + self.present(alertVC, animated: true, completion: nil) | |
| 48 | + } | |
| 49 | + func unbundlingAction(){ | |
| 50 | + SVProgressHUD.show() | |
| 51 | + HTTPServer.shared.getUnBindStudent(["parentid":info.parentId as AnyObject,"studentid":info.studentId as AnyObject]) { (str, error) in | |
| 52 | + SVProgressHUD.dismiss() | |
| 53 | + if error == nil{ | |
| 54 | + if JSON.fromString(str)!["status"].intValue == 1{ | |
| 55 | + AccountManager.shared.refreshUserInfo(AccountManager.shared.phone(), completionHandler: { (finish) in | |
| 56 | + self.navigationController?.popToRootViewController(animated: true) | |
| 57 | + }) | |
| 58 | + }else{ | |
| 59 | + appDelegate.window!.makeToast("解绑孩子失败:\(JSON.fromString(str)!["message"].stringValue)") | |
| 60 | + } | |
| 61 | + }else{ | |
| 62 | + appDelegate.window!.makeToast("解绑孩子失败:\(String(describing: error))") | |
| 63 | + } | |
| 64 | + } | |
| 65 | + } | |
| 30 | 66 | override func didReceiveMemoryWarning() { |
| 31 | 67 | super.didReceiveMemoryWarning() |
| 32 | 68 | } | ... | ... |
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
| ... | ... | @@ -1567,6 +1567,44 @@ |
| 1567 | 1567 | <constraint firstAttribute="trailing" secondItem="6aM-bP-gD0" secondAttribute="trailing" constant="8" id="zHP-la-7CK"/> |
| 1568 | 1568 | </constraints> |
| 1569 | 1569 | </view> |
| 1570 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jmq-mD-M7V"> | |
| 1571 | + <rect key="frame" x="8" y="583" width="359" height="30"/> | |
| 1572 | + <color key="backgroundColor" red="0.26289805769920349" green="0.83853167295455933" blue="0.5797455906867981" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | |
| 1573 | + <constraints> | |
| 1574 | + <constraint firstAttribute="height" constant="30" id="TDs-w3-m8B"/> | |
| 1575 | + </constraints> | |
| 1576 | + <state key="normal" title="校卡激活"> | |
| 1577 | + <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | |
| 1578 | + </state> | |
| 1579 | + <userDefinedRuntimeAttributes> | |
| 1580 | + <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> | |
| 1581 | + <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> | |
| 1582 | + <integer key="value" value="5"/> | |
| 1583 | + </userDefinedRuntimeAttribute> | |
| 1584 | + </userDefinedRuntimeAttributes> | |
| 1585 | + <connections> | |
| 1586 | + <action selector="activationSchoolCardAction:" destination="dKf-Bp-I4E" eventType="touchUpInside" id="Fql-FN-QN6"/> | |
| 1587 | + </connections> | |
| 1588 | + </button> | |
| 1589 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eob-2f-LHk"> | |
| 1590 | + <rect key="frame" x="8" y="621" width="359" height="30"/> | |
| 1591 | + <color key="backgroundColor" red="0.99277454614639282" green="0.58486777544021606" blue="0.58350682258605957" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | |
| 1592 | + <constraints> | |
| 1593 | + <constraint firstAttribute="height" constant="30" id="4TM-cx-grP"/> | |
| 1594 | + </constraints> | |
| 1595 | + <state key="normal" title="解除绑定"> | |
| 1596 | + <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | |
| 1597 | + </state> | |
| 1598 | + <userDefinedRuntimeAttributes> | |
| 1599 | + <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> | |
| 1600 | + <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> | |
| 1601 | + <integer key="value" value="5"/> | |
| 1602 | + </userDefinedRuntimeAttribute> | |
| 1603 | + </userDefinedRuntimeAttributes> | |
| 1604 | + <connections> | |
| 1605 | + <action selector="unbundlingAction:" destination="dKf-Bp-I4E" eventType="touchUpInside" id="zHt-KY-kPh"/> | |
| 1606 | + </connections> | |
| 1607 | + </button> | |
| 1570 | 1608 | </subviews> |
| 1571 | 1609 | <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> |
| 1572 | 1610 | <constraints> |
| ... | ... | @@ -1576,14 +1614,20 @@ |
| 1576 | 1614 | <constraint firstItem="Ts6-G9-JrA" firstAttribute="leading" secondItem="Q9l-Zq-soh" secondAttribute="leading" constant="16" id="Ch8-lH-pSf"/> |
| 1577 | 1615 | <constraint firstItem="Q9l-Zq-soh" firstAttribute="trailing" secondItem="DLs-pB-ghE" secondAttribute="trailing" constant="16" id="GGc-S4-evq"/> |
| 1578 | 1616 | <constraint firstItem="Ts6-G9-JrA" firstAttribute="top" secondItem="qQn-2U-CCe" secondAttribute="bottom" constant="8" id="Pv0-ef-SuP"/> |
| 1617 | + <constraint firstItem="Q9l-Zq-soh" firstAttribute="bottom" secondItem="eob-2f-LHk" secondAttribute="bottom" constant="16" id="UEJ-x6-5ZD"/> | |
| 1579 | 1618 | <constraint firstItem="Q9l-Zq-soh" firstAttribute="trailing" secondItem="Vg2-tu-Jr9" secondAttribute="trailing" constant="16" id="XWK-gg-kgC"/> |
| 1619 | + <constraint firstItem="jmq-mD-M7V" firstAttribute="leading" secondItem="Q9l-Zq-soh" secondAttribute="leading" constant="8" id="YFr-qj-4hB"/> | |
| 1580 | 1620 | <constraint firstItem="qQn-2U-CCe" firstAttribute="leading" secondItem="Q9l-Zq-soh" secondAttribute="leading" constant="16" id="ZIR-Df-DlQ"/> |
| 1581 | 1621 | <constraint firstItem="Vg2-tu-Jr9" firstAttribute="leading" secondItem="Q9l-Zq-soh" secondAttribute="leading" constant="16" id="kuS-Ms-wiS"/> |
| 1622 | + <constraint firstItem="Q9l-Zq-soh" firstAttribute="trailing" secondItem="eob-2f-LHk" secondAttribute="trailing" constant="8" id="lTx-UI-jFs"/> | |
| 1582 | 1623 | <constraint firstItem="DLs-pB-ghE" firstAttribute="top" secondItem="J7F-BU-RFH" secondAttribute="bottom" constant="8" id="oh1-a0-CLl"/> |
| 1624 | + <constraint firstItem="eob-2f-LHk" firstAttribute="top" secondItem="jmq-mD-M7V" secondAttribute="bottom" constant="8" id="pKV-Bl-qCB"/> | |
| 1625 | + <constraint firstItem="eob-2f-LHk" firstAttribute="leading" secondItem="Q9l-Zq-soh" secondAttribute="leading" constant="8" id="sE3-jt-0h9"/> | |
| 1583 | 1626 | <constraint firstItem="Vg2-tu-Jr9" firstAttribute="top" secondItem="DLs-pB-ghE" secondAttribute="bottom" constant="8" id="wYh-Mo-4BC"/> |
| 1584 | 1627 | <constraint firstItem="Q9l-Zq-soh" firstAttribute="trailing" secondItem="J7F-BU-RFH" secondAttribute="trailing" constant="16" id="wgO-2D-rYm"/> |
| 1585 | 1628 | <constraint firstItem="Q9l-Zq-soh" firstAttribute="trailing" secondItem="Ts6-G9-JrA" secondAttribute="trailing" constant="16" id="wm7-oU-HJm"/> |
| 1586 | 1629 | <constraint firstItem="DLs-pB-ghE" firstAttribute="leading" secondItem="Q9l-Zq-soh" secondAttribute="leading" constant="16" id="wxO-LP-hUx"/> |
| 1630 | + <constraint firstItem="Q9l-Zq-soh" firstAttribute="trailing" secondItem="jmq-mD-M7V" secondAttribute="trailing" constant="8" id="xra-5X-buN"/> | |
| 1587 | 1631 | <constraint firstItem="Q9l-Zq-soh" firstAttribute="trailing" secondItem="qQn-2U-CCe" secondAttribute="trailing" constant="16" id="xw1-9i-hVY"/> |
| 1588 | 1632 | </constraints> |
| 1589 | 1633 | <viewLayoutGuide key="safeArea" id="Q9l-Zq-soh"/> |
| ... | ... | @@ -1602,6 +1646,119 @@ |
| 1602 | 1646 | </objects> |
| 1603 | 1647 | <point key="canvasLocation" x="910" y="606"/> |
| 1604 | 1648 | </scene> |
| 1649 | + <!--校卡激活--> | |
| 1650 | + <scene sceneID="ife-4P-5ZO"> | |
| 1651 | + <objects> | |
| 1652 | + <viewController storyboardIdentifier="ActivationSchoolCardViewController" id="PmZ-B7-NJl" customClass="ActivationSchoolCardViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController"> | |
| 1653 | + <view key="view" contentMode="scaleToFill" id="7qg-B6-foy"> | |
| 1654 | + <rect key="frame" x="0.0" y="0.0" width="375" height="667"/> | |
| 1655 | + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | |
| 1656 | + <subviews> | |
| 1657 | + <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b7a-Ma-IMT"> | |
| 1658 | + <rect key="frame" x="16" y="265.5" width="343" height="200"/> | |
| 1659 | + <subviews> | |
| 1660 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hqJ-dt-VX1"> | |
| 1661 | + <rect key="frame" x="8" y="162" width="327" height="30"/> | |
| 1662 | + <color key="backgroundColor" red="0.7725490196" green="0.85490196080000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> | |
| 1663 | + <constraints> | |
| 1664 | + <constraint firstAttribute="height" constant="30" id="Q7U-19-vsq"/> | |
| 1665 | + </constraints> | |
| 1666 | + <state key="normal" title="确定"> | |
| 1667 | + <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | |
| 1668 | + </state> | |
| 1669 | + <userDefinedRuntimeAttributes> | |
| 1670 | + <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/> | |
| 1671 | + <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> | |
| 1672 | + <integer key="value" value="5"/> | |
| 1673 | + </userDefinedRuntimeAttribute> | |
| 1674 | + </userDefinedRuntimeAttributes> | |
| 1675 | + <connections> | |
| 1676 | + <action selector="activationAction:" destination="PmZ-B7-NJl" eventType="touchUpInside" id="Ksh-r0-pNC"/> | |
| 1677 | + </connections> | |
| 1678 | + </button> | |
| 1679 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="卡号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Nq-Xv-dmq"> | |
| 1680 | + <rect key="frame" x="30" y="89" width="70" height="21"/> | |
| 1681 | + <constraints> | |
| 1682 | + <constraint firstAttribute="width" constant="70" id="F0z-oJ-wvJ"/> | |
| 1683 | + </constraints> | |
| 1684 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | |
| 1685 | + <nil key="textColor"/> | |
| 1686 | + <nil key="highlightedColor"/> | |
| 1687 | + </label> | |
| 1688 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="持卡人:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I1Y-8N-EP4"> | |
| 1689 | + <rect key="frame" x="30" y="60" width="69.5" height="21"/> | |
| 1690 | + <constraints> | |
| 1691 | + <constraint firstAttribute="width" constant="70" id="oEu-tI-1vf"/> | |
| 1692 | + </constraints> | |
| 1693 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | |
| 1694 | + <nil key="textColor"/> | |
| 1695 | + <nil key="highlightedColor"/> | |
| 1696 | + </label> | |
| 1697 | + <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入卡号" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ydQ-Nw-taF"> | |
| 1698 | + <rect key="frame" x="108" y="91.5" width="227" height="17"/> | |
| 1699 | + <nil key="textColor"/> | |
| 1700 | + <fontDescription key="fontDescription" type="system" pointSize="14"/> | |
| 1701 | + <textInputTraits key="textInputTraits"/> | |
| 1702 | + </textField> | |
| 1703 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xV0-Xz-JLq"> | |
| 1704 | + <rect key="frame" x="108" y="87.5" width="227" height="0.0"/> | |
| 1705 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | |
| 1706 | + <nil key="textColor"/> | |
| 1707 | + <nil key="highlightedColor"/> | |
| 1708 | + </label> | |
| 1709 | + <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tBg-aB-jbG"> | |
| 1710 | + <rect key="frame" x="108" y="108.5" width="227" height="1"/> | |
| 1711 | + <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | |
| 1712 | + <constraints> | |
| 1713 | + <constraint firstAttribute="height" constant="1" id="0ep-an-Xnu"/> | |
| 1714 | + </constraints> | |
| 1715 | + <fontDescription key="fontDescription" type="system" pointSize="17"/> | |
| 1716 | + <nil key="textColor"/> | |
| 1717 | + <nil key="highlightedColor"/> | |
| 1718 | + </label> | |
| 1719 | + </subviews> | |
| 1720 | + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> | |
| 1721 | + <constraints> | |
| 1722 | + <constraint firstItem="ydQ-Nw-taF" firstAttribute="leading" secondItem="6Nq-Xv-dmq" secondAttribute="trailing" constant="8" id="0PR-YB-H1K"/> | |
| 1723 | + <constraint firstItem="6Nq-Xv-dmq" firstAttribute="centerY" secondItem="b7a-Ma-IMT" secondAttribute="centerY" id="0qf-xz-Xc2"/> | |
| 1724 | + <constraint firstAttribute="trailing" secondItem="hqJ-dt-VX1" secondAttribute="trailing" constant="8" id="CMh-Kx-Bat"/> | |
| 1725 | + <constraint firstAttribute="trailing" secondItem="xV0-Xz-JLq" secondAttribute="trailing" constant="8" id="Fkz-pa-chm"/> | |
| 1726 | + <constraint firstItem="I1Y-8N-EP4" firstAttribute="leading" secondItem="b7a-Ma-IMT" secondAttribute="leading" constant="30" id="KQp-Ie-CkZ"/> | |
| 1727 | + <constraint firstAttribute="height" constant="200" id="QLR-Wj-mRw"/> | |
| 1728 | + <constraint firstItem="6Nq-Xv-dmq" firstAttribute="top" secondItem="I1Y-8N-EP4" secondAttribute="bottom" constant="8" id="W5O-rZ-VTK"/> | |
| 1729 | + <constraint firstItem="tBg-aB-jbG" firstAttribute="leading" secondItem="6Nq-Xv-dmq" secondAttribute="trailing" constant="8" id="c8H-IA-Ktj"/> | |
| 1730 | + <constraint firstAttribute="trailing" secondItem="tBg-aB-jbG" secondAttribute="trailing" constant="8" id="k2l-hw-vNO"/> | |
| 1731 | + <constraint firstItem="ydQ-Nw-taF" firstAttribute="centerY" secondItem="b7a-Ma-IMT" secondAttribute="centerY" id="kdg-98-Ff8"/> | |
| 1732 | + <constraint firstAttribute="bottom" secondItem="hqJ-dt-VX1" secondAttribute="bottom" constant="8" id="mrd-tC-O3U"/> | |
| 1733 | + <constraint firstItem="6Nq-Xv-dmq" firstAttribute="leading" secondItem="b7a-Ma-IMT" secondAttribute="leading" constant="30" id="rJM-mi-fV3"/> | |
| 1734 | + <constraint firstItem="hqJ-dt-VX1" firstAttribute="leading" secondItem="b7a-Ma-IMT" secondAttribute="leading" constant="8" id="sYo-om-3Tu"/> | |
| 1735 | + <constraint firstAttribute="trailing" secondItem="ydQ-Nw-taF" secondAttribute="trailing" constant="8" id="xMF-Z6-xjU"/> | |
| 1736 | + <constraint firstItem="ydQ-Nw-taF" firstAttribute="top" secondItem="xV0-Xz-JLq" secondAttribute="bottom" constant="4" id="xTh-T1-fNQ"/> | |
| 1737 | + <constraint firstItem="tBg-aB-jbG" firstAttribute="top" secondItem="ydQ-Nw-taF" secondAttribute="bottom" id="xpy-QI-qcy"/> | |
| 1738 | + <constraint firstItem="xV0-Xz-JLq" firstAttribute="leading" secondItem="I1Y-8N-EP4" secondAttribute="trailing" constant="8" id="yTS-Dn-AB2"/> | |
| 1739 | + </constraints> | |
| 1740 | + </view> | |
| 1741 | + </subviews> | |
| 1742 | + <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/> | |
| 1743 | + <constraints> | |
| 1744 | + <constraint firstItem="b7a-Ma-IMT" firstAttribute="leading" secondItem="ZrG-k7-97i" secondAttribute="leading" constant="16" id="K9c-89-uSQ"/> | |
| 1745 | + <constraint firstItem="ZrG-k7-97i" firstAttribute="trailing" secondItem="b7a-Ma-IMT" secondAttribute="trailing" constant="16" id="St5-Nd-paj"/> | |
| 1746 | + <constraint firstItem="b7a-Ma-IMT" firstAttribute="centerX" secondItem="ZrG-k7-97i" secondAttribute="centerX" id="Z0U-Sc-Zuc"/> | |
| 1747 | + <constraint firstItem="b7a-Ma-IMT" firstAttribute="centerY" secondItem="ZrG-k7-97i" secondAttribute="centerY" id="v0s-4b-Pg0"/> | |
| 1748 | + </constraints> | |
| 1749 | + <viewLayoutGuide key="safeArea" id="ZrG-k7-97i"/> | |
| 1750 | + </view> | |
| 1751 | + <navigationItem key="navigationItem" title="校卡激活" id="GXY-kd-xer"/> | |
| 1752 | + <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/> | |
| 1753 | + <connections> | |
| 1754 | + <outlet property="cardNumberTextField" destination="ydQ-Nw-taF" id="fs1-fT-56C"/> | |
| 1755 | + <outlet property="nameLabel" destination="xV0-Xz-JLq" id="Oii-qf-u8T"/> | |
| 1756 | + </connections> | |
| 1757 | + </viewController> | |
| 1758 | + <placeholder placeholderIdentifier="IBFirstResponder" id="pcB-ds-46z" userLabel="First Responder" sceneMemberID="firstResponder"/> | |
| 1759 | + </objects> | |
| 1760 | + <point key="canvasLocation" x="1605.5999999999999" y="605.84707646176912"/> | |
| 1761 | + </scene> | |
| 1605 | 1762 | </scenes> |
| 1606 | 1763 | <resources> |
| 1607 | 1764 | <image name="defphoto" width="128" height="128"/> | ... | ... |
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift
| ... | ... | @@ -72,7 +72,7 @@ extension MyChildrenViewController:UITableViewDelegate,UITableViewDataSource { |
| 72 | 72 | } |
| 73 | 73 | //先要设cell可编辑 |
| 74 | 74 | func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool { |
| 75 | - return true | |
| 75 | + return false | |
| 76 | 76 | } |
| 77 | 77 | //定义编辑样式 |
| 78 | 78 | func tableView(_ tableView: UITableView, editingStyleForRowAt indexPath: IndexPath) -> UITableViewCellEditingStyle { | ... | ... |