diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/SearchTVStationListViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/SearchTVStationListViewController.swift
index 8352130..b420629 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/SearchTVStationListViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/SearchTVStationListViewController.swift
@@ -133,6 +133,13 @@ extension SearchTVStationListViewController:UITableViewDataSource,UITableViewDel
             gradName.text = grad[indexPath.row]
             sortDataSet(arr: dataSet,type: grad[indexPath.row])
         }
+        if tableView == self.tableView{
+            let item = dataDic[allKeys[indexPath.section]]![indexPath.row]
+            let vc = Story.instantiateViewControllerWithIdentifier("TVStationInforViewControllerVC", storyName: "TVStation") as! TVStationInforViewController
+            vc.TVStationProgram = item
+            vc.title = item.f_SchoolName
+            self.navigationController?.pushViewController(vc, animated: true)
+        }
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
index cae38b2..08b5707 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/TVStation/TVStation.storyboard
@@ -323,7 +323,7 @@
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </view>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="cell" rowHeight="84" id="MMn-tR-I0v" customClass="SearchTVStationListCell" customModule="YouerLiveVideo" customModuleProvider="target">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="84" id="MMn-tR-I0v" customClass="SearchTVStationListCell" customModule="YouerLiveVideo" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="375" height="84"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MMn-tR-I0v" id="H7d-Zz-WAS">
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift
index 2ebd3d5..4fd56a7 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/Setting/ChangePassWordViewController.swift
@@ -23,7 +23,7 @@ class ChangePassWordViewController: UIViewController {
     @IBOutlet weak var userCodeTextFiled: UITextField!
     
     @IBOutlet var cancleItem: UIBarButtonItem!
-    
+    var timer:Timer!
     var scrollViewH:CGFloat = 200
     var user = AppDelegate.instance().accountManager
     @IBAction func editKeyboard(_ sender: Any) {
@@ -110,6 +110,24 @@ class ChangePassWordViewController: UIViewController {
     
     @IBAction func sendUserCodeBtnClick(_ sender: UIButton) {
         self.view.endEditing(true)
+        var num = 0
+        if #available(iOS 10.0, *) {
+            self.timer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true, block: { (timers) in
+                if num == 60{
+                    sender.titleLabel?.text = "获取验证码"
+                    sender.isUserInteractionEnabled = true
+                    sender.backgroundColor = UIColorFromRGB(0x007aff)
+                    self.timer.invalidate()
+                    return
+                }
+                sender.setTitle("重新获取(\(60-num))", for: .normal)
+                sender.isUserInteractionEnabled = false
+                sender.backgroundColor = UIColor.lightGray
+                num += 1
+            })
+        } else {
+            // Fallback on earlier versions
+        }
         var phone = ""
         if user.isOnline(){
             phone = user.phone()
@@ -158,6 +176,11 @@ class ChangePassWordViewController: UIViewController {
             }
         }
     }
+    
+    override func viewWillDisappear(_ animated: Bool) {
+        timer.invalidate()
+        timer = nil
+    }
     // MARK: - 销毁通知
     deinit {
         NotificationCenter.default.removeObserver(self)
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard b/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
index 21c40ab..b1972d0 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/User.storyboard
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1217" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -315,8 +315,8 @@
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YjI-UW-Ova">
                                                 <rect key="frame" x="0.0" y="150" width="375" height="50"/>
                                                 <subviews>
-                                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入您收到的验证码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="dtg-hq-Nhp">
-                                                        <rect key="frame" x="20" y="16" width="246" height="19"/>
+                                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入您收到的验证码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="dtg-hq-Nhp">
+                                                        <rect key="frame" x="20" y="16" width="241" height="19"/>
                                                         <nil key="textColor"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                         <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
@@ -334,10 +334,14 @@
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i2a-hL-oad">
-                                                        <rect key="frame" x="274" y="10" width="85" height="30"/>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i2a-hL-oad">
+                                                        <rect key="frame" x="269" y="11" width="90" height="28"/>
                                                         <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                                        <state key="normal" title=" 获取验证码 ">
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="90" id="8cP-zC-Gtl"/>
+                                                        </constraints>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                        <state key="normal" title="获取验证码">
                                                             <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                         </state>
                                                         <userDefinedRuntimeAttributes>
@@ -356,7 +360,7 @@
                                                     <constraint firstAttribute="height" constant="50" id="FXG-ec-5Cr"/>
                                                     <constraint firstAttribute="trailing" secondItem="i2a-hL-oad" secondAttribute="trailing" constant="16" id="G4t-LR-wkT"/>
                                                     <constraint firstItem="i2a-hL-oad" firstAttribute="centerY" secondItem="YjI-UW-Ova" secondAttribute="centerY" id="Qy3-FK-b2B"/>
-                                                    <constraint firstItem="i2a-hL-oad" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="dtg-hq-Nhp" secondAttribute="trailing" constant="8" id="Wxn-1V-gz8"/>
+                                                    <constraint firstItem="i2a-hL-oad" firstAttribute="leading" secondItem="dtg-hq-Nhp" secondAttribute="trailing" constant="8" id="Wxn-1V-gz8"/>
                                                     <constraint firstItem="dtg-hq-Nhp" firstAttribute="centerY" secondItem="YjI-UW-Ova" secondAttribute="centerY" id="a8d-eK-VXu"/>
                                                     <constraint firstItem="dtg-hq-Nhp" firstAttribute="leading" secondItem="YjI-UW-Ova" secondAttribute="leading" constant="20" id="bpj-hN-bZ1"/>
                                                     <constraint firstAttribute="trailing" secondItem="lFa-PY-Lg1" secondAttribute="trailing" constant="16" id="lvB-uj-jjc"/>
diff --git a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift
index 2c4dd81..ed26a5a 100644
--- a/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift
+++ b/YouerLiveVideo/YouerLiveVideo/controllers/User/UserViewController.swift
@@ -102,6 +102,7 @@ extension UserViewController:UITableViewDelegate,UITableViewDataSource{
     }
     
     func numberOfSections(in tableView: UITableView) -> Int {
+        
         return sectionList.count
     }
     
diff --git a/YouerLiveVideo/YouerLiveVideo/util/account.swift b/YouerLiveVideo/YouerLiveVideo/util/account.swift
index b794cbc..e419462 100644
--- a/YouerLiveVideo/YouerLiveVideo/util/account.swift
+++ b/YouerLiveVideo/YouerLiveVideo/util/account.swift
@@ -90,6 +90,13 @@ class AccountManager{
         }
         return false
     }
+    
+    func roletype()->Int{
+        if let info=rawUserInfo{
+            return info.contentData()["roletype"].intValue
+        }
+        return 0
+    }
 
     
     func logOut(){
--
libgit2 0.21.0