Merge remote-tracking branch 'origin/StableVersion' into develop

src/component/Detail/DesignDetail.vue

@@ -28,8 +28,8 @@
                     <!-- <img class="detial_img" :src="designItemDetail.designItemUrl"> -->
 
 					<div v-show="imgDesignImg" class="detail_modal_body">
-						<div class="detail_modal_body_nav">
-							<div v-for="item,index in designItemDetail?.clothes" v-show="item.id" :class="{active:item.clothesOpen}" @click="clothesOpen(index)">
+						<div class="detail_modal_body_nav" :style="[(driver__.index == 35|| driver__.index == 36)?'transform: translate(-50%,0%)':'']">
+							<div v-for="item,index in designItemDetail?.clothes" v-show="item.id" :class="{active:item.clothesOpen,Guide_1_19:(index == 0 && (driver__.index == 35|| driver__.index == 36))}" @click="clothesOpen(index)">
 								<img :src="item?.path" alt="">
 								<i v-show="deleteShow" class="fi fi-br-cross" @click.stop="setDelete(index)"></i>
 							</div>
@@ -543,7 +543,7 @@ export default defineComponent({
 					if(this.driver__.driver){
 						nextTick().then(()=>{  
 							// driverObj__.moveNext();
-							driverObj__.moveTo(41);
+							driverObj__.moveTo(36);
 						})
 					}
                 }

src/component/Detail/DesignDetailAlter.vue

@@ -752,14 +752,14 @@ export default defineComponent({
 				// 	path:imgData?.url,
 				// 	designType: imgData?.designType
 				// }]
-				// if(this.driver__.driver){
-				// 	nextTick().then(()=>{
-				// 		driverObj__.moveNext();
-				// 	})
-				// }
+			
 				imgData.path = imgData.url
 				DesignDetailEnd.printsList.push(imgData)
-
+				if(this.driver__.driver){
+					nextTick().then(()=>{
+						driverObj__.moveNext();
+					})
+				}
 				// console.log(this.current.printObject,imgData); 
 			}else if(this.selectCode == 'DesignElements'){
 				imgData.path = imgData.url

src/component/Detail/DesignPrintOperation.vue

@@ -829,7 +829,9 @@ export default defineComponent({
 			}
 			this.designOpenrtion = false
 			if(this.driver__.driver){
-				driverObj__.moveNext();
+				nextTick(()=>{
+					driverObj__.moveNext();
+				})
 			}
 		},
 		clearModal(){

src/component/Detail/DesignPrintOperationMobile.vue

@@ -833,7 +833,9 @@ export default defineComponent({
 				this.designItemDetailTS = {}
 			}
 			if(this.driver__.driver){
-				driverObj__.moveNext();
+				nextTick(()=>{
+					driverObj__.moveNext();
+				})
 			}
 		},
 		clearModal(){

src/component/Detail/habit.vue

@@ -61,7 +61,7 @@
 					<span :title="workspaceItem.styleName">{{ workspaceItem.styleName }}</span>
 				</div>
 				<!-- <div class="button_second">选择</div> -->
-				<div class="started_btn" @click="setStyle">{{ $t('Habit.Select') }}</div>
+				<div class="started_btn" :class="[driver__.driver?'hideEvents':'']" @click="setStyle">{{ $t('Habit.Select') }}</div>
 			</div>
             <div class="habit_Overal_Single">
                 <div
@@ -726,7 +726,9 @@ export default defineComponent({
 					// this.openType.habit = false
 					nextTick().then(()=>{
 						// driverObj__.moveTo(2);
-						driverObj__.moveNext();
+						setTimeout(() => {
+							driverObj__.moveNext();
+						}, 300);
 						this.openType.model = false
 
 						// driverObj__.moveNext();