fix:

- 地址列表接口修改
- 放号时间排期重叠检测
- bug修复

app/admin/view/appointment/index.html

@@ -126,111 +126,6 @@
                     }
                 }
             });
-            laydate.render({
-                elem: '#time_range_end_time'
-                , type: 'datetime'
-                , range: true
-                , max: 0 //最大值0天后
-                , theme: 'molv'
-                , calendar: true
-                , done: function (value, date, endDate) {
-                    if (endDate.hours == 0 && endDate.minutes == 0 && endDate.seconds == 0) {
-                        setTimeout(function () {
-                            $('#time_range_end_time').val(value.replace(/00:00:00$/, '23:59:59'))
-                        }, 100)
-                    }
-                }
-            });
-            laydate.render({
-                elem: '#time_range_morning_start_time'
-                , type: 'datetime'
-                , range: true
-                , max: 0 //最大值0天后
-                , theme: 'molv'
-                , calendar: true
-                , done: function (value, date, endDate) {
-                    if (endDate.hours == 0 && endDate.minutes == 0 && endDate.seconds == 0) {
-                        setTimeout(function () {
-                            $('#time_range_morning_start_time').val(value.replace(/00:00:00$/, '23:59:59'))
-                        }, 100)
-                    }
-                }
-            });
-            laydate.render({
-                elem: '#time_range_morning_end_time'
-                , type: 'datetime'
-                , range: true
-                , max: 0 //最大值0天后
-                , theme: 'molv'
-                , calendar: true
-                , done: function (value, date, endDate) {
-                    if (endDate.hours == 0 && endDate.minutes == 0 && endDate.seconds == 0) {
-                        setTimeout(function () {
-                            $('#time_range_morning_end_time').val(value.replace(/00:00:00$/, '23:59:59'))
-                        }, 100)
-                    }
-                }
-            });
-            laydate.render({
-                elem: '#time_range_afternoon_start_time'
-                , type: 'datetime'
-                , range: true
-                , max: 0 //最大值0天后
-                , theme: 'molv'
-                , calendar: true
-                , done: function (value, date, endDate) {
-                    if (endDate.hours == 0 && endDate.minutes == 0 && endDate.seconds == 0) {
-                        setTimeout(function () {
-                            $('#time_range_afternoon_start_time').val(value.replace(/00:00:00$/, '23:59:59'))
-                        }, 100)
-                    }
-                }
-            });
-            laydate.render({
-                elem: '#time_range_afternoon_end_time'
-                , type: 'datetime'
-                , range: true
-                , max: 0 //最大值0天后
-                , theme: 'molv'
-                , calendar: true
-                , done: function (value, date, endDate) {
-                    if (endDate.hours == 0 && endDate.minutes == 0 && endDate.seconds == 0) {
-                        setTimeout(function () {
-                            $('#time_range_afternoon_end_time').val(value.replace(/00:00:00$/, '23:59:59'))
-                        }, 100)
-                    }
-                }
-            });
-            laydate.render({
-                elem: '#time_range_night_start_time'
-                , type: 'datetime'
-                , range: true
-                , max: 0 //最大值0天后
-                , theme: 'molv'
-                , calendar: true
-                , done: function (value, date, endDate) {
-                    if (endDate.hours == 0 && endDate.minutes == 0 && endDate.seconds == 0) {
-                        setTimeout(function () {
-                            $('#time_range_night_start_time').val(value.replace(/00:00:00$/, '23:59:59'))
-                        }, 100)
-                    }
-                }
-            });
-            laydate.render({
-                elem: '#time_range_night_end_time'
-                , type: 'datetime'
-                , range: true
-                , max: 0 //最大值0天后
-                , theme: 'molv'
-                , calendar: true
-                , done: function (value, date, endDate) {
-                    if (endDate.hours == 0 && endDate.minutes == 0 && endDate.seconds == 0) {
-                        setTimeout(function () {
-                            $('#time_range_night_end_time').val(value.replace(/00:00:00$/, '23:59:59'))
-                        }, 100)
-                    }
-                }
-            });
             laydate.render({
                 elem: '#time_range_create_time'
                 , type: 'datetime'

app/admin/view/appointment_ticket/index.html

@@ -124,12 +124,7 @@
 
             table.on('tool(table)', function (obj) {
                 if (obj.event == 'edit') {
-                    window.parent.tab.tabAdd({
-                        icon: "fa-bookmark",
-                        id: "tplay_appointment_ticket" + obj.data.id,
-                        title: obj.data.title == null ? "号源管理" + obj.data.id : obj.data.title,
-                        url: "/admin/appointment_ticket/publish?id=" + obj.data.id
-                    });
+                    location.href = "{:url('publish',['pid'=>$Request.param.pid])}?id=" + obj.data.id;
                 }
                 else if (obj.event == 'del') {
                     layer.confirm('确定要删除?', function (index) {

app/admin/view/appointment_ticket/publish.html

@@ -28,14 +28,12 @@
 <body style="padding:10px;">
 <div class="tplay-body-div">
 
-    {empty name="$data"}
     <div class="layui-tab">
         <ul class="layui-tab-title">
-            <li><a href="index" class="a_menu">列表</a></li>
-            <li class="layui-this">新增</li>
+            <li><a href="{:url('admin/appointment_ticket/index',['pid'=>$Request.param.pid])}" class="a_menu">列表</a></li>
+            <li class="layui-this">{empty name="$data"}新增{else/}修改{/empty}</li>
         </ul>
     </div>
-    {/empty}
 
     <div style="margin-top: 20px;"></div>
     <form class="layui-form" id="publish" method="post">

app/admin/view/specialist/index.html

@@ -173,7 +173,7 @@
                     layer.open({
                         type: 2,
                         title: '放号设置 | ' + obj.data.name ,
-                        area: ['60%', '90%'],
+                        area: ['80%', '90%'],
                         maxmin: true,
                         id: 'layerDemo', //防止重复弹出
                         content: "{:url('admin/appointment_ticket/index')}?pid=" + obj.data.id

app/api/controller/Appointment.php

@@ -35,6 +35,27 @@ class Appointment extends Base
     }
 
 
+    //可预约的地址
+    public function availableAddressList()
+    {
+        $post = $this->request->param();
+        $validate = new \think\Validate([
+            ['page', 'number'],
+            ['pagenum', 'number|<=:1000']
+        ]);
+        if (!$validate->check($post)) {
+            $this->json_error('提交失败：' . $validate->getError());
+        }
+
+        $pagenum = $this->request->param('pagenum', 20, 'intval');
+        $datalist = (new Address())->paginate($pagenum, true);
+        if (empty($datalist)) {
+            $this->json_error("没有数据");
+        }
+        $this->json_success("查询成功", $datalist);
+    }
+
+
     //按地址id获取号源信息
     public function getTicketByAddressId()
     {

app/install/data/db.sql

@@ -842,8 +842,16 @@ INSERT INTO `tplay_webconfig` (`id`, `name`, `is_log`, `is_close_site`, `file_ty
 ALTER TABLE `tplay_address`
 	ADD COLUMN `thumb` INT NOT NULL DEFAULT '0' COMMENT '封面' AFTER `title`;
 
+
+
 ALTER TABLE `tplay_appointment_ticket`
 	ADD COLUMN `status` TINYINT NOT NULL DEFAULT '1' COMMENT '状态:1启用0停用' AFTER `night_use`;
 
 ALTER TABLE `tplay_appointment`
-	CHANGE COLUMN `phone` `phone` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '咨询电话' COLLATE 'utf8_general_ci' AFTER `title`;
+	CHANGE COLUMN `phone` `phone` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '咨询电话' COLLATE 'utf8_general_ci' AFTER `title`;
+
+
+
+
+
+