222

@@ -11,14 +11,15 @@ use Exception;
 use think\exception\PDOException;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use think\exception\ValidateException;
+
 /**
- * 
+ *
  *
  * @icon fa fa-circle-o
  */
 class Product extends Backend
 {
-    
+
     /**
      * Product模型对象
      * @var \app\admin\model\Product
@@ -31,13 +32,13 @@ class Product extends Backend
         $this->model = new \app\admin\model\Product;
 
     }
-    
+
     /**
      * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
      * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
      * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
      */
-    
+
 
     /**
      * 查看
@@ -48,32 +49,30 @@ class Product extends Backend
         $this->relationSearch = true;
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
-        if ($this->request->isAjax())
-        {
+        if ($this->request->isAjax()) {
             //如果发送的来源是Selectpage，则转发到Selectpage
-            if ($this->request->request('keyField'))
-            {
+            if ($this->request->request('keyField')) {
                 return $this->selectpage();
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $total = $this->model
-                    ->with(['classa','classcon','logo'])
-                    ->where($where)
-                    ->order($sort, $order)
-                    ->count();
+                ->with(['classa', 'classcon', 'logo'])
+                ->where($where)
+                ->order($sort, $order)
+                ->count();
 
             $list = $this->model
-                    ->with(['classa','classcon','logo'])
-                    ->where($where)
-                    ->order($sort, $order)
-                    ->limit($offset, $limit)
-                    ->select();
+                ->with(['classa', 'classcon', 'logo'])
+                ->where($where)
+                ->order($sort, $order)
+                ->limit($offset, $limit)
+                ->select();
 
             foreach ($list as $row) {
-                
+
                 $row->getRelation('classa')->visible(['class']);
-				$row->getRelation('classcon')->visible(['class_con']);
-				$row->getRelation('logo')->visible(['logo']);
+                $row->getRelation('classcon')->visible(['class_con']);
+                $row->getRelation('logo')->visible(['logo']);
             }
             $list = collection($list)->toArray();
             $result = array("total" => $total, "rows" => $list);
@@ -89,6 +88,7 @@ class Product extends Backend
      */
     public function import()
     {
+        echo '1';
         $file = $this->request->request('file');
         if (!$file) {
             $this->error(__('Parameter %s can not be empty', 'file'));
@@ -175,8 +175,6 @@ class Product extends Backend
                         $row[$fieldArr[$k]] = $v;
                     }
                 }
-                dump($row);
-                die;
                 if ($row) {
                     $insert[] = $row;
                 }