From 89c47f7a602b114cb808cc93791a8dbfcd793d0b Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 28 Nov 2022 11:33:26 +0800 Subject: [PATCH 01/13] =?UTF-8?q?init=20=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 16 ++ package.json | 50 +++--- src/App.vue | 4 +- src/api/api.js | 20 +++ src/api/request.js | 75 ++++++++ src/mock/index.js | 12 ++ src/mock/mocks/ballot.js | 97 +++++++++++ src/mock/mocks/debate.js | 3 + src/mock/mocks/face.js | 76 +++++++++ src/mock/mocks/task.js | 254 ++++++++++++++++++++++++++++ src/router/config.js | 8 +- src/views/discuss/DiscussDetail.vue | 7 +- vite.config.js | 25 +++ webstorm.config.js | 19 +++ 14 files changed, 636 insertions(+), 30 deletions(-) create mode 100644 index.html create mode 100644 src/api/api.js create mode 100644 src/api/request.js create mode 100644 src/mock/index.js create mode 100644 src/mock/mocks/ballot.js create mode 100644 src/mock/mocks/debate.js create mode 100644 src/mock/mocks/face.js create mode 100644 src/mock/mocks/task.js create mode 100644 vite.config.js create mode 100644 webstorm.config.js diff --git a/index.html b/index.html new file mode 100644 index 0000000..5d3bac5 --- /dev/null +++ b/index.html @@ -0,0 +1,16 @@ + + + + + + + 京东方 + + + +
+ + + diff --git a/package.json b/package.json index dfd3785..23a462d 100644 --- a/package.json +++ b/package.json @@ -1,31 +1,41 @@ { - "name": "stu_h5", + "name": "jdfstudy", "version": "0.1.0", "private": true, "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint" + "dev": "vite", + "server": "vite build && vite preview", + "build": "vite build" }, "dependencies": { - "core-js": "^3.8.3", - "element-plus": "^2.2.17", - "vue": "^3.2.13", - "vue-router": "^4.0.3", - "vuex": "^4.0.0" + "axios": "^1.1.3", + "core-js": "^3.26.0", + "dayjs": "^1.11.6", + "element-plus": "^2.2.20", + "vue": "^3.2.45", + "vue-router": "^4.1.6", + "vuex": "^4.1.0" }, "devDependencies": { - "@babel/core": "^7.12.16", - "@babel/eslint-parser": "^7.12.16", - "@vue/cli-plugin-babel": "~5.0.0", - "@vue/cli-plugin-eslint": "~5.0.0", - "@vue/cli-plugin-router": "~5.0.0", - "@vue/cli-plugin-vuex": "~5.0.0", - "@vue/cli-service": "~5.0.0", - "eslint": "^7.32.0", - "eslint-plugin-vue": "^8.0.3", - "sass": "^1.32.7", - "sass-loader": "^12.0.0" + "@babel/core": "^7.20.2", + "@babel/eslint-parser": "^7.19.1", + "@vitejs/plugin-legacy": "^2.3.1", + "@vitejs/plugin-vue": "^3.2.0", + "@vue/cli-plugin-babel": "~5.0.8", + "@vue/cli-plugin-eslint": "~5.0.8", + "@vue/cli-plugin-router": "~5.0.8", + "@vue/cli-plugin-vuex": "~5.0.8", + "@vue/cli-service": "~5.0.8", + "ajv": "^8", + "eslint": "^8.27.0", + "eslint-plugin-vue": "^9.7.0", + "mockjs": "^1.1.0", + "sass": "^1.56.1", + "sass-loader": "^13.2.0", + "vite": "^3.2.3", + "vite-plugin-imp": "^2.3.1", + "vite-plugin-mock": "^2.9.6", + "vite-plugin-style-import": "^2.0.0" }, "eslintConfig": { "root": true, diff --git a/src/App.vue b/src/App.vue index c430b25..b0b5420 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@ @@ -78,7 +70,7 @@ export default { diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 9543b37..bb0ee61 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -1,6 +1,7 @@ - diff --git a/src/views/homeworkpage/HomeworkPage.vue b/src/views/homeworkpage/HomeworkPage.vue index e5a6df8..c272ac0 100644 --- a/src/views/homeworkpage/HomeworkPage.vue +++ b/src/views/homeworkpage/HomeworkPage.vue @@ -1,123 +1,206 @@ - @@ -136,7 +219,7 @@ export default { display: flex; justify-content: center; // margin-top: -17.5px; - margin-top: 20px; + margin-top: 10px; .noticebox { width: 100%; background: #fff; @@ -144,60 +227,60 @@ export default { position: relative; display: flex; justify-content: center; - .line{ - width: 100%; - height: 0; - border-top: 1px solid #F1F2F3; - margin-top: 17px; - position:absolute; - left:0; - } + .line { + width: 100%; + height: 0; + border-top: 1px solid #f1f2f3; + margin-top: 17px; + position: absolute; + left: 0; + } .mani { width: 90%; margin-top: 20px; // position:relative; - .joininfo{ - color:#0D233A; + .joininfo { + color: #0d233a; font-size: 16px; font-weight: bold; } - - .contenttitle{ - width:100%; + + .contenttitle { + width: 100%; // height:10px; margin-top: 15px; // background-color: #bfa; - display:flex; - .timeimg{ + display: flex; + .timeimg { width: 12.8px; height: 13px; } - .timee{ - color:#6E7B84; + .timee { + color: #6e7b84; font-size: 14px; line-height: 13px; margin-left: 6px; } } - .timebox{ - display:flex; + .timebox { + display: flex; width: 100%; - height:49px; - background-color:#F2F5F7; + height: 49px; + background-color: #f2f5f7; margin-top: 17.5px; margin-bottom: 27.5px; border-radius: 10px; - .samez{ - color:#0060FF; + .samez { + color: #0060ff; font-size: 18px; line-height: 49px; margin-left: 13px; } - .samey{ - color:#6E7B84; + .samey { + color: #6e7b84; font-size: 14px; line-height: 49px; - + margin-left: 13px; } } @@ -208,49 +291,52 @@ export default { width: 100%; margin-bottom: 20px; // height: 200px; - - .ballotdetail{ - color:#6E7B84; + + .ballotdetail { + color: #6e7b84; line-height: 30px; font-size: 13px; } - .hiscon{ + .hiscon { width: 100%; - .historyitem{ + .historyitem { // margin-left: 21px; width: 100%; border-radius: 4px; - .itemtime{ - color:#6E7B84; + .itemtime { + color: #6e7b84; margin-left: 21px; font-size: 12px; margin-top: 11px; } - .itemtitle{ + .itemtitle { line-height: 22px; font-size: 13px; - color:#333330; - margin:10.5px 0 10.5px 21px; + color: #333330; + margin: 10.5px 0 10.5px 21px; + width: 90%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } } - } - .btnc{ - width:100%; - display: flex; - justify-content: center; - .btncc{ - margin-bottom: 19px; - height:33px; - width:88%; - border:0; - background-color: #2478FF; - border-radius: 6px; - color:#fff; - font-size: 14px; - } + .btnc { + width: 100%; + display: flex; + justify-content: center; + .btncc { + margin-bottom: 19px; + height: 33px; + width: 88%; + border: 0; + background-color: #2478ff; + border-radius: 6px; + color: #fff; + font-size: 14px; } + } } } } diff --git a/src/views/homeworkpage/UploadWork.vue b/src/views/homeworkpage/UploadWork.vue index 7fdcb37..375d4cb 100644 --- a/src/views/homeworkpage/UploadWork.vue +++ b/src/views/homeworkpage/UploadWork.vue @@ -1,4 +1,9 @@ - +