111

app/Http/Controllers/Admin/Medical/ComboController.php

@@ -8,6 +8,7 @@
  */
 namespace App\Http\Controllers\Admin\Medical;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\MedicalComboModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\Medical\Criteria\MultiWhere;
@@ -64,6 +65,7 @@ class ComboController extends Controller
      */
     private function _createSave(){
         $data = (array) request('data');
+        $data['content'] = htmlspecialchars($data['content']);
         $id = $this->repository->create($data);
         if($id) {
             $url[] = array('url'=>U( 'Medical/Combo/index'),'title'=>'返回列表');
@@ -94,6 +96,7 @@ class ComboController extends Controller
      */
     private function _updateSave() {
         $data = (array) request('data');
+        $data['content'] = htmlspecialchars($data['content']);
         $ok = $this->repository->update(request('id'),$data);
         if($ok) {
             $url[] = array('url'=>U( 'Medical/Combo/index'),'title'=>'返回列表');
@@ -128,7 +131,8 @@ class ComboController extends Controller
      * 删除
      */
     public function destroy(Request $request) {
-        $bool = $this->repository->destroy($request->get('id'));
+        $cat = MedicalComboModel::find($request->get('id'));
+        $bool = $cat->delete();
         if($bool) {
             return  $this->showMessage('操作成功');
         }else{

app/Http/Controllers/Admin/Medical/OrderController.php

@@ -8,6 +8,7 @@
  */
 namespace App\Http\Controllers\Admin\Medical;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\MedicalOrderModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\Medical\Criteria\MultiWhere;
@@ -106,7 +107,13 @@ class OrderController extends Controller
 
     public function view(Request $request) {
         $data = $this->repository->find(request('id'));
-        return view('admin.medical.order.view',compact('data'));
+        $data['single'] = unserialize($data['single']);
+        $str = '';
+        foreach ($data['single'] as $key_s=>$val_s){
+            $str.=$val_s->name;
+        }
+        $data['combo'] = unserialize($data['combo']);
+        return view('admin.medical.order.view',compact('data','str'));
     }
 
 
@@ -128,7 +135,8 @@ class OrderController extends Controller
      * 删除
      */
     public function destroy(Request $request) {
-        $bool = $this->repository->destroy($request->get('id'));
+        $cat = MedicalOrderModel::find($request->get('id'));
+        $bool = $cat->delete();
         if($bool) {
             return  $this->showMessage('操作成功');
         }else{

app/Http/Controllers/Admin/Medical/Single/CateController.php

@@ -8,6 +8,7 @@
  */
 namespace App\Http\Controllers\Admin\Medical\Single;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\MedicalSingleCateModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\Medical\Single\Criteria\MultiWhere;
@@ -128,7 +129,8 @@ class CateController extends Controller
      * 删除
      */
     public function destroy(Request $request) {
-        $bool = $this->repository->destroy($request->get('id'));
+        $cat = MedicalSingleCateModel::find($request->get('id'));
+        $bool = $cat->delete();
         if($bool) {
             return  $this->showMessage('操作成功');
         }else{

app/Http/Controllers/Admin/Medical/Single/ProjectController.php

@@ -9,6 +9,7 @@
 namespace App\Http\Controllers\Admin\Medical\Single;
 use App\Http\Controllers\Admin\Controller;
 use App\Models\MedicalSingleCateModel;
+use App\Models\MedicalSingleProjectModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\Medical\Single\Criteria\MultiWhere;
@@ -135,7 +136,8 @@ class ProjectController extends Controller
      * 删除
      */
     public function destroy(Request $request) {
-        $bool = $this->repository->destroy($request->get('id'));
+        $cat = MedicalSingleProjectModel::find($request->get('id'));
+        $bool = $cat->delete();
         if($bool) {
             return  $this->showMessage('操作成功');
         }else{

app/Models/FavoriteModel.php

@@ -1,44 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: 思维定制
- * Date: 2018/7/13
- * Time: 17:52
- */
-
-namespace App\Models;
-
-
-
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-class FavoriteModel extends BaseModel
-{
-    use SoftDeletes;
-    protected $dates = ['delete_at'];
-
-    /**
-     * 数据表名
-     *
-     * @var string
-     *
-     */
-    protected $table = 'favorite';
-    /**
-     * 主键
-     */
-    protected $primaryKey = 'id';
-
-    //分页
-    protected $perPage = PAGE_NUMS;
-
-    /**
-     * 可以被集体附值的表的字段
-     *
-     * @var string
-     */
-    protected $fillable = [
-        'messages_id',
-        'user_id'
-    ];
-}

app/Models/MedicalComboModel.php

@@ -1,6 +1,8 @@
 <?php
 namespace App\Models;
 use App\Models\BaseModel;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
 /**
  *  @description 套餐
  *  @author  system;
@@ -10,6 +12,8 @@ use App\Models\BaseModel;
  */
 class MedicalComboModel extends BaseModel
 {
+    use SoftDeletes;
+    protected $dates = ['delete_at'];
     /**
      * 数据表名
      *

app/Models/MedicalOrderModel.php

@@ -1,6 +1,8 @@
 <?php
 namespace App\Models;
 use App\Models\BaseModel;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
 /**
  *  @description 单据管理1
  *  @author  system;
@@ -10,6 +12,8 @@ use App\Models\BaseModel;
  */
 class MedicalOrderModel extends BaseModel
 {
+    use SoftDeletes;
+    protected $dates = ['delete_at'];
     /**
      * 数据表名
      *

app/Models/MedicalSingleCateModel.php

@@ -1,6 +1,8 @@
 <?php
 namespace App\Models;
 use App\Models\BaseModel;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
 /**
  *  @description 单项分类
  *  @author  system;
@@ -10,6 +12,8 @@ use App\Models\BaseModel;
  */
 class MedicalSingleCateModel extends BaseModel
 {
+    use SoftDeletes;
+    protected $dates = ['delete_at'];
     /**
      * 数据表名
      *

app/Models/MedicalSingleProjectModel.php

@@ -1,6 +1,8 @@
 <?php
 namespace App\Models;
 use App\Models\BaseModel;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
 /**
  *  @description 单项项目
  *  @author  system;
@@ -10,6 +12,8 @@ use App\Models\BaseModel;
  */
 class MedicalSingleProjectModel extends BaseModel
 {
+    use SoftDeletes;
+    protected $dates = ['delete_at'];
     /**
      * 数据表名
      *

app/Models/MessagesFollowerModel.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Models\BaseModel;
-
-/**
- * @description 标签列表
- * @author  system;
- * @version    1.0
- * @date 2018-07-11 06:51:31
- *
- */
-class MessagesFollowerModel extends BaseModel
-{
-    /**
-     * 数据表名
-     *
-     * @var string
-     *
-     */
-    protected $table = 'messages_followers';
-    /**
-     * 主键
-     */
-    protected $primaryKey = 'id';
-
-    //分页
-    protected $perPage = PAGE_NUMS;
-
-    /**
-     * 可以被集体附值的表的字段
-     *
-     * @var string
-     */
-    protected $fillable = [
-        'site_id',
-        'messages_id',
-        'user_id',
-        'username',
-        'mobile',
-        'state'
-    ];
-
-    public function infos()
-    {
-        return $this->belongsTo('App\Models\MessagesInfoModel',  'messages_id', 'id');
-    }
-}

app/Models/MessagesInfoModel.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Models\BaseModel;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-/**
- * @description 信息列表
- * @author  system;
- * @version    1.0
- * @date 2018-07-11 06:50:54
- *
- */
-class MessagesInfoModel extends BaseModel
-{
-    use SoftDeletes;
-    /**
-     * 数据表名
-     *
-     * @var string
-     *
-     */
-    protected $table = 'messages_info';
-    /**
-     * 主键
-     */
-    protected $primaryKey = 'id';
-
-    //分页
-    protected $perPage = PAGE_NUMS;
-
-    /**
-     * 可以被集体附值的表的字段
-     *
-     * @var string
-     */
-    protected $fillable = [
-        'site_id',
-        'title',
-        'content',
-        'user_id',
-        'price',
-        'phone',
-        'comment',
-        'type',
-        'sort',
-        'pic_url'
-    ];
-
-    public function tags()
-    {
-        return $this->belongsToMany('App\Models\MessagesTagModel', 'messages_tag_relation', 'messages_id', 'tag_id');
-    }
-
-}

app/Models/MessagesTagModel.php

@@ -1,45 +0,0 @@
-<?php
-namespace App\Models;
-use App\Models\BaseModel;
-/**
- *  @description 标签列表
- *  @author  system;
- *  @version    1.0
- *  @date 2018-07-11 06:51:31
- *
- */
-class MessagesTagModel extends BaseModel
-{
-    /**
-     * 数据表名
-     *
-     * @var string
-     *
-     */
-    protected $table = 'messages_tag';
-    /**
-    主键
-     */
-    protected $primaryKey = 'id';
-
-    //分页
-    protected $perPage = PAGE_NUMS;
-
-    /**
-     * 可以被集体附值的表的字段
-     *
-     * @var string
-     */
-    protected $fillable = [
-                           'site_id',
-                           'name',
-                           'sort'
-                          ];
-
-
-    public function messgaes()
-    {
-        return $this->belongsToMany('App\Models\MessagesInfoModel', 'messages_tag_relation',  'tag_id', 'messages_id');
-    }
-
-}

app/Models/MessagesTagRelationModel.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Models\BaseModel;
-
-/**
- * @description 标签列表
- * @author  system;
- * @version    1.0
- * @date 2018-07-11 06:51:31
- *
- */
-class MessagesTagRelationModel extends BaseModel
-{
-    /**
-     * 数据表名
-     *
-     * @var string
-     *
-     */
-    protected $table = 'messages_tag_relation';
-    /**
-     * 主键
-     */
-    protected $primaryKey = 'id';
-
-    //分页
-    protected $perPage = PAGE_NUMS;
-
-    /**
-     * 可以被集体附值的表的字段
-     *
-     * @var string
-     */
-    protected $fillable = [
-        'site_id',
-        'messages_id',
-        'tag_id'
-    ];
-
-}

app/Models/PaymentInfoModel.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Models\BaseModel;
-use Illuminate\Database\Eloquent\SoftDeletes;
-
-/**
- * @description 支付列表
- * @author  system;
- * @version    1.0
- * @date 2018-07-11 06:53:04
- *
- */
-class PaymentInfoModel extends BaseModel
-{
-    use SoftDeletes;
-    /**
-     * 数据表名
-     *
-     * @var string
-     *
-     */
-    protected $table = 'payment_info';
-    /**
-     * 主键
-     */
-    protected $primaryKey = 'id';
-
-    //分页
-    protected $perPage = PAGE_NUMS;
-
-    /**
-     * 可以被集体附值的表的字段
-     *
-     * @var string
-     */
-    protected $fillable = [
-        'site_id',
-        'user_id',
-        'openid',
-        'out_trade_no',
-        'price',
-        'type',
-        'msg_id',
-        'to_user',
-        'state',
-        'poundage',
-        'name'
-    ];
-
-}

app/Models/UserInfoModel.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Laravel\Passport\HasApiTokens;
-use Illuminate\Notifications\Notifiable;
-/**
- * @description 用户表
- * @author  system;
- * @version    1.0
- * @date 2017-05-30 12:16:56
- *
- */
-class UserInfoModel extends Authenticatable
-{
-    use HasApiTokens, Notifiable;
-    use SoftDeletes;
-    /**
-     * 数据表名
-     *
-     * @var string
-     *
-     */
-    protected $table = 'user_info';
-    /**W
-     * 主键
-     */
-    protected $primaryKey = 'id';
-
-    //分页
-    protected $perPage = PAGE_NUMS;
-
-    /**
-     * 可以被集体附值的表的字段
-     *
-     * @var string
-     */
-    protected $fillable = [
-        'nickname',
-        'openid',
-        'mobile',
-        'avatar',
-        'lost_login_time',
-        'remember_token',
-        'money'
-    ];
-
-}

app/Models/WechatAppModel.php

@@ -1,41 +0,0 @@
-<?php
-namespace App\Models;
-use App\Models\BaseModel;
-/**
- *  @description 11
- *  @author  system;
- *  @version    1.0
- *  @date 2018-07-26 01:43:25
- *
- */
-class WechatAppModel extends BaseModel
-{
-    /**
-     * 数据表名
-     *
-     * @var string
-     *
-     */
-    protected $table = 'wechat_app';
-    /**
-    主键
-     */
-    protected $primaryKey = 'id';
-
-    //分页
-    protected $perPage = PAGE_NUMS;
-
-    /**
-     * 可以被集体附值的表的字段
-     *
-     * @var string
-     */
-    protected $fillable = [
-                           'appId',
-                           'appSecret',
-                           'mchId',
-                           'key',
-                           'poundage'
-                          ];
-
-}

resources/views/admin/medical/order/view.blade.php

@@ -4,97 +4,22 @@
 <div class="row">
     <div class="ibox-content">
         <div class="list-group">
-                                 
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">ID</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['id'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading"></h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['deleted_at'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">客户电话号</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['mobile'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">受检者姓名</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['name'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">民族</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['nationality'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">性别</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['sex'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">电子邮件地址</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['email'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">籍贯</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['native_place'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">职业</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['work'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">通讯地址</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['address'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">样本类型</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['sample_type'] or ''}}</p>
-                                                 
-               </div>                     
                <div class="list-group-item">
                                                   
                    <h3 class="list-group-item-heading">单项</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['single'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $str or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
                    <h3 class="list-group-item-heading">套餐</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['combo'] or ''}}</p>
-                                                 
+                   {{--<p class="list-group-item-text"> {{ $data['combo'] or ''}}</p>--}}
+                   @foreach($data['combo'] as $combo)
+                       <h4>{{$combo->name}}</h4>
+                       <div>{{htmlspecialchars_decode($combo->content)}}</div>
+                   @endforeach
                </div>                     
                <div class="list-group-item">
                                                   
@@ -116,20 +41,6 @@
                                                    
                    <p class="list-group-item-text"> {{ $data['comment'] or ''}}</p>
                                                  
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">创建时间</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['created_at'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">更新时间</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['updated_at'] or ''}}</p>
-                                                 
                </div>
         </div>
     </div>

resources/views/web/order/post.blade.php

@@ -136,6 +136,7 @@
                  <form class="bs-example bs-example-form" role="form" action="" method="post" enctype="multipart/form-data">
                      <input type="hidden" name="_token" value="{{ csrf_token() }}">
                      <input type="hidden" name="id" value="{{ $id }}">
+                     <input type="hidden" id="total_price" name="total_price" value=""/>
                 <div class="top" style="width: 90%;margin: 0 auto;">
                     <img src="{{cdn_asset('/assets/img/top.jpg')}}" alt="" style="width: 100%;">
                 </div>
@@ -176,7 +177,7 @@
                 /*var taocan = [
                     {id:'tc1',name:'血清维生素含量检测套餐',neirong:'检测血清中维生素A、维生素E、维生素D2、维生素D3、维生素K、维生素B1、维生素B2、维生素B3、维生素B5、维生素B6、维生素C、维生素B7、维生素B9（叶酸）、维生素B12的含量，精准指导各种维生素的补充。维生素的失衡与众多慢性疾病和肿瘤密切相关，体内维生素的平衡是保证健康的关键。',jiage:'1480',youhui:'1180'},
                     {id:'tc2',name:'骨骼营养健康关爱套餐',neirong:'检测包含了维生素A代谢、维生素D代谢、钙质代谢、锌质代谢能力检测。维生素A、D、钙、锌是直接关系到骨骼健康的营养物质，它们的利用需要人体的各种代谢能力的参与，通过本检测，指导和骨骼健康物质的补充和调整。',jiage:'720',youhui:'570'},
-                    {id:'tc3',name:'心脑血管呵护检测套餐',neirong:'心脑血管疾病的发生与相关的基因缺陷存在着密切的关系，该检测通过对与冠心病、心房纤维性颤动、静脉血栓栓塞、心原性猝死、中风相关基因进行检测，明确高危因素，及早调整生理状态，做到疾病的早期预防。',jiage:'720',youhui:'570'},
+                    {id:'tc3',name:'心脑血管呵护检测套餐',neirong:'<p style=xxxx">心脑血管疾病的发生与相关的基因缺陷存在着密切的关系，该检测通过对与冠心病、心房纤维性颤动、静脉血栓栓塞、心原性猝死、中风相关基因进行检测，明确高危因素，及早调整生理状态，做到疾病的早期预防。',jiage:'720',youhui:'570'},
                     {id:'tc4',name:'遗传性肿瘤基因检测经济套餐',neirong:'涵盖了结直肠癌、肺癌、肝癌、胃癌、甲状腺癌、乳腺癌（女性）、宫颈癌（女性）、子宫内膜癌（女性）、卵巢癌（女性），共计9种肿瘤发病风险的评估。本检测覆盖了与肿瘤相关的数十个主要遗传位点。',jiage:'980',youhui:'780'},
                     {id:'tc5',name:'遗传性肿瘤基因检测实用套餐',neirong:'涵盖了结直肠癌、肺癌、肝癌、膀胱癌、肾癌、胃癌、甲状腺癌、胰腺癌、慢性淋巴细胞白血病、基底细胞癌、鼻咽癌、口腔癌、咽喉癌、黑色素瘤、骨髓增生性肿瘤、霍奇金氏淋巴瘤、食管癌、前列腺癌（男性）、睾丸癌（男性）、乳腺癌（女性）、宫颈癌（女性）、子宫内膜癌（女性），共计9种肿瘤发病风险的评估。本检测覆盖了与肿瘤相关的数十个主要遗传位点。',jiage:'2400',youhui:'1900'},
                     {id:'tc6',name:'心脑血管药物治疗安全指导套餐',neirong:'心脑血管常用的治疗药物的药效、毒副作用、用药剂量都与个人的遗传背景密切相关，同医不同药、同药不同量。通过基因检测技术，精准评估心脑血管疾病相关的37种药物效果，并精准提供指导个性用药指导，做到用对药、少吃药、治好病的目的。',jiage:'3960',youhui:'3160'},
@@ -370,6 +371,8 @@
                 }
                 console.log(zonger)
                 document.getElementById("zongjia").innerHTML = zonger;
+                document.getElementById("total_price").value = zonger
+
             });
             $(".cprice").click(function(){
                 if($(this)[0].checked){
@@ -385,6 +388,8 @@
                 }
                 console.log(zonger)
                 document.getElementById("zongjia").innerHTML = zonger;
+                document.getElementById("total_price").value = zonger
+
             });
         })
     </script>