完成商家信息接口对接

GeliBusinessPlatform/Assets.xcassets/商家信息/Contents.json

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Assets.xcassets/商家信息/idCard1.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "idCard1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "idCard1@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "idCard1@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Assets.xcassets/商家信息/idCard2.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "idCard2.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "idCard2@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "idCard2@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Assets.xcassets/商家信息/idCard3.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "idCard3.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "idCard3@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "idCard3@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Assets.xcassets/商家信息/idCard4.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "idCard4.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "idCard4@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "idCard4@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

@@ -20,8 +20,8 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
     let listArray = ["格利支付","蓝牙打印设置","权限设置"]
     //MARK:--加载数据
     func loadData(){
-        adminInfo(["user_token":UserToken], success: { (data) in
-            self.dataModel = data as! AdminInfoModel
+        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.shopNameLbl.text = self.dataModel?.data?.stall_name
             self.nameLbl.text = self.dataModel?.data?.admin_name

GeliBusinessPlatform/ViewController/商家信息/ShopInfoViewController.swift

@@ -10,8 +10,8 @@ import UIKit
 
 class ShopInfoViewController: BaseViewController {
     @IBOutlet weak var scrollHeight: NSLayoutConstraint!
-    
     @IBOutlet weak var scrlloV: UIScrollView!
+    var dataModel : ShopInfoModel? = nil
     override func viewDidLoad() {
         super.viewDidLoad()
         navbar.title = "商家信息"
@@ -20,5 +20,71 @@ class ShopInfoViewController: BaseViewController {
             make.top.equalTo(NavCGRect.height)
             make.left.bottom.right.equalTo(0)
         }
+        loadData()
+    }
+    //MARK:--加载数据
+    func loadData(){
+        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.shopNameLbl.text = self.dataModel?.data?.shop_name
+            self.compAddressLbl.text = self.dataModel?.data?.addr_str
+            self.addressDetLbl.text = self.dataModel?.data?.address
+            self.compPhoneLbl.text = self.dataModel?.data?.shop_tel
+            self.compTotalLbl.text = self.dataModel?.data?.shop_scale
+            //MARK:--需要计算高度，也可以根据行数确定
+            self.compInfoLbl.text = self.dataModel?.data?.shop_intro
+            print("简介\(self.compInfoLbl.numberOfLines)")
+            self.scrollHeight.constant = 950*glscale + CGFloat(self.compInfoLbl.numberOfLines) * 15*glscale
+            self.stallNameLbl.text = self.dataModel?.data?.stall_name
+            self.accoutLbl.text = self.dataModel?.data?.contacts_name
+            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)!))
+
+        }) { (error) in
+            //缺省数据，隐藏滚动视图，展示错误视图
+        }
+    }
+    
+    @IBAction func previousAction(_ sender: UIButton) {
+        self.idCardImgV.kf.setImage(with: URL(string: SERVERCE_HOST + (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)!))
+        rightChangeImgBtn.setImage(UIImage.init(named: "idCard4"), for: .normal)
+        leftChangeImgBtn.setImage(UIImage.init(named: "idCard3"), for: .normal)
     }
+    @IBAction func checkBtnAction(_ sender: UIButton) {
+        print("查看==\(sender.tag)")
+        if sender.tag == 1001 {
+            //商家协议
+        }else if sender.tag == 1002 {
+            //营业执照电子版：
+
+        }else if sender.tag == 1003 {
+            //流通许可证：
+
+        }
+    }
+    
+    @IBOutlet weak var leftChangeImgBtn: UIButton!
+    @IBOutlet weak var rightChangeImgBtn: UIButton!
+    @IBOutlet weak var shopImgV: UIImageView!
+    @IBOutlet weak var shopNameLbl: UILabel!
+    @IBOutlet weak var compAddressLbl: UILabel!
+    @IBOutlet weak var addressDetLbl: UILabel!
+    @IBOutlet weak var compPhoneLbl: UILabel!
+    @IBOutlet weak var compTotalLbl: UILabel!
+    @IBOutlet weak var compInfoLbl: UILabel!
+    @IBOutlet weak var stallNameLbl: UILabel!
+    @IBOutlet weak var accoutLbl: UILabel!
+    @IBOutlet weak var emailLbl: UILabel!
+    @IBOutlet weak var businessNumLbl: UILabel!
+    @IBOutlet weak var businessSphereLbl: UILabel!
+    @IBOutlet weak var idCardImgV: UIImageView!
+    
 }