asdfasdfsre474674366

GeliBusinessPlatform/AppDelegate.swift

@@ -258,13 +258,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate,UITabBarCont
         // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
         UIApplication.shared.applicationIconBadgeNumber = 0
         JPUSHService.setBadge(0)
-        
     }
     
     func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
         // Saves changes in the application's managed object context before the application terminates.
-        
     }
     
     //MARK:--tabbarVCs
@@ -284,10 +282,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate,UITabBarCont
         
         let v2 = GoodsManageListVC()
         
-//        let v3 = WorkCViewController()
-        let v3 = DZGL_VC()
+        let v3 = WorkCViewController()
         
         let v4 = WarehoseMangementListVC()
+        
         let v5 = PersonCenterViewController()
         
         v1.tabBarItem = ESTabBarItem.init(ExampleBouncesContentView(), title: "订单管理", image: UIImage(named: "tab_btn_dingdao_nor"), selectedImage: UIImage(named: "tab_btn_dingdan_hig"))

GeliBusinessPlatform/Model/get_dbt_rule_model/getDbtRuleModel.swift

@@ -278,7 +278,7 @@ class dbtListDataModel: Mappable {
     var shop_name:String? //商店名称
     var shop_img_thumb : String?//商店图标
     var address:String?//商店地址
-    
+    var is_shopowner:Int?//关系类型，0为一对多,1为一对一
     
     required init?( map: Map) {
         
@@ -289,6 +289,7 @@ class dbtListDataModel: Mappable {
         shop_name <- map["shop_name"]
         shop_img_thumb <- map["shop_img_thumb"]
         address <- map["address"]
+        is_shopowner <- map["is_shopowner"]
     }
 }
 

GeliBusinessPlatform/Model/queryStore_model/queryStore_model.swift

@@ -66,73 +66,164 @@ class storeInfo_model: Mappable {
 }
 
 class storeInfoData_model: Mappable {
-    var shop_id:Int?
-    var shop_name : String? //商店名
-    var shop_img :String? //商店logo
+    var shop_info:storeShopInfoData_model?
+    var shop_type:Array<shop_type_model>?
+    var shops_sparea:Array<shops_sparea_model>?
   
-    var province:Int?
-    var city : Int?
-    var district :Int?
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        shop_info <- map["shop_info"]
+        shop_type <- map["shop_type"]
+        shops_sparea <- map["shops_sparea"]
+    }
+}
+
+class storeShopInfoData_model: Mappable {
+    var is_qz:Int? //是否清真 1是 0否
+    var kd:Int?//1 企业 0 个人
+    var shop_type:Int? //店铺类型
     
-    var address:String?//详细地址
-    var shop_tel : String?//联系方式
-    var shop_email :String?//邮件
+    var shop_longitude:String? //经度
+    var shop_latitude:String?  //纬度
+    var shop_name:String? //商家名称
     
-    var shop_intro:String? //公司简介
-    var shop_scale : String?//公司规模
-    var stall_name :String? //档口名称
+    var show_abbre:Int? //显示简称 1是 0否
+    var abbreviation:String?//公司简称
+    var sparea_ids:String?     //关联专区展示
     
-    var contacts_name:String? //联系人姓名
-    var contacts_phone : String?   //联系人电话
-    var identity_card_front :String? //负责人身份证(正面)
+    var province:Int? //公司所在地(省)
+    var city:Int?  //公司所在地(市)
+    var district:Int? //公司所在地(县/区)
     
-    var identity_card_back:String? //负责人身份证(反面)
-    var agreement : String?//商家入驻协议
-    var upload_status :Int?
+    var province_name:String? //公司所在地(省)
+    var city_name:String?//公司所在地(市)
+    var district_name:String?//公司所在地(县/区)
     
+    var address:String?//公司详细地址
+    var is_logo:Int?//是否logo 1是 0否
+    var shop_img:String?//商家图片(原图)
+    
+    var logo_word:String?        //简称
+    var business_week_start:Int?//营业时间 - 一周 - 开始
+    var business_week_end:Int? //营业时间 - 一周 - 结束
+    
+    var business_hours:String?//营业时间 - 数据格式为，8:30-18:30
+    var pickup_start_day:Int? //自提开始日(1-7表示为周一至周日)
+    var pickup_end_day:Int? //自提结束日(1-7表示为周一至周日)
+    
+    var pickup_hours:String?  //自提时间
+    var pickup_phone:String?//自提联系电话
+    var pickup_address:String? //自提详细地址
+    
+    var shop_tel:String?  //公司电话
+    var shop_scale:String?  //公司规模
+    var shop_intro:String?//商家简介
+    
+    var contacts_name:String?//联系人
+    var shop_email:String?//电子邮件
     var business_licence_number:String?  //营业执照号
-    var business_sphere : String?//法定经营范围
-    var zhizhao :String?  //营业执照电子版
     
-    var food_production_license:String?  //流通许可证
-    var addr_str : String?   //商家地址(省市区）拼接
+    var business_sphere:String?//法定经营范围
+    var identity_card_front:String? //负责人身份证(正面)
+    var agreement:String? //商家入驻协议
+    
+    var zhizhao:String?//营业执照电子版
+    var food_production_license:String?  //食品生产或加工许可证
+    var shop_id:Int?  //商家ID
   
     required init?( map: Map) {
         
     }
     func mapping(map: Map) {
-        shop_id <- map["shop_id"]
+        is_qz <- map["is_qz"]
+        kd <- map["kd"]
+        shop_type <- map["shop_type"]
+        
+        shop_longitude <- map["shop_longitude"]
+        shop_latitude <- map["shop_latitude"]
         shop_name <- map["shop_name"]
-        shop_img <- map["shop_img"]
+        
+        show_abbre <- map["show_abbre"]
+        abbreviation <- map["abbreviation"]
+        sparea_ids <- map["sparea_ids"]
         
         province <- map["province"]
         city <- map["city"]
         district <- map["district"]
         
+        province_name <- map["province_name"]
+        city_name <- map["city_name"]
+        district_name <- map["district_name"]
+        
         address <- map["address"]
-        shop_tel <- map["shop_tel"]
-        shop_email <- map["shop_email"]
+        is_logo <- map["is_logo"]
+        shop_img <- map["shop_img"]
         
-        shop_intro <- map["shop_intro"]
+        logo_word <- map["logo_word"]
+        business_week_start <- map["business_week_start"]
+        business_week_end <- map["business_week_end"]
+        
+        business_hours <- map["business_hours"]
+        pickup_start_day <- map["pickup_start_day"]
+        pickup_end_day <- map["pickup_end_day"]
+        
+        pickup_hours <- map["pickup_hours"]
+        pickup_phone <- map["pickup_phone"]
+        pickup_address <- map["pickup_address"]
+        
+        shop_tel <- map["shop_tel"]
         shop_scale <- map["shop_scale"]
-        stall_name <- map["stall_name"]
+        shop_intro <- map["shop_intro"]
         
         contacts_name <- map["contacts_name"]
-        contacts_phone <- map["contacts_phone"]
-        identity_card_front <- map["identity_card_front"]
+        shop_email <- map["shop_email"]
+        business_licence_number <- map["business_licence_number"]
         
-        identity_card_back <- map["identity_card_back"]
+        business_sphere <- map["business_sphere"]
+        identity_card_front <- map["identity_card_front"]
         agreement <- map["agreement"]
-        upload_status <- map["upload_status"]
         
-        business_licence_number <- map["business_licence_number"]
-        business_sphere <- map["business_sphere"]
         zhizhao <- map["zhizhao"]
-        
         food_production_license <- map["food_production_license"]
-        addr_str <- map["addr_str"]
+        shop_id <- map["shop_id"]
+    }
+}
+
+
+
 
+class shop_type_model: Mappable {
+    var shop_type:Int?
+    var type_name:String?
+    var entry_on:Int?
+    
+    var tag_name:String?
+    var tag_color:Int?
+  
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        shop_type <- map["shop_type"]
+        type_name <- map["type_name"]
+        entry_on <- map["entry_on"]
+        
+        tag_name <- map["tag_name"]
+        tag_color <- map["tag_color"]
     }
 }
 
+class shops_sparea_model: Mappable {
+    var sparea_id:Int?
+    var sparea_name:String?
   
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        sparea_id <- map["sparea_id"]
+        sparea_name <- map["sparea_name"]
+    }
+}

GeliBusinessPlatform/ViewController/店长管理/DZGL_VC.swift

@@ -42,6 +42,7 @@ class DZGL_VC: BaseViewController, UITableViewDelegate, UITableViewDataSource, U
 //            self.tableView.mj_header?.beginRefreshing()
         }
     }
+    
     let type_arr = ["全部","1对1","1对多"]
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if tableView.tag == 2 {
@@ -49,7 +50,7 @@ class DZGL_VC: BaseViewController, UITableViewDelegate, UITableViewDataSource, U
             if cell == nil {
                 cell = UITableViewCell(style: .default, reuseIdentifier: "cell")
                 cell?.selectionStyle = .none
-                cell?.textLabel?.font = UIFont.systemFont(ofSize: 13)
+                cell?.textLabel?.font = UIFont.systemFont(ofSize:13)
             }
             cell?.textLabel?.text = type_arr[indexPath.row]
             return cell!