diff --git a/components.d.ts b/components.d.ts index e62b27e1..73145d49 100644 --- a/components.d.ts +++ b/components.d.ts @@ -10,23 +10,15 @@ declare module 'vue' { export interface GlobalComponents { ABadge: typeof import('ant-design-vue/es')['Badge'] ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb'] - ACheckbox: typeof import('ant-design-vue/es')['Checkbox'] AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider'] ADatePicker: typeof import('ant-design-vue/es')['DatePicker'] ADrawer: typeof import('ant-design-vue/es')['Drawer'] - ADropdown: typeof import('ant-design-vue/es')['Dropdown'] - AImage: typeof import('ant-design-vue/es')['Image'] - AInputNumber: typeof import('ant-design-vue/es')['InputNumber'] AMenu: typeof import('ant-design-vue/es')['Menu'] AMenuItem: typeof import('ant-design-vue/es')['MenuItem'] AModal: typeof import('ant-design-vue/es')['Modal'] APagination: typeof import('ant-design-vue/es')['Pagination'] - APopover: typeof import('ant-design-vue/es')['Popover'] ARangePicker: typeof import('ant-design-vue/es')['RangePicker'] ASelect: typeof import('ant-design-vue/es')['Select'] - ASelectOption: typeof import('ant-design-vue/es')['SelectOption'] - ASlider: typeof import('ant-design-vue/es')['Slider'] - ASpace: typeof import('ant-design-vue/es')['Space'] ASpin: typeof import('ant-design-vue/es')['Spin'] ASubMenu: typeof import('ant-design-vue/es')['SubMenu'] ASwitch: typeof import('ant-design-vue/es')['Switch'] diff --git a/src/assets/icons/Folder.svg b/src/assets/icons/Folder.svg new file mode 100644 index 00000000..abfd060d --- /dev/null +++ b/src/assets/icons/Folder.svg @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/src/assets/images/icon/library.png b/src/assets/images/icon/library.png new file mode 100644 index 00000000..60b8e7bf Binary files /dev/null and b/src/assets/images/icon/library.png differ diff --git a/src/assets/images/icon/upload_black.png b/src/assets/images/icon/upload_black.png new file mode 100644 index 00000000..635249c7 Binary files /dev/null and b/src/assets/images/icon/upload_black.png differ diff --git a/src/assets/images/icon/upload_gray.png b/src/assets/images/icon/upload_gray.png new file mode 100644 index 00000000..4e109e29 Binary files /dev/null and b/src/assets/images/icon/upload_gray.png differ diff --git a/src/component/Account/frontPage/bindPage.vue b/src/component/Account/frontPage/bindPage.vue index 7ec33f51..825781f4 100644 --- a/src/component/Account/frontPage/bindPage.vue +++ b/src/component/Account/frontPage/bindPage.vue @@ -111,28 +111,46 @@ export default defineComponent({ .catch((res) => {accountHomeData.loadingShow = false}); } const ungroupWeiXinModel = ()=>{ - Https.axiosGet(Https.httpUrls.unbindWeChat,).then((rv)=>{ - message.success(t('frontPage.jsContent1')); - let value = { - accountExtendList:{ - WeChat:undefined, - Google:accountHomeData.userDetail.accountExtendList?.Google - } + Modal.confirm({ + title: t('frontPage.UnbindTip'), + okText: t('Yes'), + cancelText: t('No'), + mask:false, + centered:true, + onOk() { + Https.axiosGet(Https.httpUrls.unbindWeChat,).then((rv)=>{ + message.success(t('frontPage.jsContent1')); + let value = { + accountExtendList:{ + WeChat:undefined, + Google:accountHomeData.userDetail.accountExtendList?.Google + } + } + store.commit("upUserDetail", value) + }) } - store.commit("upUserDetail", value) - }) + }); } const ungroupGoogleModel = ()=>{ - Https.axiosGet(Https.httpUrls.unbindGoogle,).then((rv)=>{ - let value = { - accountExtendList:{ - WeChat:accountHomeData.userDetail.accountExtendList?.WeChat, - Google:undefined, - } + Modal.confirm({ + title: t('frontPage.UnbindTip'), + okText: t('Yes'), + cancelText: t('No'), + mask:false, + centered:true, + onOk() { + Https.axiosGet(Https.httpUrls.unbindGoogle,).then((rv)=>{ + let value = { + accountExtendList:{ + WeChat:accountHomeData.userDetail.accountExtendList?.WeChat, + Google:undefined, + } + } + store.commit("upUserDetail", value) + message.success(t('frontPage.jsContent1')); + }) } - store.commit("upUserDetail", value) - message.success(t('frontPage.jsContent1')); - }) + }); } const modifyEmail = ()=>{ bindPageDom.bindEmail.init('Modify') diff --git a/src/component/HomePage/Generate copy.vue b/src/component/HomePage/Generate copy.vue new file mode 100644 index 00000000..8b420cf9 --- /dev/null +++ b/src/component/HomePage/Generate copy.vue @@ -0,0 +1,1268 @@ + + + diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 04cffff0..f3e15fcb 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -36,32 +36,38 @@ @@ -75,170 +81,271 @@ @click="inputFocus()" v-model="searchPictureName" @paste="onPaste" + > - > - - - - -
-
-
-
- -
-
- -
- -
-
-
-
- - - - - -
- -
-
- -
-
-
{{ item.label }}
-
-
-
{{ item.label }}
-
-
-
- -
-
- {{$t('Generate.Close')}} -
- -
- - - -
-
-
-
{{item}}
-
{{item}}
-
-
-
- -
+ +
+
+
+
- -
- -
- -
- - -
-
- -
-
- -
+ {{ item }}
-
- -
+
+ {{ item }} +
+
- - - +
+
+
+ +
+ +
+ +
+ + +
+
+ +
+
+ +
+
+
+ +
+
+ + + + diff --git a/src/component/home/tools/toProduct/index.vue b/src/component/home/tools/toProduct/index.vue index cd6228a4..f281ad1a 100644 --- a/src/component/home/tools/toProduct/index.vue +++ b/src/component/home/tools/toProduct/index.vue @@ -45,8 +45,8 @@ }" :headers="{ Authorization: token }" :before-upload="beforeUpload" + :multiple="!!upload.projectId" v-model:file-list="fileList[productimgMenu.value]" - :multiple="true" accept=".jpg,.png,.jpeg,.bmp" @change="(file) => fileUploadChange(file)" > @@ -323,6 +323,9 @@ export default defineComponent({ watch(()=>store.state.HomeStoreModule.uploadElement.length,(newVal,oldVal)=>{ if(props.isDesignPage)return productImgData.fileList[props.productimgMenu.value] = store.state.HomeStoreModule.uploadElement + if(productImgData.fileList[props.productimgMenu.value][0]){ + productImgData.fileList[props.productimgMenu.value][0].isChecked = true + } }) const productImgDom = reactive({ generalDragLeft:null as any, @@ -435,11 +438,14 @@ export default defineComponent({ // if(props.productimgMenu.value == 'Relight'){ // file.type = "ToProductImage" // } - productImgData.fileList[props.productimgMenu.value].filter((v: any) => v.status === "done"); + let storeData = { + str:'add', + list:[file] + } + store.commit('setUploadElement',storeData) }else{ bor = false } - // this.showFileList = productImgData.fileList } else if (file.status === "error") { bor = false } @@ -468,9 +474,6 @@ export default defineComponent({ } return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE; } - let deleteFile = (index:any)=>{ - productImgData.fileList[props.productimgMenu.value].splice(index,1) - } let setGenerate = (item:any)=>{ item.isChecked = !item.isChecked } @@ -893,7 +896,6 @@ export default defineComponent({ setproduct, fileUploadChange, beforeUpload, - deleteFile, setGenerate, setUploadDelete, likeFile, diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 4ad24d17..1b459be2 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -825,6 +825,7 @@ export default { Modify: "修改", jsContent1: "取消绑定成功", jsContent2: "当前网络无法加载谷歌", + UnbindTip: "确认取消绑定吗?", }, Renew: { title: "选择你的最佳计划", @@ -1413,5 +1414,7 @@ export default { ToProductImage:'产品图', Relight:'打光', ChatRobot:'对话生成', + Yes:'是', + No:'否', }, }; diff --git a/src/lang/en.ts b/src/lang/en.ts index 1f2da2f7..621e7464 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -825,6 +825,7 @@ export default { Modify: "Modify", jsContent1: "Successful discharge", jsContent2: "The current network cannot load Google", + UnbindTip: "Are you sure to cancel the binding?", }, Renew: { title: "Find Your Ideal Plan", @@ -1413,5 +1414,7 @@ export default { ToProductImage:'ToProductImage', Relight:'Relight', ChatRobot:'ChatRobot', + Yes:'Yes', + No:'No', }, };