diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..7c435d0 Binary files /dev/null and b/.DS_Store differ diff --git a/app/Forms/ParamedicForm.php b/app/Forms/ParamedicForm.php index b8ffceb..9c07649 100755 --- a/app/Forms/ParamedicForm.php +++ b/app/Forms/ParamedicForm.php @@ -14,6 +14,8 @@ class ParamedicForm extends Form $this->add("mobile", Field::TEXT, ["label" => "电话", "rules" => "required"]); $this->add("serial", Field::TEXT, ["label" => "编号", "rules" => "required"]); $this->add("avatar", Field::TEXT, ["label" => "照片", "attr" => ["data-plugin" => "uploader"]]); + $this->add("health_certificate", Field::TEXT, ["label" => "健康证", "attr" => ["data-plugin" => "uploader"]]); + $this->add("work_certificate", Field::TEXT, ["label" => "护理员证", "attr" => ["data-plugin" => "uploader"]]); $this->add("id_card_number", Field::TEXT, ["label" => "身份证号"]); $this->add("sex", Field::SELECT, ["label" => "性别", "choices" => [ "男" => "男", diff --git a/public/.DS_Store b/public/.DS_Store new file mode 100644 index 0000000..898243f Binary files /dev/null and b/public/.DS_Store differ diff --git a/public/dashboard/.DS_Store b/public/dashboard/.DS_Store new file mode 100644 index 0000000..0f4ff04 Binary files /dev/null and b/public/dashboard/.DS_Store differ diff --git a/public/dashboard/skin/.DS_Store b/public/dashboard/skin/.DS_Store new file mode 100644 index 0000000..0efb165 Binary files /dev/null and b/public/dashboard/skin/.DS_Store differ diff --git a/public/dashboard/skin/default/.DS_Store b/public/dashboard/skin/default/.DS_Store new file mode 100644 index 0000000..5c3c6c2 Binary files /dev/null and b/public/dashboard/skin/default/.DS_Store differ diff --git a/public/dashboard/skin/default/images/head.png b/public/dashboard/skin/default/images/head.png index 9f60153..506a6a8 100644 Binary files a/public/dashboard/skin/default/images/head.png and b/public/dashboard/skin/default/images/head.png differ diff --git a/public/js/common.js b/public/js/common.js index 6bd4431..d360648 100755 --- a/public/js/common.js +++ b/public/js/common.js @@ -325,7 +325,7 @@ function initUploader(obj, index) { var li = ''; $(".uploader-list[data-uploader-index=" + index + "]").append(li); $(".uploader-list[data-uploader-index=" + index + "]").children(":last").find(".close").click(function () { @@ -439,7 +439,7 @@ function initUploader(obj, index) { var index = this.options.uploaderIndex; $('#' + file.id).addClass("alert-success").attr("data-id", data.id); - $('#' + file.id).find("a").attr("href", "/storage/" + (data.folder ? data.folder + "/" : "") + data.name).attr("target", "_blank").addClass("text-success"); + $('#' + file.id).find("a").attr("href", "/storage/" + (data.folder && data.folder != "public" ? data.folder + "/" : "") + data.name).attr("target", "_blank").addClass("text-success"); if (typeof uploaderCallback === "function") { var res = uploaderCallback(file, data, index); diff --git a/resources/views/admin/paramedic/create.blade.php b/resources/views/admin/paramedic/create.blade.php index 621e566..68bb134 100755 --- a/resources/views/admin/paramedic/create.blade.php +++ b/resources/views/admin/paramedic/create.blade.php @@ -35,7 +35,7 @@ } function uploaderCallback(file, data, index) { - $('input[data-uploader-index=' + index + ']').val("/storage/" + (data.folder ? data.folder + "/" : "") + data.name); + $('input[data-uploader-index=' + index + ']').val("/storage/" + (data.folder && data.folder != "public" ? data.folder + "/" : "") + data.name); return true; } diff --git a/resources/views/admin/paramedic/index.blade.php b/resources/views/admin/paramedic/index.blade.php index 92c6794..cb8ee14 100755 --- a/resources/views/admin/paramedic/index.blade.php +++ b/resources/views/admin/paramedic/index.blade.php @@ -6,7 +6,6 @@