1

application/admin/controller/Customer.php

@@ -125,6 +125,14 @@ class Customer extends Base
             if (isset($email) && $email != "") {
                 $map['a.email'] = ['like', "%" . $email . "%"];
             }
+            if (isset($country) && $country != "") {
+                $countyId = Db::name('countries')->where('country',$country)->column('id');
+                if ($countyId) {
+                    $map['a.country'] = $countyId[0];
+                } else{
+                    $map['a.country'] = $country;
+                }
+            }
             $whereOr = [];
             if (isset($type) && $type != '') {
                 $typeArr = explode(',',$type);
@@ -562,6 +570,14 @@ class Customer extends Base
             if (isset($email) && $email != "") {
                 $map['a.email'] = ['like', "%" . $email . "%"];
             }
+            if (isset($country) && $country != "") {
+                $countyId = Db::name('countries')->where('country',$country)->column('id');
+                if ($countyId) {
+                    $map['a.country'] = $countyId[0];
+                } else{
+                    $map['a.country'] = $country;
+                }
+            }
             $whereOr = [];
             if (isset($type) && $type != '') {
                 $typeArr = explode(',',$type);
@@ -660,6 +676,14 @@ class Customer extends Base
             if (isset($email) && $email != "") {
                 $map['a.email'] = ['like', "%" . $email . "%"];
             }
+            if (isset($country) && $country != "") {
+                $countyId = Db::name('countries')->where('country',$country)->column('id');
+                if ($countyId) {
+                    $map['a.country'] = $countyId[0];
+                } else{
+                    $map['a.country'] = $country;
+                }
+            }
             $whereOr = [];
             if (isset($type) && $type != '') {
                 $typeArr = explode(',',$type);
@@ -770,6 +794,14 @@ class Customer extends Base
             if (isset($email) && $email != "") {
                 $map['a.email'] = ['like', "%" . $email . "%"];
             }
+            if (isset($country) && $country != "") {
+                $countyId = Db::name('countries')->where('country',$country)->column('id');
+                if ($countyId) {
+                    $map['a.country'] = $countyId[0];
+                } else{
+                    $map['a.country'] = $country;
+                }
+            }
             $whereOr = [];
             if (isset($type) && $type != '') {
                 $typeArr = explode(',',$type);
@@ -872,6 +904,14 @@ class Customer extends Base
             if (isset($email) && $email != "") {
                 $map['a.email'] = ['like', "%" . $email . "%"];
             }
+            if (isset($country) && $country != "") {
+                $countyId = Db::name('countries')->where('country',$country)->column('id');
+                if ($countyId) {
+                    $map['a.country'] = $countyId[0];
+                } else{
+                    $map['a.country'] = $country;
+                }
+            }
             $whereOr = [];
             if (isset($type) && $type != '') {
                 $typeArr = explode(',',$type);
@@ -968,6 +1008,14 @@ class Customer extends Base
             if (isset($email) && $email != "") {
                 $map['a.email'] = ['like', "%" . $email . "%"];
             }
+            if (isset($country) && $country != "") {
+                $countyId = Db::name('countries')->where('country',$country)->column('id');
+                if ($countyId) {
+                    $map['a.country'] = $countyId[0];
+                } else{
+                    $map['a.country'] = $country;
+                }
+            }
             if (isset($type) && $type != '') {
                 $typeArr = explode(',',$type);
                 for ($i = 0; $i < count($typeArr); $i++) {
@@ -1114,6 +1162,14 @@ class Customer extends Base
             if (isset($email) && $email != "") {
                 $map['a.email'] = ['like', "%" . $email . "%"];
             }
+            if (isset($country) && $country != "") {
+                $countyId = Db::name('countries')->where('country',$country)->column('id');
+                if ($countyId) {
+                    $map['a.country'] = $countyId[0];
+                } else{
+                    $map['a.country'] = $country;
+                }
+            }
             $whereOr = [];
             if (isset($type) && $type != '') {
                 $typeArr = explode(',',$type);
@@ -1207,6 +1263,14 @@ class Customer extends Base
             if (isset($email) && $email != "") {
                 $map['a.email'] = ['like', "%" . $email . "%"];
             }
+            if (isset($country) && $country != "") {
+                $countyId = Db::name('countries')->where('country',$country)->column('id');
+                if ($countyId) {
+                    $map['a.country'] = $countyId[0];
+                } else{
+                    $map['a.country'] = $country;
+                }
+            }
             $whereOr = [];
             if (isset($type) && $type != '') {
                 $typeArr = explode(',',$type);
@@ -1300,6 +1364,14 @@ class Customer extends Base
             if (isset($email) && $email != "") {
                 $map['a.email'] = ['like', "%" . $email . "%"];
             }
+            if (isset($country) && $country != "") {
+                $countyId = Db::name('countries')->where('country',$country)->column('id');
+                if ($countyId) {
+                    $map['a.country'] = $countyId[0];
+                } else{
+                    $map['a.country'] = $country;
+                }
+            }
             $whereOr = [];
             if (isset($type) && $type != '') {
                 $typeArr = explode(',',$type);

application/admin/controller/Product.php

@@ -22,8 +22,19 @@ class Product extends Base
                 ->whereOr('d.admin_id',session('uid'))
                 ->whereOr('a.groupid','3')
                 ->whereOr('a.groupid','5')
-                ->field('d.id,d.product_name')
+                ->field('d.id,d.product_name,a.groupid')
                 ->select();
+            foreach ($lists as &$v) {
+                if ($v['groupid'] == 3) {
+                    $v['groupid_name'] = '管理员';
+                }
+                if ($v['groupid'] == 4) {
+                    $v['groupid_name'] = '业务端';
+                }
+                if ($v['groupid'] == 5) {
+                    $v['groupid_name'] = '操作员';
+                }
+            }
             $count = count($lists);
             return json(['code' => 220, 'msg' => '', 'count' => $count, 'data' => $lists]);
         }
@@ -100,6 +111,11 @@ class Product extends Base
 //        $user = new UserModel();
 //        $is_use = Db::name('customer')->where('type',$id)->find(); // 判断是否由用户使用此字段
 //        if ($is_use) return json(['code' => 100, 'msg' => "还有用户正在使用此行业呢！"]);
+        if (session('groupid') == 4) {
+            if (!Db::name('product')->where('id',$id)->where('admin_id',session('uid'))->find()) {
+                return json(['code' => '100', 'msg' => '只能删除自己创建的行业']);
+            }
+        }
         $del = ProductModel::where('id',$id)->delete();
         if ($del) return json(['code' => 200, 'msg' => "删除成功"]);
         if (!$del) return json(['code' => 100, 'msg' => "删除失败"]);

application/admin/controller/Type.php

@@ -21,8 +21,19 @@ class Type extends Base
                 ->whereOr('d.admin_id',session('uid'))
                 ->whereOr('a.groupid','3')
                 ->whereOr('a.groupid','5')
-                ->field('d.id,d.name')
+                ->field('d.id,d.name,a.groupid')
                 ->select();
+            foreach ($lists as &$v) {
+                if ($v['groupid'] == 3) {
+                    $v['groupid_name'] = '管理员';
+                }
+                if ($v['groupid'] == 4) {
+                    $v['groupid_name'] = '业务端';
+                }
+                if ($v['groupid'] == 5) {
+                    $v['groupid_name'] = '操作员';
+                }
+            }
             $count = count($lists);
             return json(['code' => 220, 'msg' => '', 'count' => $count, 'data' => $lists]);
         }
@@ -97,8 +108,13 @@ class Type extends Base
     {
         $id = input('id');
         $user = new UserModel();
-        $is_use = Db::name('customer')->where('type',$id)->find(); // 判断是否由用户使用此字段
-        if ($is_use) return json(['code' => 100, 'msg' => "还有用户正在使用此行业呢！"]);
+//        $is_use = Db::name('customer')->where('type',$id)->find(); // 判断是否由用户使用此字段
+//        if ($is_use) return json(['code' => 100, 'msg' => "还有用户正在使用此行业呢！"]);
+        if (session('groupid') == 4) {
+            if (!Db::name('type')->where('id',$id)->where('admin_id',session('uid'))->find()) {
+                return json(['code' => '100', 'msg' => '只能删除自己创建的行业']);
+            }
+        }
         $del = Types::where('id',$id)->delete();
         if ($del) return json(['code' => 200, 'msg' => "删除成功"]);
         if (!$del) return json(['code' => 100, 'msg' => "删除失败"]);

application/admin/model/CustomerModel.php

@@ -256,23 +256,31 @@ class CustomerModel extends Model
                 $msg = '修改成功!';
             }
         }
+        if (isset($param['grade'])){
+            $upd_phone = $this->where('id',$param['id'])->update(['grade' => $param['grade']]);
+            if ($upd_phone) {
+//                writelog('操作员'.session('nickname').'修改客户'.$customer['name'].'的电话为'.$param['phone'],200);
+                $status = 200;
+                $msg = '修改成功!';
+            }
+        }
         if (isset($param['type']) && $param['type'] != '') {
             $info['type'] = ','.implode(',',$param['type']).',';
         }
         if (isset($param['product']) && $param['product'] != '') {
             $info['product'] = ','.implode(',',$param['product']).',';
         }
-        if (session('groupid') == 4) {
-            $check = $this->where('type',$info['type'])->where('product',$info['product'])->find();
-            if ($check) {
-                $msg = '行业与产品与原先一致，无需修改';
-            } else {
+        if(!empty($param['type'] )|| !empty($param['product'])) {
+//            $check = $this->where('type',$info['type'])->where('product',$info['product'])->find();
+//            if ($check) {
+//                $msg = '行业与产品与原先一致，无需修改';
+//            } else {
                 $res = $this->where('id',$param['id'])->update($info);
                 if ($res) {
                     $status = 200;
                     $msg = '修改成功!';
                 }
-            }
+//            }
         }
         return json(['code' => $status,'msg'=>$msg]);
     }

application/admin/model/RankingModel.php

@@ -36,21 +36,24 @@ class RankingModel extends Model
                 ->toArray();
         }
         $all_company = $res;
+//        var_dump($all_company);die;
         if (count($all_company) > 0) {
             foreach ($all_company  as $k=>$v) {
 //            $rank = $this->where('c_id',$all_company[$k]['id'])->where('admin_id',$all_company[$k]['spread_id'])->find();
-                $rank = $this->where('c_id',$all_company[$k]['id'])->find();
-                if ($rank) {
-                    if ($rank['admin_id'] != $all_company[$k]['spread_id']) {
-                        Db::name('ranking')->where('id',$rank['id'])->update(['status' => 0]);
+//                $rank = $this->where('c_id',$all_company[$k]['id'])->find();
+//                if ($rank) {
+//                    if ($rank['admin_id'] != $all_company[$k]['spread_id']) {
+//                        echo $rank['id'];
+                        Db::name('ranking')->where('c_id',$v['id'])->delete();
                         Db::name('ranking')->insert(['c_id' => $v['id'], 'admin_id' => $v['spread_id'],'create_time'=>time(),'type' => 1]);
-                    }
-                    else{
-                        $this->where('id',$rank['id'])->update(['type' => 1,'create_time' => time()]);
-                    }
-                } else {
-                    Db::name('ranking')->insert(['c_id' => $v['id'], 'admin_id' => $v['spread_id'],'create_time'=>time(),'type' => 1]);
-                }
+//                    }
+//                    else{
+//                        Db::name('ranking')->where('id',$rank['id'])->delete();
+//                        Db::name('ranking')->where('id',$rank['id'])->update(['type' => 1,'create_time' => time()]);
+//                    }
+//                } else {
+//                    Db::name('ranking')->insert(['c_id' => $v['id'], 'admin_id' => $v['spread_id'],'create_time'=>time(),'type' => 1]);
+//                }
             }
         }
         // 除此客户外查出相同邮箱的客户
@@ -90,18 +93,19 @@ class RankingModel extends Model
         }
         $all_company = $res;
         foreach ($all_company  as $k=>$v) {
-            $rank = $this->where('c_id',$all_company[$k]['id'])->find();
-            if ($rank) {
-                if ($rank['admin_id'] != $all_company[$k]['spread_id']) {
-                    Db::name('ranking')->where('id',$rank['id'])->update(['status' => 0]);
+//            $rank = $this->where('c_id',$all_company[$k]['id'])->find();
+//            if ($rank) {
+//                if ($rank['admin_id'] != $all_company[$k]['spread_id']) {
+                    Db::name('ranking')->where('c_id',$v['id'])->delete();
                     Db::name('ranking')->insert(['c_id' => $v['id'], 'admin_id' => $v['spread_id'],'create_time'=>time(),'type' => 2]);
-                }
-                else{
-                    $this->where('id',$rank['id'])->update(['type' => 2,'create_time' => time()]);
-                }
-            } else {
-                Db::name('ranking')->insert(['c_id' => $v['id'], 'admin_id' => $v['spread_id'],'create_time'=>time(),'type' => 2]);
-            }
+//                }
+//                else{
+//                    Db::name('ranking')->where('id',$rank['id'])->update(['status' => 0]);
+//                    $this->where('id',$rank['id'])->update(['type' => 2,'create_time' => time()]);
+//                }
+//            } else {
+//                Db::name('ranking')->insert(['c_id' => $v['id'], 'admin_id' => $v['spread_id'],'create_time'=>time(),'type' => 2]);
+//            }
             // 除此客户外查出相同邮箱的客户
             $email = CustomerModel::where('email',$customer['email'])->where('id','neq',$customer['id'])->where('status',0)->select();
             if ($email) {
@@ -141,18 +145,19 @@ class RankingModel extends Model
         }
         $all_company = $res;
         foreach ($all_company  as $k=>$v) {
-            $rank = $this->where('c_id',$all_company[$k]['id'])->find();
-            if ($rank) {
-                if ($rank['admin_id'] != $all_company[$k]['spread_id']) {
-                    Db::name('ranking')->where('id',$rank['id'])->update(['status' => 0]);
+//            $rank = $this->where('c_id',$all_company[$k]['id'])->find();
+//            if ($rank) {
+//                if ($rank['admin_id'] != $all_company[$k]['spread_id']) {
+                    Db::name('ranking')->where('c_id',$v['id'])->delete();
                     Db::name('ranking')->insert(['c_id' => $v['id'], 'admin_id' => $v['spread_id'],'create_time'=>time(),'type' => 3]);
-                }
-                else{
-                    $this->where('id',$rank['id'])->update(['type' => 3,'create_time' => time()]);
-                }
-            } else {
-                Db::name('ranking')->insert(['c_id' => $v['id'], 'admin_id' => $v['spread_id'],'create_time'=>time(),'type' => 3]);
-            }
+//                }
+//                else{
+//                    Db::name('ranking')->where('id',$rank['id'])->update(['status' => 0]);
+//                    $this->where('id',$rank['id'])->update(['type' => 3,'create_time' => time()]);
+//                }
+//            } else {
+//                Db::name('ranking')->insert(['c_id' => $v['id'], 'admin_id' => $v['spread_id'],'create_time'=>time(),'type' => 3]);
+//            }
             // 除此客户外查出相同邮箱的客户
             $email = CustomerModel::where('email',$customer['email'])->where('id','neq',$customer['id'])->where('status',0)->select();
             if ($email) {

application/admin/model/UserModel.php

@@ -326,9 +326,9 @@ class UserModel extends Model
         Db::startTrans();// 启动事务
         try{
             UserModel::destroy($param);
-            for($i=0;$i<count($param);$i++){
-                Db::name('auth_group_access')->where('uid','in',$param)->delete();
-            }
+//            for($i=0;$i<count($param);$i++){
+//                Db::name('auth_group_access')->where('uid','in',$param)->delete();
+//            }
             Db::commit();// 提交事务
 //            writelog('批量删除管理员成功',200);
             return ['code' => 200, 'data' => '', 'msg' => '批量删除成功'];

application/admin/view/customer/admin/admin_user_index.html

@@ -60,8 +60,19 @@
 	                    </div>
 	                </div>
                 </div>
-                
-                
+
+				<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
+					<div class="layui-inline" >
+						<div class="layui-input-inline" style="width: 56px;text-align: center;">
+							国家
+						</div>
+					</div>
+					<div class="layui-inline" >
+						<div class="layui-input-inline">
+							<input type="text" id="country" style="height: 32px;line-height: 32px;" class="layui-input" name="country" placeholder=""/>
+						</div>
+					</div>
+				</div>
                 <div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
 	                <div class="layui-inline">
 	                    <div class="layui-input-inline" style="width: 56px;text-align: center;"> 
@@ -210,7 +221,7 @@
             , autoSort: false
             , cellMinWidth: 150
             , height: "full-220"
-            , limits: [10, 20, 30, 40, 50]
+            , limits: [100, 200, 500, 1000, 2000]
             , limit: "{:config('pages')}"
             , loading: true
             , id: 'LAY-table'

application/admin/view/customer/admin/admin_user_index_1.html

@@ -57,7 +57,18 @@
 							</div>
 						</div>
 					</div>
-
+					<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
+						<div class="layui-inline" >
+							<div class="layui-input-inline" style="width: 56px;text-align: center;">
+								国家
+							</div>
+						</div>
+						<div class="layui-inline" >
+							<div class="layui-input-inline">
+								<input type="text" id="country" style="height: 32px;line-height: 32px;" class="layui-input" name="country" placeholder=""/>
+							</div>
+						</div>
+					</div>
 					<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
 						<div class="layui-inline">
 							<div class="layui-input-inline" style="width: 56px;text-align: center;">
@@ -199,7 +210,7 @@
 				autoSort: false,
 				cellMinWidth: 150,
 				height: "full-220",
-				limits: [10, 20, 30, 40, 50],
+				limits: [100, 200, 500, 1000, 2000],
 				limit: "{:config('pages')}",
 				loading: true,
 				id: 'LAY-table',
@@ -310,8 +321,7 @@
 						wk.msg('请至少选择一项');
 						return false;
 					}
-					wk.layer_show('', '{:url('
-						admin / customer / to_chengjiao ')}?id=' + ids);
+					wk.layer_show('', '{:url('admin/customer/to_chengjiao')}?id=' + ids);
 					//成交
 					// wk.chengJiao(getIds(),"{:url('admin/customer/to_chengjiao')}");
 				},
@@ -332,8 +342,7 @@
 						wk.msg('请至少选择一项');
 						return false;
 					}
-					wk.layer_show('', '{:url('
-						admin / customer / to_guanlian ')}?id=' + ids);
+					wk.layer_show('', '{:url('admin/customer/to_guanlian')}?id=' + ids);
 					//关联
 					// wk.guanLian(getIds(),"{:url('admin/customer/to_guanlian')}");
 				},
@@ -343,8 +352,7 @@
 						wk.msg('请至少选择一项');
 						return false;
 					}
-					wk.layer_show('', '{:url('
-						admin / customer / hebing ')}?id=' + ids);
+					wk.layer_show('', '{:url('admin/customer/hebing ')}?id=' + ids);
 					//关联
 					// wk.guanLian(getIds(),"{:url('admin/customer/to_guanlian')}");
 				}

application/admin/view/customer/admin/admin_user_index_2.html

@@ -56,7 +56,18 @@
 							</div>
 						</div>
 					</div>
-
+				<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
+					<div class="layui-inline" >
+						<div class="layui-input-inline" style="width: 56px;text-align: center;">
+							国家
+						</div>
+					</div>
+					<div class="layui-inline" >
+						<div class="layui-input-inline">
+							<input type="text" id="country" style="height: 32px;line-height: 32px;" class="layui-input" name="country" placeholder=""/>
+						</div>
+					</div>
+				</div>
 					<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
 						<div class="layui-inline">
 							<div class="layui-input-inline" style="width: 56px;text-align: center;">
@@ -207,7 +218,7 @@
             , autoSort: false
             , cellMinWidth: 150
             , height: "full-220"
-            , limits: [10, 20, 30, 40, 50]
+            , limits: [100, 200, 500, 1000, 2000]
             , limit: "{:config('pages')}"
             , loading: true
             , id: 'LAY-table'

application/admin/view/customer/admin/admin_user_index_3.html

@@ -56,7 +56,18 @@
 							</div>
 						</div>
 					</div>
-
+				<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
+					<div class="layui-inline" >
+						<div class="layui-input-inline" style="width: 56px;text-align: center;">
+							国家
+						</div>
+					</div>
+					<div class="layui-inline" >
+						<div class="layui-input-inline">
+							<input type="text" id="country" style="height: 32px;line-height: 32px;" class="layui-input" name="country" placeholder=""/>
+						</div>
+					</div>
+				</div>
 					<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
 						<div class="layui-inline">
 							<div class="layui-input-inline" style="width: 56px;text-align: center;">
@@ -198,7 +209,7 @@
             , autoSort: false
             , cellMinWidth: 150
             , height: "full-220"
-            , limits: [10, 20, 30, 40, 50]
+            , limits: [100, 200, 500, 1000, 2000]
             , limit: "{:config('pages')}"
             , loading: true
             , id: 'LAY-table'

application/admin/view/customer/admin/admin_user_index_4.html

@@ -60,8 +60,19 @@
 	                    </div>
 	                </div>
                 </div>
-                
-                
+
+				<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
+					<div class="layui-inline" >
+						<div class="layui-input-inline" style="width: 56px;text-align: center;">
+							国家
+						</div>
+					</div>
+					<div class="layui-inline" >
+						<div class="layui-input-inline">
+							<input type="text" id="country" style="height: 32px;line-height: 32px;" class="layui-input" name="country" placeholder=""/>
+						</div>
+					</div>
+				</div>
                 <div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
 	                <div class="layui-inline">
 	                    <div class="layui-input-inline" style="width: 56px;text-align: center;"> 
@@ -209,7 +220,7 @@
             , autoSort: false
             , cellMinWidth: 150
             , height: "full-220"
-            , limits: [10, 20, 30, 40, 50]
+            , limits: [100, 200, 500, 1000, 2000]
             , limit: "{:config('pages')}"
             , loading: true
             , id: 'LAY-table'

application/admin/view/customer/admin/see.html

@@ -25,13 +25,35 @@
                         <div style="margin-top: 1%"><strong>{$see.status}</strong></div>
                     </div>
                 </div>
+
+                {if $groupid == 4}
+                <div class="layui-form-item layui-col-md-offset1 layui-col-md8">
+                    <label class="layui-form-label"><strong>评级：</strong></label>
+                    <div class="layui-input-block">
+<!--                        <div style="margin-top: 1%"><strong>{$see.grade}</strong></div>-->
+                        <select name="grade" lay-verify="required" lay-search="">
+                            <option value="10" {if $see.grade==10} selected {/if}>10 </option>
+                            <option value="9" {if $see.grade==9} selected {/if}>9</option>
+                            <option value="8" {if $see.grade==8} selected {/if}>8</option>
+                            <option value="7" {if $see.grade==7} selected {/if}>7</option>
+                            <option value="6" {if $see.grade==6} selected {/if}>6</option>
+                            <option value="5" {if $see.grade==5} selected {/if}>5</option>
+                            <option value="4" {if $see.grade==4} selected {/if}>4</option>
+                            <option value="3" {if $see.grade==3} selected {/if}>3</option>
+                            <option value="2" {if $see.grade==2} selected {/if}>2</option>
+                            <option value="1" {if $see.grade==1} selected {/if}>1</option>
+                            <option value="0" {if $see.grade==0} selected {/if}>0</option>
+                        </select>
+                    </div>
+                </div>
+                {else}
                 <div class="layui-form-item layui-col-md-offset1 layui-col-md8">
                     <label class="layui-form-label"><strong>评级：</strong></label>
                     <div class="layui-input-block">
                         <div style="margin-top: 1%"><strong>{$see.grade}</strong></div>
                     </div>
                 </div>
-
+                {/if}
                 {if $groupid == 5}
                 <div class="layui-form-item layui-col-md-offset1 layui-col-md8">
                     <label class="layui-form-label"><strong>邮箱：</strong></label>

application/admin/view/customer/customer/customer_index_0.html

@@ -57,7 +57,18 @@
 	                    </div>
 	                </div>
                 </div>
-                
+                <div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
+                    <div class="layui-inline" >
+                        <div class="layui-input-inline" style="width: 56px;text-align: center;">
+                            国家
+                        </div>
+                    </div>
+                    <div class="layui-inline" >
+                        <div class="layui-input-inline">
+                            <input type="text" id="country" style="height: 32px;line-height: 32px;" class="layui-input" name="country" placeholder=""/>
+                        </div>
+                    </div>
+                </div>
                 <div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;"> 
 	                <div class="layui-inline" >
 	                    <div class="layui-input-inline" style="width: 56px;text-align: center;">

application/admin/view/customer/customer/customer_index_1.html

@@ -56,8 +56,19 @@
 	                    </div>
 	                </div>
                 </div>
-                
-                
+
+				<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
+					<div class="layui-inline" >
+						<div class="layui-input-inline" style="width: 56px;text-align: center;">
+							国家
+						</div>
+					</div>
+					<div class="layui-inline" >
+						<div class="layui-input-inline">
+							<input type="text" id="country" style="height: 32px;line-height: 32px;" class="layui-input" name="country" placeholder=""/>
+						</div>
+					</div>
+				</div>
                 <div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;"> 
 	                <div class="layui-inline" >
 	                    <div class="layui-input-inline" style="width: 56px;text-align: center;">

application/admin/view/customer/customer/customer_index_2.html

@@ -57,7 +57,18 @@
 							</div>
 						</div>
 					</div>
- 
+					<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
+						<div class="layui-inline" >
+							<div class="layui-input-inline" style="width: 56px;text-align: center;">
+								国家
+							</div>
+						</div>
+						<div class="layui-inline" >
+							<div class="layui-input-inline">
+								<input type="text" id="country" style="height: 32px;line-height: 32px;" class="layui-input" name="country" placeholder=""/>
+							</div>
+						</div>
+					</div>
 
 				
 			</div>

application/admin/view/customer/customer/customer_index_3.html

@@ -56,7 +56,18 @@
 							</div>
 						</div>
 					</div>
-
+				<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
+					<div class="layui-inline" >
+						<div class="layui-input-inline" style="width: 56px;text-align: center;">
+							国家
+						</div>
+					</div>
+					<div class="layui-inline" >
+						<div class="layui-input-inline">
+							<input type="text" id="country" style="height: 32px;line-height: 32px;" class="layui-input" name="country" placeholder=""/>
+						</div>
+					</div>
+				</div>
 					
 
 				</div>

application/admin/view/customer/customer/customer_index_4.html

@@ -56,7 +56,18 @@
 							</div>
 						</div>
 					</div>
-
+					<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
+						<div class="layui-inline" >
+							<div class="layui-input-inline" style="width: 56px;text-align: center;">
+								国家
+							</div>
+						</div>
+						<div class="layui-inline" >
+							<div class="layui-input-inline">
+								<input type="text" id="country" style="height: 32px;line-height: 32px;" class="layui-input" name="country" placeholder=""/>
+							</div>
+						</div>
+					</div>
 					<div class="admin_flex" style="margin-left: 2%;margin-bottom: 10px;">
 						<div class="layui-inline">
 							<div class="layui-input-inline" style="width: 56px;text-align: center;">

application/admin/view/product/index.html

@@ -62,6 +62,8 @@
                 {type: 'checkbox', fixed: 'left'}
                 , {type:'numbers', width: 50, title: '序号'}
                 , {field: 'product_name', width: '', title: '行业名称', align: 'center'}
+                , {field: 'groupid_name', width: '', title: '添加者', align: 'center'}
+
                 // , {field: 'nickname', width: '', title: '销售名称', align: 'center'}
                 // , {field: 'pwd', width: '', title: '密码', align: 'center'}
                 // , {field: 'phone', width: '', title: '电话', align: 'center'}

application/admin/view/type/index.html

@@ -62,6 +62,7 @@
                 {type: 'checkbox', fixed: 'left'}
                 , {type:'numbers', width: 50, title: '序号'}
                 , {field: 'name', width: '', title: '行业名称', align: 'center'}
+                , {field: 'groupid_name', width: '', title: '添加者', align: 'center'}
                 // , {field: 'nickname', width: '', title: '销售名称', align: 'center'}
                 // , {field: 'pwd', width: '', title: '密码', align: 'center'}
                 // , {field: 'phone', width: '', title: '电话', align: 'center'}

application/admin/view/user/index.html

@@ -59,6 +59,9 @@
                 <button class="layui-btn layui-btn-normal"  data-type="add" onclick="wk.layer_show('','{:url('userAdd')}')">
                     <i class="fa fa-plus"></i> 新增
                 </button>
+                <button class="layui-btn layui-btn-normal layuiBtn"  data-type="getCheckData">
+                    批量删除
+                </button>
 <!--                <span class="layui-btn-dropdown" style="display:inline-block;">-->
 <!--                    <button class="layui-btn layui-btn-normal" data-toggle="dropdown"><i class="fa fa-wrench"></i> 批量操作 <i class="fa fa-caret-down"></i></button>-->
 <!--                    <ul class="layui-dropdown-menu layui-anim layui-anim-upbit">-->