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

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

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,