Merge branch 'sh/20'

app/Http/Controllers/Admin/OrderController.php

             'receiverCity'           => 'required|between:1,10', 
             'receiverAddress'           => 'required', 
             'delivery_date'           => 'required|date', 
-            'createTime'           => 'required|date', 
+            //'createTime'           => 'required|date', 
             'receivedAmount'           => 'required|numeric|min:1', 
             //'goods_note'           => 'required|min:1',  
             'warehouse'           => 'required|integer|min:1',  
             'receiverCity.between'           => '市填写有误',   
             'receiverAddress.required'           => '详细地址不能为空',             
             'delivery_date.required'           => '预发货时间不能为空',   
-            'createTime.required'           => '下单时间不能为空',   
+            //'createTime.required'           => '下单时间不能为空',   
             'receivedAmount.required'           => '付款金额不能为空',                   
             'receivedAmount.numeric'           => '付款金额必须为数字',                   
             'goods_note.required'           => '商品信息不能为空',                   
         $order['receivedAmount'] = trim($request->input('receivedAmount')); //付款金额        
         $order['buyerMemo'] = trim($request->input('buyerMemo', '')); // 买家备注
         $order['sellerMemo'] = trim($request->input('sellerMemo', '')); // 卖家备注
-        $order['createTime'] = !empty($request->input('createTime')) ? $request->input('createTime') : date('Y-m-d H:i:s'); // 订单创建时间
+        $order['createTime'] = date('Y-m-d H:i:s'); // 订单创建时间
         $order['modifyTime'] = date('Y-m-d H:i:s'); // 订单修改时间
         $order['should_amount'] = $request->input('should_amount');
         if(!$order['should_amount']) $order['should_amount'] = null;
             'receiverCity'           => 'required|between:1,10', 
             'receiverAddress'           => 'required', 
             'delivery_date'           => 'required|date', 
-            'createTime'           => 'required|date', 
+            //'createTime'           => 'required|date', 
             'receivedAmount'           => 'required|numeric|min:1', 
             //'goods_note'           => 'required|min:1',  
             'warehouse'           => 'required|integer|min:1',    
             'receiverCity.between'           => '市填写有误',   
             'receiverAddress.required'           => '详细地址不能为空',             
             'delivery_date.required'           => '预发货时间不能为空',   
-            'createTime.required'           => '下单时间不能为空',   
+            //'createTime.required'           => '下单时间不能为空',   
             'receivedAmount.required'           => '付款金额不能为空',                   
             'receivedAmount.numeric'           => '付款金额必须为数字',                   
             'goods_note.required'           => '商品信息不能为空',                   
         $order['is_fugou'] = (int)$request->input('is_fugou'); //是否复购
         $order['warehouse'] = (int)$request->input('warehouse'); //仓库
         $order['delivery_date'] = !empty($request->input('delivery_date')) ? $request->input('delivery_date') : date('Y-m-d'); //发货日期
-        if(!empty($request->input('createTime'))) $order['createTime'] = $request->input('createTime'); // 订单创建时间
+        //if(!empty($request->input('createTime'))) $order['createTime'] = $request->input('createTime'); // 订单创建时间
         $order['order_status'] = (int)$request->input('order_status');
         $order['payment_type'] = (int)$request->input('payment_type'); //支付方式
         //$order['status'] = (int)$request->input('status');
             $orderSkus['receivedAmount'] = $order['receivedAmount'];
             $orderSkus['buyerMemo'] = $order['buyerMemo'];
             $orderSkus['sellerMemo'] = $order['sellerMemo'];
-            $orderSkus['createTime'] = $order['createTime'];
+            $orderSkus['createTime'] = $old_order->createTime;
             $orderSkus['modifyTime'] = $old_order->modifyTime;
             
         }

app/Http/Controllers/Admin/TemplateController.php

      */
     public function sourcestore(Request $request)
     {
+        $t_id = intval($request->input('t_id'));
+        $back_vali_str = '';
+        if($t_id != 4){
+            $back_vali_str = 'required';
+        }
         $this->validate($request, [
             't_id' => 'required',           
-            'back_img' => 'required',           
+            'back_img' => $back_vali_str,           
         ], [
             't_id.required' => '模板不能为空',
             'back_img.required' => '背景图不能为空',
             
         ]);
         $template = new TemplatesSource();
-        $template->t_id = intval($request->input('t_id'));
+        $template->t_id = $t_id;
         $template->note = trim($request->input('note'));
     
         $template->back_img = trim($request->input('back_img'));
         }
         */
 
+        //新模板数据
+        if($template->t_id == 4){
+            $arr = array();
+            $arr['title'] = trim($request->input('title'));
+            $arr['text1'] = trim($request->input('text1'));
+            $arr['text2'] = trim($request->input('text2'));
+            $arr['text3'] = trim($request->input('text3'));
+            $arr['img1'] = '';
+            $arr['img2_1'] = '';
+            $arr['img2_2'] = '';
+            $arr['img3'] = '';
+            if ($request->hasFile('img1') && $request->file('img1')->isValid()) {
+                $file = $request->file('img1');
+                $ossClient=new oss();
+                // 上传阿里云
+                $file = $ossClient->upload($file->getClientOriginalExtension(), $file->getRealPath(), 'upload/seafoodPic'.date("Y-m-d",time()).'/'.date('His'));
+                $img=$file['oss-request-url'];
+                $arr['img1']=str_replace("kx-youhuiquan.oss-cn-beijing.aliyuncs.com","imgs.726p.com",$img);
+            }
+            if ($request->hasFile('img2_1') && $request->file('img2_1')->isValid()) {
+                $file = $request->file('img2_1');
+                $ossClient=new oss();
+                // 上传阿里云
+                $file = $ossClient->upload($file->getClientOriginalExtension(), $file->getRealPath(), 'upload/seafoodPic'.date("Y-m-d",time()).'/'.date('His'));
+                $img=$file['oss-request-url'];
+                $arr['img2_1']=str_replace("kx-youhuiquan.oss-cn-beijing.aliyuncs.com","imgs.726p.com",$img);
+            }
+            if ($request->hasFile('img2_2') && $request->file('img2_2')->isValid()) {
+                $file = $request->file('img2_2');
+                $ossClient=new oss();
+                // 上传阿里云
+                $file = $ossClient->upload($file->getClientOriginalExtension(), $file->getRealPath(), 'upload/seafoodPic'.date("Y-m-d",time()).'/'.date('His'));
+                $img=$file['oss-request-url'];
+                $arr['img2_2']=str_replace("kx-youhuiquan.oss-cn-beijing.aliyuncs.com","imgs.726p.com",$img);
+            }
+            if ($request->hasFile('img3') && $request->file('img3')->isValid()) {
+                $file = $request->file('img3');
+                $ossClient=new oss();
+                // 上传阿里云
+                $file = $ossClient->upload($file->getClientOriginalExtension(), $file->getRealPath(), 'upload/seafoodPic'.date("Y-m-d",time()).'/'.date('His'));
+                $img=$file['oss-request-url'];
+                $arr['img3']=str_replace("kx-youhuiquan.oss-cn-beijing.aliyuncs.com","imgs.726p.com",$img);
+            }
+
+            $template->new_context = json_encode($arr);
+        }
         if($template->save()){
             //生成连接
             $template->url = $this->createSourceUrl($template->t_id, $template->id);
         $templates = Templates::where('is_del', 0)->whereNotNull('url')->get();      
         $template = TemplatesSource::findOrFail($id);
         $back_imgs = TemplatesBackimg::where('is_del', 0)->whereNotNull('back_img')->where('t_id', $template->t_id)->lists('back_img');
-        return view('template/sourceedit', ['template' => $template, 'id'=>$id, 'templates' => $templates, 'back_imgs'=>$back_imgs]);
+        $new_context = array();
+        if($template->t_id==4){
+            $new_context = json_decode($template->new_context,true);
+        }
+        return view('template/sourceedit', ['template' => $template, 'id'=>$id, 'templates' => $templates, 'back_imgs'=>$back_imgs, 'new_context'=>$new_context]);
     }
 
     /**
     public function sourceupdate(Request $request)
     {
         $id = (int)$request->input('id');
-        $this->validate($request, [
-            //'t_id' => 'required',           
-            'back_img' => 'required',           
-        ], [
-            //'t_id.required' => '模板不能为空',
-            'back_img.required' => '背景图不能为空',
-            
-        ]);
-
+       
         $template = TemplatesSource::findOrFail($id);
-        /*
-        $t_id = (int)$request->input('t_id');
-        if( $template->t_id != $t_id ){
-            //模板更改，生成新连接
-            $template->t_id = $t_id;
-            $template->url = $this->createSourceUrl($t_id, $template->id);
-        }
-        */
         $template->note = trim($request->input('note'));
         $template->back_img = trim($request->input('back_img'));
-        //图片上传 阿里云oss 
-        /*      
-        if ($request->hasFile('img') && $request->file('img')->isValid()) {
-            $file = $request->file('img');
-            $ossClient=new oss();
-            // 上传阿里云
-            $file = $ossClient->upload($file->getClientOriginalExtension(), $file->getRealPath(), 'upload/seafoodPic'.date("Y-m-d",time()).'/'.date('His'));
-            $img=$file['oss-request-url'];
-            $template->back_img=str_replace("kx-youhuiquan.oss-cn-beijing.aliyuncs.com","imgs.726p.com",$img);
-            #保存背景图
-            TemplatesBackimg::insert(['back_img'=>$template->back_img]);
+
+        //是否是新图文模板
+        //新模板数据
+        if($template->t_id == 4){
+            $new_context = json_decode($template->new_context, true);
+            $arr = $new_context;
+            $arr['title'] = trim($request->input('title'));
+            $arr['text1'] = trim($request->input('text1'));
+            $arr['text2'] = trim($request->input('text2'));
+            $arr['text3'] = trim($request->input('text3'));
+
+            if ($request->hasFile('img1') && $request->file('img1')->isValid()) {
+                $file = $request->file('img1');
+                $ossClient=new oss();
+                // 上传阿里云
+                $file = $ossClient->upload($file->getClientOriginalExtension(), $file->getRealPath(), 'upload/seafoodPic'.date("Y-m-d",time()).'/'.date('His'));
+                $img=$file['oss-request-url'];
+                $arr['img1']=str_replace("kx-youhuiquan.oss-cn-beijing.aliyuncs.com","imgs.726p.com",$img);
+            }
+            if ($request->hasFile('img2_1') && $request->file('img2_1')->isValid()) {
+                $file = $request->file('img2_1');
+                $ossClient=new oss();
+                // 上传阿里云
+                $file = $ossClient->upload($file->getClientOriginalExtension(), $file->getRealPath(), 'upload/seafoodPic'.date("Y-m-d",time()).'/'.date('His'));
+                $img=$file['oss-request-url'];
+                $arr['img2_1']=str_replace("kx-youhuiquan.oss-cn-beijing.aliyuncs.com","imgs.726p.com",$img);
+            }
+            if ($request->hasFile('img2_2') && $request->file('img2_2')->isValid()) {
+                $file = $request->file('img2_2');
+                $ossClient=new oss();
+                // 上传阿里云
+                $file = $ossClient->upload($file->getClientOriginalExtension(), $file->getRealPath(), 'upload/seafoodPic'.date("Y-m-d",time()).'/'.date('His'));
+                $img=$file['oss-request-url'];
+                $arr['img2_2']=str_replace("kx-youhuiquan.oss-cn-beijing.aliyuncs.com","imgs.726p.com",$img);
+            }
+            if ($request->hasFile('img3') && $request->file('img3')->isValid()) {
+                $file = $request->file('img3');
+                $ossClient=new oss();
+                // 上传阿里云
+                $file = $ossClient->upload($file->getClientOriginalExtension(), $file->getRealPath(), 'upload/seafoodPic'.date("Y-m-d",time()).'/'.date('His'));
+                $img=$file['oss-request-url'];
+                $arr['img3']=str_replace("kx-youhuiquan.oss-cn-beijing.aliyuncs.com","imgs.726p.com",$img);
+            }
+
+            $template->new_context = json_encode($arr);
         }
-        */
 
         $template->save();
         return redirect('/admin/template/sourceindex')->with('info', '修改成功');

app/Http/Controllers/Api/TemplateController.php

         $_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');
+        $new_data = array();
+        $title = '';
+        if(!empty($new_context)){
+            $new_context = json_decode($new_context, true);
+            $title = $new_context['title'];
+            $new_data[0]['text'] = $new_context['text1'];
+            $new_data[0]['img'] = [$new_context['img1']];
+            $new_data[1]['text'] = $new_context['text2'];
+            $new_data[1]['img'] = [$new_context['img2_1'], $new_context['img2_2']];
+            $new_data[2]['text'] = $new_context['text3'];
+            $new_data[2]['img'] = [$new_context['img3']];
+        }
         $result = TemplatesSourceSalers::where('s_id', $t_id)->where('is_del', 0)->where('weight','>',0)->whereIn('admin_id', $_open_ids)->orderBy('weight', 'asc')->lists('weight', 'admin_id');
         if(empty($result)){
             return self::returnValue([],1001);
 
         $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]);
+        return self::returnValue(['qrcode'=>$qrcode, 'ip'=>$ip, 'saler_id'=>$saler_id, 'qrcodes'=>$qrcodes, 'back_img'=>$back_img, 'title'=>$title, 'new_context'=>$new_data]);
     }
 
      /**

resources/views/order/ordercreate.blade.php

                 <label class="form-label col-xs-4 col-sm-2">
                     <font color='red'>* </font>下单时间：</label>
                 <div class="formControls col-xs-6 col-sm-6">
-                    <input id="createTime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss' })" autocomplete="off"  class="input-text Wdate" style="width:22%;text-align:center;" name="createTime" value="{{old('createTime')}}"> <font color='red'> *默认今天 </font>                  
+                    <input id="createTime" type="text" autocomplete="off"  class="input-text" style="width:22%;text-align:center;" name="createTime" value="{{$createTime}}" disabled> <font color='red'> *默认当前时间 </font>                                    
                 </div>
             </div>
 
             layer.msg('预发货时间不能为空!',{icon:2,time:1500});
             return false;
         }
-        var createTime = $("input[name=createTime]").val();
-        if(!createTime){
-            layer.msg('下单时间不能为空!',{icon:2,time:1500});
-            return false;
-        }
+        
         var warehouse = $("#warehouse").val();
         if(warehouse<1){
             layer.msg('仓库必须选择!',{icon:2,time:1500});

resources/views/order/orderedit.blade.php

                 <div class="formControls col-xs-6 col-sm-6">
                     <input type="radio" name="payment_type"  value="1" @if($order['payment_type']=='1') checked  @endif>
                     <label for="status-1" style="margin-right: 27px;">微信支付</label>
-                    <input type="radio" name="payment_type" value="2" @if($order['payment_type']=='2') checked @endif>
+                    @if($order['payment_type']=='2')
+                    <input type="radio" name="payment_type" value="2"  checked >
                     <label for="status-0" style="margin-right: 27px;">付款码支付</label>
+                    @endif
                     <input type="radio" name="payment_type" value="3" @if($order['payment_type']=='3') checked @endif>
                     <label for="status-0" style="margin-right: 27px;">个体户支付</label>
                 </div>
                 <label class="form-label col-xs-4 col-sm-2">
                     <font color='red'>* </font>下单时间：</label>
                 <div class="formControls col-xs-6 col-sm-6">
-                    <input id="createTime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss' })" class="input-text Wdate" style="width:22%;text-align:center;" name="createTime" value="{{$order['createTime']}}"> <font color='red'>  </font>                  
+                    <input id="createTime" type="text"  class="input-text" style="width:22%;text-align:center;" name="createTime" value="{{$order['createTime']}}" disabled> <font color='red'> *不可变更 </font>                  
                 </div>
             </div>
 

resources/views/order/orderlist.blade.php

                                 <select id="refund_type_2{{$a['id']}}" style="display: none" name='refund_type' value="{{$a['refund_type']}}" onchange="change_refund_type({{$a['id']}})">
                                     <option value='0'>-请选择-</option>
                                     <option value='1'>微信支付</option>
-                                    <option value='2'>付款码支付</option>
+                                    <!--option value='2'>付款码支付</option-->
+                                    <option value='3'>个体户支付</option>
                                 </select>
                                 <span class="sort_icon" hidden  onClick='change_refund_type_click("{{$a['id']}}","{{$a['cost']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
                             </td>
                     if(refund_type==2){
                         refund_type = '付款码支付';
                     }
+                    if(refund_type==3){
+                        refund_type = '个体户支付';
+                    }
                     if(refund_type==0){
                         refund_type = '';
                     }

resources/views/statistics/teamFinanceTotal.blade.php

                 <tr class="text-c">
                     <th width="5%">团队</th>
                     <th width="5%">时间</th>
-                    <th width="5%">总单数</th>
+                    <th width="4%">总单数</th>
                     <th width="5%">成交金额</th>
                     <th width="5%">微信支付金额</th>
                     <th width="5%">付款码支付金额</th>
-                    <th width="5%">售后单数</th>
+                    <th width="5%">个体户支付金额</th>
+                    <th width="4%">售后单数</th>
                     <th width="5%">售后金额</th>
-                    <th width="5%">微信退补单数</th>
-                    <th width="5%">微信退补差价</th>
+                    <th width="4%">微信退补单数</th>
+                    <th width="4%">微信退补差价</th>
                     <th width="5%">微信实际金额</th>
-                    <th width="5%">付款码退补单数</th>
-                    <th width="5%">付款码退补差价</th>
+                    <th width="4%">付款码退补单数</th>
+                    <th width="4%">付款码退补差价</th>
                     <th width="5%">付款码实际金额</th>
-                    <th width="5%">发货单数</th>
+                    <th width="4%">个体户退补单数</th>
+                    <th width="4%">个体户退补差价</th>
+                    <th width="5%">个体户实际金额</th>
+                    <th width="4%">发货单数</th>
                     <th width="5%">货品成本</th>
                     <th width="5%">物流成本</th>
                     <th width="5%">毛利</th>
                             <td>{{$a['receivedAmount']}}</td>
                             <td>{{$a['wx_money']}}</td>
                             <td>{{$a['zfm_money']}}</td>
+                            <td>{{$a['gth_money']}}</td>
                             <td>{{$a['aftersale_count']}}</td>
                             <td>{{$a['aftersale_fee']}}</td>
                             <td>{{$a['wx_refund_count']}}</td>
                             <td>{{$a['zfm_refund_count']}}</td>
                             <td>{{$a['zfm_refund_price']}}</td>
                             <td>{{$a['zfm_true_amount']}}</td>
+                            <td>{{$a['gth_refund_count']}}</td>
+                            <td>{{$a['gth_refund_price']}}</td>
+                            <td>{{$a['gth_true_amount']}}</td>
                             <td>{{$a['send_count']}}</td>
                             <td>{{$a['cost']}}</td>
                             <td>{{$a['freight_cost']}}</td>

resources/views/template/sourcecreate.blade.php

     .clear {
         zoom: 1;
     }
+    .new_tuwen{
+        display: none;
+    }
 </style>
     <body>
     @if(count($errors) > 0)
                     @endif
                 </div>
             </div>
-            <div class="row cl">
+            <div class="row cl" id='back_c'>
                 <label class="form-label col-xs-4 col-sm-2">
                     选择背景图：</label>
                 <div class="formControls col-xs-6 col-sm-7">
                     <input type="text" class="input-text" value="{{old('note')}}" placeholder="" name="note">
                 </div>
             </div>
+
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                    文章标题：</label>
+                <div class="formControls col-xs-6 col-sm-7">
+                    <input type="text" class="input-text" value="{{old('title')}}" placeholder="" name="title">
+                </div>
+            </div>
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                段一文字：</label>
+                <div class="formControls col-xs-6 col-sm-7">
+                    <textarea type="text" class="textarea"  placeholder="" name="text1">{{old('text1')}}</textarea>
+                </div>
+            </div>
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                    段一图片：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                        <span class="btn-upload">
+                          <input class="input-text upload-url radius" type="text" name="uploadfile-1" id="uploadfile-1" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe642;</i> 上传图片</a>
+                          <input type="file" multiple name="img1" class="input-file">
+                        </span><br>
+                    文件类型支持:jpg ,png ,ico ,文件大小不能超过1M
+                </div>
+            </div>
+
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                段二文字：</label>
+                <div class="formControls col-xs-6 col-sm-7">
+                    <textarea type="text" class="textarea"  placeholder="" name="text2">{{old('text2')}}</textarea>
+                </div>
+            </div>
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                    段二图一：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                        <span class="btn-upload">
+                          <input class="input-text upload-url radius" type="text" name="uploadfile-1" id="uploadfile-1" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe642;</i> 上传图片</a>
+                          <input type="file" multiple name="img2_1" class="input-file">
+                        </span><br>
+                    文件类型支持:jpg ,png ,ico ,文件大小不能超过1M
+                </div>
+            </div>
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                    段二图二：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                        <span class="btn-upload">
+                          <input class="input-text upload-url radius" type="text" name="uploadfile-1" id="uploadfile-1" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe642;</i> 上传图片</a>
+                          <input type="file" multiple name="img2_2" class="input-file">
+                        </span><br>
+                    文件类型支持:jpg ,png ,ico ,文件大小不能超过1M
+                </div>
+            </div>
+
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                段三文字：</label>
+                <div class="formControls col-xs-6 col-sm-7">
+                    <textarea type="text" class="textarea"  placeholder="" name="text3">{{old('text3')}}</textarea>
+                </div>
+            </div>
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                    段三图片：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                        <span class="btn-upload">
+                          <input class="input-text upload-url radius" type="text" name="uploadfile-1" id="uploadfile-1" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe642;</i> 上传图片</a>
+                          <input type="file" multiple name="img3" class="input-file">
+                        </span><br>
+                    文件类型支持:jpg ,png ,ico ,文件大小不能超过1M
+                </div>
+            </div>
+
             
             <div class="row cl">
                 <div class="col-9 col-offset-2">
 
         function getTback(){
             var t_id = $("input[type='radio'][name='t_id']:checked").val();
+            if(t_id==4){
+                $(".new_tuwen").show();
+                $("#back_c").hide();
+                return false;
+            }
+            else{
+                $(".new_tuwen").hide();
+                $("#back_c").show();
+            }
             if(t_id>0){
                 $.ajax({
                     url:'/admin/template/getTempback/'+t_id,

resources/views/template/sourceedit.blade.php

                     @endif
                 </div>
             </div>
+            @if($template['t_id'] !=4)
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
                     选择背景图：</label>
                     @endif
                 </div>
             </div>
+            @endif
 
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
                     <input type="text" class="input-text" value="{{$template['note']}}" placeholder="" name="note">
                 </div>
             </div>
+
+            @if($template['t_id'] ==4)
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                    文章标题：</label>
+                <div class="formControls col-xs-6 col-sm-7">
+                    <input type="text" class="input-text" value="{{$new_context['title']}}" placeholder="" name="title">
+                </div>
+            </div>
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                段一文字：</label>
+                <div class="formControls col-xs-6 col-sm-7">
+                    <textarea type="text" class="textarea"  placeholder="" name="text1">{{$new_context['text1']}}</textarea>
+                </div>
+            </div>
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                    段一图片：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <div><img width="100" src="{{$new_context['img1']?$new_context['img1']:'/empty.png'}}"/></div><br>
+                        <span class="btn-upload">
+                          <input class="input-text upload-url radius" type="text" name="uploadfile-1" id="uploadfile-1" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe642;</i> 上传图片</a>
+                          <input type="file" multiple name="img1" class="input-file">
+                        </span><br>
+                    文件类型支持:jpg ,png ,ico ,文件大小不能超过1M
+                </div>
+            </div>
+
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                段二文字：</label>
+                <div class="formControls col-xs-6 col-sm-7">
+                    <textarea type="text" class="textarea"  placeholder="" name="text2">{{$new_context['text2']}}</textarea>
+                </div>
+            </div>
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                    段二图一：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <div><img width="100" src="{{$new_context['img2_1']?$new_context['img2_1']:'/empty.png'}}"/></div><br>
+                        <span class="btn-upload">
+                          <input class="input-text upload-url radius" type="text" name="uploadfile-1" id="uploadfile-1" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe642;</i> 上传图片</a>
+                          <input type="file" multiple name="img2_1" class="input-file">
+                        </span><br>
+                    文件类型支持:jpg ,png ,ico ,文件大小不能超过1M
+                </div>
+            </div>
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                    段二图二：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <div><img width="100" src="{{$new_context['img2_2']?$new_context['img2_2']:'/empty.png'}}"/></div><br>
+                        <span class="btn-upload">
+                          <input class="input-text upload-url radius" type="text" name="uploadfile-1" id="uploadfile-1" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe642;</i> 上传图片</a>
+                          <input type="file" multiple name="img2_2" class="input-file">
+                        </span><br>
+                    文件类型支持:jpg ,png ,ico ,文件大小不能超过1M
+                </div>
+            </div>
+
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                段三文字：</label>
+                <div class="formControls col-xs-6 col-sm-7">
+                    <textarea type="text" class="textarea"  placeholder="" name="text3">{{$new_context['text3']}}</textarea>
+                </div>
+            </div>
+            <div class="row cl new_tuwen">
+                <label class="form-label col-xs-4 col-sm-2">
+                    段三图片：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <div><img width="100" src="{{$new_context['img3']?$new_context['img3']:'/empty.png'}}"/></div><br>
+                        <span class="btn-upload">
+                          <input class="input-text upload-url radius" type="text" name="uploadfile-1" id="uploadfile-1" readonly><a href="javascript:void();" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe642;</i> 上传图片</a>
+                          <input type="file" multiple name="img3" class="input-file">
+                        </span><br>
+                    文件类型支持:jpg ,png ,ico ,文件大小不能超过1M
+                </div>
+            </div>
+            @endif
             
             <div class="row cl">
                 <div class="col-9 col-offset-2">