diff --git a/src/component/Account/frontPage/bindPage.vue b/src/component/Account/frontPage/bindPage.vue
index 6bedcefe..188d68b2 100644
--- a/src/component/Account/frontPage/bindPage.vue
+++ b/src/component/Account/frontPage/bindPage.vue
@@ -21,11 +21,17 @@
![]()
{{ userDetail.accountExtendList?.Google?userDetail.accountExtendList?.Google.name:$t('frontPage.Unbound') }}
-
+
+
+
{{ $t('frontPage.BindNow') }}
+
+
{{ $t('frontPage.Unbind') }}
+
Email
{{$t('account.Country')}}:
-
+
@@ -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 = []
diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts
index caf2b0ea..57977168 100644
--- a/src/store/userHabit/userHabit.ts
+++ b/src/store/userHabit/userHabit.ts
@@ -199,14 +199,7 @@ const userHabit : Module
= {
},
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 = {
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 ： 游客
diff --git a/src/tool/country.js b/src/tool/country.js
index 0816fe40..d56adb20 100644
--- a/src/tool/country.js
+++ b/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"
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index 8c5e0783..c3afa878 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/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){
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
index 749d2d21..bc6d77e8 100644
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -129,8 +129,14 @@
{});
},
+ 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 {