{{$t('account.email')}}:
diff --git a/src/component/Account/frontPage/bindPage.vue b/src/component/Account/frontPage/bindPage.vue
index 188d68b2..a67eca16 100644
--- a/src/component/Account/frontPage/bindPage.vue
+++ b/src/component/Account/frontPage/bindPage.vue
@@ -212,6 +212,7 @@ export default defineComponent({
.bindPage_page{
height: 100%;
overflow-y: auto;
+ padding-bottom: 2rem;
.bindPage_page_body{
.bind_item{
margin-bottom: 4rem;
diff --git a/src/component/Account/frontPage/cancelRenewal.vue b/src/component/Account/frontPage/cancelRenewal.vue
index 11288b34..b822754c 100644
--- a/src/component/Account/frontPage/cancelRenewal.vue
+++ b/src/component/Account/frontPage/cancelRenewal.vue
@@ -5,7 +5,13 @@
{{ $t('cancelRenewal.cancelling') }}
-
+
+
+
+
@@ -51,21 +57,49 @@ export default defineComponent({
},
setup() {
const store = useStore();
+ const {t} = useI18n()
let userDetail:any= computed(()=>{
return store.state.UserHabit.userDetail
})
let accountHomeData:any = reactive({
textareaValue:'',
isShowMark:false,
+ causeList:[
+ {
+ vlaue:'Too expensive',
+ str:t('account.jsContent1'),
+ },{
+ value:'Sytem not user friendly',
+ str:t('account.jsContent2'),
+ },{
+ value:'Too Slowy',
+ str:t('account.jsContent3'),
+ },{
+ value:'Difficult to edit',
+ str:t('account.jsContent4'),
+ },{
+ value:'Insufficlent Tutorial/Support',
+ str:t('account.jsContent5'),
+ },{
+ value:'Unable to generate what you need',
+ str:t('account.jsContent6'),
+ }
+ ],
+ selectedOptions:[]
})
let renew = ref()
const subscribe = ()=>{
renew.value.init()
}
const cancelSubscription = ()=>{
+ let str = ''
+ accountHomeData.selectedOptions.forEach((item:any)=>{
+ str += ' #' + item
+ })
+
let data = {
subscriptionId:userDetail.value.subscriptionId,
- reason:'',
+ reason:accountHomeData.textareaValue + str,
}
accountHomeData.isShowMark = true
Https.axiosGet(Https.httpUrls.cancelSubscription, {params:data})
@@ -100,6 +134,7 @@ export default defineComponent({
.cancelRenewal_page{
height: 100%;
overflow-y: auto;
+ padding-bottom: 2rem;
>div{
display: flex;
flex-direction: column;
@@ -128,19 +163,28 @@ export default defineComponent({
border-radius: 1.4rem;
}
}
- >textarea{
- margin-top: 1.5rem;
- width: 100%;
- border-radius: 1.4rem;
- border: 1px solid #D0D0D0;
- height: 11rem !important;
- font-size: 1.6rem;
- transition: border .3s;
- padding: 1.5rem;
- }
- >textarea:hover{
- border: 1px solid #000;
+ >.cause_list{
+ > .cause_item{
+ display: flex;
+ input{
+ margin-right: 1rem;
+ }
+ }
+ >textarea{
+ margin-top: 1.5rem;
+ width: 100%;
+ border-radius: 1.4rem;
+ border: 1px solid #D0D0D0;
+ height: 11rem !important;
+ font-size: 1.6rem;
+ transition: border .3s;
+ padding: 1.5rem;
+ }
+ >textarea:hover{
+ border: 1px solid #000;
+ }
}
+
>.button_box{
display: flex;
margin-top: 2.5rem;
diff --git a/src/component/Account/frontPage/mylnformation.vue b/src/component/Account/frontPage/mylnformation.vue
index 1286eeb6..56c58144 100644
--- a/src/component/Account/frontPage/mylnformation.vue
+++ b/src/component/Account/frontPage/mylnformation.vue
@@ -95,6 +95,7 @@ export default defineComponent({
.accountEdit_page{
height: 100%;
overflow-y: auto;
+ padding-bottom: 2rem;
.accountEdit_page_body{
width: 100%;
// width: 85rem;
diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue
index 99aa63e3..3530a16b 100644
--- a/src/component/Detail/setDesignItem.vue
+++ b/src/component/Detail/setDesignItem.vue
@@ -382,7 +382,6 @@ export default defineComponent({
//判断尺寸是否到边
this.frontBack.front[this.imgDomIndex].style.width = width
this.frontBack.front[this.imgDomIndex].style.height = height
-
},
//鼠标抬起
sizeMouseup(e){
diff --git a/src/component/DetailCopy/designDetail.vue b/src/component/DetailCopy/designDetail.vue
index 2edf1373..a44841b1 100644
--- a/src/component/DetailCopy/designDetail.vue
+++ b/src/component/DetailCopy/designDetail.vue
@@ -85,15 +85,76 @@ export default defineComponent({
return store.state.UserHabit.userDetail
})
const detailData = reactive({
+ designDetail:null,
designDetailShow:true,
loadingShow:false,
})
+ provide('designDetail',detailData.designDetail)
const closeModal = ()=>{
detailData.designDetailShow = false
}
+ const showDesignDetailModal = (data:any,str:any)=>{
+ // this.moible = isMoible()
+ // this.designItemId = data.design.designItemId
+ // this.designOutfitId = data.design.designOutfitId
+ let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}`
+ // let url = Https.httpUrls.getDesignDetail + `?designItemId=61204&designPythonOutfitId=60908`
+ // this.parentData = data
+ detailData.loadingShow = true
+ Https.axiosGet(url).then(
+ async (rv: any) => {
+ rv.clothes.forEach((item:any)=>{
+ let a
+ item.designType='Library'
+ if(item.layersObject[0].imageCategory.indexOf("back") == -1){
+ a = item.layersObject[0]
+ item.layersObject[0] = item.layersObject[1]
+ item.layersObject[1] = a
+ }
+ if(item.printObject.prints == null)item.printObject.prints = []
+ item.printObject.prints.forEach((element:any) => {
+ if(!element.designType){
+ element.designType = 'Library'
+ }
+ });
+ })
+ setTimeout(() => {
+ detailData.designDetail = rv
+ }, 2000);
+ detailData.designDetailShow = true
+ // this.store.commit('setDesignItemDetail',rv)
+ // this.deleteShow = false
+
+ setRevocation(rv,'')
+ // if(rv.singleOverall == 'overall'){
+ // this.body = false
+ // }else{
+ // this.body = true
+ // }
+ // await this.setImgSize()
+ // this.generateHighDesignImg = rv.highDesignUrl
+ // this.designDetailShow = true
+ detailData.loadingShow = false
+ // await this.setImgSize()
+ }
+
+ ).catch(rv=>{
+ detailData.loadingShow = false
+ })
+ }
+ const initialize = ()=>{//design后初始化
+
+
+ sessionStorage.removeItem('oppositeRevocation')
+ sessionStorage.removeItem('revocation')
+ }
+ const setRevocation = (designItemDetail:any,data:any)=>{//设置撤销
+
+ }
return{
...toRefs(detailData),
closeModal,
+ showDesignDetailModal,
}
},
provide() {
diff --git a/src/component/DetailCopy/model/index.vue b/src/component/DetailCopy/model/index.vue
index 982d639d..f25b9c27 100644
--- a/src/component/DetailCopy/model/index.vue
+++ b/src/component/DetailCopy/model/index.vue
@@ -5,27 +5,30 @@
-
-
+
-
-
-
+
+
+
+
-
21313
+
\ No newline at end of file
diff --git a/src/component/DetailCopy/model/position.vue b/src/component/DetailCopy/model/position.vue
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index e89ca646..2c9fbc1a 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -1273,6 +1273,7 @@ export default defineComponent({
if(keyDown.indexOf(event.code)>-1){
}else{
keyDown.push(event.code)
+ // console.log(keyDown.indexOf('ControlLeft') > -1 , keyDown.indexOf('MetaLeft') > -1, event.code == 'KeyC')
if(event.code === 'Enter' && operation.value == 'fold'){
foldEnd('Enter')
}else if(event.key === 'Delete'){
@@ -1311,7 +1312,6 @@ export default defineComponent({
// }
}
}
- console.log(keyDown);
}
let getColor = async ()=>{
try {
@@ -1336,8 +1336,6 @@ export default defineComponent({
keyDown = keyDown.filter(function(item) {
return event.code !== item;
})
- console.log(keyDown,'UP',event.code);
-
if(event.code == 'Backquote' && oldOperation){
// setOperation(oldOperation)
oldOperation = ''
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index da4f1359..88738867 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -628,6 +628,13 @@ export default {
Interact:'互动',
hisWorks:'他的作品',
works:'作品',
+ //取消
+ jsContent1:'太贵了',
+ jsContent2:'系统不友好',
+ jsContent3:'太慢了',
+ jsContent4:'操作困难',
+ jsContent5:'教程不充足',
+ jsContent6:'无法生成需要的内容',
},
frontPage:{
BindWechat:'绑定微信',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 5168c2a9..ab455113 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -627,6 +627,13 @@ export default {
Interact:'interact',
hisWorks:'His works',
works:'Works',
+ //取消
+ jsContent1:'Too expensive',
+ jsContent2:'Sytem not user friendly',
+ jsContent3:'Too Slowy',
+ jsContent4:'Difficult to edit',
+ jsContent5:'Insufficlent Tutorial/Support',
+ jsContent6:'Unable to generate what you need',
},
frontPage:{
BindWechat:'Bind Wechat',
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index b2399397..df6eed03 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -211,7 +211,7 @@