+
-
+
![]()
@@ -55,6 +56,7 @@ export default defineComponent({
const detailData = reactive({
frontBack:computed(()=>store.state.DesignDetail.frontBack),
designDetail:computed(()=>store.state.DesignDetail.designDetail),
+ selectDetail:computed(()=>store.state.DesignDetail.selectDetail),
isEditPattern:inject('isEditPattern') as any,
singleOveral:inject('singleOveral') as any,
detailBody:null as any,
@@ -67,7 +69,7 @@ export default defineComponent({
direction:'',
})
watch(()=>selectItem.selectDetail,(newValue,oldValue)=>{
- if(newValue.id == oldValue?.id)return
+ if(!newValue && newValue?.id == oldValue?.id)return
selectItem.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == newValue.id)
},{immediate: true,})
watch(()=>detailData.frontBack?.body?.path,(newVal)=>{
@@ -80,6 +82,9 @@ export default defineComponent({
let dom = document.querySelector('.molepositon .perview_img') as any
if(!detailData.frontBack?.body?.path || !dom)return
img.onload = () => {
+ if(!detailData.selectDetail?.id){
+ store.commit('DesignDetail/setDesignColthes',detailData.designDetail.clothes[0].id)
+ }
// resolve(img)
sacle = dom.parentNode.offsetWidth / img.width
detailData.frontBack.front.forEach((item:any,index:number) => {
@@ -462,14 +467,28 @@ export default defineComponent({
position: relative;
display: none;
&.active{
- display: block;
+ display: flex;
z-index: 2;
+ align-items: center;
+ justify-content: center;
+ }
+ &.imgDesignImg{
+ > .designOpenrtion_imgMask{
+ .detail_modal_item_front{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ img{
+ height: auto;
+ }
+ }
+ }
}
> .designOpenrtion_imgMask{
width: auto;
height: auto;
position: relative;
- height: 100%;
+ // height: 100%;
display: flex;
align-items: center;
justify-content: center;
@@ -491,9 +510,8 @@ export default defineComponent({
width: 100%;
img{
width: 100%;
+ // height: ;
height: 100%;
- // width: 100%;
- // height: auto;
float: left;
user-select:none;
-webkit-user-drag: none;
diff --git a/src/component/HomePage/NewCollectionReview.vue b/src/component/HomePage/NewCollectionReview.vue
index d9debc0c..2b717b6d 100644
--- a/src/component/HomePage/NewCollectionReview.vue
+++ b/src/component/HomePage/NewCollectionReview.vue
@@ -59,12 +59,12 @@
+
-
-
{{$t('collectionModal.Mannequin')}}
+
![]()
@@ -89,7 +89,6 @@
@@ -107,6 +106,9 @@ import { useStore } from "vuex";
export default defineComponent({
components:{MoodTemplate},
emits:['openCollection'],
+ props:{
+
+ },
setup(props, { emit }) {
const store:any = useStore();
let sketch:any = ref([[],[],[]])
@@ -114,15 +116,18 @@ export default defineComponent({
return store.state.UploadFilesModule.showSketchboard})
let allBoardData:any = computed(()=>{
return store.state.UploadFilesModule.allBoardData})
- let probjects:any = computed(()=>{
- return store.state.Workspace.probjects})
+ // let probjects:any = computed(()=>{
+ // return store.state.Workspace.probjects})
+ const selectProbject = computed(()=>{
+ return store.state.Workspace.probjects
+ })
const openCollection = (str:any)=>{
emit('openCollection',str)
}
return {
store,
allBoardData,
- probjects,
+ selectProbject,
sketch,
sketchList,
openCollection,
diff --git a/src/component/HomePage/bindEmail.vue b/src/component/HomePage/bindEmail.vue
index 461f9f0b..872278b0 100644
--- a/src/component/HomePage/bindEmail.vue
+++ b/src/component/HomePage/bindEmail.vue
@@ -203,7 +203,7 @@ export default defineComponent({
registerModel:computed(()=>{
return store.state.UserHabit.bindEmail.isBindEmail
}),
- // registerModel:false,
+ // registerModel:true,
bindType:computed(()=>{
return store.state.UserHabit.bindEmail.type
}),
diff --git a/src/component/HomePage/createSlogan.vue b/src/component/HomePage/createSlogan.vue
index 5fe3d382..95ff14e8 100644
--- a/src/component/HomePage/createSlogan.vue
+++ b/src/component/HomePage/createSlogan.vue
@@ -57,9 +57,23 @@
{{ $t('createSlogan.FontFamily') }}
-
+
@@ -93,11 +107,13 @@ import allOrder from "@/component/Pay/allOrder.vue";
import creditsDetail from "@/component/Pay/creditsDetail.vue";
import { JSSetRemoveImage } from "@/tool/canvasDrawing";
import { useI18n } from "vue-i18n";
+import generalMenu from "@/component/HomePage/generalMenu.vue";
export default defineComponent({
components: {
creditsDetail,
allOrder,
+ generalMenu,
},
emits: ['setSloganData'],
setup(props,{emit}) {
diff --git a/src/component/HomePage/generalMenu.vue b/src/component/HomePage/generalMenu.vue
index 3ba3d705..58a9f04a 100644
--- a/src/component/HomePage/generalMenu.vue
+++ b/src/component/HomePage/generalMenu.vue
@@ -1,5 +1,5 @@
-
+
@@ -10,46 +10,34 @@
{{ item?.name }}
-
- {{ item?.label }}
- {{ item?.name }}
+ {{ item?.label }}
+ {{ item?.name }}
-
+
-
- - {{ $t('Generate.referenceImage') }} - {{ listItem?.label }} {{ listItem?.name }}
- {{ listItem?.label }} - {{ listItem?.name }} + {{ listItem?.label }} + {{ listItem?.name }}
-
-
-
+
+
{{ $props.text }}
@@ -70,6 +70,9 @@
});
}
}
+ const toGmailLogin = ()=>{
+ message.info(t('account.canNotUtilize'))
+ }
onBeforeUnmount(()=>{
var existingScript = document.querySelector(`script[src="${data.scriptSrc}"]`);
if(existingScript){
@@ -78,9 +81,10 @@
}
})
onMounted(()=>{
- createGmailLogin()
+ // createGmailLogin()
})
return {
+ toGmailLogin,
}
},
})
diff --git a/src/component/LoginPage/login/enterprise.vue b/src/component/LoginPage/login/enterprise.vue
index e6f222b9..0f94eaba 100644
--- a/src/component/LoginPage/login/enterprise.vue
+++ b/src/component/LoginPage/login/enterprise.vue
@@ -102,7 +102,12 @@
{{ $props.text }}