From 9e784f03defb399588dfb51fb9372d67c60bb5db Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Mon, 8 Mar 2021 12:02:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package-lock.json | 19 ++-
src/components/Activity/ActivityDate.vue | 81 ++++++-----
src/components/Activity/ActivitySearch.vue | 131 +++++-------------
src/components/Page/PageDate.vue | 1 -
.../EnterpriseDate.vue => User/UserDate.vue} | 0
.../UserSearch.vue} | 0
src/config/api.js | 10 ++
src/plugins/ant-design-vue.js | 2 +
.../EventAnnouncement/EventAnnouncement.vue | 53 +++++--
src/views/IndustryInfo/IndustryInfo.vue | 44 ++++--
src/views/UserManage/UserManage.vue | 12 +-
yarn.lock | 14 +-
12 files changed, 205 insertions(+), 162 deletions(-)
rename src/components/{Enterprise/EnterpriseDate.vue => User/UserDate.vue} (100%)
rename src/components/{Enterprise/EnterpriseSearch.vue => User/UserSearch.vue} (100%)
diff --git a/package-lock.json b/package-lock.json
index bd67ef8..0e405bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
"register-service-worker": "^1.7.1",
"stylus": "^0.54.8",
"vue": "^2.6.11",
+ "vue-dompurify-html": "^2.3.0",
"vue-quill-editor": "^3.0.6",
"vue-router": "^3.2.0",
"vuex": "^3.4.0"
@@ -5807,6 +5808,11 @@
"domelementtype": "1"
}
},
+ "node_modules/dompurify": {
+ "version": "2.2.6",
+ "resolved": "https://registry.npm.taobao.org/dompurify/download/dompurify-2.2.6.tgz?cache=0&sync_timestamp=1608303432721&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdompurify%2Fdownload%2Fdompurify-2.2.6.tgz",
+ "integrity": "sha1-VJRdxcC0XOWuIocFd36OWdey7cQ="
+ },
"node_modules/domready": {
"version": "1.0.8",
"resolved": "https://registry.npm.taobao.org/domready/download/domready-1.0.8.tgz",
@@ -14621,6 +14627,17 @@
"integrity": "sha1-KdTrSCdcf+FbkuH9XZX74qlmQ28=",
"dev": true
},
+ "node_modules/vue-dompurify-html": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npm.taobao.org/vue-dompurify-html/download/vue-dompurify-html-2.3.0.tgz",
+ "integrity": "sha1-sXXt2lc2LPewPShkRo+mROBaKtA=",
+ "dependencies": {
+ "dompurify": "^2.0.0"
+ },
+ "peerDependencies": {
+ "vue": "^2.0.0"
+ }
+ },
"node_modules/vue-eslint-parser": {
"version": "7.1.1",
"resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-7.1.1.tgz?cache=0&sync_timestamp=1602498980660&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-7.1.1.tgz",
@@ -21159,7 +21176,7 @@
},
"dompurify": {
"version": "2.2.6",
- "resolved": "https://registry.npm.taobao.org/dompurify/download/dompurify-2.2.6.tgz",
+ "resolved": "https://registry.npm.taobao.org/dompurify/download/dompurify-2.2.6.tgz?cache=0&sync_timestamp=1608303432721&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdompurify%2Fdownload%2Fdompurify-2.2.6.tgz",
"integrity": "sha1-VJRdxcC0XOWuIocFd36OWdey7cQ="
},
"domready": {
diff --git a/src/components/Activity/ActivityDate.vue b/src/components/Activity/ActivityDate.vue
index 365a259..18fd6ac 100644
--- a/src/components/Activity/ActivityDate.vue
+++ b/src/components/Activity/ActivityDate.vue
@@ -5,7 +5,10 @@
:columns="columns"
:data-source="lists"
:loading="loading"
+ :pagination="pagination"
+ @change="handleTableChange"
:row-key="record => record.id"
+ :scroll="{ y: height }"
bordered
class="white"
>
@@ -13,6 +16,10 @@
{{ index + 1 }}
+
+ {{ record.releaseTime}}-{{record.releaseTime}}
+
+