diff --git a/src/components/gradientButton.vue b/src/components/gradientButton.vue
index 3acfb3a..a2968d9 100644
--- a/src/components/gradientButton.vue
+++ b/src/components/gradientButton.vue
@@ -48,11 +48,11 @@ const {} = toRefs(data);
left: 50%;
border-radius: var(--gradientButtonBorderRadius);
transform: translate(-50%, -50%);
- background: linear-gradient(125deg,
- #f1f1f1 0%,
- #000 40%,
- #000 65%,
- #fff 100%);
+ background: linear-gradient(156deg,
+ #d3d3d3 0%,
+ #8a8682 40%,
+ #8a8682 65%,
+ #ebebeb 100%);
}
}
\ No newline at end of file
diff --git a/src/components/selectStyle/selectItem.vue b/src/components/selectStyle/selectItem.vue
index c9baa4b..c3c2c73 100644
--- a/src/components/selectStyle/selectItem.vue
+++ b/src/components/selectStyle/selectItem.vue
@@ -82,22 +82,11 @@ const {} = toRefs(data);
-
-
+
-
-
+ -->
@@ -109,7 +98,7 @@ const {} = toRefs(data);
flex-wrap: wrap;
justify-content: space-between;
> .item{
- width: calc(50% - 3.1rem / 2);
+ width: calc(50% - 3.5rem / 2);
position: relative;
// margin-bottom: 3.3rem;
display: flex;
@@ -126,7 +115,7 @@ const {} = toRefs(data);
align-items: center;
flex-wrap: wrap;
height: 45rem;
- margin: 2.4rem 0;
+ margin: 2.3rem 0;
background-color: #fff;
justify-content: center;
border: .6px solid #acacac;
@@ -170,26 +159,26 @@ const {} = toRefs(data);
// max-height: 50%;
}
}
- > .btn{
- display: flex;
- align-items: center;
- justify-content: flex-end;
- > div{
- color: #000;
- margin-right: 1.2rem;
- border-radius: 50%;
- width: 5.2rem;
- height: 5.2rem;
- padding: 1rem;
- background-color: #fff;
- &:last-child{
- margin-right: 0rem;
- }
- &:hover{
- color: #000;
- }
- }
- }
+ // > .btn{
+ // display: flex;
+ // align-items: center;
+ // justify-content: flex-end;
+ // > div{
+ // color: #000;
+ // margin-right: 1.2rem;
+ // border-radius: 50%;
+ // width: 5.2rem;
+ // height: 5.2rem;
+ // padding: 1rem;
+ // background-color: #fff;
+ // &:last-child{
+ // margin-right: 0rem;
+ // }
+ // &:hover{
+ // color: #000;
+ // }
+ // }
+ // }
}
}
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index 307d257..4eed819 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -121,7 +121,7 @@ const router = createRouter({
{
path: '/workshop/selectStyle',
name: 'selectStyle',
- component: () => import('../views/Workshop/selectStyle.vue'),
+ component: () => import('../views/Workshop/selectStyle/index.vue'),
meta: { verify: () => VerifyIDs(2) }
},
{
diff --git a/src/stores/modules/generate.ts b/src/stores/modules/generate.ts
index 4be5501..f985ef3 100644
--- a/src/stores/modules/generate.ts
+++ b/src/stores/modules/generate.ts
@@ -15,7 +15,12 @@ export const useGenerateStore = defineStore({
isLike: false, //是否喜欢
status: ''
},
- styleList: [{}, {}, {}, {}],
+ styleList: [
+ {id:'',taskId:'',status:'',path:''},
+ {id:'',taskId:'',status:'',path:''},
+ {id:'',taskId:'',status:'',path:''},
+ {id:'',taskId:'',status:'',path:''},
+ ],
model: {
id: ''
},
@@ -98,6 +103,12 @@ export const useGenerateStore = defineStore({
taskId:'',
status: ''
}
+ this.styleList = [
+ {id:'',taskId:'',status:'',path:''},
+ {id:'',taskId:'',status:'',path:''},
+ {id:'',taskId:'',status:'',path:''},
+ {id:'',taskId:'',status:'',path:''},
+ ]
},
//模特相关
selectModel(data: any) {
@@ -107,7 +118,12 @@ export const useGenerateStore = defineStore({
this.isGenerate = isGenerate
},
clearProductData() {
- this.styleList = [{}, {}, {}, {}]
+ this.styleList = [
+ {id:'',taskId:'',status:'',path:''},
+ {id:'',taskId:'',status:'',path:''},
+ {id:'',taskId:'',status:'',path:''},
+ {id:'',taskId:'',status:'',path:''},
+ ]
this.style = {
id: '',
path: '',
diff --git a/src/views/Workshop/homeNav.vue b/src/views/Workshop/homeNav.vue
index e78924b..815cc8f 100644
--- a/src/views/Workshop/homeNav.vue
+++ b/src/views/Workshop/homeNav.vue
@@ -22,20 +22,6 @@ const navDisabledList = ref([])
// const data = reactive({
// })
-const clickSwitchVIPID = ()=>{
- showConfirmDialog({
- title: 'Switch VIP ID?',
- message: 'You have unsaved changes. Your progress will be lost.',
- confirmButtonText: 'Yes',
- cancelButtonText: 'Cancel',
- })
- .then(() => {
- MyEvent.emit('clear-generate-state')
- MyEvent.emit('clearAllCache')
- router.push({ name: 'customer', query: { demo: 1 } })
- })
- .catch(() => {})
-}
const openFlow = (item: any)=>{
item.click && item.click()
const query = route.query
diff --git a/src/views/Workshop/index.vue b/src/views/Workshop/index.vue
index 55d95c6..dadf8be 100644
--- a/src/views/Workshop/index.vue
+++ b/src/views/Workshop/index.vue
@@ -21,8 +21,11 @@
+
+
+
-
+
\ No newline at end of file
diff --git a/src/views/asistant/components/GenerateLoading.vue b/src/views/asistant/components/GenerateLoading.vue
index 721480e..0714ea7 100644
--- a/src/views/asistant/components/GenerateLoading.vue
+++ b/src/views/asistant/components/GenerateLoading.vue
@@ -113,7 +113,7 @@ onMounted(() => {
.loading-image {
width: 36.4rem;
height: 36.4rem;
- animation: rotate 1s linear infinite;
+ animation: rotate 1.5s ease-in-out infinite;
}
.loading-shadow {
@@ -146,11 +146,14 @@ onMounted(() => {
}
@keyframes rotate {
- from {
- transform: rotate(0deg);
+ 0% {
+ transform: translateY(0px);
}
- to {
- transform: rotate(360deg);
+ 50% {
+ transform: translateY(-100px);
+ }
+ 100% {
+ transform: translateY(0px);
}
}