fix
This commit is contained in:
@@ -43,7 +43,7 @@
|
||||
<div class="otherUser_works_title modal_title_text">
|
||||
<div>{{$t('account.hisWorks')}}</div>
|
||||
</div>
|
||||
<Works :isScroll="false" :otherUsers="true" :userId=userId></Works>
|
||||
<Works :isScroll="false" :otherUsers="true"></Works>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -63,7 +63,9 @@ export default defineComponent({
|
||||
const router:any = useRouter()
|
||||
const store = useStore();
|
||||
let otherUsers = reactive({
|
||||
userId:'0',
|
||||
userId:computed(()=>{
|
||||
return store.state.UserHabit.userDetail.userId
|
||||
}),
|
||||
userContent:{}
|
||||
})
|
||||
let getUserDetail = (id:any)=>{
|
||||
@@ -90,7 +92,6 @@ export default defineComponent({
|
||||
})
|
||||
}
|
||||
onMounted (()=>{
|
||||
otherUsers.userId = router.currentRoute.value.query?.userId
|
||||
// alert()
|
||||
setTimeout(() => {
|
||||
getUserDetail(otherUsers.userId)
|
||||
|
||||
@@ -286,7 +286,7 @@ onMounted(() => {
|
||||
:value="canvasWidth?.toFixed(2)"
|
||||
class="setting-input"
|
||||
:min="1"
|
||||
:max="9999"
|
||||
:max="4999"
|
||||
:step="1"
|
||||
@change="
|
||||
(value) => {
|
||||
@@ -302,7 +302,7 @@ onMounted(() => {
|
||||
:value="canvasHeight?.toFixed(2)"
|
||||
class="setting-input"
|
||||
:min="1"
|
||||
:max="9999"
|
||||
:max="4999"
|
||||
:step="1"
|
||||
@change="
|
||||
(value) => {
|
||||
|
||||
@@ -317,7 +317,7 @@ export default defineComponent({
|
||||
scale:[scale[0]?scale[0]:1,scale[1]?scale[1]:1],
|
||||
type:(newData && detailData.currentDetailType == 'sketch' && isCurrent)?newData.level2Type || newData.categoryValue:list[i].type,
|
||||
sketchString:list[i].sketchString?list[i].sketchString:'',
|
||||
trims:(newData && detailData.currentDetailType == 'element' && isCurrent)?{prints:newData}:list[i].trims?list[i].trims:{prints:[]},
|
||||
trims:(newData && detailData.currentDetailType == 'element' && isCurrent)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]},
|
||||
}
|
||||
if((list[i].color?.gradient || list[i].newDetail?.color?.gradient)){
|
||||
gradient = list[i].newDetail?.color?.gradient || list[i].color.gradient
|
||||
|
||||
@@ -339,7 +339,7 @@ export default defineComponent({
|
||||
editPrintElementData.stateOverallSingle = 'single'
|
||||
let arr:any = editPrintElementData.selectDetail.printObject.prints
|
||||
if(props.type == 'element'){
|
||||
arr = editPrintElementData.selectDetail.trims
|
||||
arr = editPrintElementData.selectDetail.trims.prints
|
||||
}
|
||||
if(editPrintElementData.selectDetail.newDetail?.[editPrintElementData.currentDetailType]){
|
||||
arr = editPrintElementData.selectDetail.newDetail[editPrintElementData.currentDetailType]
|
||||
|
||||
@@ -161,12 +161,12 @@
|
||||
<div v-show="!isProductimg" class="generage_btn started_btn" @click.stop="getPrductimg">
|
||||
{{ $t('Generate.Generate') }}
|
||||
</div>
|
||||
<div v-show="isProductimg && !remProductimg" class="generage_btn started_btn" @click="getPrductimg">
|
||||
<div v-show="isProductimg && remProductimg" class="generage_btn started_btn" @click="getPrductimg">
|
||||
<i class="fi fi-br-loading"></i>
|
||||
</div>
|
||||
<div v-show="remProductimg" @click="removeProductimg" class="generage_btn started_btn">
|
||||
<!-- <div v-show="remProductimg" @click="removeProductimg" class="generage_btn started_btn">
|
||||
{{$t('Generate.Close')}}
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -408,7 +408,7 @@ export default defineComponent({
|
||||
};
|
||||
const cancelDsign = () => {
|
||||
renew.renewModel = false;
|
||||
store.dispatch('getLangType')
|
||||
store.dispatch('getUserDetail')
|
||||
};
|
||||
const setPaymentType = (str: any) => {
|
||||
renewData.current.PaymentType = str;
|
||||
|
||||
@@ -113,12 +113,12 @@
|
||||
<div v-for="item in speedList" :key="item.value" :class="{active:item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="generage_btn started_btn" v-show="productimgIsProductimg && !productimgRemProductimg">
|
||||
<div class="generage_btn started_btn" v-show="productimgIsProductimg && productimgRemProductimg">
|
||||
<i class="fi fi-br-loading" ></i>
|
||||
</div>
|
||||
<div class="generage_btn started_btn" v-show="productimgRemProductimg" @click="removeProductimg">
|
||||
<!-- <div class="generage_btn started_btn" v-show="productimgRemProductimg" @click="removeProductimg">
|
||||
{{$t('Generate.Close')}}
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<!-- <div class="productImg_content_item_generate_btn input_border">
|
||||
<div class="input_box">
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div class="allOrder_page generalModel_page">
|
||||
<div class="generalModel_table_search">
|
||||
<div class="generalModel_state">
|
||||
<div class="generalModel_state_item">
|
||||
<div class="generalModel_state_item" style="width: 50rem;">
|
||||
<!-- <span>{{$t('allOrder.Time')}}:</span> -->
|
||||
<a-range-picker
|
||||
class="range_picker"
|
||||
@@ -254,5 +254,7 @@ export default defineComponent({
|
||||
flex: 1;
|
||||
}
|
||||
.generalModel_page {
|
||||
.generalModel_state_item{
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -18,7 +18,7 @@
|
||||
}"
|
||||
|
||||
/>
|
||||
<i class="fi fi-rr-trash icon_delete" @click="deleteSinglePic(item,index)"></i>
|
||||
<i v-show="isDelete" class="fi fi-rr-trash icon_delete" @click="deleteSinglePic(item,index)"></i>
|
||||
<div v-if="item.original == 1" class="falls_item_user_Original">{{$t('newScaleImage.Original')}}</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -406,15 +406,44 @@ export default defineComponent({
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
let setChoose = () =>{
|
||||
const getWorks = (id)=>{
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
let data:any = {
|
||||
"accountId": 0,
|
||||
"collectionId": 0,
|
||||
"coverId": 0,
|
||||
"createDate": "",
|
||||
"id": id,
|
||||
"isDeleted": 0,
|
||||
"portfolioDes": "",
|
||||
"portfolioName": "",
|
||||
"portfolioType": "",
|
||||
"status": 0,
|
||||
"updateDate": "",
|
||||
"userLikeGroupId":''
|
||||
}
|
||||
imgData.isShowMark = true;
|
||||
Https.axiosPost(Https.httpUrls.setPorfolioChoose, data).then(
|
||||
(rv: any) => {
|
||||
imgData.isShowMark = false;
|
||||
resolve(rv.id)
|
||||
}
|
||||
).catch((res)=>{
|
||||
imgData.isShowMark = false;
|
||||
reject('')
|
||||
});
|
||||
})
|
||||
|
||||
}
|
||||
let setChoose = async () =>{
|
||||
if(userDetail.value.systemList.indexOf(1) == -1){
|
||||
return message.info(t('newScaleImage.jsContent1'))
|
||||
}
|
||||
if(imgData.scaleImageData.openSource == 0){
|
||||
return message.info(t('newScaleImage.jsContent2'))
|
||||
}
|
||||
router.push(`/home?history=${imgData.scaleImageData.id}&type=Works`)
|
||||
let id = await getWorks(imgData.scaleImageData.id)
|
||||
router.push(`/home?history=${id}`)
|
||||
// router.push({name:'home',params: {id:imgData.scaleImageData.id,type:'Works'}})
|
||||
store.commit('setChooseIsDesign',false)
|
||||
// router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}})
|
||||
|
||||
@@ -124,26 +124,13 @@
|
||||
<div v-for="item in speedList" :key="item.value" :class="{active:item.value == speedData.value}" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="generage_btn started_btn" v-show="productimgIsProductimg && !productimgRemProductimg">
|
||||
<div class="generage_btn started_btn" v-show="productimgIsProductimg && productimgRemProductimg">
|
||||
<i class="fi fi-br-loading" ></i>
|
||||
</div>
|
||||
<div class="generage_btn started_btn" v-show="productimgRemProductimg" @click="removeProductimg">
|
||||
<!-- <div class="generage_btn started_btn" v-show="productimgRemProductimg" @click="removeProductimg">
|
||||
{{$t('Generate.Close')}}
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<!-- <div class="productImg_content_item_generate_btn input_border">
|
||||
<div class="input_box">
|
||||
<div v-show="!productimgIsProductimg" class="generage_btn started_btn" @click.stop="getPrductimg">
|
||||
{{ $t('Generate.Generate') }}
|
||||
</div>
|
||||
<div v-show="productimgIsProductimg && !productimgRemProductimg" class="generage_btn started_btn" @click="getPrductimg">
|
||||
<i class="fi fi-br-loading"></i>
|
||||
</div>
|
||||
<div v-show="productimgRemProductimg" @click="removeProductimg" class="generage_btn started_btn">
|
||||
{{$t('Generate.Close')}}
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="scaleImage_content_imgBox" :class="{active:isComparison}">
|
||||
@@ -408,7 +395,13 @@ setup(props:any,{emit}) {
|
||||
}
|
||||
productimg.productimgIsProductimg = true
|
||||
if(productimg.openType != 'add'){
|
||||
await props.onlike(null,null,productimg.selectGenerate.listType,'onLike')
|
||||
await new Promise(async (res,reject)=>{
|
||||
await props.onlike(null,null,productimg.selectGenerate.listType,'onLike')
|
||||
setTimeout(()=>{
|
||||
res('')
|
||||
},1000)
|
||||
})
|
||||
// await props.onlike(null,null,productimg.selectGenerate.listType,'onLike')
|
||||
}
|
||||
// setPrductimg([{taskId:"f785fbbf-425c-4d9b-b4d0-0f38f480c64e-83"}])
|
||||
// return
|
||||
@@ -504,6 +497,7 @@ setup(props:any,{emit}) {
|
||||
}
|
||||
isEnd = true
|
||||
clearInterval(remPrductimgTime)
|
||||
store.dispatch('getCredits')
|
||||
}else if(rv[0].status == 'Fail'){
|
||||
message.info(t('ProductImg.jsContent3'))
|
||||
isEnd = true
|
||||
@@ -674,7 +668,9 @@ setup(props:any,{emit}) {
|
||||
}
|
||||
const cancelDsign = async ()=>{
|
||||
if(productimg.productimgIsProductimg){
|
||||
if(!productimg.productimgRemProductimg)return
|
||||
if(!productimg.productimgRemProductimg){
|
||||
return message.info(t('Generate.generateLoading'))
|
||||
}
|
||||
}
|
||||
if(productimg.isGenerate){
|
||||
if(productimg.productimgIsProductimg){
|
||||
|
||||
@@ -1231,6 +1231,7 @@ export default defineComponent({
|
||||
// setFail([element.taskId])
|
||||
upDataSuccess(element)
|
||||
data = data.filter((item:any) => item !== element.taskId);
|
||||
store.dispatch('getCredits')
|
||||
}else if(element?.status == 'Fail' || element?.status == 'Invalid'){
|
||||
data = data.filter((item:any) => item !== element.taskId);
|
||||
setFail([element.taskId])
|
||||
@@ -1984,33 +1985,6 @@ export default defineComponent({
|
||||
this.isShowMark = false;
|
||||
});
|
||||
},
|
||||
getWorks(userGroupId: any, type: any) {
|
||||
let data:any = {
|
||||
"accountId": 0,
|
||||
"collectionId": 0,
|
||||
"coverId": 0,
|
||||
"createDate": "",
|
||||
"id": userGroupId,
|
||||
"isDeleted": 0,
|
||||
"portfolioDes": "",
|
||||
"portfolioName": "",
|
||||
"portfolioType": "",
|
||||
"status": 0,
|
||||
"updateDate": "",
|
||||
"userLikeGroupId":''
|
||||
}
|
||||
this.isShowMark = true;
|
||||
Https.axiosPost(Https.httpUrls.setPorfolioChoose, data).then(
|
||||
(rv: any) => {
|
||||
this.setPortfolio(rv.portfolioDTO)
|
||||
this.store.commit("setUserGroupId", rv.userGroupId);
|
||||
this.dealHistoryChooseData(rv, type);
|
||||
this.isShowMark = false;
|
||||
}
|
||||
).catch((res)=>{
|
||||
this.isShowMark = false;
|
||||
});
|
||||
},
|
||||
//处理选择组的数据
|
||||
dealHistoryChooseData(data: any, type: any) {
|
||||
let collectionData = {
|
||||
|
||||
@@ -100,12 +100,7 @@ export default defineComponent({
|
||||
store.commit("createProbject");
|
||||
store.commit("clearAllData");
|
||||
}
|
||||
if(query.type == 'Works'){
|
||||
getWorks(query.id || query.history)
|
||||
}else{
|
||||
// setProjectData({id:query.id,process:'toProduct'})
|
||||
getHistory(query.id || query.history)
|
||||
}
|
||||
getHistory(query.id || query.history)
|
||||
}else{
|
||||
data.dataLoad = false
|
||||
createData()
|
||||
@@ -127,29 +122,7 @@ export default defineComponent({
|
||||
store.commit("clearAllBoardData",item);
|
||||
})
|
||||
}
|
||||
const getWorks = (id:any)=>{
|
||||
let value:any = {
|
||||
"accountId": 0,
|
||||
"collectionId": 0,
|
||||
"coverId": 0,
|
||||
"createDate": "",
|
||||
id,
|
||||
"isDeleted": 0,
|
||||
"portfolioDes": "",
|
||||
"portfolioName": "",
|
||||
"portfolioType": "",
|
||||
"status": 0,
|
||||
"updateDate": "",
|
||||
"userLikeGroupId":''
|
||||
}
|
||||
Https.axiosPost(Https.httpUrls.setPorfolioChoose, value).then(
|
||||
(rv: any) => {
|
||||
setProjectData(rv)
|
||||
}
|
||||
).catch((res)=>{
|
||||
data.isShowMark = false
|
||||
});
|
||||
}
|
||||
|
||||
const getHistory = (id:any)=>{
|
||||
let value = {
|
||||
id,
|
||||
|
||||
@@ -87,12 +87,12 @@
|
||||
<div v-for="item in speedList" :key="item.value" :class="{active:item.value == speedData.value}" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-show="isGenerate && !remGenerate" class="generage_btn started_btn">
|
||||
<div v-show="isGenerate && remGenerate" class="generage_btn started_btn">
|
||||
<i class="fi fi-br-loading"></i>
|
||||
</div>
|
||||
<div v-show="remGenerate" @click="setRemoveGenerate" class="generage_btn started_btn">
|
||||
<!-- <div v-show="remGenerate" @click="setRemoveGenerate" class="generage_btn started_btn">
|
||||
{{$t('Generate.Close')}}
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<div class="likeBox">
|
||||
|
||||
@@ -134,12 +134,12 @@
|
||||
<div v-for="item in speedList" :key="item.value" :class="{active:item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-show="isProductimg && !remProductimg" class="generage_btn started_btn" @click="getPrductimg">
|
||||
<div v-show="isProductimg && remProductimg" class="generage_btn started_btn" @click="getPrductimg">
|
||||
<i class="fi fi-br-loading"></i>
|
||||
</div>
|
||||
<div v-show="remProductimg" @click="removeProductimg" class="generage_btn started_btn">
|
||||
<!-- <div v-show="remProductimg" @click="removeProductimg" class="generage_btn started_btn">
|
||||
{{$t('Generate.Close')}}
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -370,7 +370,7 @@ export default defineComponent({
|
||||
passwordConditionShow: false,
|
||||
userI18n: {
|
||||
en:{
|
||||
title:'Register for AiDA 3.0',
|
||||
title:'Register for AiDA',
|
||||
Name:'Name',
|
||||
inputName:'Enter your username',
|
||||
Password:'Password',
|
||||
@@ -391,7 +391,7 @@ export default defineComponent({
|
||||
wechat:'Register with wechat',
|
||||
},
|
||||
cn:{
|
||||
title:'注册 AiDA 3.0',
|
||||
title:'注册 AiDA',
|
||||
Name:'用户名',
|
||||
inputName:'请输入用户名',
|
||||
Password:'密码',
|
||||
|
||||
@@ -337,7 +337,18 @@ export default defineComponent({
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
|
||||
scrollbar-width: none; /* Firefox */
|
||||
-ms-overflow-style: none; /* IE 10+ */
|
||||
/* Webkit 浏览器 */
|
||||
&::-webkit-scrollbar {
|
||||
display: none;
|
||||
width: 0;
|
||||
height: 0;
|
||||
background: transparent;
|
||||
}
|
||||
&::-webkit-scrollbar-horizontal {
|
||||
display: none;
|
||||
}
|
||||
> .generalDragBox{
|
||||
|
||||
min-height: 100%;
|
||||
|
||||
Reference in New Issue
Block a user