diff --git a/package2/group/groupBuyList.vue b/package2/group/groupBuyList.vue
index 00399ce..a317b85 100644
--- a/package2/group/groupBuyList.vue
+++ b/package2/group/groupBuyList.vue
@@ -26,23 +26,22 @@
 					<view class="steam steam-one"></view>
 					<view class="steam steam-two"></view>
 					<view class="steam steam-three"></view>
-					<view class="food-float float-one">🍜</view>
+					<!-- <view class="food-float float-one">🍜</view>
 					<view class="food-float float-two">🥤</view>
 					<view class="food-float float-three">🍢</view>
-					<view class="food-float float-four">🥟</view>
+					<view class="food-float float-four">🥟</view> -->
 					<view class="banner-copy">
 						<view class="banner-sticker">宿舍正在拼</view>
 						<view class="banner-title">今天谁还没吃？</view>
-						<view class="banner-desc">楼下热乎的那口，凑个饭搭子就出发。</view>
+						<!-- <view class="banner-desc">楼下热乎的那口，凑个饭搭子就出发。</view> -->
 						<view class="banner-bubbles">
-							<text>还差1人</text>
 							<text>拼团局开了</text>
-							<text>一起点奶茶</text>
+							<text>刚刚有人拼成功</text>
 						</view>
 					</view>
 					<view class="banner-food-card">
 						<img src="/static/images/img/loading.gif" alt="" />
-						<view class="food-card-tag">刚刚有人拼成功</view>
+						<!-- <view class="food-card-tag">刚刚有人拼成功</view> -->
 					</view>
 				</view>
 			</view>
@@ -87,7 +86,7 @@
 			<view class="title-sort">
 				<view class="sort-member">
 					<view class="sort-text" @tap="searchShop('all','')">
-						附近热拼 <text style="font-size: 20rpx;">▼</text>
+						综合排序 <text style="font-size: 20rpx;">▼</text>
 					</view>
 				</view>
 				<view class="sort-member">
@@ -192,7 +191,7 @@
 					<view class="zaixian-item">宿舍群正在等一个饭搭子</view>
 				</swiper-item>
 				<swiper-item v-for="(item,index) in onlineWorkerAreaList" :key="index">
-					<view class="zaixian-item">{{item.areaName}} 附近 {{item.onlineWorkerCount}} 位同学在线拼</view>
+					<view class="zaixian-item">{{item.areaName}} 附近 {{item.onlineWorkerCount}} 位同学在线接单</view>
 				</swiper-item>
 			</swiper>
 		</view>
@@ -234,7 +233,7 @@
 					orderSale: ''
 				},
 				shopList: [],
-				searchHotWords: ['🍜 今晚吃啥', '🥤 奶茶续命拼团', '🔥 夜宵局差1人', '🍱 宿舍套餐热拼'],
+				searchHotWords: ['🍜 今晚吃啥', '🥤 奶茶续命拼团', '🔥 还差1人', '🍱 宿舍套餐热拼'],
 				liveSlogans: ['谁在偷吃夜宵', '差个饭搭子', '隔壁宿舍已开拼'],
 				liveFeeds: [{
 					avatar: '🍜',
@@ -795,7 +794,7 @@
 	}
 
 	.banner-bubbles {
-		margin-top: 18rpx;
+		margin-top: 88rpx;
 		white-space: nowrap;
 
 		text {
diff --git a/package2/group/groupBuySingle.vue b/package2/group/groupBuySingle.vue
index a6d675c..b70174a 100644
--- a/package2/group/groupBuySingle.vue
+++ b/package2/group/groupBuySingle.vue
@@ -1,6 +1,6 @@
 <template>
 	<!-- 拼团单一商家 -->
-	<view class="page1">
+	<view class="page1" :class="{'store-group-page': isStoreGroupOrder}">
 		<!-- 固定顶部导航栏（悬浮在背景图之上） -->
 		<view class="nav-bar"
 			:style="{'padding-top': menuButtonInfo.top +'px','background':((orderListWait.length > 0 && lastScrollTop>217) || (orderListWait.length == 0 && lastScrollTop>149))?'#fff':''}">
@@ -38,7 +38,7 @@
 							{{shopItem.shopName}}
 						</view>
 						<view class="shop-subtitle">
-							约上室友同学一起拼，越快成团越快开吃
+							{{isStoreGroupOrder ? '到店核销，约上同学一起拼更划算' : '约上室友同学一起拼，越快成团越快开吃'}}
 						</view>
 						<view class="shop-content-center">
 							<view class="shop-rate">
@@ -118,7 +118,7 @@
 					<scroll-view scroll-y id="menuList" class="menu-scroll"
 						:style="{ height: stickyInnerHeight + 'px' }">
 						<view class="menu1" @tap="checkTab(index)" v-for="(item,index) in menuList" :key="index"
-							:style="{'border-top-right-radius':item.checked?'20rpx':'','border-bottom-right-radius':item.checked?'20rpx':'','color':item.checked?'rgba(0, 35, 28, 1)':'#777','background':item.checked?'#fff':''}">
+							:style="{'border-top-right-radius':item.checked?'20rpx':'','border-bottom-right-radius':item.checked?'20rpx':'','color':item.checked ? (isStoreGroupOrder ? '#f0642f' : 'rgba(0, 35, 28, 1)') : (isStoreGroupOrder ? '#9b6a4c' : '#777'),'background':item.checked ? (isStoreGroupOrder ? 'linear-gradient(90deg, #fff4e8, #fff)' : '#fff') : ''}">
 							<image class="menu-active-dot" v-if="item.checked" src="/static/images/img/loading.gif"
 								mode="aspectFit"></image>
 							<view style="width: 160rpx;">{{item.categoryName}}</view>
@@ -209,7 +209,11 @@
 				</view>
 			</view>
 			<view class="bottom-right checkout-btn" @tap="submitCartCheckout">
-				<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d93d893296ed46ea99cfd0e8e2835eaa.png" alt="" />
+				<img v-if="!isStoreGroupOrder" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d93d893296ed46ea99cfd0e8e2835eaa.png" alt="" />
+				<view v-else class="store-checkout-btn">
+					<text>去下单</text>
+					<view class="store-checkout-shine"></view>
+				</view>
 			</view>
 		</view>
 
@@ -276,8 +280,12 @@
 						</view>
 					</view>
 					<view class="bottom-right" @tap="submitCartCheckout">
-						<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d93d893296ed46ea99cfd0e8e2835eaa.png"
+						<img v-if="!isStoreGroupOrder" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/d93d893296ed46ea99cfd0e8e2835eaa.png"
 							alt="" />
+						<view v-else class="store-checkout-btn">
+							<text>去下单</text>
+							<view class="store-checkout-shine"></view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -298,7 +306,7 @@
 					<uni-icons type="close" size="30" color="#fff"></uni-icons>
 				</view>
 				<view class="popup-rally-title" v-if="isPintuan">
-					<view class="popup-rally-main">拼团搭子哪里找-隔壁宿舍全是宝！</view>
+					<view class="popup-rally-main">{{isStoreGroupOrder ? '到店团购搭子哪里找-同校同学一起省！' : '拼团搭子哪里找-隔壁宿舍全是宝！'}}</view>
 				</view>
 				<view class="goods-top popup-product-card">
 					<view class="goods-img">
@@ -427,13 +435,13 @@
 							<view class="pintuan2"
 								style="background: rgba(0, 35, 28, 1);border-bottom-right-radius: 100rpx;border-top-right-radius: 100rpx;color: rgba(166, 255, 234, 1);"
 								@tap.stop="submitPintuan(false)">
-								发起拼团￥{{selectedGroupRule && selectedGroupRule.groupPrice ? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}}
+								{{isStoreGroupOrder ? '发起到店团' : '发起拼团'}}￥{{selectedGroupRule && selectedGroupRule.groupPrice ? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}}
 							</view>
 						</template>
 						<template v-else>
 							<view class="pintuan2" style="width: 100%; border-radius: 100rpx;"
 								@tap.stop="submitPintuan(false)">
-								参与拼团￥{{selectedGroupRule && selectedGroupRule.groupPriceAndMore ? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}}
+								{{isStoreGroupOrder ? '参与到店团' : '参与拼团'}}￥{{selectedGroupRule && selectedGroupRule.groupPriceAndMore ? parseFloat(selectedGroupRule.groupPriceAndMore).toFixed(2) : '0.00'}}
 							</view>
 						</template>
 					</view>
@@ -514,7 +522,7 @@
 							若拼团失败，将会为您自动退款
 						</view>
 					</view>
-					<view class="box1" style="display: flex;padding: 40rpx;" v-if="groupdeliveryType == 2">
+					<view class="box1" style="display: flex;padding: 40rpx;" v-if="groupdeliveryType == 2 && !isStoreGroupOrder">
 						<view style="flex: 1;">
 							<view style="height: 42rpx;line-height: 42rpx;display: flex;">
 								<!-- <img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4c8e0cc311db4d38ab43e019673c4b8c.png"
@@ -564,7 +572,7 @@
 					<view class="btn"
 						style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));width: 90%;height: 100rpx;border-radius: 100rpx;text-align: center;font-size: 28rpx;font-weight: 700;line-height: 100rpx;margin: 40rpx auto;"
 						@tap="wxPayment">
-						确认付款{{nowMake && groupdeliveryType == 2 ? '-即刻出餐' : ''}}
+						确认付款{{nowMake && groupdeliveryType == 2 && !isStoreGroupOrder ? '-即刻出餐' : ''}}
 					</view>
 				</view>
 			</view>
@@ -694,6 +702,7 @@
 				loadStatus: 'more',
 				type: '',
 				isPindan:true,
+				orderScene: '',
 				shopId: '',
 				shopItem: {
 					shopIcon: '',
@@ -760,6 +769,9 @@
 
 		},
 		computed: {
+			isStoreGroupOrder() {
+				return this.orderScene === 'storeGroup' || this.shopItem.merchantType == 2;
+			},
 			cartTotalCount() {
 				return this.cartItems.reduce((acc, curr) => acc + curr.quantity, 0);
 			},
@@ -803,6 +815,7 @@
 		},
 		onLoad(option) {
 			this.type = option.type;
+			this.orderScene = option.orderScene || '';
 			if (option.groupId) {
 				this.groupId = option.groupId;
 			}
@@ -1378,12 +1391,13 @@
 					specs: specChoices,
 					orderType: 2, // 2 indicates Group Buy
 					groupId: this.groupId,
-					isFaceToFace: this.groupId ? this.isFaceToFaceGroup : (isFaceToFace || false)
+					isFaceToFace: this.groupId ? this.isFaceToFaceGroup : (isFaceToFace || false),
+					orderScene: this.orderScene
 				};
 				uni.navigateTo({
 					url: '/package1/buyFood/buyFood?item=' + encodeURIComponent(JSON.stringify(goData)) +
 						'&shopItem=' + encodeURIComponent(JSON.stringify(this.shopItem)) + '&packageFee=' +
-						packageFee
+						packageFee + (this.orderScene ? '&orderScene=' + this.orderScene : '')
 				});
 				this.$refs.pintuanPopup.close();
 			},
@@ -1681,7 +1695,7 @@
 
 				let amountInCents = Math.round(this.backendTotalAmount * 100);
 				let userRequireMake = 0
-				if(this.nowMake && this.groupdeliveryType == 2){
+				if(this.nowMake && this.groupdeliveryType == 2 && !this.isStoreGroupOrder){
 					userRequireMake = 1
 				}
 
@@ -3574,4 +3588,167 @@
 		0%, 100% { transform: scale(0.6); opacity: 0.35; }
 		50% { transform: scale(1.45); opacity: 1; }
 	}
+
+	.store-group-page {
+		background:
+			radial-gradient(circle at 85% 90rpx, rgba(255, 228, 177, 0.58), transparent 260rpx),
+			linear-gradient(180deg, #fff3e5 0%, #fff8f1 44%, #fffaf6 100%);
+		color: #3f2618;
+	}
+
+	.store-group-page .title {
+		background:
+			radial-gradient(circle at 76% 22%, rgba(255, 245, 218, 0.72), transparent 230rpx),
+			linear-gradient(135deg, #ff9569 0%, #ffc47d 52%, #ffe8c6 100%);
+	}
+
+	.store-group-page .group-hero-card,
+	.store-group-page .goods-card {
+		background:
+			radial-gradient(circle at 92% 6%, rgba(255, 210, 138, 0.34) 0, rgba(255, 210, 138, 0) 150rpx),
+			#fff;
+		border-color: rgba(255, 218, 183, 0.82);
+		box-shadow: 0 18rpx 42rpx rgba(178, 102, 48, 0.12);
+	}
+
+	.store-group-page .group-hero-card {
+		background:
+			radial-gradient(circle at 92% 0, rgba(255, 235, 198, 0.95) 0, rgba(255, 235, 198, 0) 190rpx),
+			linear-gradient(135deg, #ffffff 0%, #fff8f1 52%, #fff1df 100%);
+		border: 2rpx solid rgba(255, 116, 68, 0.18);
+	}
+
+	.store-group-page .group-card-glow,
+	.store-group-page .goods-card-shine {
+		background: rgba(255, 196, 126, 0.32);
+	}
+
+	.store-group-page .shop-name {
+		color: #3f2618;
+	}
+
+	.store-group-page .shop-subtitle,
+	.store-group-page .shop-deal {
+		color: #8f684c !important;
+	}
+
+	.store-group-page .shop-rate {
+		background: rgba(255, 240, 220, 0.92);
+		box-shadow: inset 0 0 0 1rpx rgba(255, 190, 130, 0.26);
+	}
+
+	.store-group-page .shop-tag text {
+		background: #fff0dc !important;
+		color: #d65f2c !important;
+	}
+
+	.store-group-page .shop-bottom {
+		color: #8f684c;
+		border-top: 1rpx solid rgba(255, 126, 39, 0.1);
+	}
+
+	.store-group-page .notice-label {
+		background: rgba(255, 116, 68, 0.12);
+		color: #f0642f;
+	}
+
+	.store-group-page .catalog-menu-wrap,
+	.store-group-page .menu-scroll {
+		background: linear-gradient(180deg, #fff3e7 0%, #fffaf6 100%) !important;
+		border-right: 1rpx solid rgba(255, 190, 130, 0.22);
+	}
+
+	.store-group-page .menu1 {
+		color: #9b6a4c;
+	}
+
+	.store-group-page .menu-active-dot {
+		filter: hue-rotate(148deg) saturate(1.5);
+		opacity: 0.9;
+	}
+
+	.store-group-page .group-live-card {
+		background:
+			radial-gradient(circle at 92% 0, rgba(255, 209, 110, 0.34) 0, rgba(255, 209, 110, 0) 150rpx),
+			linear-gradient(135deg, #fff9f2 0%, #fff0dc 48%, #fff7ee 100%);
+		border-color: rgba(255, 194, 132, 0.72);
+		color: #4f311f;
+	}
+
+	.store-group-page .goods-vibe-tag,
+	.store-group-page .live-pill,
+	.store-group-page .pintuan0,
+	.store-group-page .pintuan2,
+	.store-group-page .list-btn {
+		background: linear-gradient(90deg, #ff7444, #ffb35e) !important;
+		color: #fff !important;
+	}
+
+	.store-group-page .group-buy-btn {
+		background: linear-gradient(90deg, #ff7444 0%, #ffb35e 62%, #ffe0a8 100%) !important;
+		color: #fff;
+		box-shadow: 0 12rpx 26rpx rgba(255, 126, 39, 0.26);
+	}
+
+	.store-group-page .solo-buy-btn {
+		color: #b4572d !important;
+		border-color: rgba(255, 180, 118, 0.5) !important;
+		background: rgba(255, 244, 232, 0.72) !important;
+	}
+
+	.store-group-page .checkout-bar,
+	.store-group-page .popup-bottom-bar {
+		box-shadow: 0 -8rpx 34rpx rgba(178, 102, 48, 0.16);
+	}
+
+	.store-group-page .bottom-right.checkout-btn,
+	.store-group-page .bottom-right {
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		padding: 16rpx 18rpx 16rpx 0;
+		box-sizing: border-box;
+	}
+
+	.store-checkout-btn {
+		width: 318rpx;
+		height: 92rpx;
+		border-radius: 999rpx;
+		background: linear-gradient(100deg, #ff7444 0%, #ff9f38 52%, #ffd16e 100%);
+		color: #fff;
+		font-size: 30rpx;
+		font-weight: 900;
+		line-height: 92rpx;
+		text-align: center;
+		position: relative;
+		overflow: hidden;
+		box-shadow: 0 16rpx 34rpx rgba(255, 126, 39, 0.34);
+		border: 2rpx solid rgba(255, 255, 255, 0.64);
+	}
+
+	.store-checkout-btn text {
+		position: relative;
+		z-index: 2;
+		letter-spacing: 2rpx;
+	}
+
+	.store-checkout-shine {
+		position: absolute;
+		left: -120rpx;
+		top: -40rpx;
+		width: 120rpx;
+		height: 180rpx;
+		background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.44), transparent);
+		transform: rotate(18deg);
+		animation: storeCheckoutShine 2.8s ease-in-out infinite;
+	}
+
+	@keyframes storeCheckoutShine {
+		0%, 40% {
+			transform: translateX(0) rotate(18deg);
+		}
+		100% {
+			transform: translateX(480rpx) rotate(18deg);
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/package2/group/studentStoreList.vue b/package2/group/studentStoreList.vue
index c58d88c..112fb6f 100644
--- a/package2/group/studentStoreList.vue
+++ b/package2/group/studentStoreList.vue
@@ -450,7 +450,7 @@
 			},
 			goShop(item) {
 				uni.navigateTo({
-					url: '/package2/group/groupBuySingle?type=shop&item=' + encodeURIComponent(JSON.stringify(item))
+					url: '/package2/group/groupBuySingle?type=shop&orderScene=storeGroup&item=' + encodeURIComponent(JSON.stringify(item))
 				})
 			},
 			getShopType(item) {
diff --git a/package2/login/login.vue b/package2/login/login.vue
index 0c3f9ac..2085946 100644
--- a/package2/login/login.vue
+++ b/package2/login/login.vue
@@ -1,654 +1,685 @@
 <template>
-	<view class="content">
-		<view class="title-name">
-			快衣店
-		</view>
-		<view class="container" :style='{"padding-top":isShareDown?"300rpx":"0"}'>
-			<view class="" v-if="!isShareDown">
-				<uni-section title="选择登录身份" type="line">
-					<uni-data-select v-model="wayValue" :localdata="range" @change="sectionChange"
-						:clear="false"></uni-data-select>
-				</uni-section>
+	<view class="radius-login">
+		<view class="ambient ambient-one"></view>
+		<view class="ambient ambient-two"></view>
+		<view class="ambient ambient-three"></view>
+
+		<view class="float-bubble bubble-a">刚刚有人拼成奶茶</view>
+		<view class="float-bubble bubble-b">夜宵局启动中</view>
+		<view class="float-bubble bubble-c">附近同学正在拼饭</view>
+
+		<view class="hero">
+			<view class="brand-mark">
+				<view class="brand-dot"></view>
+				<text>半径里</text>
 			</view>
-			<view class="login-content" v-if="loginWay == true && !isShareDown">
-				<uni-easyinput v-model="username" placeholder="请输入账号" />
-				<com-zw />
-				<uni-easyinput v-model="password" :maxlength="25" placeholder="请输入密码" type="password" />
-				<com-zw />
-				<view class="flex" style="display: flex;">
-					<uni-easyinput v-model="code" :clearable="false" :maxlength="4" placeholder="请输入验证码" />
-					<img :src="captchaImg" alt="加载验证码失败"
-						style="width: 180rpx; height: 74rpx; cursor: pointer; display: block" @click="getCaptchaImg" />
-				</view>
+			<view class="brand-title">拼团更省钱，半径更精彩</view>
+			<view class="brand-subtitle">校园万物 · 皆可拼团</view>
+		</view>
+
+		<view class="ip-stage">
+			<view class="halo"></view>
+			<view class="squirrel-card">
+				<image class="squirrel" src="/static/images/img/loading.gif" mode="aspectFit"></image>
+				<view class="squirrel-mask"></view>
 			</view>
-			<view class="login-content" v-if="!isShareDown &&loginWay == false ">
-				<uni-easyinput v-model="mobile" :maxlength="11" placeholder="请输入手机号" />
-				<com-zw />
-				<view class="code-box">
-					<uni-easyinput type="digit" v-model="code" placeholder="请输入验证码" trim="all" />
-					<button class="button" size="mini" type="default" @click="sendLoginSms" :disabled="choose"
-						:class="choose == false ? 'hasChosen':'notChosen'">
-						{{ choose ? clock + '重新获取' : '获取验证码' }}
-					</button>
-				</view>
+			<view class="sticker sticker-phone">邀你拼团</view>
+			<view class="sticker sticker-tea">奶茶 +1</view>
+			<view class="emoji emoji-food">🍱</view>
+			<view class="emoji emoji-run">🏃</view>
+		</view>
+
+		<view class="login-card">
+			<view class="card-title">进入你的校园半径</view>
+			<view class="card-desc">拼饭、跑腿、搭子和校园好物，都在附近发生。</view>
+
+			<button
+				v-if="!needPhoneAuth"
+				class="primary-btn"
+				:class="{ loading: loginLoading }"
+				:disabled="loginLoading"
+				hover-class="primary-btn-hover"
+				@tap="wxLogin"
+			>
+				<text class="btn-icon">微信</text>
+				<text>{{ loginLoading ? '正在进入半径里' : '微信半径里' }}</text>
+			</button>
+
+			<button
+				v-else
+				class="primary-btn phone-btn"
+				:class="{ loading: phoneLoading }"
+				:disabled="phoneLoading"
+				open-type="getPhoneNumber"
+				hover-class="primary-btn-hover"
+				@getphonenumber="getPhoneNumber"
+			>
+				<text>{{ phoneLoading ? '正在绑定手机号' : '绑定手机号，解锁完整半径' }}</text>
+			</button>
+
+			<view class="login-tip">
+				{{ needPhoneAuth ? '最后一步，绑定后即可进入主页' : '使用微信身份轻松进入校园生活世界' }}
 			</view>
+
 			<view class="tui-protocol" hover-class="opcity" :hover-stay-time="150">
-				<checkbox-group @change="xieyi" style="display: inline;">
+				<checkbox-group @change="xieyi" class="protocol-check">
 					<label>
-						<checkbox :value="xieyidata" :checked="xieyidata" style="transform:scale(0.7)" />
+						<checkbox value="agree" :checked="xieyidata" color="#46bf8c" style="transform:scale(0.7)" />
 					</label>
 				</checkbox-group>
-				您已阅读并同意
-				<text class="tui-protocol-red" @tap="protocol('1')">《用户协议》</text>
-				<text class="tui-protocol-red" @tap="protocol('2')">《隐私政策》</text>
-			</view>
-			<view v-if="!isShareDown" @tap.stop="goLogin" class="login-btn">登录</view>
-			<view v-if="isShareDown" @tap.stop="wxLogin" class="login-btn">微信登录</view>
-			<view class="login-way">
-				<view class="" @tap="goRegister">新店铺注册</view>
-				<view class="" v-if="!isShareDown && wayValue == '2'" @tap="isShareDown = true">微信登录</view>
-				<view class="" v-if="isShareDown" @tap="isShareDown = false">手机号登录</view>
-				<view class="" v-if="!isShareDown" @tap="switchLoginWay">{{loginWay ? '验证码登录' : '账号密码登录'}}</view>
+				<text>已阅读并同意</text>
+				<text class="tui-protocol-red" @tap.stop="protocol('1')">《用户协议》</text>
+				<text class="tui-protocol-red" @tap.stop="protocol('2')">《隐私政策》</text>
 			</view>
 		</view>
-		<!-- 多店铺的时候，选择店铺的弹窗 -->
-		<uni-popup ref="popup" background-color="#fff">
-			<view class="popup-content">
-				<view class="popup-title">
-					<text>{{wayValue == 1?'选择登录物流':'选择登录店铺'}}</text>
-				</view>
-				<view class="popup-container" v-for="item in shopList" :key="item" @tap="checkShop(item)">
-					<text style="display: inline-block">{{wayValue==1?item.companyName:item.shopName}}</text>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 获取手机号弹窗 -->
-		<uni-popup ref="mobilePopup" background-color="#fff">
-			<view class="mobile-popup-content">
-				<view class="">
-					获取手机号，为您提供更便捷的使用体验
-				</view>
-				<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">一键获取手机号</button>
-			</view>
-		</uni-popup>
 	</view>
 </template>
 
 <script>
-	import {
-		mapMutations,
-		mapActions,
-		mapState
-	} from 'vuex';
-	import {
-		reg,
-		wxLogin
-	} from '@/utils/global.js'
 	export default {
 		data() {
 			return {
-				mobile: '',
-				username: '',
-				isShareDown:false,
-				// username: '15630117759',
-				code: '',
-				password: '',
-				// password: '19950123kang',
-				loginWay: true, //true账号密码登录  false验证码登录
-				captchaImg: '',
-				xieyidata:false,
-				captchaId: '',
-				wayValue: 0,
-				range: [{
-					value: 0,
-					text: "店铺"
-				},
-				{
-					value: 1,
-					text: "物流公司"
-				},
-				{
-					value: 2,
-					text: "下游客户"
-				}],
-				choose: false,
-				isChoose: false,
-				clock: 60, // 倒计时
-				shopList: [],
-				saleId:'',
-				customId:''
+				xieyidata: false,
+				loginLoading: false,
+				phoneLoading: false,
+				needPhoneAuth: false,
+				customId: '',
+				saleId: ''
 			}
 		},
-		computed: mapState(['type']),
 		onLoad(option) {
-			let that = this;
-			if(option.saleId){
+			if (option.saleId) {
 				this.saleId = option.saleId
 			}
-			if(uni.getStorageSync('shopId') && uni.getStorageSync('hiver_token')){
-				uni.reLaunch({
-					url: '/pages/index/index'
-				})
-				return
-			}
-			if(option.customId){
-				uni.setStorageSync('wayValue',2)
+			if (option.customId) {
 				this.customId = option.customId
-				this.isShareDown = true
 			}
-			
-			if(uni.getStorageSync('codePage')){
-				this.wayValue = 2
-				this.$forceUpdate()
-				uni.removeStorageSync('codePage')
-			}
-			
-			//缓存中有userId，直接更新
-			if(uni.getStorageSync('id') && uni.getStorageSync('wayValue') == 2){
-				that.tui.request("/app/customer/updateUserId", "post", {
-					customerId:option.customId,
-					userId:uni.getStorageSync('id')
-				}, false, true).then((res) => {
-					uni.reLaunch({
-						url: '/package1/other/custom?saleId=' + this.saleId + '&userId=' + option.customId
-					})
-				})
-			}
-			if(uni.getStorageSync('hiver_token') && uni.getStorageSync('wayValue') == 2){
+			if (uni.getStorageSync('hiver_token')) {
 				uni.reLaunch({
-					url: '/package1/other/custom?saleId=' + this.saleId + '&userId=' + this.customId
+					url: '/pages/index/index'
 				})
 			}
-			this.getCaptchaImg();
-			this.username = uni.getStorageSync('username')
-			this.password = uni.getStorageSync('password')
 		},
 		methods: {
-			
-			...mapMutations(['login']),
-			...mapActions(['getUserInfo']),
-			getCaptchaImg() {
-				this.tui.request("/common/captcha/init", "GET", null).then((res) => {
-					if (res.code == 200) {
-						this.captchaId = res.result
-						this.captchaImg = this.tui.interfaceUrl() + '/common/captcha/draw/' + this
-							.captchaId
-					} else {
-						this.tui.toast(res.message)
-					}
-				}).catch((res) => {})
-			},
-			getPhoneNumber (e) {
-				console.log(e)
-				if (e.detail.code) {
-					// 将 code 发送给后端
-					this.tui.request("/social/wechat/getPhone", "POST", {
-						code: e.detail.code
-					}, false, true).then((res) => {
-						if (res.code == 200) {
-							// 授权成功后的处理逻辑
-							this.tui.toast('获取手机号成功'+res.result.mobile);
-							
-							// 如果后端返回了 phone，将其存入缓存，方便以后使用
-							if (res.result) {
-								uni.setStorageSync("hiver_token", res.result.accessToken)
-								uni.setStorageSync('mobile', res.result.mobile);
-							}
-						} else {
-							this.tui.toast(res.message || '获取失败');
-						}
-					}).catch((err) => {
-						console.log("请求异常: ", err);
-						this.tui.toast('请求获取手机号失败');
-					});
-				} else {
-					// 用户拒绝授权
-					console.log('用户取消授权', e.detail.errMsg);
-					this.tui.toast('您取消了手机号授权');
-				}
-				setTimeout(() => {
-					uni.reLaunch({
-						url: '/pages/index/index'
-					})
-				}, 200)
-				this.tui.toast('登录成功', 2000, true)
-			},
-			sectionChange(index) {
-				this.wayValue = index;
-				if(index == '2'){
-					this.isShareDown = true
-				}
-			},
-			//登录
-			goLogin() {
-				let data = {},
-					loginUrl=''
-				if(this.xieyidata == false){
-					this.tui.toast('请阅读用户协议并勾选同意后再登录！')
-					return
-				}
-				if (this.loginWay) { //true
-					data = {
-						username: this.username,
-						password: this.password,
-						code: this.code,
-						captchaId: this.captchaId,
-						saveLogin: true,
-						type: this.wayValue
-					}
-					loginUrl='/auth/login'  //type : 0管理员  1是普通员工
-				} else {
-					data = {
-						mobile: this.mobile,
-						code: this.code,
-						saveLogin: true,
-						type: this.wayValue
-					}
-					loginUrl='/auth/smsLogin'
-				}
-				if(this.wayValue == 1){ //物流公司
-					this.tui.request("/app/logitics/login", "POST", {
-						username: this.username,
-						password: this.password,
-						code: this.code,
-						saveLogin: true,
-						type: this.wayValue
-					}, true, true).then((res) => {
-						if (res.code == 200) {
-							this.toggle("center");
-							this.shopList = res.result
-							
-						}else{
-							this.getCaptchaImg()
-							this.tui.toast(res.message)
-						}
-					}).catch((res) => {
-						this.getCaptchaImg()
-					})
-				}else{
-					this.tui.request(loginUrl, "POST", data, true, true).then((res) => {
-						if (res.code == 200) {
-							uni.setStorageSync("hiver_token", res.result.accessToken)
-							uni.setStorageSync("wayValue", this.wayValue)
-							uni.setStorageSync("nickname", res.result.user.nickname)
-							
-							if(this.wayValue == '2'){
-								uni.setStorageSync("id", res.result.user.id)
-							}else{
-								uni.setStorageSync("id", res.result.user.id)
-							}
-							uni.setStorageSync('username',this.username)
-							uni.setStorageSync('password',this.password)
-							if(this.wayValue == 2){ //下游客户登录
-								uni.setStorageSync('miniProgramOpenid',res.result.user.miniProgramOpenid)
-								uni.setStorageSync('officialAccountOpenid',res.result.user.officialAccountOpenid)
-								uni.setStorageSync('unionid',res.result.user.unionid)
-								setTimeout(() => {
-									uni.reLaunch({
-										url: '/package1/other/custom?saleId=' + this.saleId
-									})
-								}, 200)
-								this.tui.toast('登录成功', 2000, true)
-							}else if (res.result.shopList.length > 1 && this.wayValue == 0) {
-								this.shopList = res.result.shopList;
-								this.toggle("center");
-								
-							}else{
-								this.checkShop(res.result.shopList[0])
-							}
-						} else {
-							this.tui.toast(res.message)
-							setTimeout(res=>{
-								this.getCaptchaImg()
-							},1000)
-						}
-					}).catch((res) => {
-						
-						this.getCaptchaImg()
-					})
-				}
-				
-			},
-			wxLogin(){
-				let that =this;
-				if(this.xieyidata == false){
-					this.tui.toast('请阅读用户协议并勾选同意后再登录！')
+			wxLogin() {
+				if (!this.xieyidata) {
+					this.tui.toast('请阅读并同意用户协议和隐私政策')
 					return
 				}
+				if (this.loginLoading) return
+
+				const that = this
+				this.loginLoading = true
 				uni.login({
 					provider: 'weixin',
-					success(res) {
-						console.log(res)
-						uni.getUserInfo({
-							provider: 'weixin',
-							success: function(infoRes) {
-								
-								that.tui.request("/user/login", "post", {
-									jsCode: res.code,
-									customId: that.customId,
-									wechatName: infoRes.userInfo.nickName,
-									userType: "2"
-								}, false, false).then((res) => {
-									if (res.code == 200) {
-										
-										uni.setStorageSync("hiver_token", res.result.accessToken)
-										uni.setStorageSync("worker", res.result.worker)
-										uni.setStorageSync("wayValue", "0")
-										uni.setStorageSync("nickname", res.result.user.nickname)
-										uni.setStorageSync("id", res.result.user.id)
-										uni.setStorageSync('unionid',res.result.user.unionid)
-										uni.setStorageSync('schoolShop',res.result.shop)
-										if(res.result.waimaiData != undefined){
-											uni.setStorageSync("waimaiData", res.result.waimaiData)
-										}
-										if(res.result.kuaidiData != undefined){
-											uni.setStorageSync("kuaidiData", res.result.kuaidiData)
-										}
-										uni.setStorageSync('miniProgramOpenid',res.result.user.miniProgramOpenid)
-										uni.setStorageSync('officialAccountOpenid',res.result.user.officialAccountOpenid)
-										if(res.result.user.mobile == null){
-											that.$refs.mobilePopup.open('bottom')
-										}else{
-											setTimeout(() => {
-												uni.reLaunch({
-													url: '/pages/index/index'
-												})
-											}, 200)
-											that.tui.toast('登录成功', 2000, true)
-										}
-									} else {
-										that.tui.toast(res.message)
-									}
-								}).catch((res) => {})
-							}
-						});
-						
-					}
-				});
-			},
-			//多店铺的时候点击选择需要登录的店铺
-			checkShop(item) {
-				let that = this;
-				uni.getSystemInfo({
-					success: function (res1) {
-						if(that.wayValue ==1){
-							that.tui.request("/app/logitics/chooseCompany", "POST", {
-								companyId: item.id,
-								username:item.username
-							}, false, true).then((res) => {
+					success(loginRes) {
+						that.getWechatProfile().then((profile) => {
+							that.tui.request('/user/login', 'post', {
+								jsCode: loginRes.code,
+								customId: that.customId,
+								wechatName: profile.nickName || '半径里同学',
+								userType: '2'
+							}, false, false).then((res) => {
+								that.loginLoading = false
 								if (res.code == 200) {
-									let printMethod = JSON.parse(res.result.logiticsCompany.printMethod)
-									uni.setStorageSync('remark',res.result.logiticsCompany.remark)
-									if(printMethod == null){
-										uni.setStorageSync('wlNum',1)
-									}else{
-										if(printMethod.xbqNum != undefined){
-											uni.setStorageSync('wlNum',printMethod.wlNum)
-											uni.setStorageSync('xbqNum',1)
-										}else{
-											uni.setStorageSync('wlNum',printMethod.wlNum)
-											uni.setStorageSync('zhiType',printMethod.zhiType)
-										}
+									that.saveLoginResult(res.result)
+									if (!res.result.user || res.result.user.mobile == null || res.result.user.mobile === '') {
+										that.needPhoneAuth = true
+										that.tui.toast('绑定手机号，解锁完整半径')
+									} else {
+										that.enterHome()
 									}
-									uni.setStorageSync('contacts',res.result.logiticsCompany.contacts)
-									uni.setStorageSync('username',res.result.logiticsCompany.username)
-									uni.setStorageSync('mobile',res.result.logiticsCompany.mobile)
-									uni.setStorageSync("hiver_token", res.result.lcomToken)
-									uni.setStorageSync("transCompany", res.result.logiticsCompany.companyId)
-									uni.setStorageSync("isOnLine", res.result.logiticsCompany.isOnLine)
-									uni.setStorageSync("companyMobile", res.result.logiticsCompany.mobile)
-									uni.setStorageSync("companyName", res.result.logiticsCompany.companyName)
-									uni.setStorageSync("signCompany", res.result.logiticsCompany.signCompany)
-									uni.setStorageSync("wayValue", that.wayValue)
-									that.tui.toast('登录成功', 2000, true)
-									setTimeout(() => {
-										uni.reLaunch({
-											url: '/package2/other/newLogisticsIndex'
-										})
-									}, 200)
 								} else {
 									that.tui.toast(res.message)
-									return
 								}
-							}).catch((res) => {})
-						}else{
-							that.tui.request("/auth/chooseShop", "POST", {
-								shopId: item.shop.id,
-								deviceId:res1.deviceId
-							}, false, true).then((res) => {
-								if (res.code == 200) {
-									uni.setStorageSync('type',item.type)
-									uni.setStorageSync('warehouseKeeperFlag',item.warehouseKeeperFlag)
-									uni.setStorageSync('shopId',item.shop.id)
-									uni.setStorageSync('shopName',item.shopName)
-									uni.setStorageSync('storeFlag',item.storeFlag)
-									uni.setStorageSync('shopIcon',res.result.shopIcon)
-									uni.setStorageSync('shopAddress',res.result.shopAddress)
-									uni.setStorageSync('shopRemark',res.result.remark)
-									uni.setStorageSync("shopOwnerPhone", item.shopOwnerPhone)
-									uni.setStorageSync("isShop",true)
-									setTimeout(() => {
-										uni.reLaunch({
-											url: '/pages/index/index'
-											// url: '/pages/index/logistics'
-										})
-									}, 200)
-									that.tui.toast('登录成功', 2000, true)
-								} else {
-									that.tui.toast(res.message)
-									return
-								}
-							}).catch((res) => {})
-						}
+							}).catch(() => {
+								that.loginLoading = false
+								that.tui.toast('登录失败，请稍后再试')
+							})
+						})
+					},
+					fail() {
+						that.loginLoading = false
+						that.tui.toast('微信登录失败，请稍后再试')
 					}
-				});
+				})
 			},
-			sendLoginSms() { // 获取验证码
-				this.isChoose = false
-				if (reg(this.mobile, this.clock) && this.isChoose == false) {
-					this.choose = true
-					this.setTime()
-					this.tui.request("/common/captcha/sendLoginSms/" + this.mobile, "GET", {
-						type: this.wayValue
-					}).then((res) => {
-						if (res.code == 200) {
-							uni.showToast({
-								title: "发送成功",
-								icon: 'success'
-							})
-						} else {
-							this.tui.toast(res.message)
-						}
-					}).catch((res) => {})
-				} else if (reg(this.mobile, this.clock) && this.isChoose == true) {
+			getWechatProfile() {
+				return new Promise((resolve) => {
+					if (uni.getUserProfile) {
+						uni.getUserProfile({
+							desc: '用于完善半径里校园身份',
+							success: (res) => resolve(res.userInfo || {}),
+							fail: () => resolve({})
+						})
+						return
+					}
 
-				}
+					uni.getUserInfo({
+						provider: 'weixin',
+						success: (res) => resolve(res.userInfo || {}),
+						fail: () => resolve({})
+					})
+				})
 			},
-			setTime() { // 倒计时函数
-				if (this.clock == 0) {
-					this.clock = 60
-					this.choose = false
+			getPhoneNumber(e) {
+				if (this.phoneLoading) return
+				if (!e.detail.code) {
+					this.tui.toast('需要绑定手机号后进入主页')
 					return
-				} else {
-					this.clock--
-					if (this.clock < 10) {
-						this.clock = '0' + this.clock
-					}
 				}
-				setTimeout(() => {
-					this.setTime()
-				}, 1000)
-			},
-			//注册
-			goRegister() {
-				uni.navigateTo({
-					url: '/package2/login/register'
+
+				this.phoneLoading = true
+				this.tui.request('/social/wechat/getPhone', 'POST', {
+					code: e.detail.code
+				}, false, true).then((res) => {
+					this.phoneLoading = false
+					if (res.code == 200) {
+						if (res.result) {
+							if (res.result.accessToken) {
+								uni.setStorageSync('hiver_token', res.result.accessToken)
+							}
+							if (res.result.mobile) {
+								uni.setStorageSync('mobile', res.result.mobile)
+							}
+						}
+						this.enterHome()
+					} else {
+						this.tui.toast(res.message || '手机号绑定失败')
+					}
+				}).catch(() => {
+					this.phoneLoading = false
+					this.tui.toast('手机号绑定失败，请稍后再试')
 				})
 			},
-			//切换登录方式
-			switchLoginWay() {
-				this.loginWay = !this.loginWay
+			saveLoginResult(result) {
+				if (!result) return
+
+				if (result.accessToken) uni.setStorageSync('hiver_token', result.accessToken)
+				if (result.worker !== undefined) uni.setStorageSync('worker', result.worker)
+				uni.setStorageSync('wayValue', '0')
+				if (result.user) {
+					uni.setStorageSync('nickname', result.user.nickname)
+					uni.setStorageSync('id', result.user.id)
+					uni.setStorageSync('unionid', result.user.unionid)
+					uni.setStorageSync('miniProgramOpenid', result.user.miniProgramOpenid)
+					uni.setStorageSync('officialAccountOpenid', result.user.officialAccountOpenid)
+					if (result.user.mobile) {
+						uni.setStorageSync('mobile', result.user.mobile)
+					}
+				}
+				if (result.shop !== undefined) uni.setStorageSync('schoolShop', result.shop)
+				if (result.waimaiData !== undefined) uni.setStorageSync('waimaiData', result.waimaiData)
+				if (result.kuaidiData !== undefined) uni.setStorageSync('kuaidiData', result.kuaidiData)
 			},
-			protocol(num) {
-				if(num == '1'){
-					uni.navigateTo({
-						url: '/package2/login/protocol'
-					})
-				}else{
-					uni.navigateTo({
-						url: '/package2/login/privacy'
+			enterHome() {
+				this.tui.toast('登录成功', 2000, true)
+				setTimeout(() => {
+					uni.reLaunch({
+						url: '/pages/index/index'
 					})
-				}
-				
+				}, 200)
 			},
-			//打开弹出层
-			toggle(type) {
-				this.type = type
-				this.$refs.popup.open(type)
+			protocol(num) {
+				uni.navigateTo({
+					url: num == '1' ? '/package2/login/protocol' : '/package2/login/privacy'
+				})
 			},
-			xieyi(e){
-				this.xieyidata = e.detail.value=='false'?true:false
+			xieyi(e) {
+				this.xieyidata = e.detail.value.length > 0
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.content {
-		height: 1624rpx;
-		background: #fff;
-		font-size: 24rpx;
+	.radius-login {
+		position: relative;
+		min-height: 100vh;
+		box-sizing: border-box;
+		overflow: hidden;
+		padding: 96rpx 44rpx 52rpx;
+		color: #17372d;
+		background:
+			radial-gradient(circle at 12% 14%, rgba(255, 255, 255, 0.96) 0, rgba(255, 255, 255, 0) 270rpx),
+			radial-gradient(circle at 88% 6%, rgba(199, 248, 219, 0.72) 0, rgba(199, 248, 219, 0) 260rpx),
+			linear-gradient(160deg, #f8f5e8 0%, #eefbe8 42%, #e7f8ef 68%, #fbf7ed 100%);
 	}
-	.title-name {
-		width: 100%;
-		height: 400rpx;
-		line-height: 200rpx;
-		font-size: 80rpx;
-		text-align: center;
-		padding-top: 200rpx;
-		color: #000;
+
+	.ambient {
+		position: absolute;
+		border-radius: 999rpx;
+		pointer-events: none;
 	}
 
-	.container {
-		width: 90%;
-		height: 700rpx;
-		margin: 0 auto;
+	.ambient-one {
+		top: 88rpx;
+		left: -84rpx;
+		width: 260rpx;
+		height: 260rpx;
+		background: rgba(255, 255, 255, 0.55);
+		box-shadow: 0 0 80rpx rgba(255, 255, 255, 0.74);
+		animation: softFloat 8s ease-in-out infinite;
 	}
 
-	.login-content {
-		margin-top: 20rpx;
+	.ambient-two {
+		top: 260rpx;
+		right: -70rpx;
+		width: 210rpx;
+		height: 210rpx;
+		background: rgba(192, 245, 221, 0.52);
+		box-shadow: 0 0 90rpx rgba(137, 220, 177, 0.28);
+		animation: softFloat 10s ease-in-out infinite reverse;
 	}
 
-	.tui-protocol {
-		color: #333;
+	.ambient-three {
+		left: 122rpx;
+		bottom: 238rpx;
+		width: 120rpx;
+		height: 120rpx;
+		background: rgba(255, 240, 199, 0.48);
+		box-shadow: 0 0 70rpx rgba(255, 213, 127, 0.26);
+		animation: ambientPulse 7s ease-in-out infinite;
+	}
+
+	.float-bubble {
+		position: absolute;
+		z-index: 2;
+		padding: 14rpx 22rpx;
+		border: 1rpx solid rgba(255, 255, 255, 0.68);
+		border-radius: 999rpx;
+		background: rgba(255, 255, 255, 0.45);
+		box-shadow: 0 16rpx 42rpx rgba(95, 150, 121, 0.12);
+		color: rgba(38, 81, 67, 0.58);
+		font-size: 21rpx;
+		line-height: 1;
+		backdrop-filter: blur(16rpx);
+		animation: bubbleFloat 9s ease-in-out infinite;
+	}
+
+	.bubble-a {
+		top: 286rpx;
+		right: 34rpx;
+	}
+
+	.bubble-b {
+		top: 488rpx;
+		left: 34rpx;
+		animation-delay: -2s;
+	}
+
+	.bubble-c {
+		top: 640rpx;
+		right: 30rpx;
+		animation-delay: -4s;
+	}
+
+	.hero {
+		position: relative;
+		z-index: 3;
+	}
+
+	.brand-mark {
+		display: inline-flex;
+		align-items: center;
+		height: 54rpx;
+		padding: 0 22rpx;
+		border: 1rpx solid rgba(255, 255, 255, 0.72);
+		border-radius: 999rpx;
+		background: rgba(255, 255, 255, 0.42);
+		box-shadow: 0 12rpx 34rpx rgba(69, 131, 99, 0.1);
+		color: rgba(26, 69, 55, 0.68);
 		font-size: 24rpx;
-		text-align: center;
+		font-weight: 600;
+		backdrop-filter: blur(18rpx);
+	}
+
+	.brand-dot {
+		width: 14rpx;
+		height: 14rpx;
+		margin-right: 12rpx;
+		border-radius: 50%;
+		background: #54c990;
+		box-shadow: 0 0 20rpx rgba(84, 201, 144, 0.75);
+	}
+
+	.brand-title {
 		width: 100%;
-		margin: 29rpx 0;
+		margin-top: 38rpx;
+		font-size: 42rpx;
+		font-weight: 700;
+		letter-spacing: 0;
+		line-height: 1.25;
+		color: #17372d;
+		white-space: nowrap;
+	}
 
-		.tui-protocol-red {
-			color: $u-primary;
-		}
+	.brand-subtitle {
+		margin-top: 18rpx;
+		color: rgba(43, 88, 73, 0.62);
+		font-size: 25rpx;
+		letter-spacing: 4rpx;
+	}
+
+	.ip-stage {
+		position: relative;
+		z-index: 3;
+		height: 440rpx;
+		margin-top: 26rpx;
+	}
+
+	.halo {
+		position: absolute;
+		left: 50%;
+		top: 94rpx;
+		width: 380rpx;
+		height: 210rpx;
+		border-radius: 50%;
+		background: radial-gradient(circle, rgba(255, 255, 255, 0.82), rgba(245, 225, 177, 0.18) 64%, rgba(255, 255, 255, 0));
+		transform: translateX(-50%);
+		animation: lightPulse 6s ease-in-out infinite;
 	}
 
-	.login-btn {
+	.squirrel-card {
+		position: absolute;
+		left: 50%;
+		top: 18rpx;
+		width: 360rpx;
+		height: 360rpx;
+		border-radius: 64rpx;
+		overflow: hidden;
+		z-index: 3;
+		transform: translateX(-50%);
+		filter: drop-shadow(0 34rpx 34rpx rgba(80, 103, 79, 0.16));
+		animation: ipBreath 5.8s ease-in-out infinite;
+	}
+
+	.squirrel-card::after {
+		content: '';
+		position: absolute;
+		left: 44rpx;
+		right: 44rpx;
+		bottom: 14rpx;
+		height: 34rpx;
+		border-radius: 50%;
+		background: rgba(126, 159, 126, 0.12);
+		filter: blur(10rpx);
+	}
+
+	.squirrel {
 		width: 100%;
-		height: 80rpx;
+		height: 100%;
+		transform: scale(1.02) translateY(4rpx);
+	}
+
+	.squirrel-mask {
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 92rpx;
+		background: linear-gradient(180deg, rgba(237, 249, 234, 0) 0%, rgba(237, 249, 234, 0.68) 58%, rgba(237, 249, 234, 0.96) 100%);
+		pointer-events: none;
+	}
+
+	.sticker,
+	.emoji {
+		position: absolute;
+		z-index: 2;
+		border: 1rpx solid rgba(255, 255, 255, 0.72);
+		background: rgba(255, 255, 255, 0.58);
+		box-shadow: 0 18rpx 48rpx rgba(93, 132, 101, 0.14);
+		backdrop-filter: blur(16rpx);
+		animation: stickerFloat 7s ease-in-out infinite;
+	}
+
+	.sticker {
+		padding: 12rpx 20rpx;
+		border-radius: 28rpx;
+		color: #2e6955;
+		font-size: 21rpx;
+		font-weight: 600;
+		opacity: 0.72;
+	}
+
+	.sticker-phone {
+		left: 4rpx;
+		top: 140rpx;
+		transform: rotate(-6deg);
+	}
+
+	.sticker-tea {
+		right: 0;
+		top: 264rpx;
+		color: #9c6f3e;
+		transform: rotate(5deg);
+		animation-delay: -2s;
+	}
+
+	.emoji {
+		display: flex;
 		align-items: center;
 		justify-content: center;
+		width: 62rpx;
+		height: 62rpx;
+		border-radius: 24rpx;
+		font-size: 30rpx;
+	}
+
+	.emoji-food {
+		right: 96rpx;
+		top: 72rpx;
+		animation-delay: -1s;
+	}
+
+	.emoji-run {
+		left: 94rpx;
+		top: 286rpx;
+		animation-delay: -3s;
+	}
+
+	.login-card {
+		position: relative;
+		z-index: 5;
 		box-sizing: border-box;
-		color: #fff;
-		background-color: #0072E3;
-		border-radius: 80rpx !important;
-		line-height: 80rpx;
+		margin-top: -10rpx;
+		padding: 42rpx 36rpx 30rpx;
+		border: 1rpx solid rgba(255, 255, 255, 0.72);
+		border-radius: 44rpx;
+		background: rgba(255, 255, 255, 0.56);
+		box-shadow:
+			0 28rpx 70rpx rgba(62, 116, 91, 0.16),
+			inset 0 1rpx 0 rgba(255, 255, 255, 0.7);
+		backdrop-filter: blur(26rpx);
+		animation: cardLift 6s ease-in-out infinite;
+	}
+
+	.card-title {
+		color: #183a30;
+		font-size: 34rpx;
+		font-weight: 700;
 		text-align: center;
 	}
 
-	.login-way {
-		display: flex;
-		height: 80rpx;
-		line-height: 80rpx;
+	.card-desc {
+		width: 500rpx;
+		margin: 16rpx auto 34rpx;
+		color: rgba(42, 80, 66, 0.58);
+		font-size: 24rpx;
+		line-height: 1.55;
+		text-align: center;
 	}
 
-	.login-way view:first-child {
-		flex: 1;
-		padding-left: 40rpx;
+	.primary-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 96rpx;
+		padding: 0;
+		border: 0;
+		border-radius: 999rpx;
+		background: linear-gradient(90deg, rgba(227, 255, 150, 0.98), rgba(166, 255, 234, 0.98));
+		box-shadow:
+			0 18rpx 44rpx rgba(13, 114, 82, 0.2),
+			0 0 44rpx rgba(166, 255, 234, 0.62),
+			0 0 18rpx rgba(227, 255, 150, 0.5);
+		color: #073d33;
+		font-size: 30rpx;
+		font-weight: 700;
+		line-height: 96rpx;
+		letter-spacing: 1rpx;
+		animation: btnGlow 4.8s ease-in-out infinite;
 	}
 
-	.login-way view:last-child {
-		flex: 1;
-		padding-right: 40rpx;
-		text-align: right;
+	.primary-btn::after {
+		border: 0;
 	}
 
-	.hasChosen {
-		height: 74rpx;
-		line-height: 74rpx;
-		color: #fff;
-		border: none;
-		background: #5fd9ee;
+	.primary-btn-hover {
+		transform: scale(0.985);
+		opacity: 0.92;
 	}
 
-	.code-box {
-		display: flex;
+	.primary-btn.loading {
+		opacity: 0.82;
 	}
 
-	.popup-content {
+	.btn-icon {
+		display: inline-flex;
 		align-items: center;
 		justify-content: center;
-		padding: 30rpx;
-		width: 500rpx;
-		height: auto;
-		overflow: scroll;
-		max-height: 900rpx;
-		background-color: #fff;
+		height: 42rpx;
+		margin-right: 16rpx;
+		padding: 0 16rpx;
+		border-radius: 999rpx;
+		background: rgba(255, 255, 255, 0.46);
+		font-size: 22rpx;
+		font-weight: 600;
+		line-height: 42rpx;
 	}
 
-	.popup-title {
-		font-size: 36rpx;
-		font-weight: bold;
-		text-align: center;
-		position: relative;
+	.phone-btn {
+		background: linear-gradient(90deg, rgba(227, 255, 150, 0.98), rgba(166, 255, 234, 0.98));
 	}
 
-	.popup-container {
-		margin-top: 20rpx;
-		height: 100rpx;
-		border-radius: 20rpx;
-		background: #088FEB;
-		line-height: 100rpx;
+	.login-tip {
+		margin-top: 22rpx;
+		color: rgba(43, 83, 70, 0.52);
+		font-size: 22rpx;
 		text-align: center;
-		border-bottom: 1px solid #eee;
-		border-top: 1px solid #eee;
-		color: #fff;
 	}
 
-	.phone-btn {
-		width: 150rpx;
-		height: 75rpx;
-		color: #088FEB;
-		line-height: 75rpx;
-		font-size: 26rpx;
-	}
-	@media screen and (min-width: 760px) {
-		.content {
-			height: 1000rpx;
-			background: #fff;
-			font-size: 24rpx;
+	.tui-protocol {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-wrap: wrap;
+		margin-top: 24rpx;
+		color: rgba(39, 75, 63, 0.55);
+		font-size: 22rpx;
+		line-height: 1.8;
+	}
+
+	.protocol-check {
+		display: inline-flex;
+		align-items: center;
+	}
+
+	.tui-protocol-red {
+		color: #2caf79;
+		font-weight: 600;
+	}
+
+	@keyframes ipBreath {
+		0%,
+		100% {
+			transform: translateX(-50%) translateY(0) scale(1);
+		}
+		50% {
+			transform: translateX(-50%) translateY(-16rpx) scale(1.025);
 		}
-		.title-name {
-			width: 100%;
-			height: 350rpx;
-			line-height: 200rpx;
-			font-size: 80rpx;
-			text-align: center;
-			padding-top: 200rpx;
-			color: #000;
+	}
+
+	@keyframes softFloat {
+		0%,
+		100% {
+			transform: translate3d(0, 0, 0);
+		}
+		50% {
+			transform: translate3d(18rpx, -22rpx, 0);
+		}
+	}
+
+	@keyframes bubbleFloat {
+		0%,
+		100% {
+			transform: translateY(0);
+			opacity: 0.72;
+		}
+		50% {
+			transform: translateY(-18rpx);
+			opacity: 0.96;
+		}
+	}
+
+	@keyframes stickerFloat {
+		0%,
+		100% {
+			margin-top: 0;
+		}
+		50% {
+			margin-top: -14rpx;
+		}
+	}
+
+	@keyframes lightPulse {
+		0%,
+		100% {
+			opacity: 0.58;
+			transform: translateX(-50%) scale(1);
+		}
+		50% {
+			opacity: 0.9;
+			transform: translateX(-50%) scale(1.06);
+		}
+	}
+
+	@keyframes ambientPulse {
+		0%,
+		100% {
+			opacity: 0.58;
+			transform: scale(1);
+		}
+		50% {
+			opacity: 0.9;
+			transform: scale(1.08);
+		}
+	}
+
+	@keyframes btnGlow {
+		0%,
+		100% {
+			box-shadow:
+				0 18rpx 44rpx rgba(13, 114, 82, 0.2),
+				0 0 44rpx rgba(166, 255, 234, 0.62),
+				0 0 18rpx rgba(227, 255, 150, 0.5);
+		}
+		50% {
+			box-shadow:
+				0 24rpx 58rpx rgba(13, 114, 82, 0.26),
+				0 0 64rpx rgba(166, 255, 234, 0.82),
+				0 0 28rpx rgba(227, 255, 150, 0.68);
+		}
+	}
+
+	@keyframes cardLift {
+		0%,
+		100% {
+			transform: translateY(0);
 		}
-		.container {
-			width: 90%;
-			height: 600rpx;
-			margin: 0 auto;
+		50% {
+			transform: translateY(-8rpx);
 		}
 	}
-</style>
\ No newline at end of file
+</style>