admin/app/api/controller/branch/admin/Activity.php
@@ -48,7 +48,10 @@
        $model = new ActivityModel;
        //Vue要添加的数据
        $data = json_decode($this->request->post('formData', '', null), true);
        if(empty($data['start_time']) || empty($data['end_time'])){
        if(empty($data['register_start_time']) || empty($data['register_end_time'])){
            return $this->renderError('请选择报名时间');
        }
        if(empty($data['activity_start_time']) || empty($data['activity_end_time'])){
            return $this->renderError('请选择活动时间');
        }
        if (empty($data['latitude'])) {
@@ -70,9 +73,12 @@
            // 活动分类
            $category = CategoryModel::getAll();
            $model = ActivityModel::detail($activity_id);
            // 报名时间
            $model['register_start_time'] = date("Y-m-d H:i:s", $model['register_start_time']);
            $model['register_end_time'] = date("Y-m-d H:i:s", $model['register_end_time']);
            //活动时间
            $model['start_time'] = date("Y-m-d H:i:s", $model['activity_start_time']);
            $model['end_time'] = date("Y-m-d H:i:s", $model['activity_end_time']);
            $model['activity_start_time'] = date("Y-m-d H:i:s", $model['activity_start_time']);
            $model['activity_end_time'] = date("Y-m-d H:i:s", $model['activity_end_time']);
            return $this->renderSuccess('', compact('category', 'model'));
        }