添加常用国家选择

src/component/Account/frontPage/bindPage.vue

@@ -21,11 +21,17 @@
 						<img v-else :src="userDetail.accountExtendList?.Google?.headImgUrl" alt="">
 						<div class="text">{{ userDetail.accountExtendList?.Google?userDetail.accountExtendList?.Google.name:$t('frontPage.Unbound') }}</div>
 					</div>
-					<div class="gmail_btn">
+					<!-- <div class="gmail_btn">
 						<div v-if="!userDetail.accountExtendList?.Google && googleLoad" class="gallery_btn">{{ $t('frontPage.BindNow') }}</div>
 						<div v-else-if="!userDetail.accountExtendList?.Google" class="gallery_btn loading"><i class="fi fi-br-loading"></i></div>
 						<div v-show="!userDetail.accountExtendList?.Google" id="g_id_bind"></div>
 						<div v-if="userDetail.accountExtendList?.Google" class="gallery_btn" @click="ungroupGoogleModel">{{ $t('frontPage.Unbind') }}</div>
+					</div> -->
+					<div class="gmail_btn">
+						<div v-if="!userDetail.accountExtendList?.Google" class="gallery_btn">{{ $t('frontPage.BindNow') }}</div>
+						<div v-show="!userDetail.accountExtendList?.Google" id="g_id_bind"></div>
+						<div v-if="userDetail.accountExtendList?.Google" class="gallery_btn" @click="ungroupGoogleModel">{{ $t('frontPage.Unbind') }}</div>
+						<!-- <div v-if="userDetail.accountExtendList?.Google" class="gallery_btn" @click="ungroupGoogleModel">{{ $t('frontPage.Unbind') }}</div> -->
 					</div>
 				</div>
 			</div>

src/component/HomePage/bindEmail.vue

@@ -48,15 +48,18 @@
 								<div class="login_form_title marign_top30">Email</div>
 								<input
 									class="login_form_input"
+									:class="{active:!!email}"
 									placeholder="Enter your email address"
 									v-model="email"
+									:disabled="!!email"								
 									@keydown.enter="submitPerLogin()"
 								/>
 								<div class="login_form_title marign_top30">{{$t('account.Country')}}:</div>
-								<div class="">
+								<div class="login_form_select">
 									<a-select
-									class="gallerySelect"
+										class="gallerySelect"
 										v-model:value="Country"
+										:disabled="!!userDetail.country"
 										size="large"
 										optionFilterProp="label"
 										style="width: 100%;"
@@ -68,7 +71,7 @@
 								</div>
 								
 								<div class="login_form_title marign_top30">{{$t('account.CompanyName')}}:</div>
-								<input class="login_form_input" type="text" placeholder="Please enter occupation" v-model="CompanyName">
+								<input class="login_form_input" :class="{active:!!email}" :disabled="!!CompanyName" type="text" placeholder="Please enter occupation" v-model="CompanyName">
 
 							<!-- 邮箱登录 start -->
 								<div class="login_form_email" :class="{active:emailStap===2}">
@@ -513,6 +516,10 @@ export default defineComponent({
                     box-sizing: border-box;
                     outline: none;
 					transition: all .3s;
+					&.active{
+						color: #b8b8b8;
+						background: #f5f5f5;
+					}
 					&:hover{
 						border: 0.1rem solid #000;
 					}

src/component/HomePage/productImg.vue

@@ -238,6 +238,8 @@
 				RelightDirectionList:RelightDirectionList,
 			}" 
 			:isProductimg="true"></scaleImage>
+		<UpgradePlan ref="UpgradePlan"></UpgradePlan>
+
 	</a-modal>
 </div>
 </template>
@@ -258,12 +260,14 @@ import { useStore } from "vuex";
 import scaleImage from "@/component/HomePage/scaleImage.vue";
 import generalMenu from "@/component/HomePage/generalMenu.vue";
 import { openGuide,driverObj__ } from "@/tool/guide";
+import UpgradePlan from "@/component/HomePage/UpgradePlan.vue";
+
 
 export default defineComponent({
 	components:{
 		ExportModel,
 		scaleImage,
-		generalMenu,
+		generalMenu,UpgradePlan
 	},
     props: ['setTask'],
     setup(props,{emit}) {
@@ -293,6 +297,7 @@ export default defineComponent({
 			likeList:[],
 			similarity:30,
 			brightenValue:1,
+			UpgradePlan
 		})
 		let productimgMenuList = ref([
 			{
@@ -548,6 +553,25 @@ export default defineComponent({
 				productImgData.isProductimg = false
 				clearInterval(remPrductimgTime)
 				productImgData.remProductimg= false
+				if(res.errCode === 2){
+					Modal.confirm({
+						title: res.errMsg,
+						icon: createVNode(ExclamationCircleOutlined),
+						okText: 'Yes',
+						cancelText: 'No',
+						mask:false,
+						zIndex:99999,
+						centered:true,
+						onOk() {
+							let UpgradePlan:any = productImgData.UpgradePlan
+							UpgradePlan.init()
+						},
+						onCancel(){
+							
+						}
+					});
+				}
+				
             });
 		}
 		let generateProceedList:any = []

src/component/HomePage/scaleImage.vue

@@ -134,6 +134,8 @@
 		<div class="mark_loading" v-show="loadingShow">
 				<a-spin size="large" />
 			</div>
+		<UpgradePlan ref="UpgradePlan"></UpgradePlan>
+
 	</a-modal>
 </div>
 </template>
@@ -147,8 +149,10 @@ import { downloadIamge } from "@/tool/util";
 import { useI18n } from "vue-i18n";
 import { useStore } from "vuex";
 import generalMiniCanvas from "@/component/modules/generalMiniCanvas.vue";
+import UpgradePlan from "@/component/HomePage/UpgradePlan.vue";
+
 export default defineComponent({
-	components:{generalMiniCanvas},
+	components:{generalMiniCanvas,UpgradePlan},
 	props:{
 		productData:{
             type:Object,
@@ -175,6 +179,7 @@ export default defineComponent({
 		})
 		let {t} = useI18n()
 		let productimg = reactive({
+			UpgradePlan:null,
 			isProductimg:false,
 			productimgSearchName:'',
 			productimgIsTextarea:false,
@@ -246,6 +251,25 @@ export default defineComponent({
 				productimg.productimgIsProductimg = false
 				clearInterval(remPrductimgTime)
 				productimg.productimgRemProductimg = false
+				if(res.errCode === 2){
+					Modal.confirm({
+						title: res.errMsg,
+						icon: createVNode(ExclamationCircleOutlined),
+						okText: 'Yes',
+						cancelText: 'No',
+						mask:false,
+						zIndex:99999,
+						centered:true,
+						onOk() {
+							let UpgradePlan:any = productimg.UpgradePlan
+							UpgradePlan.init()
+						},
+						onCancel(){
+							
+						}
+					});
+				}
+
             });
 		}
 		let generateProceedList:any = []

src/store/userHabit/userHabit.ts

@@ -199,14 +199,7 @@ const userHabit : Module<UserHabit,RootState> = {
 
 		},
 		setUserDetail(state,data){
-			if(
-				(!data.email && state.userDetail.email == '-------------') || 
-				(!data.country && !state.userDetail.country) || 
-				(!data.occupation && !state.userDetail.occupation)
-			){
-				state.bindEmail.isBindEmail = true
-				state.bindEmail.type = ''
-			}
+			
 			// if(!data.email && !state.userDetail.email)state.isBindEmail = true
 			// state.userDetail = data
 			state.userDetail.email = data.email?data.email:'-------------'
@@ -217,6 +210,14 @@ const userHabit : Module<UserHabit,RootState> = {
 			state.userDetail.occupation = data.occupation//头像
 			state.userDetail.usernameModify = data.usernameModify//当月剩余修改次数
 			state.userDetail.isBeginner = data.isBeginner == 1 ? true : false;//是否完成新手指引
+			if(
+				(!data.email && state.userDetail.email == '-------------') || 
+				(!data.country && !state.userDetail.country) || 
+				(!data.occupation && !state.userDetail.occupation)
+			){
+				state.bindEmail.isBindEmail = true
+				state.bindEmail.type = ''
+			}
 			/**
 			 * 用于区分游客与系统用户
 			 * 0 ： 游客

src/tool/country.js

@@ -1,4 +1,34 @@
 let country = [
+	{
+        label: "Commonly used",
+        value: "Commonly used",
+		disabled: true,
+    },
+	{
+        label: "Hong Kong, China",
+        value: "Hong Kong, China"
+    },
+	{
+        label: "Taiwan, China",
+        value: "Taiwan, China"
+    },
+	{
+        label: "China",
+        value: "China"
+    },
+	{
+        label: "South Korea",
+        value: "South Korea"
+    },
+	{
+        label: "American",
+        value: "American"
+    },
+	{
+        label: "All",
+        value: "All",
+		disabled: true,
+    },
     {
         label: "Albania",
         value: "Albania"

src/views/HomeView/HomeView.vue

@@ -397,7 +397,10 @@ export default defineComponent({
 		let likeItemDom = ref()
 		let collItemDom = ref()
 		let domHidden = ref(JSON.parse(sessionStorage.getItem('domHidden') as any) || false);
-		let recycleDomHidden = ref(JSON.parse(sessionStorage.getItem('recycleDomHidden') as any) || false);
+		let recycleDomHidden = ref(false);
+		if(likeDesignCollectionList.value.length>0){
+			JSON.parse(sessionStorage.getItem('recycleDomHidden') as any) || false
+		}
 		let getDesignTime = null as any;
 		const setSystemDesigner = (time:any)=>{
 			clearTimeout(collItemSize.collTime)
@@ -788,6 +791,7 @@ export default defineComponent({
 		// 		type: 'dislike',
 		// 	};
 		// 	designDetail.showDesignDetailModal(data);
+		this.setSystemDesigner()
 	},
 	directives:{
 		mousewheel:{
@@ -954,6 +958,7 @@ export default defineComponent({
 		getDesignResult(data:any,str:any){
 			this.showDesignMark = true
 			this.recycleDomHidden = true
+			this.setSystemDesigner(0)
 			Https.axiosGet(Https.httpUrls.getDesignResult,{params:data})
 			.then(async (rv)=>{
 				if(rv.designCollectionItems){

src/views/LoginPage.vue

@@ -129,8 +129,14 @@
                             </label>
                         </div>
 						<div class="thirdPartyLogin marign_top30">
-							<googleLogin @googelLogin="googelLogin"></googleLogin>
-							<weiXinLogin></weiXinLogin>
+							<div class="label">
+								<div class="mask" v-show="!checked" @click="isCheckAgreement"></div>
+								<googleLogin @googelLogin="googelLogin"></googleLogin>
+							</div>
+							<div class="label">
+								<div class="mask" v-show="!checked" @click="isCheckAgreement"></div>
+								<weiXinLogin></weiXinLogin>
+							</div>
 							<!-- <phoneLogin></phoneLogin> -->
 						</div>
                         <div
@@ -520,6 +526,11 @@ export default defineComponent({
                 })
                 .catch((res) => {});
         },
+		isCheckAgreement(){
+			message.info(
+					"Agree to all terms, privacy fees and policies"
+				);
+		},
 		//微信登录
 		wechatLogin(value:any) {
 			let data = {
@@ -998,8 +1009,18 @@ export default defineComponent({
 	.thirdPartyLogin{
 		display: flex;
 		justify-content: flex-start;
-		>div{
+		> div{
+			position: relative;
 			margin-right: 1rem;
+			> .mask{
+				position: absolute;
+				width: 100%;
+				height: 100%;
+				top: 0;
+				left: 0;
+				z-index: 2;
+				cursor: pointer;
+			}
 		}
 	}
     .tip_content {