Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

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']

src/assets/icons/Folder.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="288.000000pt" height="288.000000pt" viewBox="0 0 288.000000 288.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,288.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M379 2446 c-101 -36 -179 -116 -209 -214 -19 -62 -20 -93 -20 -792 0
+-701 1 -730 20 -793 26 -83 88 -155 168 -194 l57 -28 1045 0 1045 0 47 22
+c101 46 170 138 188 250 6 32 10 329 10 668 0 659 -3 692 -54 774 -35 54 -101
+108 -163 131 -52 19 -78 20 -626 20 l-572 0 -46 53 c-25 29 -70 66 -100 82
+l-54 30 -350 2 c-269 2 -358 0 -386 -11z m710 -175 c20 -11 42 -25 48 -33 6
+-7 48 -92 92 -188 85 -183 118 -229 196 -274 73 -43 119 -46 635 -46 l490 0 0
+-517 c0 -496 -1 -519 -20 -547 -10 -17 -36 -40 -57 -53 l-38 -23 -993 0 c-968
+0 -994 0 -1031 20 -22 11 -48 35 -60 53 -21 34 -21 40 -21 777 0 737 0 743 21
+777 12 18 37 42 57 53 34 18 60 19 340 20 280 0 306 -1 341 -19z m1381 -174
+c53 -28 80 -75 80 -139 l0 -48 -506 0 c-498 0 -507 0 -541 21 -31 19 -74 88
+-103 165 l-10 24 519 0 518 0 43 -23z"/>
+</g>
+</svg>

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)=>{
+				Modal.confirm({
-				message.success(t('frontPage.jsContent1'));
+				title: t('frontPage.UnbindTip'),
-				let value = {
+				okText: t('Yes'),
-					accountExtendList:{
+				cancelText: t('No'),
-						WeChat:undefined,
+				mask:false,
-						Google:accountHomeData.userDetail.accountExtendList?.Google
+				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)=>{
+			Modal.confirm({
-				let value = {
+				title: t('frontPage.UnbindTip'),
-					accountExtendList:{
+				okText: t('Yes'),
-						WeChat:accountHomeData.userDetail.accountExtendList?.WeChat,
+				cancelText: t('No'),
-						Google:undefined,
+				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')

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,

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:'否',
   },
 };

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',
   },
 };