m

app/Http/Controllers/Admin/TemplateController.php

@@ -120,7 +120,7 @@ class TemplateController extends Controller
     {
         $id = (int)$request->input('id');
         $this->validate($request, [
-            'url' => 'required|unique:templates,url,'.$id.',id',           
+            'url' => 'required',           
         ], [
             'url.required' => '模板链接不能为空',
             'url.unique' => '该模板链接已存在',
@@ -497,8 +497,13 @@ class TemplateController extends Controller
     public function sourcestore(Request $request)
     {
         $t_id = intval($request->input('t_id'));
+
+        #查次模板是否是html自定义
+        $html_info = Templates::select('is_html')->where('id', $t_id)->first();
+        $is_html = $html_info->is_html;
+
         $back_vali_str = '';
-        if($t_id != 4){
+        if($t_id != 4 && $is_html != 1){
             $back_vali_str = 'required';
         }
         $this->validate($request, [
@@ -514,6 +519,7 @@ class TemplateController extends Controller
         $template->note = trim($request->input('note'));
     
         $template->back_img = trim($request->input('back_img'));
+        $template->is_html = $is_html;
         //图片上传 阿里云oss    
         /*   
         if ($request->hasFile('img') && $request->file('img')->isValid()) {

app/Http/Controllers/Api/TemplateController.php

@@ -33,9 +33,16 @@ class TemplateController extends Controller {
         if(!$t_id) $t_id = 1;
         //查询未离职销售
         $_open_ids = Admin::where('is_use', 1)->where('is_qrcode_use', 1)->lists('id');
-        //获取背景图
-        $back_img = TemplatesSource::where('id', $t_id)->pluck('back_img');
-        $new_context = TemplatesSource::where('id', $t_id)->pluck('new_context');
+       //获取背景图
+        $source_info = TemplatesSource::where('id', $t_id)->first();
+        $back_img = $source_info->back_img;
+        $new_context = $source_info->new_context;
+        #假如是自定义文章模板，获取html代码
+        $is_html = $source_info->is_html;
+        $article_html = null;
+        if( $is_html == 1 ){
+            $article_html = Templates::where('id', $source_info->t_id)->pluck('article_html');
+        }
         $new_data = array();
         $title = '';
         if(!empty($new_context)){
@@ -83,7 +90,7 @@ class TemplateController extends Controller {
 
         $qrcode = Admin::where('id', $saler_id)->pluck('qrcode');
         $qrcodes = Admin::whereIn('id', $saler_ids)->lists('qrcode');
-        return self::returnValue(['qrcode'=>$qrcode, 'ip'=>$ip, 'saler_id'=>$saler_id, 'qrcodes'=>$qrcodes, 'back_img'=>$back_img, 'title'=>$title, 'new_context'=>$new_data]);
+        return self::returnValue(['qrcode'=>$qrcode, 'ip'=>$ip, 'saler_id'=>$saler_id, 'qrcodes'=>$qrcodes, 'back_img'=>$back_img, 'title'=>$title, 'new_context'=>$new_data, 'is_html'=>$is_html, 'article_html'=>$article_html]);
     }
 
      /**