Merge branch 'master' of http://119.23.72.7/sunlong_v5/note-library

app/Http/Controllers/AjaxController.php

@@ -229,7 +229,19 @@ Class AjaxController extends Controller
     /**
     /**
      * 编辑模板 获取模板详情
      * 编辑模板 获取模板详情
      */
      */
-    public function getTemplateDetail(){
+    public function getTemplateDetail($request){
+        $id  = $request->input("t_id",0);
+        $count = TemplateListModel::where("id",intval($id))->where("create_userid",$request->user->userId)->count("id");
+        if($count <= 0){
+            return $this->ajaxReturn(-1,"没找到属于您的模板信息");
+        }
+        $templateInfo = TemplateListModel::where("id",intval($id))->select("id","template_name","status")->first();
+        if($templateInfo->status <= 0){
+            return $this->ajaxReturn(-1,"改模板已经被主人禁用了");
+        }
+        $templateInfo->template_extend = $templateInfo->template_extend;
+        return $this->ajaxReturn(0,"ok",$templateInfo);
+
 
 
     }
     }
 
 

app/Model/TemplateListModel.php

@@ -70,6 +70,13 @@ class TemplateListModel extends Model{
     }
     }
 
 
 
 
+    /**
+     * 获取关联到用户的手机
+     */
+    public function template_extend()
+    {
+        return $this->hasOne(\App\Model\TemplateExtendModel::class,"template_id","id");
+    }