合并分支 'master-server' 到 'master'

Master server



查看合并请求 !873

@@ -126,7 +126,7 @@ class DetailController extends BaseController
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
             $column->del(['id'=>$this->param['id']]);
             $column->del(['id'=>$this->param['id']]);
-            $detail->del(['product_id'=>$info['product_id'],'column_id'=>$info['column_id']]);
+            $detail->del(['column_id'=>$info['id']]);
             DB::commit();
             DB::commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
             DB::rollBack();
             DB::rollBack();

@@ -38,7 +38,7 @@ class DetailLogic extends BaseLogic
                 $this->fail('保存失败，请联系管理员');
                 $this->fail('保存失败，请联系管理员');
             }
             }
         }else{
         }else{
-            $id = $columnModel->add($this->param);
+            $id = $columnModel->addReturnId($this->param);
         }
         }
         return $this->success(['id'=>$id]);
         return $this->success(['id'=>$id]);
     }
     }
@@ -73,6 +73,6 @@ class DetailLogic extends BaseLogic
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->fail('保存失败，请联系管理员.错误：'.$e->getMessage());
             $this->fail('保存失败，请联系管理员.错误：'.$e->getMessage());
         }
         }
-        $this->success(['product_id'=>$this->param['product_id']]);
+        return $this->success(['product_id'=>$this->param['product_id']]);
     }
     }
 }
 }

@@ -28,4 +28,8 @@ class News extends Base
     public function getRelatedNewsIdAttribute($value){
     public function getRelatedNewsIdAttribute($value){
         return Arr::setToArr($value);
         return Arr::setToArr($value);
     }
     }
+
+    public function getRelatedProductIdAttribute($value){
+        return Arr::setToArr($value);
+    }
 }
 }

@@ -9,6 +9,7 @@
 
 
 namespace App\Models\Product;
 namespace App\Models\Product;
 
 
+use App\Helper\Arr;
 use App\Models\Base;
 use App\Models\Base;
 
 
 class Detail extends Base
 class Detail extends Base
@@ -18,6 +19,13 @@ class Detail extends Base
     //连接数据库
     //连接数据库
     protected $connection = 'custom_mysql';
     protected $connection = 'custom_mysql';
 
 
+    public function getCssAttribute($value){
+        return Arr::s2a($value);
+    }
+
+    public function getContentAttribute($value){
+        return Arr::s2a($value);
+    }
     /**
     /**
      * @remark :文本框类型
      * @remark :文本框类型
      * @name   :text_box
      * @name   :text_box