From 8178f896cacdb9ce08ff0ce8c549f529e313c9a9 Mon Sep 17 00:00:00 2001 From: fengyu Date: Tue, 6 Sep 2022 23:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 142 +++ .../modules/events/item-deal-detail-view.vue | 900 ++++++++++-------- 2 files changed, 647 insertions(+), 395 deletions(-) diff --git a/package-lock.json b/package-lock.json index 585f4db5..e3f6ea4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3002,9 +3002,15 @@ } }, "graceful-fs": { +<<<<<<< HEAD "version": "4.1.11", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", +>>>>>>> 5c4435b... update dealDetail "dev": true }, "lru-cache": { @@ -4780,9 +4786,15 @@ }, "dependencies": { "graceful-fs": { +<<<<<<< HEAD "version": "4.1.11", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", +>>>>>>> 5c4435b... update dealDetail "dev": true } } @@ -5128,10 +5140,16 @@ } }, "graceful-fs": { +<<<<<<< HEAD "version": "4.1.11", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" +>>>>>>> 5c4435b... update dealDetail }, "isarray": { "version": "1.0.0", @@ -5149,6 +5167,17 @@ "parse-json": "^2.2.0", "pify": "^2.0.0", "strip-bom": "^3.0.0" +<<<<<<< HEAD +======= + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "dev": true + } +>>>>>>> 5c4435b... update dealDetail } }, "minimatch": { @@ -5877,9 +5906,15 @@ }, "dependencies": { "graceful-fs": { +<<<<<<< HEAD "version": "4.1.11", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", +>>>>>>> 5c4435b... update dealDetail "dev": true } } @@ -6102,9 +6137,15 @@ }, "dependencies": { "graceful-fs": { +<<<<<<< HEAD "version": "4.1.11", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", +>>>>>>> 5c4435b... update dealDetail "dev": true } } @@ -6122,9 +6163,15 @@ }, "dependencies": { "graceful-fs": { +<<<<<<< HEAD "version": "4.1.11", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", +>>>>>>> 5c4435b... update dealDetail "dev": true } } @@ -6694,9 +6741,15 @@ }, "dependencies": { "graceful-fs": { +<<<<<<< HEAD "version": "4.2.8", "resolved": "https://registry.npmmirror.com/graceful-fs/download/graceful-fs-4.2.8.tgz", "integrity": "sha1-5BK40z9eAGWTy9PO5t+fLOu+gCo=" +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" +>>>>>>> 5c4435b... update dealDetail } } }, @@ -6972,12 +7025,28 @@ "graceful-fs": "~1.2.0", "inherits": "1", "minimatch": "~0.2.11" +<<<<<<< HEAD } }, "graceful-fs": { "version": "1.2.3", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-1.2.3.tgz", "integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=" +======= + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + } + } + }, + "graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" +>>>>>>> 5c4435b... update dealDetail }, "inherits": { "version": "1.0.2", @@ -7258,9 +7327,15 @@ } }, "graceful-fs": { +<<<<<<< HEAD "version": "2.0.3", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-2.0.3.tgz", "integrity": "sha1-fNLNsiiko/Nule+mzBQt59GhNtA=" +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" +>>>>>>> 5c4435b... update dealDetail }, "gulp-rename": { "version": "1.1.0", @@ -9049,9 +9124,15 @@ }, "dependencies": { "graceful-fs": { +<<<<<<< HEAD "version": "4.1.11", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", +>>>>>>> 5c4435b... update dealDetail "dev": true, "optional": true } @@ -9191,9 +9272,15 @@ }, "dependencies": { "graceful-fs": { +<<<<<<< HEAD "version": "4.1.11", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" +>>>>>>> 5c4435b... update dealDetail }, "strip-bom": { "version": "2.0.0", @@ -10141,9 +10228,15 @@ } }, "graceful-fs": { +<<<<<<< HEAD "version": "4.2.8", "resolved": "https://registry.npmmirror.com/graceful-fs/download/graceful-fs-4.2.8.tgz", "integrity": "sha1-5BK40z9eAGWTy9PO5t+fLOu+gCo=" +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" +>>>>>>> 5c4435b... update dealDetail }, "minimatch": { "version": "3.0.4", @@ -10942,9 +11035,15 @@ }, "dependencies": { "graceful-fs": { +<<<<<<< HEAD "version": "4.1.11", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" +>>>>>>> 5c4435b... update dealDetail } } }, @@ -13419,9 +13518,15 @@ }, "dependencies": { "graceful-fs": { +<<<<<<< HEAD "version": "4.1.11", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", +>>>>>>> 5c4435b... update dealDetail "dev": true }, "isarray": { @@ -15256,9 +15361,15 @@ }, "dependencies": { "graceful-fs": { +<<<<<<< HEAD "version": "2.0.3", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-2.0.3.tgz", "integrity": "sha1-fNLNsiiko/Nule+mzBQt59GhNtA=" +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" +>>>>>>> 5c4435b... update dealDetail } } }, @@ -15351,6 +15462,17 @@ "ssri": "^6.0.1", "unique-filename": "^1.1.1", "y18n": "^4.0.0" +<<<<<<< HEAD +======= + }, + "dependencies": { + "graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "dev": true + } +>>>>>>> 5c4435b... update dealDetail } }, "end-of-stream": { @@ -15414,10 +15536,16 @@ } }, "graceful-fs": { +<<<<<<< HEAD "version": "4.2.3", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", "dev": true +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" +>>>>>>> 5c4435b... update dealDetail }, "json-schema-traverse": { "version": "0.4.1", @@ -16355,6 +16483,14 @@ "resolved": "http://r.cnpmjs.org/clone/download/clone-0.2.0.tgz", "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" }, +<<<<<<< HEAD +======= + "graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + }, +>>>>>>> 5c4435b... update dealDetail "readable-stream": { "version": "1.0.34", "resolved": "http://r.cnpmjs.org/readable-stream/download/readable-stream-1.0.34.tgz", @@ -16513,9 +16649,15 @@ }, "dependencies": { "graceful-fs": { +<<<<<<< HEAD "version": "4.1.11", "resolved": "http://r.cnpmjs.org/graceful-fs/download/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", +======= + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", +>>>>>>> 5c4435b... update dealDetail "dev": true } } diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue index 3c8abd4a..d058a6d3 100644 --- a/src/views/modules/events/item-deal-detail-view.vue +++ b/src/views/modules/events/item-deal-detail-view.vue @@ -2,10 +2,10 @@
-
项目详情
+
议题详情
-
{{dataForm.itemContent}}
处理进展
- -
+ + +
- -
- -
-
-