From 204f88d6f116252ba422d33688b8572dd11a1cdb Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 5 Feb 2025 10:09:59 +0800
Subject: [PATCH] fix

---
 src/assets/style/style.css                    |  7 ++++
 src/assets/style/style.less                   |  7 ++++
 .../Account/frontPage/cancelRenewal.vue       |  2 +-
 src/component/HomePage/generalMenu.vue        |  9 ++++-
 .../mainPage/signUp/registerModel.vue         | 36 ++++++++++++++++---
 src/views/Register.vue                        |  2 --
 6 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index 7f2c6859..796cb246 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -656,6 +656,13 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
 .gallerySelect.ant-select-single.ant-select-lg:not(.ant-select-customize-input) .ant-select-selector .ant-select-selection-placeholder {
   line-height: 5.5rem;
 }
+.ant-select-arrow {
+  right: 2rem;
+  width: 1.2rem;
+  height: 1.2rem;
+  margin-top: -0.6rem;
+  font-size: 1.2rem;
+}
 .generalModel_page {
   width: 100%;
   height: 100%;
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index 59419bf7..c8096b08 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -720,6 +720,13 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte
 		line-height: 5.5rem;
 	}
 }
+.ant-select-arrow{
+	right: 2rem;
+    width: 1.2rem;
+    height: 1.2rem;
+    margin-top: -.6rem;
+    font-size: 1.2rem;
+}
 .generalModel_page {//常用查询列表样式
 	width: 100%;
 	height: 100%;
diff --git a/src/component/Account/frontPage/cancelRenewal.vue b/src/component/Account/frontPage/cancelRenewal.vue
index d78ea3f9..f5449753 100644
--- a/src/component/Account/frontPage/cancelRenewal.vue
+++ b/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>
diff --git a/src/component/HomePage/generalMenu.vue b/src/component/HomePage/generalMenu.vue
index d6ba665c..ae311bd1 100644
--- a/src/component/HomePage/generalMenu.vue
+++ b/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;
diff --git a/src/component/mainPage/signUp/registerModel.vue b/src/component/mainPage/signUp/registerModel.vue
index 86d7366c..1f921126 100644
--- a/src/component/mainPage/signUp/registerModel.vue
+++ b/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 {
diff --git a/src/views/Register.vue b/src/views/Register.vue
index be562743..b9cd9085 100644
--- a/src/views/Register.vue
+++ b/src/views/Register.vue
@@ -52,7 +52,6 @@ export default defineComponent({
 	setup(){
         const store = useStore();
 		const router = useRouter();
-		let registerModel = ref()
 		let data = reactive({
 			homeRecommendMax:null,
 			signUp:null
@@ -100,7 +99,6 @@ export default defineComponent({
 			...toRefs(data),
 			userDetail,
 			setLogin,
-			registerModel,
 			logout,
 			goHome,
 			isMoblie,