From 7daed98dfc6a6d5bc1bf822319cd99701a802895 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 27 Mar 2024 17:49:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AB=98=E6=B8=85=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=80=8D=E7=8E=87=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/HomePage/ExportModel.vue | 39 +++++++++++++++-----------
 src/component/HomePage/TaskPage.vue    |  2 +-
 src/tool/guide.js                      |  1 -
 src/views/HomeMain.vue                 |  1 +
 src/views/LoginPage.vue                |  1 -
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index e12eab3b..98a7be03 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -229,14 +229,16 @@
 				<div class="SRExport_operate_box">
 					<div>{{ $t('exportModel.Scale') }}:</div>
 					<!-- <input type="number" @input="setMaxInput('scale', 500)" v-model="scaleSR"/> -->
-					<a-select ref="select" class="SRExport_operate_sclae" size="small" v-model:value="scaleSR"
+					<!-- <a-select ref="select" class="SRExport_operate_sclae" size="small" v-model:value="scaleSR"
 						style="flex: 1"
 						@change="setScaleSR"
 						>
-						<!-- v-model:value="brushwork" -->
 						<a-select-option class="label_select_item" v-for="item in scaleSRList" :value="item.value">
 						</a-select-option>
-					</a-select>
+					</a-select> -->
+					<div class="SRExport_operate_item_sclae" :class="{active:scaleSR==2}" @click="setScaleSR(2)">2</div>
+					<div class="SRExport_operate_item_sclae" :class="{active:scaleSR==4}" @click="setScaleSR(4)">4</div>
+					<div class="SRExport_operate_item_sclae" :class="{active:scaleSR==6}" @click="setScaleSR(6)">6</div>
 				</div>
 				<div :class="['check_all_block',allChecked ? 'check_all' : '']" @click="selectAllImg()">
 					<div class="check_block"><div class="check_block_body"></div></div>
@@ -1408,18 +1410,7 @@ export default defineComponent({
 		}
 		let allExportSR = ref([])
 		let scaleSR = ref(2);
-		let scaleSRList = ref([
-			{
-				value:2,
-				label:2
-			},{
-				value:4,
-				label:4
-			},{
-				value:6,
-				label:6
-			},
-		]);
+		
 		let setScaleSR = (value)=>{
 			scaleSR.value = value
 		}
@@ -1522,7 +1513,6 @@ export default defineComponent({
 			brushworkValue,//当前笔触
 			textureValue,//当前材质
 			scaleSR,
-			scaleSRList,
 			setScaleSR,
 			//SR页面
 			showSRExport,
@@ -1883,8 +1873,25 @@ export default defineComponent({
 			>div {
 				width: 5rem;
 			}
+			.SRExport_operate_item_sclae{
+				width: 4rem;
+				height: 3rem;
+				border: .2rem solid rgba(0, 0, 0, 0.3);
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-right: 1rem;
+				cursor: pointer;
+				border-radius: .4rem;
+				font-weight: 600;
+				&.active{
+					border-color: rgba(152, 139, 247);
+					color: rgba(152, 139, 247);
+				}
+			}
 			.SRExport_operate_sclae{
 				max-width: 15rem;
+				
 			}
 			
 			// input {
diff --git a/src/component/HomePage/TaskPage.vue b/src/component/HomePage/TaskPage.vue
index 765855fe..f2fdd213 100644
--- a/src/component/HomePage/TaskPage.vue
+++ b/src/component/HomePage/TaskPage.vue
@@ -230,6 +230,7 @@ export default defineComponent({
 				startTime: "",
 			}
 			Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{
+				this.isShowMark = false
 				this.currentPage += 1
 				if(this.currentPage > 1 && rv.content.length == 0){
 					this.currentPage = 1
@@ -247,7 +248,6 @@ export default defineComponent({
 					if(!this.getTaskTime){
 						this.getTaskList()
 					}
-					this.isShowMark = false
 					// if(this.taskListMore.indexOf('success'))
 				}
 			}).catch((rv) => {
diff --git a/src/tool/guide.js b/src/tool/guide.js
index f72df578..dc027d70 100644
--- a/src/tool/guide.js
+++ b/src/tool/guide.js
@@ -137,7 +137,6 @@ function createDriver(){
 				driver : true,
 				stepsLenth:stepsLenth,
 			}
-			console.log(111);
 			store?.commit("setGuide", data);
 			if(options.state.activeIndex ==  0 ||
 				options.state.activeIndex ==  39
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 67c95006..1626d870 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -525,6 +525,7 @@ export default defineComponent({
 				margin-right: .9rem;
 				.credits_item{
 					transition: .3s all;
+					height: 4rem;
 					div{
 						height: 100%;
 					}
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
index b0e959f4..0dbac345 100644
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -246,7 +246,6 @@ export default defineComponent({
     setup(){
         let timer:any =  0;
 		const {locale} = useI18n()
-		WriteCookie("token");
 	
         return{
             timer,