2023-11-20-dist

src/component/Detail/DesignDetailEnd.vue

@@ -152,7 +152,6 @@ export default defineComponent({
 		//点击判断
 		init(num){
 			// this.current = JSON.parse(JSON.stringify(this.currentItem))
-			console.log(this.current);
 			this.type_ = num
 			this.colorList[this.selectIndex] = this.$parent.selectColor
 			this.overallSingle = this.current?.printObject?.ifSingle == null?false:this.current?.printObject?.ifSingle

src/component/HomePage/ColorboardUpload.vue

@@ -340,7 +340,6 @@ export default defineComponent({
 							(rv) => {
 								if(rv){
 									colorSort = rv.ratio
-									console.log(rv);
 								}
 							}
 						)

src/component/HomePage/Generate.vue

@@ -583,7 +583,6 @@ export default defineComponent({
 		},
 		scaleImage(){
 			let scaleImage:any = this.$refs.scaleImage
-			 console.log(this.fileList);
 			 
 			scaleImage.init(this.fileList)
 		},

src/component/HomePage/Header.vue

@@ -301,14 +301,27 @@ export default defineComponent({
         },
 
         //登出
-        logout() {
+        async logout() {
             let data = {
                 userId: this.userInfo.userId,
             };
-            Https.axiosPost(Https.httpUrls.accountLogout, data).then((rv) => {
-                this.$router.replace("/login");
-                WriteCookie("token");
-            });
+			let isTest = getCookie('isTest')
+			console.log(getCookie("token"));
+			if(JSON.parse(isTest)){
+				Https.axiosGet(Https.httpUrls.trialUserLogout,).then((rv) => {
+					Https.axiosPost(Https.httpUrls.accountLogout, data).then((rv) => {
+						this.$router.replace("/login");
+						WriteCookie("token");
+					});
+				})
+			}else{
+				Https.axiosPost(Https.httpUrls.accountLogout, data).then((rv) => {
+					this.$router.replace("/login");
+					WriteCookie("token");
+				});
+			}
+			
+            
         },
 
         //绑定邮箱

src/component/HomePage/PrintboardUpload.vue

@@ -643,12 +643,9 @@ export default defineComponent({
                 }
             }
             data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone,
-			console.log(data,this.moodBoards,this.printBoards);
-			
             this.loadingShow = true
             Https.axiosPost(Https.httpUrls.elementGeneratePrint, data).then((rv) =>{
                 if(rv){
-					console.log(rv);
 					this.generateList = []
 					let value = {
 						id:rv.generateItemId,

src/component/HomePage/SketchboardUpload.vue

@@ -472,7 +472,6 @@ export default defineComponent({
 			this.inputTime = setTimeout(()=>{
 				// let num1 = ((input as HTMLInputElement).value.match(/ /g) || []).length
 				// let num2 = (input as HTMLInputElement).value.split(' ').length
-				console.log(this.captionGeneration);
 				
 				if(this.captionGeneration?.split(/\s+/).length > 75){
 					this.inputShow = true

src/component/HomePage/scaleImage.vue

@@ -87,7 +87,6 @@ export default defineComponent({
     methods: {
 		init(list:any){
 			this.scaleImage = true
-			console.log(list);
 			this.scaleImageList = list
 			// let scaleImageList = this.store.state.UploadFilesModule.moodboard
 		},

src/tool/https.js

@@ -98,6 +98,8 @@ export const Https = {
         getUserLanguage:`/api/account/getUserLanguage`, //账号密码登录接口
         changeUserLanguage:`/api/account/changeUserLanguage`, //账号密码登录接口
 
+        trialUserLogout:`/account/trialUserLogout`, //试用用户退出登录接口
+
         preLogin:'/api/account/preLogin',//预先登入
         accountSendEmail:`/api/account/sendEmail`, //发送邮件
         accountResetPwd:'/api/account/resetPwd', //忘记密码修改

src/views/Demo.vue

@@ -47,7 +47,6 @@ export default defineComponent({
                 this.currentSign.left = event.clientX - this.imgBox.left
                 this.currentSign.top =  event.clientY + scrollTop - this.imgBox.top
                 this.imgDian.push(this.currentSign)
-                console.log(this.currentSign)
                 this.intObj = null
             }else{
                 if(this.startDian){

src/views/LibraryPage.vue

@@ -728,7 +728,6 @@ export default defineComponent({
                     }
 					Https.axiosPost(Https.httpUrls.relationLibrary, data2).then(
 						(rv: any) => {
-							console.log(rv);
 							this.getLibraryList()
 							this.closeRenameModal() 
 
@@ -971,7 +970,6 @@ export default defineComponent({
 			this.value.labelValue.forEach((item:any)=>{
 				labelArr.push(item[item.length-1])
 			})
-			console.log(this.value.labelValue);
             let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : ''
             let data = {
 				classificationIdList:labelArr,
@@ -1090,7 +1088,6 @@ export default defineComponent({
 			}
 		},
 		getgenerate(){
-			console.log(this.isTest);
 			
 			if(this.isTest){//试用用户禁止使用
 				message.info(
@@ -1222,7 +1219,6 @@ export default defineComponent({
 			}
 			Https.axiosPost(Https.httpUrls.queryClassification, data).then(
                 (rv: any) => {
-                  	console.log(rv);
 					this.options = rv
 					rv.forEach((rvItem:any,rvIndex:number) => {
 						this.options[rvIndex].value = rvItem.id
@@ -1232,9 +1228,6 @@ export default defineComponent({
 							this.options[rvIndex].childList[index].label = childItem.classificationName
 						});
 					});
-					console.log(this.options);
-					
-					
                 }
             ).catch((res)=>{
             });

src/views/LoginPage.vue

@@ -449,12 +449,15 @@ export default defineComponent({
                 (rv: any) => {
                     if (rv) {
                         this.createTimer();
+						let isTest
+						if(rv.isTrial == 1){
+							isTest = true
+						}else{
+							isTest = false
+						}
                         let token = rv.token;
-						let isTest = false
                         setCookie("token", token);
                         setCookie("isTest", isTest);
-						console.log();
-						
                         setCookie("userInfo", JSON.stringify(rv));
                         this.turnToHomePage();
                     }