爱仕达撒所大

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift

@@ -1627,19 +1627,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 }
                 //保障
                 if indexPath.row == 3 {
-                    //                    if glSelectView == nil {
-                    //                        let view = GLAlertSelectView(frame: self.view.bounds)
-                    //                        view.delegate = self
-                    //                        view.isBz = true
-                    //                        if bzIdx != 10086 {
-                    //                            view.selectNum = bzIdx
-                    //                            view.tempNum = view.selectNum
-                    //                        }
-                    //                        view.titleLbl.text = "货物保障"
-                    //                        view.dataArr = bzArr
-                    //                        self.view.addSubview(view)
-                    //                        glSelectView = view
-                    //                    }
                 }
                 //时间
                 if indexPath.row == 0 {

GeliBusinessPlatform/ViewController/店长审核/DZSH_Detail_ViewController.swift

@@ -132,7 +132,12 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
             break
         case 12:
             sparea_select = selectNum
-            sparea_ids = shops_sparea[sparea_select].sparea_name!
+            if sparea_select != -1 && sparea_select != 10086 {
+                sparea_ids = shops_sparea[sparea_select].sparea_name!
+            }else{
+                sparea_ids = ""
+            }
+            
             break
         case 22:
             business_week_start = selectNum
@@ -270,6 +275,92 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
     
     
     @IBAction func submit_action(_ sender: Any) {
+        if title_str == "店铺信息" {
+            var qz = 1
+            if is_qz == false {
+                qz = 0
+            }
+            var k = 1
+            if kd == false {
+                k = 0
+            }
+            
+            var show_name = 0
+            if show_abbre {
+                show_name = 1
+            }
+            var show_logo = 0
+            if is_logo {
+                show_logo = 1
+            }
+            let proDict = addressArray[provinceIndex] as! Dictionary<String,Any>
+            var cityDict:Dictionary<String,Any> = Dictionary()
+            var areaDict:Dictionary<String,Any> = Dictionary()
+            cityDict["area_id"] = ""
+            areaDict["area_id"] = ""
+            if (proDict["city_list"] as! NSArray).count > 0 {
+                cityDict = (proDict["city_list"] as! NSArray)[cityIndex] as! Dictionary<String, Any>
+                if (cityDict["district_list"] as! NSArray).count > 0 {
+                    areaDict = (cityDict["district_list"] as! NSArray)[areaIndex] as! Dictionary<String,Any>
+                }
+            }
+            
+            let shops = [
+                "is_qz":qz as Any,
+                "kd":k as Any,
+                "shop_type":type_arr[shop_type].shop_type as Any,
+                "shop_longitude":shop_longitude as Any,
+                "shop_latitude":shop_latitude as Any,
+                "shop_name":shop_name as Any,
+                "show_abbre":show_name as Any,
+                "abbreviation":abbreviation as Any,
+                "sparea_ids":sparea_ids as Any,
+                "province":proDict["area_id"] as Any,
+                "city":cityDict["area_id"] as Any,
+                "district":areaDict["area_id"] as Any,
+                "address":adr_str as Any,
+                "is_logo":show_logo as Any,
+                "shop_img":shop_img as Any,
+                "logo_word":logo_word as Any,
+                "business_week_start":business_week_start + 1 as Any,
+                "business_week_end":business_week_end + 1 as Any,
+                "business_hours":business_hours as Any,
+                "pickup_start_day":pickup_start_day + 1 as Any,
+                "pickup_end_day":pickup_end_day + 1 as Any,
+                "pickup_hours":pickup_hours as Any,
+                "pickup_phone":pickup_phone as Any,
+                "pickup_address":pickup_address as Any,
+                "shop_tel":shop_tel as Any,
+                "shop_scale":shop_scale as Any,
+                "shop_intro":shop_intro as Any,
+                "contacts_name":contacts_name as Any,
+                "shop_email":shop_email as Any,
+                "business_licence_number":business_licence_number as Any,
+                "business_sphere":business_sphere as Any,
+                "identity_card_front":identity_card_front as Any,
+                "agreement":agreement as Any,
+                "zhizhao":zhizhao as Any,
+                "food_production_license":food_production_license as Any,
+                "shop_id":shop_id as Any
+            ]
+            
+            let shops_info = dictChangeString(sender:shops)
+            let dic = ["user_token":user_token as Any,
+                       "action":action as Any,
+                       "shop_id":shop_id as Any,
+                       "vendor_audit_desc":"" as Any,
+                       "reason":"" as Any,
+                       "shop_info":shops_info as Any]
+                storeExamineOperation(dic) { (data) in
+                    HUD.flash(.success, delay: 1.2)
+                    self.navigationController?.popViewController(animated: true)
+                    self.delegate?.DZSH_Detail_ViewController_refresh()
+                } failture: { (err) in
+                    
+                }
+            
+            return
+        }
         let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
         alterView.delegate = self
         alterView.tag = 99
@@ -381,6 +472,7 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
                 type_arr.append(item)
             })
             
+            
             is_qz = true
             if model?.shop_info?.is_qz == 0 {
                 is_qz = false
@@ -458,6 +550,13 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
                 shops_sparea.append(item)
             })
             
+            
+            for i in 0 ..< shops_sparea.count {
+                if model?.shop_info?.sparea_ids == shops_sparea[i].sparea_name {
+                    sparea_select = i
+                }
+            }
+            
             getIndex()
             list_view.reloadData()
             
@@ -827,13 +926,14 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
                     view.tag = 12
                     view.titleLbl.text = "请选择关联专区"
                     view.delegate = self
+                    view.isBz = true
                     var arr:Array<String> = []
                     shops_sparea.forEach { (item) in
                         arr.append(item.sparea_name!)
                     }
                     view.dataArr = arr
                     view.is_center_select = true
-                    if sparea_select != -1 {
+                    if sparea_select != -1 && sparea_select != 10086 {
                         view.selectNum = sparea_select
                     }
                     self.view.addSubview(view)