Merge branch 'StableVersion' of https://e.coding.net/aidlabfashion/aida/aida_front into StableVersion

.env.dev

@@ -6,7 +6,7 @@ NODE_ENV = 'development'
 VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 # VUE_APP_BASE_URL = 'https://www.api.aida.com.hk'
 # 佩佩
-VUE_APP_BASE_URL = 'http://192.168.1.4:5567'
+# VUE_APP_BASE_URL = 'http://192.168.1.4:5567'
 # 海波
 # VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
 

src/assets/style/style.css

@@ -1843,6 +1843,71 @@ textarea:focus {
   top: 0rem;
   border: 1px solid #dcdfe6;
 }
+.collection_modal_body .input_border .generage_btn_box,
+.design_detail_modal_component .input_border .generage_btn_box,
+.library_page .input_border .generage_btn_box,
+.productImg_modal .input_border .generage_btn_box,
+.accountEdit_page .input_border .generage_btn_box,
+.generalMenu_printModel_upload .input_border .generage_btn_box {
+  position: relative;
+  display: flex;
+  align-items: center;
+}
+.collection_modal_body .input_border .generage_btn_box .icon-xiala,
+.design_detail_modal_component .input_border .generage_btn_box .icon-xiala,
+.library_page .input_border .generage_btn_box .icon-xiala,
+.productImg_modal .input_border .generage_btn_box .icon-xiala,
+.accountEdit_page .input_border .generage_btn_box .icon-xiala,
+.generalMenu_printModel_upload .input_border .generage_btn_box .icon-xiala {
+  margin-left: 1rem;
+  transition: all 0.3s;
+  cursor: pointer;
+}
+.collection_modal_body .input_border .generage_btn_box .icon-xiala.active,
+.design_detail_modal_component .input_border .generage_btn_box .icon-xiala.active,
+.library_page .input_border .generage_btn_box .icon-xiala.active,
+.productImg_modal .input_border .generage_btn_box .icon-xiala.active,
+.accountEdit_page .input_border .generage_btn_box .icon-xiala.active,
+.generalMenu_printModel_upload .input_border .generage_btn_box .icon-xiala.active {
+  transform: rotate(180deg);
+}
+.collection_modal_body .input_border .generage_btn_box .content,
+.design_detail_modal_component .input_border .generage_btn_box .content,
+.library_page .input_border .generage_btn_box .content,
+.productImg_modal .input_border .generage_btn_box .content,
+.accountEdit_page .input_border .generage_btn_box .content,
+.generalMenu_printModel_upload .input_border .generage_btn_box .content {
+  position: absolute;
+  top: 100%;
+  width: calc(100% - 2rem);
+  left: 2rem;
+  text-align: center;
+  border-radius: calc(1rem*1.2);
+  overflow: hidden;
+  z-index: 3;
+  margin-top: 0.2rem;
+}
+.collection_modal_body .input_border .generage_btn_box .content > div,
+.design_detail_modal_component .input_border .generage_btn_box .content > div,
+.library_page .input_border .generage_btn_box .content > div,
+.productImg_modal .input_border .generage_btn_box .content > div,
+.accountEdit_page .input_border .generage_btn_box .content > div,
+.generalMenu_printModel_upload .input_border .generage_btn_box .content > div {
+  background: #cccccc;
+  line-height: 2;
+  cursor: pointer;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.collection_modal_body .input_border .generage_btn_box .content > div:hover,
+.design_detail_modal_component .input_border .generage_btn_box .content > div:hover,
+.library_page .input_border .generage_btn_box .content > div:hover,
+.productImg_modal .input_border .generage_btn_box .content > div:hover,
+.accountEdit_page .input_border .generage_btn_box .content > div:hover,
+.generalMenu_printModel_upload .input_border .generage_btn_box .content > div:hover {
+  background: #999999;
+}
 .collection_modal_body .input_border .generage_btn,
 .design_detail_modal_component .input_border .generage_btn,
 .library_page .input_border .generage_btn,
@@ -1850,6 +1915,7 @@ textarea:focus {
 .accountEdit_page .input_border .generage_btn,
 .generalMenu_printModel_upload .input_border .generage_btn {
   margin-left: 2rem;
+  display: flex;
 }
 .collection_modal_body .upload_item,
 .design_detail_modal_component .upload_item,

src/assets/style/style.less

@@ -1794,9 +1794,45 @@ textarea:focus{
 		// 	color: red;
 		// 	width: 100%;
 		// }
+		.generage_btn_box{
+			position: relative;
+			display: flex;
+			align-items: center;
+			.icon-xiala{
+				margin-left: 1rem;
+				transition: all .3s;
+				cursor: pointer;
+				&.active{
+					transform: rotate(180deg);
+				}
+			}
+			.content{
+				position: absolute;
+				top: 100%;
+				width: calc(100% - 2rem);
+				left: 2rem;
+				text-align: center;
+				border-radius: calc(1rem* 1.2);
+				overflow: hidden;
+				z-index: 3;
+				margin-top: .2rem;
+				>div{
+					background: #cccccc;
+					line-height: 2;
+					cursor: pointer;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+				>div:hover{
+					background: #999999;
+				}
+			}
+		}
 		.generage_btn{
 			// margin: 0 auto;
 			margin-left: 2rem;
+			display: flex;
 		}
 	}
 	

src/component/HomePage/Generate.vue

@@ -126,8 +126,27 @@
 					@click.stop=""
 					v-model="searchPictureName"
 				></textarea>
-				<div v-show="!isGenerate" class="generage_btn started_btn" :class="{Guide_1_2_8:type_.type2 == 'Printboard'}" @click.stop="getgenerate">
+				<div class="generage_btn_box" v-show="!isGenerate">
-					{{ $t('Generate.Generate') }}
+					<div class="generage_btn started_btn">
+						<div :class="{Guide_1_2_8:type_.type2 == 'Printboard'}" @click.stop="getgenerate">
+							<span 
+								v-if="
+								type_.type2 == 'Moodboard' || 
+								(type_.type2 == 'Printboard' && scene?.value == 'Pattern') || 
+								(type_.type2 == 'Sketchboard' && scene?.value == 'generate')"
+								>
+								{{ speedData.label }}
+							</span>
+							<span v-else>{{ $t('Generate.Generate') }}</span>
+						</div>
+						<div class="icon iconfont icon-xiala" v-show="
+							type_.type2 == 'Moodboard' || 
+							(type_.type2 == 'Printboard' && scene?.value == 'Pattern') || 
+							(type_.type2 == 'Sketchboard' && scene?.value == 'generate')" :class="{active:speedState}" @click.stop="openSpeed"></div>
+					</div>
+					<div class="content" v-show="speedState">
+						<div v-for="item in speedList" :key="item.value" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
+					</div>
 				</div>
 				<div v-show="isGenerate && !remGenerate" class="generage_btn started_btn" :class="{Guide_1_2_8:type_.type2 == 'Printboard'}" @click="getgenerate">
 					<i class="fi fi-br-loading"></i>
@@ -181,7 +200,7 @@
 <script lang="ts">
 import { LoadingOutlined } from "@ant-design/icons-vue";
 import { message, Upload, Modal } from "ant-design-vue";
-import { defineComponent, computed, createVNode, h, ref,watch, nextTick, inject } from "vue";
+import { defineComponent, computed, reactive, createVNode, h, ref,watch, nextTick, inject, toRefs } from "vue";
 import { Https } from "@/tool/https";
 import { useStore } from "vuex";
 import GO from "@/tool/GO";
@@ -242,6 +261,37 @@ export default defineComponent({
 		let generateLevel2Type = ''
 		let isSloganHint:any = ref(' ')
 		let loadingShow =ref(false)
+		let speed = reactive({
+			speedList:[
+				{
+					title:'Picture quality is average, speed is fast',
+					label:'Low Quality',
+					value:'fast',
+
+				},{
+					title:'Picture quality is high, speed is slow',
+					label:'High Quality',
+					value:'high',
+				},
+			],
+			speedState:false,
+			speedData:{
+				title:'Picture quality is average, speed is fast',
+				label:'Low Quality',
+				value:'fast',
+			},
+		})
+		const openSpeed = ()=>{
+			speed.speedState = !speed.speedState
+			if(speed.speedState){
+				document.addEventListener('click',openSpeed)
+			}else{
+				document.removeEventListener('click',openSpeed)
+			}
+		}
+		const setSpeed = (item:any)=>{
+			speed.speedData = item
+		}
         return {
             searchPictureName,
 			searchPictureSeed,
@@ -272,6 +322,9 @@ export default defineComponent({
 			generateLevel2Type,
 			isSloganHint,
 			loadingShow,
+			...toRefs(speed),
+			openSpeed,
+			setSpeed,
         };
     },
     data(prop) {
@@ -537,7 +590,7 @@ export default defineComponent({
 				seed:this.searchPictureSeed,
 				userId:this?.userInfo?.userId,
 				timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
-				version:1,//为1就是Print
+				version:this.speedData.value,//为1就是Print
 				isTestUser:this.driver__.driver?false:this.isTest,
 				gender:this.workspace.sexEnum.value,
 				sloganBase64:base64,

src/router/index.ts

@@ -320,7 +320,7 @@ let setMurmur = (id:any)=> {
 router.beforeEach((to:any, from, next) => {
     let upgradeList = ['/feedbackSurvey','/feedbackSurveyCN','emailVerify']//指定页面系统维护也可以访问
 	
-	// // 	系统维护
+	// 	系统维护
 	// const toName = to.name === 'upgrade';
 	// if(upgradeList.indexOf(to.path) > -1){
 	// 	next();

src/views/HomeView/library.vue

@@ -341,9 +341,24 @@
 												@click.stop=""
 												v-model="captionGeneration"
 											></textarea>
-											<div v-show="!isGenerate[selectCode]" class="generage_btn started_btn" @click.stop="getgenerate">
+											<div class="generage_btn_box" v-show="!isGenerate[selectCode]">
-												{{ $t('LibraryPage.Generate') }}
+												<div class="generage_btn started_btn">
-												<!-- <div v-show="isGenerate"><a-spin size="large" /></div> -->
+													
+													<div @click.stop="getgenerate">
+														<span v-if="
+														selectCode == 'Moodboard' || 
+														(selectCode == 'Printboard' && scene?.value == 'Pattern') || 
+														(selectCode == 'Sketchboard' && scene?.value == 'generate')">{{ speedData.label }}</span>
+														<span v-else>{{ $t('LibraryPage.Generate') }}</span>
+													</div>
+													<div class="icon iconfont icon-xiala" v-show="
+														selectCode == 'Moodboard' || 
+														(selectCode == 'Printboard' && scene?.value == 'Pattern') || 
+														(selectCode == 'Sketchboard' && scene?.value == 'generate')" :class="{active:speedState}" @click.stop="openSpeed"></div>
+												</div>
+												<div class="content" v-show="speedState">
+													<div v-for="item in speedList" :key="item.value" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
+												</div>
 											</div>
 											<div v-show="isGenerate[selectCode] && !remGenerate[selectCode]" class="generage_btn started_btn" @click.stop="getgenerate">
 												<i class="fi fi-br-loading"></i>
@@ -418,7 +433,7 @@
 </template>
 <script lang="ts">
 import { LoadingOutlined } from "@ant-design/icons-vue";
-import { defineComponent,h ,ref,createVNode,nextTick,watch,provide,computed} from 'vue'
+import { defineComponent,h ,ref,createVNode,nextTick,watch,provide,computed,reactive,toRefs} from 'vue'
 // import HeaderComponent from "@/component/HomePage/Header.vue";
 import ModelPlacement from '@/component/LibraryPage/ModelPlacement.vue';
 // import ModelPlacement from '@/component/LibraryPage/ModelPlacementUpdata.vue';
@@ -598,6 +613,37 @@ export default defineComponent({
 		let generateLevel2:any = {}
 		let isSloganHint:any = ref('')
 		let printModelList:any = ref([])
+		let speed = reactive({
+			speedList:[
+			{
+					title:'Picture quality is average, speed is fast',
+					label:'Low Quality',
+					value:'fast',
+
+				},{
+					title:'Picture quality is high, speed is slow',
+					label:'High Quality',
+					value:'high',
+				},
+			],
+			speedState:false,
+			speedData:{
+				title:'Picture quality is average, speed is fast',
+				label:'Low Quality',
+				value:'fast',
+			},
+		})
+		const openSpeed = ()=>{
+			speed.speedState = !speed.speedState
+			if(speed.speedState){
+				document.addEventListener('click',openSpeed)
+			}else{
+				document.removeEventListener('click',openSpeed)
+			}
+		}
+		const setSpeed = (item:any)=>{
+			speed.speedData = item
+		}
 		let getSex = () =>{
 			sex.value = store.state.UserHabit.sex.value[0].value
 			getPosition()
@@ -738,6 +784,9 @@ export default defineComponent({
 			getLibraryList,
 			getClass,
 			printModelList,
+			...toRefs(speed),
+			openSpeed,
+			setSpeed,
         }
     },
 	data(this_) {
@@ -1451,7 +1500,7 @@ export default defineComponent({
 				text:sloganText,
 				seed:this.searchPictureSeed,
 				timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
-				version:1,//为1就是Print
+				version:this.speedData.value,//为1就是Print
 				gender:selectCodeStr == 'Sketchboard'?this.sex:'',
 				sloganBase64:base64,
 			}
@@ -1940,10 +1989,11 @@ export default defineComponent({
 									.input_border{
 										padding-bottom: 0;
 										background: rgba(0, 0, 0, 0);
-										width: 50rem;
+										width: 55rem;
 										.input_box_btnBox{
 											background: #fff;
 											align-items: center;
+											width:65%;
 											.search_input{
 												height: 3rem;
 											}

src/views/Upgrade.vue

@@ -5,13 +5,13 @@
 				<i class="fi fi-rr-settings"></i>
 			</div>
 			<div class="upgrade-content-wire"></div>
-			<div class="upgrade-content-text">System upgrading</div>
+			<!-- <div class="upgrade-content-text">System upgrading</div> -->
-			<!-- <div class="upgrade-content-text">System maintenance</div> -->
+			<div class="upgrade-content-text">System maintenance</div>
 			<!-- 没有截至时间 -->
-			<div class="upgrade-content-textab">Due to the system server upgrade, we will start the upgrade from 9:30 am Hong Kong time on the weekend of October 20th until October 21st. During this time,<br> the AiDA system will be temporarily inaccessible. We apologize for any inconvenience this may cause and thank you for your understanding.</div>
+			<!-- <div class="upgrade-content-textab">Due to the system server upgrade, we will start the upgrade from 9:30 am Hong Kong time on the weekend of October 20th until October 21st. During this time,<br> the AiDA system will be temporarily inaccessible. We apologize for any inconvenience this may cause and thank you for your understanding.</div> -->
 			<!-- 有截至时间 -->
 			<!-- <div class="upgrade-content-textab">Due to system server upgrades, We will be upgrading from 9:30 am Hong Kong time on Tuesday, July 9 until 17:00 PM on Tuesday, July 9. During this period, access to the AiDA system will be temporarily unavailable.<br> We apologize for any inconvenience this may cause and appreciate your understanding.</div> -->
-			<!-- <div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div> -->
+			<div class="upgrade-content-textab">The AiDA system cannot be accessed temporarily due to system server maintenance. We apologize for any inconvenience this may cause and thank you for your understanding.</div>
 		</div>
 	</div>
 </template>