commit

app/admin/controller/card/Card.php

@@ -64,7 +64,8 @@ class Card extends AuthController
             'start_week' => '',
             'end_week' => '',
             'price' => '',
-            'details_image' => ''
+            'details_image' => '',
+            'info' => '',
         ];
         if ($id){
             $data = \app\admin\model\card\Card::where('id', $id)->find()->toArray();
@@ -96,6 +97,7 @@ class Card extends AuthController
             'introduce',
             'image',
             'details_image',
+            'info',
         ]);
         if ($data['id']){
             $list = \app\admin\model\card\Card::where('id', $data['id'])->find();
@@ -107,6 +109,7 @@ class Card extends AuthController
             $list['introduce'] = $data['introduce'];
             $list['image'] = $data['image'];
             $list['details_image'] = $data['details_image'];
+            $list['info'] = $data['info'];
             $res = $list->save();
         }else{
             $res = $model->save($data);

app/admin/controller/diagnosis/DiagnosisOrder.php

@@ -215,6 +215,7 @@ class DiagnosisOrder extends AuthController
     {
         $order = model::find($id);
         $order['after_sales'] = 2;
+        $order['status'] = 3;
         $res = $order->save();
         if ($res){
             return Json::success('成功!');

app/admin/view/card/card/create.php

@@ -114,6 +114,14 @@
                        </div>
                    </div>
                </div>
+               <div class="form-group">
+                   <div class="col-md-12">
+                       <div class="input-group">
+                           <span class="input-group-addon">简介</span>
+                           <textarea type="text/plain" id="info" style="width:100%;">{$list['info']}</textarea>
+                       </div>
+                   </div>
+               </div>
                <div class="form-group">
                    <div class="col-md-12">
                        <label style="color:#aaa">介绍</label>
@@ -246,6 +254,7 @@
                 list.start_week = $('#start_week').val();/* 原文链接 */
                 list.end_week = $('#end_week').val();/* 原文链接 */
                 list.details_image = $('#image_inputs').val();/* 原文链接 */
+                list.info = $('#info').val();/* 原文链接 */
                 var Expression = /http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/;
                 var objExp=new RegExp(Expression);
                 if(list.name == ''){

app/admin/view/diagnosis/diagnosis_order/index.php

@@ -155,7 +155,13 @@
 
                     </script>
                     <script type="text/html" id="re">
-                        {{d.nickname}}/{{d.uid}}
+                        {{# if(d.order_receiving > 0){ }}
+                        {{d.re_nickname}}/{{d.order_receiving}}
+                        {{# } ;}}
+                        {{# if(d.order_receiving < 1){ }}
+                        {{d.status}}
+                        {{# } ;}}
+
 
                     </script>
                     <script type="text/html" id="act">
@@ -216,7 +222,7 @@
             {field: 'commission', title: '佣金',  align: 'center'},
             {field: 'paid', title: '支付状态',  align: 'center'},
             {field: 'pay_type', title: '支付方式',   align: 'center'},
-            {field: 're_nickname', title: '接单员', templet: '#re', align: 'center'},
+            // {field: 're_nickname', title: '接单员', templet: '#re', align: 'center'},
             {field: 'status', title: '状态',  align: 'center'},
             {field: 'create_time', title: '时间', align: 'center', width: '8%'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},

app/api/controller/diagnosis/DiagnosisOrderController.php

@@ -193,12 +193,15 @@ class DiagnosisOrderController
             ->field('a.*,b.time,b.name,b.sex,b.age,b.phone,b.hospital,b.urgent_phone,b.service_id,b.transfer_address,b.remarks')
             ->leftJoin('diagnosis_order_attr b', 'a.id = b.oid')
             ->order('a.id DESC')
+            ->where('a.paid', 1)
             ->where('a.status', $data['status'])
             ->where('a.uid', $request->uid())
             ->page($data['page'], $data['limit'])->select();
         $list = count($list) > 0 ? $list->toArray() : [];
         if ($list){
             foreach ($list as &$item){
+                $item['images'] = json_decode($item['images']);
+                $item['after_images'] = json_decode($item['after_images']);
                 $item['cate'] = DiagnosisCate::where('id', 'in', $item['cate_id'])->column('name');
                 $item['service'] = DiagnosisService::where('id', 'in', $item['service_id'])->column('name');
                 $item['receiving'] = DiagnosisApply::where('uid', $item['order_receiving'])->find();
@@ -221,6 +224,8 @@ class DiagnosisOrderController
             ->order('a.id DESC')
             ->where('a.id', $id)
             ->find()->toArray();
+        $list['images'] = json_decode($list['images']);
+        $list['after_images'] = json_decode($list['after_images']);
         $list['cate'] = DiagnosisCate::where('id', 'in', $list['cate_id'])->column('name');
         $list['service'] = DiagnosisService::where('id', 'in', $list['service_id'])->column('name');
         $list['receiving'] = DiagnosisApply::where('uid', $list['order_receiving'])->find();
@@ -274,12 +279,15 @@ class DiagnosisOrderController
             ->field('a.*,b.time,b.name,b.sex,b.age,b.phone,b.hospital,b.urgent_phone,b.service_id,b.transfer_address,b.remarks')
             ->leftJoin('diagnosis_order_attr b', 'a.id = b.oid')
             ->order('a.id DESC')
+            ->where('a.paid', 1)
             ->where('a.status', $data['status'])
             ->where('a.order_receiving', $request->uid())
             ->page($data['page'], $data['limit'])->select();
         $list = count($list) > 0 ? $list->toArray() : [];
         if ($list){
             foreach ($list as &$item){
+                $item['images'] = json_decode($item['images']);
+                $item['after_images'] = json_decode($item['after_images']);
                 $item['cate'] = DiagnosisCate::where('id', 'in', $item['cate_id'])->column('name');
                 $item['service'] = DiagnosisService::where('id', 'in', $item['service_id'])->column('name');
                 $item['receiving'] = DiagnosisApply::where('uid', $item['order_receiving'])->find();
@@ -309,12 +317,15 @@ class DiagnosisOrderController
             ->field('a.*,b.time,b.name,b.sex,b.age,b.phone,b.hospital,b.urgent_phone,b.service_id,b.transfer_address,b.remarks')
             ->leftJoin('diagnosis_order_attr b', 'a.id = b.oid')
             ->order('a.id DESC')
+            ->where('a.paid', 1)
             ->where('a.type', $data['type'])
             ->where('a.status', 0)
             ->page($data['page'], $data['limit'])->select();
         $list = count($list) > 0 ? $list->toArray() : [];
         if ($list){
             foreach ($list as &$item){
+                $item['images'] = json_decode($item['images']);
+                $item['after_images'] = json_decode($item['after_images']);
                 $item['cate'] = DiagnosisCate::where('id', 'in', $item['cate_id'])->column('name');
                 $item['service'] = DiagnosisService::where('id', 'in', $item['service_id'])->column('name');
                 $item['receiving'] = DiagnosisApply::where('uid', $item['order_receiving'])->find();
@@ -446,7 +457,8 @@ class DiagnosisOrderController
         if (!$id) return app('json')->fail('传入订单id!');
         $order = DiagnosisOrder::where('id', $id)->where('uid', $request->uid())->lock(true)->find();
         if (!$order) return app('json')->fail('订单不存在!');
-        if ($order['status'] <> 3) return app('json')->fail('订单未完成');
+        if (empty($data['after_images'])) return app('json')->fail('传入售后图片!');
+//        if ($order['status'] <> 3) return app('json')->fail('订单未完成');
         $order['after_remarks'] = $data['after_remarks'];
         $order['after_images'] = json_encode($data['after_images']);
         $order['after_sales'] = 1;

config/app.php

@@ -33,7 +33,7 @@ return [
     // 禁止URL访问的应用列表（自动多应用模式有效）
     'deny_app_list' => [],
     // 默认应用
-    'default_app' => 'wap',
+    'default_app' => 'admin',
     // 默认时区
     'default_timezone' => 'Asia/Shanghai',
     // 异常页面的模板文件