Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

src/component/Account/frontPage.vue

@@ -6,7 +6,7 @@
 				<bind v-if="item.key == 'bind' && activeKey == 'bind'" :ref="item.key"></bind>
 				<cancelRenewal v-if="item.key == 'cancelRenewal' && activeKey == 'cancelRenewal'" :ref="item.key"></cancelRenewal>
 				<template #tab>
-					<a-badge :count="0" >
+					<a-badge :count="0" v-if="!(item.key == 'cancelRenewal' && [5,6,7,8].includes(userDetail.systemUser))">
 						<span>{{item.title}}</span>
 					</a-badge>
 				</template>

src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue

@@ -115,6 +115,13 @@ export default defineComponent({
                     width: 100,
                     dataIndex: "status",
                     key: "status",
+                },{
+                    title: 'Visits',
+                    align: "center",
+                    ellipsis: true,
+                    width: 100,
+                    dataIndex: "visits",
+                    key: "visits",
                 },{
                     title: 'Commission Percent',
                     align: "center",

src/component/home/tools/poseTransfer/index.vue

@@ -65,8 +65,9 @@
 							</div>
 						</div>
 					</div>
-					<div style="width: 100%; height: 100px;">
-						<promptInput :content="prompt" ref="promptInput"></promptInput>
+					<div class="prompt-input-container" v-show="!showMotion">
+						<div class="title">{{ $t('ProductImg.Prompt') }}</div>
+						<promptInput :content="prompt" ref="promptInput" />
 					</div>
 					<div class="poses" v-show="showMotion">
 						<div class="head">
@@ -338,6 +339,7 @@ export default defineComponent({
 			data.isGenerate = true
 			// data.remGenerateTime = setTimeout(()=>{
 			// },10000)
+			// const promptText = dataDom.promptInput.getFullText()
 			let value = {
 				poseId:data.selectPose,
 				projectId:store.state.Workspace.probjects.id,
@@ -785,11 +787,7 @@ export default defineComponent({
 		> .configuratioBox > .configuratio{
 			width: 100%;
 			padding-bottom: 1rem;
-			> .title{
-				// font-size: 2.6rem;
-			}
 			> .content{
-				// margin-top: 4rem;
 				> .selectImg,> .poses{
 					display: flex;
 					flex-direction: column;
@@ -799,15 +797,12 @@ export default defineComponent({
 						margin-top: 2rem;
 						display: flex;
 						flex-wrap: nowrap;
-						// justify-content: space-between;
 						width: 100%;
 						overflow: hidden;
 						overflow-x: auto;
 						column-gap: 2.4rem;
 						position: relative;
 						> .item{
-							// width: calc(100% / 2 - .5rem);
-							// height: 25rem;
 							width: 12.7rem;
 							height: 17.8rem;
 							cursor: pointer;
@@ -816,9 +811,6 @@ export default defineComponent({
 							justify-content: center;
 							flex-shrink: 0;
 							position: relative;
-							// &.active{
-							// 	border: 2px solid;
-							// }
 							:deep(.ant-checkbox-wrapper){
 								position: absolute;
 								top: 2rem;
@@ -934,8 +926,15 @@ export default defineComponent({
 							font-size: 1.6rem;
 						}
 					}
+				}	
+				.prompt-input-container{
+					margin-top: 4rem;
+				}
+				.title{
+					font-size: 1.8rem;
+					color: #000;
+					margin-bottom: 1.4rem;
 				}
-			
 				> .poses{
 					margin-top: 3rem;
 				}