From dad03ab1825aeb4dbafebbf966280e0cf32c8955 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 22:33:30 +0800
Subject: [PATCH] 支付宝支付ddd

---
 small-program/shop/pages/login/login.vue |   80 +++++++++++++++++++++++++++++----------
 1 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/small-program/shop/pages/login/login.vue b/small-program/shop/pages/login/login.vue
index de6bb48..667fed1 100644
--- a/small-program/shop/pages/login/login.vue
+++ b/small-program/shop/pages/login/login.vue
@@ -26,9 +26,9 @@
 			<image class="agree-icon" :src="agreed ? '/static/icon/ic_accept_sel@2x.png' : '/static/icon/ic_accept@2x.png'" mode="aspectFit" @tap="agreed = !agreed"></image>
 			<view class="agreement-text-wrap">
 				<text class="agreement-text">鎴戝凡闃呰骞跺悓鎰�</text>
-				<text class="agreement-link" @click="goToService">銆婄敤鎴锋湇鍔″崗璁��</text>
+				<text class="agreement-link" @click="goToService(0)">銆婄敤鎴锋湇鍔″崗璁��</text>
 				<text class="agreement-text">鍙�</text>
-				<text class="agreement-link" @click="goToPrivacy">銆婄敤鎴烽殣绉佹斂绛栥��</text>
+				<text class="agreement-link" @click="goToService(1)">銆婄敤鎴烽殣绉佹斂绛栥��</text>
 			</view>
 		</view>
 	</view>
@@ -39,7 +39,7 @@
 
 	export default {
 		computed: {
-			...mapState(['openid'])
+			...mapState(['openid', 'userInfo','userType'])
 		},
 		data() {
 			return {
@@ -50,15 +50,45 @@
 				}
 			}
 		},
+		onLoad() {
+			// 闈欓粯鐧诲綍
+		
+			if (this.userInfo.bindShopId) {
+				uni.showLoading({
+					title:'鐧诲綍涓�...'
+				})
+				try{
+					console.log(this.userType,"============================================")
+					this.$u.api.shopSilentLogin({})
+						.then( res => {
+							if (res.code === 200 && res.data) {
+								this.$store.commit('setUserType', 1)
+								this.$store.commit('setShopToken', res.data.token)
+								// 鑾峰彇闂ㄥ簵淇℃伅
+								this.$u.api.getShopInfo({}).then( shopInfoRes => {
+									if (shopInfoRes.code === 200) {
+										this.$store.commit('setShopInfo', shopInfoRes.data)
+									}
+									uni.hideLoading();
+									// setTimeout(() => {
+										uni.navigateTo({
+											url: '/shop/pages/store-home/store-home'
+										});
+									// }, 1000)
+								})
+							}
+							uni.hideLoading()
+						})
+				}catch(e){
+					uni.hideLoading()
+				}
+				setTimeout(() => {
+					uni.hideLoading()
+				}, 10000)
+			}
+		},
 		methods: {
 			async handleLogin() {
-				if (!this.agreed) {
-					uni.showToast({
-						title: '璇峰厛闃呰骞跺悓鎰忓崗璁�',
-						icon: 'none'
-					})
-					return
-				}
 				if (!this.form.telephone) {
 					uni.showToast({
 						title: '璇疯緭鍏ヨ处鍙�',
@@ -69,6 +99,13 @@
 				if (!this.form.password) {
 					uni.showToast({
 						title: '璇疯緭鍏ュ瘑鐮�',
+						icon: 'none'
+					})
+					return
+				}
+				if (!this.agreed) {
+					uni.showToast({
+						title: '璇峰厛闃呰骞跺悓鎰忓崗璁�',
 						icon: 'none'
 					})
 					return
@@ -84,11 +121,16 @@
 					if (res.code === 200) {
 						this.$store.commit('setUserType', 1)
 						this.$store.commit('setShopToken', res.data.token)
+						// 鑾峰彇闂ㄥ簵淇℃伅
+						const shopInfoRes = await this.$u.api.getShopInfo({})
+						if (shopInfoRes.code === 200) {
+							this.$store.commit('setShopInfo', shopInfoRes.data)
+						}
 						uni.showToast({ title: '鐧诲綍鎴愬姛', icon: 'success' })
 						setTimeout(() => {
-							uni.switchTab({
-								url: '/pages/shop-index/shop-index'
-							})
+							uni.reLaunch({
+								url: '/shop/pages/store-home/store-home'
+							});
 						}, 1500)
 					} else {
 						uni.showToast({
@@ -104,16 +146,11 @@
 					})
 				}
 			},
-			goToService() {
+			goToService(type) {
 				uni.navigateTo({
-					url: '/pages/rich-text/rich-text?type=userAgreement'
+					url: '/pages/rich-text/rich-text?type='+type
 				})
-			},
-			goToPrivacy() {
-				uni.navigateTo({
-					url: '/pages/rich-text/rich-text?type=privacyPolicy'
-				})
-			}
+			} 
 		}
 	}
 </script>
@@ -192,6 +229,7 @@
 	}
 
 	.agreement-row {
+		background: #D9F3FF;
 		margin-top: 60rpx;
 		display: flex;
 		align-items: flex-start;

--
Gitblit v1.9.3