暂时不接格利支付和蓝牙

GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift

@@ -29,9 +29,14 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
             
         }
     }
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        if dataModel == nil {
+            loadData()
+        }
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
-        loadData()
         topImgBg.snp.makeConstraints { (make) in
             make.top.left.right.equalTo(0)
             make.height.equalTo(227*glscale)

GeliBusinessPlatform/ViewController/支付账号（设置，修改）/BindStepTwoViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <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"/>
@@ -165,7 +165,7 @@
             <color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="按钮渐变色下,字体颜色">
-            <color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="标题字颜色">
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

GeliBusinessPlatform/ViewController/支付账号（设置，修改）/PayViewController.swift

@@ -24,7 +24,25 @@ class PayViewController: BaseViewController {
         
         navbar.title = "支付账号"
         self.view.addSubview(navbar)
-        
+         geliPayInfo(["user_token":UserToken as Any], success: { (data) in
+             let dataM = data as! GeliPayInfoModel
+             if dataM.data?.status == 3 {
+                if self.accountLbl.text == "未绑定支付账号" {
+                    self.enterBtn.titleString = "绑定账号"
+                    self.enterBtn.borderColor = UIColor(named: "按钮渐变色下,字体颜色")!
+                    self.enterBtn.titleColor =  UIColor(named: "按钮渐变色下,字体颜色")!
+                    self.enterBtn.gradientEndColor = UIColor(named: "app底色")
+                    self.enterBtn.gradientStartColor = UIColor(named: "app底色")
+                    self.enterBtn.borderWidth = 1.5
+                    self.passBtn.isHidden = true
+                    self.changeBindBtn.isHidden = true
+                }
+             }else{
+
+             }
+         }) { (error) in
+             
+         }
         if accountLbl.text == "未绑定支付账号" {
             enterBtn.titleString = "绑定账号"
             enterBtn.borderColor = UIColor(named: "按钮渐变色下,字体颜色")!

GeliBusinessPlatform/ViewController/支付账号（设置，修改）/PayViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <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"/>
@@ -187,7 +187,7 @@
             <color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="按钮渐变色下,字体颜色">
-            <color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="未登录提示背景色">
             <color red="1" green="0.43900001049041748" blue="0.43900001049041748" alpha="0.64999997615814209" colorSpace="custom" customColorSpace="sRGB"/>

GeliBusinessPlatform/ViewController/消息中心/MsgCenterViewController.swift

@@ -13,7 +13,7 @@ class MsgCenterViewController: BaseViewController,UITableViewDelegate,UITableVie
     
     //MARK: -animateView
   
-    private let animations = AnimationType.from(direction: .bottom, offset: 30.0)
+    private let animations = AnimationType.from(direction: .bottom, offset: 150)
     
     var msgTbv:UITableView?
     
@@ -52,7 +52,7 @@ class MsgCenterViewController: BaseViewController,UITableViewDelegate,UITableVie
         cell.titleLbl.showSkeleton(transition: .crossDissolve(0.25))
         cell.dateLbl.showSkeleton(transition: .crossDissolve(0.25))
         cell.contentLbl.showSkeleton(transition: .crossDissolve(0.25))
-        DispatchQueue.main.asyncAfter(deadline: .now() + 4) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.33) {
             cell.titleLbl.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.25))
             cell.dateLbl.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.25))
             cell.contentLbl.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.25))