marge conflict fix

app/admin/controller/AppointmentApplication.php

@@ -53,7 +53,7 @@ class AppointmentApplication extends Permissions
 
             $model = $this->getModel();
             $count = $model->where($where)->count();
-            $data = $model->where($where)->page($post['page']??0, $post['limit']??15)->order('id desc')->select();
+            $data = $model->with('ticket')->where($where)->page($post['page']??0, $post['limit']??15)->order('id desc')->select();
             foreach ($data as $key => $value) {
                 $value['childs_text'] = $value->childs_text;
                 $value['sex_text'] = $value->sex_text;
@@ -62,6 +62,8 @@ class AppointmentApplication extends Permissions
                 $value['marriage_text'] = $value->marriage_text;
                 $value['education_level_text'] = $value->education_level_text;
                 $value['appointment_date'] = $value->appointment_date;
+                $value['education_level_text'] = $value->education_level_text;
+                $value['ticke_time'] = $value->ticket->appointment_daytime;
                 $data[$key] = $value;
             }
             return array('code' => 0, 'count' => $count, 'data' => $data);

app/admin/view/appointment_application/index.html

@@ -257,7 +257,7 @@
                         "咨询问题类别": obj.data.problem_type_text,
                         "问题描述": obj.data.problem_desc,
                         "需求描述": obj.data.requirement_desc,
-                        "预约时间段": obj.data.appointment_time,
+                        "预约时间段": `${obj.data.ticke_time} ${obj.data.appointment_time}`,
                         "订单状态": obj.data.status_text,
                         "备注": obj.data.remark,
                         "下单时间": obj.data.create_time,

app/api/controller/User.php

@@ -212,13 +212,14 @@ class User extends Base
             $where['finish_time'] = ['>', 0];
         }
         $pagenum = $this->request->param('pagenum', 20, 'intval');
-        $datalist = (new AppointmentApplication())->where($where)->order('create_time desc')->paginate($pagenum, true);
+        $datalist = AppointmentApplication::with('ticket')->where($where)->order('create_time desc')->paginate($pagenum, true);
         foreach ($datalist as $key => $item) {
             //专家信息
             $item->address;
             $item->specialist;
             $item->specialist->head_pic = geturl($item->specialist->head_pic, '', true);
             $item->appointment_date = $item->appointment_date;
+            $item->ticke_time = $item->ticket->appointment_daytime;
             $datalist[$key] = $item;
         }
         if (empty($datalist)) {

app/common/model/AppointmentApplication.php

@@ -130,4 +130,9 @@ class AppointmentApplication extends Model
     {
         return $this->belongsTo('AppointmentTicket');
     }
+
+    public function ticket()
+    {
+        return $this->hasOne(AppointmentTicket::class,'id','appointment_ticket_id');
+    }
 }