commit

app/admin/controller/water/WaterMaterialScience.php

@@ -447,7 +447,6 @@ class WaterMaterialScience extends AuthController
                 $this->apiReturn(303,$msg);
             }
         }
-
         $PHPExcel = $PHPReader->load($file); //加载excel对象
         $sheet = $PHPExcel->getSheet(0); //获取指定的sheet表
         $rows = $sheet->getHighestRow();//行数

app/admin/model/water/WaterCate.php

@@ -42,7 +42,7 @@ class WaterCate extends BaseModel
     {
         $model = self::field('*')->order('id DESC');
 
-        if ($where['name'])$model->where('name' , 'like', '%'.$where['name'],'%');
+        if ($where['name'])$model->where('name' , 'like', '%'.$where['name'].'%');
         if ($where['type'])$model->where('type' , $where['type']);
         $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){

app/admin/model/water/WaterMaterial.php

@@ -38,7 +38,7 @@ class WaterMaterial extends BaseModel
     {
         $model = self::field('*')->order('id DESC');
 
-        if ($where['name'])$model->where('name' , 'like', '%'.$where['name'],'%');
+        if ($where['name'])$model->where('name' , 'like', '%'.$where['name'].'%');
         $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);

app/admin/model/water/WaterMaterialScience.php

@@ -40,7 +40,7 @@ class WaterMaterialScience extends BaseModel
         ->leftJoin('water_thickness b', 'a.th_id = b.id')
         ->leftJoin('water_cate c', 'a.cate_id = c.id');
 
-        if ($where['name'])$model->where('a.name' , 'like', '%'.$where['name'],'%');
+        if ($where['name'])$model->where('a.name' , 'like', '%'.$where['name'].'%');
         if ($where['role'] == 'roof'){
             $model->where('a.type', 1);
         }elseif ($where['role'] == 'side_plate'){

app/admin/model/water/WaterMembershioCard.php

@@ -41,7 +41,7 @@ class WaterMembershioCard extends BaseModel
     {
         $model = self::field('*')->order('id DESC');
 
-        if ($where['name'])$model->where('title' , 'like', '%'.$where['name'],'%');
+        if ($where['name'])$model->where('title' , 'like', '%'.$where['name'].'%');
         $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);

app/admin/model/water/WaterOrder.php

@@ -39,7 +39,7 @@ class WaterOrder extends BaseModel
         $model = self::alias('a')->field('a.*,u.nickname')->order('a.id DESC')
             ->leftJoin('user u', 'a.uid = u.uid');
 
-        if ($where['name'])$model->where('u.uid|u.nickname' , 'like', '%'.$where['name'],'%');
+        if ($where['name'])$model->where('u.uid|u.nickname' , 'like', '%'.$where['name'].'%');
         $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);

app/admin/model/water/WaterQuery.php

@@ -39,7 +39,7 @@ class WaterQuery extends BaseModel
         $model = self::alias('a')->field('a.*,u.nickname')->order('a.id DESC')
         ->leftJoin('user u', 'a.uid = u.uid');
 
-        if ($where['name'])$model->where('u.uid|u.nickname' , 'like', '%'.$where['name'],'%');
+        if ($where['name'])$model->where('u.uid|u.nickname' , 'like', '%'.$where['name'].'%');
         $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);

app/admin/model/water/WaterThickness.php

@@ -38,7 +38,7 @@ class WaterThickness extends BaseModel
     {
         $model = self::field('*')->order('id DESC');
 
-        if ($where['name'])$model->where('name' , 'like', '%'.$where['name'],'%');
+        if ($where['name'])$model->where('name' , 'like', '%'.$where['name'].'%');
         $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);

app/admin/view/water/water_thickness/index.php

@@ -142,7 +142,7 @@
     layList.tool(function (event,data,obj) {
         switch (event) {
             case 'delete':
-                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var url=layList.U({c:'water.water_thickness',a:'delete',q:{id:data.id}});
                 var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
                 $eb.$swal('delete',function(){
                     $eb.axios.get(url).then(function(res){