fix

src/component/Account/frontPage/cancelRenewal.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="cancelRenewal_page">
-		<div v-if="userDetail.status != 'canceled'">
+		<div v-if="userDetail.status != 'expired' && userDetail.systemUser != 3">
 			<div class="cancel_box_item">
 				<div class="modal_title_text">
 					<div>{{ $t('cancelRenewal.cancelling') }}</div>

src/component/HomePage/generalMenu.vue

@@ -13,6 +13,7 @@
 				<span v-if="item?.label">{{ item?.label }}</span>
 				<span v-else>{{ item.name }}</span>
 			</div>
+			<div class="icon iconfont icon-xiala" :class="{active:openClick}"></div>
 		</div>
 		<ul :class="driverClass.class2" v-show="openClick">
 			<li v-for="item,index in dataList" :class="{active:deleteItem == index}" class="printModel_item" @click="setprintModel(item,index)">
@@ -200,7 +201,13 @@ import { message, Upload, Modal } from "ant-design-vue";
  //衣服类型下拉菜单
  .generalMenu_printModel{
 		margin-right: 2rem;
-		
+		.icon-xiala{
+			margin-left: auto;
+			transition: all .3s;
+			&.active{
+				transform: rotate(180deg);
+			}
+		}
 		>div{
 			// display: flex;
 			display: block;

src/component/mainPage/signUp/registerModel.vue

@@ -144,8 +144,14 @@
 								</label>
 							</div>
 							<div class="thirdPartyLogin marign_top30">
-								<googleLogin @googelLogin="googelLogin" text="Register with Google"></googleLogin>
-								<weiXinLogin text="Register with wechat"></weiXinLogin>
+								<div class="label">
+									<div class="mask" v-show="!checked" @click="isCheckAgreement"></div>
+									<googleLogin @googelLogin="googelLogin" text="Register with Google"></googleLogin>
+								</div>
+								<div class="label">
+									<div class="mask" v-show="!checked" @click="isCheckAgreement"></div>
+									<weiXinLogin text="Register with wechat"></weiXinLogin>
+								</div>
 								<!-- <phoneLogin></phoneLogin> -->
 							</div>
 							<div
@@ -297,6 +303,12 @@ export default defineComponent({
 			loginTime:true
         };
     },
+	mounted(){
+		const data = this.$route.query
+		if(data?.state == 'weiXin'){
+			this.wechatLogin(data)
+		}
+	},
     methods: {
 		init(){
 			this.registerModel = true
@@ -466,7 +478,11 @@ export default defineComponent({
 		
 			}
         },
-
+		isCheckAgreement(){
+			message.info(
+					"Agree to all terms, privacy fees and policies"
+				);
+		},
         changePasswordType(){
             this.passwordType = this.passwordType === 'password' ? 'text' : 'password'
         },
@@ -937,9 +953,19 @@ export default defineComponent({
     }
 	.thirdPartyLogin{
 		display: flex;
-		justify-content: flex-start;
-		>div{
+		// justify-content: flex-start;
+		> div{
+			position: relative;
 			margin-right: 1rem;
+			> .mask{
+				position: absolute;
+				width: 100%;
+				height: 100%;
+				top: 0;
+				left: 0;
+				z-index: 2;
+				cursor: pointer;
+			}
 		}
 	}
     .tip_content {