diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index bf7e381..9596be4 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -15,6 +15,7 @@
:headers="headers"
:file-list="fileList"
:on-preview="handlePictureCardPreview"
+ :disabled="disabled"
:class="{hide: this.fileList.length >= this.limit}"
>
@@ -59,6 +60,10 @@ export default {
type: Number,
default: 5,
},
+ disabled: {
+ type: Boolean,
+ default: false,
+ },
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
diff --git a/src/utils/index.js b/src/utils/index.js
index df5db12..f51f998 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -14,6 +14,17 @@ export function formatDate(cellValue) {
var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
}
+/**
+ * 表格时间格式化
+ */
+export function formatDateDay(cellValue) {
+ if (cellValue == null || cellValue == "") return "";
+ var date = new Date(cellValue)
+ var year = date.getFullYear()
+ var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+ var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+ return year + '-' + month + '-' + day
+}
/**
* @param {number} time
diff --git a/src/views/member/apply/form/applyForm.vue b/src/views/member/apply/form/applyForm.vue
new file mode 100644
index 0000000..0dfca42
--- /dev/null
+++ b/src/views/member/apply/form/applyForm.vue
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审核详情
+
+
+
+
+
+
+
+
+
+
+ 申请信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审核信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/member/apply/index.vue b/src/views/member/apply/index.vue
index 4921abe..641e87c 100644
--- a/src/views/member/apply/index.vue
+++ b/src/views/member/apply/index.vue
@@ -1,38 +1,38 @@
-
-
+
-
-
-
-
-
-
-
-
-
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期">
+
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -40,68 +40,39 @@
-
- 新增
-
-
- 修改
-
-
- 删除
-
+
+
+
+
+
+
+
+
+
+
+
+
导出
+ @click="openHis"
+ >审核历史
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
- {{ parseTime(scope.row.approvalTime, '{y}-{m}-{d}') }}
+
-
+
+
修改
- 删除
+ >审核
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 申请信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审核信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/member/user/index.vue b/src/views/member/blogger/index.vue
similarity index 100%
rename from src/views/member/user/index.vue
rename to src/views/member/blogger/index.vue