From 5de3c2ccdd452bb2d7467894524de035cb20fcce Mon Sep 17 00:00:00 2001
From: icssoa <2570063477@qq.com>
Date: Wed, 10 Mar 2021 00:42:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20upload=20=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cool/modules/base/pages/login/index.vue  | 2 +-
 src/cool/modules/demo/views/demo.vue         | 4 ++--
 src/cool/modules/task/views/task.vue         | 2 +-
 src/cool/modules/upload/components/index.vue | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cool/modules/base/pages/login/index.vue b/src/cool/modules/base/pages/login/index.vue
index 2ebda8f..3a9618f 100644
--- a/src/cool/modules/base/pages/login/index.vue
+++ b/src/cool/modules/base/pages/login/index.vue
@@ -122,7 +122,7 @@ export default {
 	height: 100vh;
 	width: 100vw;
 	position: relative;
-	background-color: $color-primary;
+	background-color: #2f3447;
 
 	.box {
 		display: flex;
diff --git a/src/cool/modules/demo/views/demo.vue b/src/cool/modules/demo/views/demo.vue
index 312d97f..6abf40c 100644
--- a/src/cool/modules/demo/views/demo.vue
+++ b/src/cool/modules/demo/views/demo.vue
@@ -158,7 +158,7 @@ export default {
 			font-size: 12px;
 
 			span {
-				background-color: $color-primary;
+				background-color: #2f3447;
 				color: #fff;
 				border-radius: 3px;
 				padding: 2px 5px;
@@ -190,7 +190,7 @@ export default {
 						position: absolute;
 						bottom: -2px;
 						left: 0;
-						background-color: $color-primary;
+						background-color: #2f3447;
 					}
 				}
 			}
diff --git a/src/cool/modules/task/views/task.vue b/src/cool/modules/task/views/task.vue
index 5cb61f9..1bebf50 100644
--- a/src/cool/modules/task/views/task.vue
+++ b/src/cool/modules/task/views/task.vue
@@ -925,7 +925,7 @@ export default {
 						.date {
 							font-size: 12px;
 							color: #fff;
-							background-color: $color-primary;
+							background-color: #2f3447;
 							border-radius: 2px;
 							margin-left: 40px;
 							padding: 1px 3px;
diff --git a/src/cool/modules/upload/components/index.vue b/src/cool/modules/upload/components/index.vue
index 831dbb5..5a7d2f6 100644
--- a/src/cool/modules/upload/components/index.vue
+++ b/src/cool/modules/upload/components/index.vue
@@ -447,7 +447,7 @@ export default {
 						// 上传
 						this.$service.common
 							.request({
-								url: res.host,
+								url: res._host || res.host,
 								method: "POST",
 								headers: {
 									"Content-Type": "multipart/form-data"
@@ -460,9 +460,9 @@ export default {
 									}
 								}
 							})
-							.then(res => {
+							.then(url => {
 								if (mode === "local") {
-									resolve(res);
+									resolve(url);
 								} else {
 									resolve(`${res.host}/app/${fileName}`);
 								}
@@ -481,7 +481,7 @@ export default {
 							.upload()
 							.then(res => {
 								if (isDev) {
-									res.host = "@/oss-upload";
+									res._host = "@/oss-upload";
 								}
 
 								next(res);