From bd3ce2d0cecc0f8b53f5205da21dc00f71daa6f6 Mon Sep 17 00:00:00 2001
From: Hx <2294602187@qq.com>
Date: Mon, 31 Mar 2025 09:37:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/votingElection.ts          |  13 +-
 src/components/ex-tags/ex-tags.vue |  61 ---
 src/pages/mine/index.vue           |   1 -
 src/pages/myElection/index.vue     |  23 +-
 src/pages/votingElection/index.vue | 824 +++++++++++++++--------------
 src/store/user.ts                  |   2 +-
 6 files changed, 443 insertions(+), 481 deletions(-)
 delete mode 100644 src/components/ex-tags/ex-tags.vue

diff --git a/src/api/votingElection.ts b/src/api/votingElection.ts
index dc80f82..269e9e3 100644
--- a/src/api/votingElection.ts
+++ b/src/api/votingElection.ts
@@ -1,12 +1,10 @@
 import { request } from '@/utils/http'
 
-
-
 // 获取投票选举（正在进行）
 export function getVoteprogress() {
     return request.http({
         url: '/api/vote_progress',
-		method: "GET"
+        method: 'GET'
     })
 }
 
@@ -19,11 +17,10 @@ export function voteMember(data: any) {
 }
 
 // 获取我的选举
-export function getMyvote(data:any) {
+export function getMyvote(data: any) {
     return request.http({
         url: '/api/my_vote',
-		method: "GET",
-		data
-		
+        method: 'GET',
+        data
     })
-}
\ No newline at end of file
+}
diff --git a/src/components/ex-tags/ex-tags.vue b/src/components/ex-tags/ex-tags.vue
deleted file mode 100644
index 119e414..0000000
--- a/src/components/ex-tags/ex-tags.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-    <view class="tag_box flex-center-start" :style="{ '--borderColor': borderColor }">
-        <view class="border" :style="borderStyle" />
-        <text :style="{ color: labelColor }">{{ label }}</text>
-        <view class="flex1">
-            <slot></slot>
-        </view>
-    </view>
-</template>
-
-<script setup lang="ts">
-interface tagsInt {
-    label: string
-    labelColor?: string
-    borderColor?: string
-    borderType?: 'round' | 'line'
-}
-
-const props = withDefaults(defineProps<tagsInt>(), {
-    label: '收益',
-    labelColor: '#616161',
-    borderColor: '#ff8d1a',
-    borderType: 'line'
-})
-
-const borderStyle = computed(() => {
-    if (props.borderType === 'line') {
-        return {
-            width: '8rpx',
-            height: '28rpx',
-            marginRight: '16rpx'
-        }
-    } else {
-        return {
-            width: '16rpx',
-            height: '16rpx',
-            marginRight: '13rpx'
-        }
-    }
-})
-</script>
-
-<style scoped lang="scss">
-.tag_box {
-    font-size: 28rpx;
-    font-weight: 400;
-    line-height: 40rpx;
-    --borderColor: #ff8d1a;
-
-    .border {
-        width: 8rpx;
-        height: 28rpx;
-        border-radius: 90rpx;
-        background-color: var(--borderColor);
-    }
-
-    > .flex1 {
-        padding-left: 20rpx;
-    }
-}
-</style>
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index 8615d16..50af5a5 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -79,7 +79,6 @@ const save = () => {
 
 onShow(() => {
     reset()
-
     getAdminPhone().then((res) => {
         const { data } = res as { data: string }
         amdinPhone.value = data || ''
diff --git a/src/pages/myElection/index.vue b/src/pages/myElection/index.vue
index d85fd15..1815e69 100644
--- a/src/pages/myElection/index.vue
+++ b/src/pages/myElection/index.vue
@@ -15,7 +15,7 @@
                                       : 'background: #F3F4F6;color: #4B5563'
                             "
                         >
-                            {{ item.vote_title==1?'未开始':(item.vote_title==2?'进行中':'已结束') }}
+                            {{ item.vote_title == 1 ? '未开始' : item.vote_title == 2 ? '进行中' : '已结束' }}
                         </view>
                     </view>
                 </view>
@@ -34,7 +34,7 @@
                                         <text class="college">{{ candidate.position }}</text>
                                     </view>
                                 </view>
-                                <view style="display: flex; margin-top: 24rpx;font-family: Roboto;font-size: 14px;color: #4B5563;">
+                                <view style="display: flex; margin-top: 24rpx; font-family: Roboto; font-size: 14px; color: #4b5563">
                                     我的选择：
                                     <view :class="['choice-tag', choiceClass(candidate.vote_result)]">
                                         {{ choiceText(candidate.vote_result) }}
@@ -108,18 +108,18 @@ const getList = async () => {
     try {
         loading.value = true
 
-		let param = {
-			openid: userStore.openId,
-			page: page.value,
-			limit: pageSize.value
-		}
+        let param = {
+            openid: userStore.openId,
+            page: page.value,
+            limit: pageSize.value
+        }
         // 模拟接口请求（替换为你的真实接口）
         const mockData = await getMyvote(param)
 
-		// 处理数据
-		electionList.value = [...electionList.value, ...mockData.data.data]
-		// electionList.value.push(mockData)
-			
+        // 处理数据
+        electionList.value = [...electionList.value, ...mockData.data.data]
+        // electionList.value.push(mockData)
+
         // 判断是否还有数据
         noMoreData.value = mockData.data.data.length < pageSize.value
     } finally {
@@ -137,7 +137,6 @@ const loadMore = () => {
 onShow(() => {
     getList()
 })
-
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/votingElection/index.vue b/src/pages/votingElection/index.vue
index 6b5b39f..5beef7e 100644
--- a/src/pages/votingElection/index.vue
+++ b/src/pages/votingElection/index.vue
@@ -1,398 +1,426 @@
-<script setup lang="ts">
-	import { getVoteprogress, voteMember } from '../../api/votingElection'
-	import useUserStore from '@/store/user'
-	const userStore = useUserStore()
-
-	const xjList = ref<any>({})
-
-	const doSearch = (_formData : { page : number; limit : number }, onSuccess : Function) => {
-		getVoteprogress().then((res) => {
-			const { data } = res as { data : { candidate : any[] } }
-			xjList.value = data || {}
-			onSuccess({

-				data: {
-					data: data.candidate || [],
-					total: (data.candidate || []).length
-				}

-			})
-		})
-	}
-
-	const buttlist = ref([
-		{
-			type: '1',
-			butname: '同意'
-		},
-		{
-			type: '2',
-			butname: '反对'
-		},
-		{
-			type: '3',
-			butname: '弃权'
-		}
-	])
-
-	const params = ref([])
-	const selectBut = (data : any, cardid : any, type : string, butname : string) => {
-		if (cardid) {
-			const target = data.find((card : { id : any }) => card.id === cardid)
-			uni.showModal({
-				title: '您本轮选举投' + butname + '票',
-				content: '确定吗？',
-				success: function (res) {
-					if (res.confirm) {
-						if (target) {
-							target.vote_result = type
-						}
-					} else if (res.cancel) {
-						console.log('用户点击取消')
-					}
-				}
-			})
-			params.value.push(target)
-		} else {
-			data.forEach((ele : { vote_result : number; id : any }) => {
-				ele.vote_result = 1
-			})
-		}
-	}
-	const allChange = () => {
-		uni.showModal({
-			title: '您本轮选举全投同意票',
-			content: '确定吗？',
-			success: function (res) {
-				if (res.confirm) {
-					xjList.value.data?.forEach((ele : { vote_result : number }) => {
-						ele.vote_result = 1
-					})
-					params.value = xjList.value.candidate
-					submit()
-				} else if (res.cancel) {
-					console.log('用户点击取消')
-				}
-			}
-		})
-	}
-
-	function extractTwoProps(arr : any, key1 : string, key2 : string) {
-		return arr.map(({ [key1]: prop1, [key2]: prop2 }) => ({
-			[key1]: prop1,
-			[key2]: prop2
-		}))
-	}
-	const submit = () => {
-		let param = {
-			openid: userStore.openId,
-			id: xjList.value.id,
-			candidate: JSON.stringify(extractTwoProps(params.value, 'id', 'vote_result'))
-		}
-		if (param.candidate === '[]') {
-			uni.showToast({
-				title: '未选举',
-				icon: 'none', // 可选，图标类型，'success', 'loading', 'none'
-				duration: 1500 // 持续时长，单位ms
-			})
-		} else {
-			voteMember(param).then((res) => {
-				console.log(res, 555555555555555)
-			})
-		}
-	}
-	onShow(() => {
-		if (userStore.mobile === '') {
-			uni.navigateTo({
-				url: '/pages/login/login'
-			})
-		}
-	})
-</script>
-
-<template>
-	<!-- 你的页面内容 -->
-	<view class="box" v-if="xjList.length != 0">
-		<view class="headpart">
-			<view class="title">{{ xjList.title }}</view>
-			<view class="time">投票开始时间：{{ xjList.start_time }}</view>
-			<view class="time">投票截止时间：{{ xjList.end_time }}</view>
-		</view>
-		<ex-list ref="reListRef" custom-list-type="custom" :on-form-search="doSearch">
-			<template v-slot="{ data }">
-				<view class="tppart">
-					<view class="tpone" v-for="(row, index) of data" :key="'tpone' + index">
-						<view class="topp">
-							<img style="width: 96rpx; height: 96rpx; border-radius: 50%" :src="row.photo" alt="" />
-							<view class="rightpart">
-								<view class="name">
-									{{ row.name }}
-								</view>
-								<view class="class">
-									{{ row.position }}
-								</view>
-							</view>
-						</view>
-						<view class="bottomp">
-							<view class="minbut" v-for="(item, ele) in buttlist" :key="ele"
-								@click="selectBut(data, row.id, item.type, item.butname)"
-								:class="{ active: row.vote_result === item.type }">
-								{{ item.butname }}
-							</view>
-						</view>
-					</view>
-				</view>
-			</template>
-		</ex-list>
-		<view class="bottbutton">
-			<view class="qbty" @click="allChange">全部同意</view>
-			<view class="tjtp" @click="submit">提交投票</view>
-		</view>
-	</view>
-	<view style="display: grid;align-items: center;justify-content: center;width: 100%;height: 100vh;align-content: center;" v-else>
-		<img style="width: 188px;height: 140px;" src="@/static/img/Group.png" alt="" />
-		<text class="nodata">
-			暂时没有选举 请刷新重试
-		</text>
-	</view>
-</template>
-
-<style scoped lang="scss">
-	.box {
-		width: 100%;
-		background-color: #f9fafb;
-
-		.headpart {
-			width: 92%;
-			height: 194rpx;
-			border-radius: 24rpx;
-			background-color: #eff6ff;
-			margin: 32rpx auto;
-			padding: 20rpx 3%;
-
-			.title {
-				color: #2563eb;
-				font-size: 28rpx;
-				margin-top: 16rpx;
-			}
-
-			.time {
-				margin-top: 16rpx;
-				color: #4b5563;
-				font-size: 28rpx;
-			}
-		}
-
-		.tppart {
-			width: 100%;
-			max-height: 69vh;
-			overflow-y: auto;
-			display: grid;
-			justify-items: center;
-
-			.tpone {
-				width: 91%;
-				height: 264rpx;
-				padding: 20rpx 4%;
-				box-sizing: border-box;
-				border-radius: 24rpx;
-				background: linear-gradient(0deg, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.001)), #ffffff;
-				box-sizing: border-box;
-				border: 2rpx solid #f3f4f6;
-				box-shadow:
-					0rpx 2rpx 4rpx -2rpx rgba(0, 0, 0, 0.1),
-					0rpx 2rpx 6rpx 0rpx rgba(0, 0, 0, 0.1);
-				margin-top: 32rpx;
-				display: grid;
-
-				.topp {
-					display: flex;
-
-					.rightpart {
-						margin-left: 32rpx;
-						display: grid;
-						justify-items: left;
-						align-content: baseline;
-
-						.name {
-							font-family: Roboto;
-							font-size: 28rpx;
-							font-weight: 500;
-							line-height: 42rpx;
-							letter-spacing: normal;
-							color: #000000;
-							margin-top: 7rpx;
-						}
-
-						.class {
-							font-family: Roboto;
-							font-size: 28rpx;
-							font-weight: normal;
-							line-height: 40rpx;
-							letter-spacing: normal;
-							color: #6b7280;
-							margin-top: 7rpx;
-						}
-					}
-				}
-
-				.bottomp {
-					display: flex;
-					justify-content: space-between;
-					gap: 0rpx 20rpx;
-
-					.minbut {
-						flex: 1;
-						width: 190rpx;
-						height: 76rpx;
-						/* 自动布局 */
-						display: flex;
-						justify-content: center;
-						padding: 16rpx 32rpx;
-						flex-wrap: wrap;
-						align-content: flex-start;
-						border-radius: 8rpx;
-						background: #ffffff;
-						box-sizing: border-box;
-						border: 2rpx solid #d1d5db;
-						font-family: Roboto;
-						font-size: 28rpx;
-						font-weight: normal;
-						line-height: 40rpx;
-						text-align: center;
-						letter-spacing: normal;
-						color: #4b5563;
-					}
-
-					.minbut.active {
-						border: 2rpx solid #2563eb;
-						color: #2563eb;
-					}
-				}
-			}
-
-			.tpone:first-child {
-				margin-top: 0;
-			}
-		}
-
-		.bottbutton {
-			width: 100%;
-			height: 10vh;
-			display: flex;
-			padding: 24rpx 32rpx;
-			gap: 0rpx 24rpx;
-			flex-wrap: wrap;
-			align-content: flex-start;
-			background: #ffffff;
-			box-sizing: border-box;
-			border-width: 2rpx 0rpx 0rpx 0rpx;
-			border-style: solid;
-			border-color: #f3f4f6;
-			position: fixed;
-			bottom: 0;
-
-			.qbty {
-				width: 331rpx;
-				height: 90rpx;
-				/* 自动布局 */
-				display: flex;
-				box-sizing: border-box;
-				justify-content: center;
-				padding: 24rpx 0rpx;
-				gap: 0rpx 20rpx;
-				flex-wrap: wrap;
-				border-radius: 8rpx;
-				background: #eff6ff;
-				font-family: Roboto;
-				font-size: 28rpx;
-				font-weight: 500;
-				line-height: 42rpx;
-				text-align: center;
-				letter-spacing: normal;
-				color: #2563eb;
-			}
-
-			.tjtp {
-				width: 331rpx;
-				height: 90rpx;
-				/* 自动布局 */
-				display: flex;
-				box-sizing: border-box;
-				justify-content: center;
-				padding: 24rpx 0rpx;
-				gap: 0rpx 20rpx;
-				flex-wrap: wrap;
-				border-radius: 8rpx;
-				background: #2563eb;
-				font-family: Roboto;
-				font-size: 28rpx;
-				font-weight: 500;
-				line-height: 42rpx;
-				text-align: center;
-				letter-spacing: normal;
-				color: #ffffff;
-			}
-		}
-
-		.address-items {
-			padding: 20rpx 15rpx 32rpx 28rpx;
-			background-color: #fff;
-			border-bottom: 2rpx solid #f5f5f5;
-
-			.left {
-				flex: 1;
-				overflow: hidden;
-
-				.name {
-					font-size: 28rpx;
-					font-weight: 700;
-					color: #101010;
-					line-height: 40rpx;
-					margin-right: 16rpx;
-				}
-
-				.isdefault {
-					font-size: 20rpx;
-					font-weight: 400;
-					color: #fff;
-					padding: 4rpx 12rpx;
-					border-radius: 8rpx;
-					background: linear-gradient(90deg, #4778ff 0%, #4778ffb8 100%);
-				}
-
-				.info {
-					width: 100%;
-					color: #666;
-					font-size: 24rpx;
-					font-weight: 400;
-					margin-top: 12rpx;
-				}
-			}
-
-			.right {
-				width: 140rpx;
-				padding-left: 32rpx;
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #4979ff;
-				text-align: right;
-			}
-		}
-
-		.buts {
-			width: 100%;
-			height: 10vh;
-			background-color: F3F4F6;
-			position: fixed;
-			bottom: 0;
-			border-top: 2rpx solid #ebebec;
-		}
-	}
-	.nodata {
-		margin-top: 43px;
-		font-family: Source Han Sans;
-		font-size: 18px;
-		font-weight: 500;
-		letter-spacing: normal;
-		color: #34343F;
-	}
-</style>
\ No newline at end of file
+<script setup lang="ts">
+import { getVoteprogress, voteMember } from '../../api/votingElection'
+import useUserStore from '@/store/user'
+const userStore = useUserStore()
+
+const xjList = ref<any>({})
+
+const doSearch = (_formData: { page: number; limit: number }, onSuccess: Function) => {
+    getVoteprogress().then((res) => {
+        const { data } = res as { data: { candidate: any[] } }
+        xjList.value = data || {}
+        onSuccess({
+            data: {
+                data: data.candidate || [],
+                total: (data.candidate || []).length
+            }
+        })
+    })
+}
+
+const buttlist = ref([
+    {
+        type: '1',
+        butname: '同意'
+    },
+    {
+        type: '2',
+        butname: '反对'
+    },
+    {
+        type: '3',
+        butname: '弃权'
+    }
+])
+
+const params = ref([])
+const selectBut = (data: any, cardid: any, type: string, butname: string) => {
+    if (cardid) {
+        const target = data.find((card: { id: any }) => card.id === cardid)
+        uni.showModal({
+            title: '您本轮选举投' + butname + '票',
+            content: '确定吗？',
+            success: function (res) {
+                if (res.confirm) {
+                    if (target) {
+                        target.vote_result = type
+                    }
+                } else if (res.cancel) {
+                    console.log('用户点击取消')
+                }
+            }
+        })
+        params.value.push(target)
+    } else {
+        data.forEach((ele: { vote_result: number; id: any }) => {
+            ele.vote_result = 1
+        })
+    }
+}
+const allChange = () => {
+    uni.showModal({
+        title: '您本轮选举全投同意票',
+        content: '确定吗？',
+        success: function (res) {
+            if (res.confirm) {
+                xjList.value.data?.forEach((ele: { vote_result: number }) => {
+                    ele.vote_result = 1
+                })
+                params.value = xjList.value.candidate
+                submit()
+            } else if (res.cancel) {
+                console.log('用户点击取消')
+            }
+        }
+    })
+}
+
+function extractTwoProps(arr: any, key1: string, key2: string) {
+    return arr.map(({ [key1]: prop1, [key2]: prop2 }) => ({
+        [key1]: prop1,
+        [key2]: prop2
+    }))
+}
+const submit = () => {
+    let param = {
+        openid: userStore.openId,
+        id: xjList.value.id,
+        candidate: JSON.stringify(extractTwoProps(params.value, 'id', 'vote_result'))
+    }
+    if (param.candidate === '[]') {
+        uni.showToast({
+            title: '未选举',
+            icon: 'none', // 可选，图标类型，'success', 'loading', 'none'
+            duration: 1500 // 持续时长，单位ms
+        })
+    } else {
+        voteMember(param)
+    }
+}
+
+const showDialog = ref(false)
+const navto = (url: string, mode: pageMode = 'navigateTo') => uni.$util.goToPage({ url: url ?? 'pages/index/index', mode })
+const isEmptyObject = (obj: any) => {
+    if (obj == null) return true
+    if (typeof obj !== 'object' || Array.isArray(obj)) return true
+    return Reflect.ownKeys(obj).length === 0
+}
+
+onShow(() => {
+    if (userStore.mobile === '') {
+        uni.navigateTo({
+            url: '/pages/login/login'
+        })
+    }
+
+    if (isEmptyObject(userStore.userInfo)) {
+        showDialog.value = true
+    }
+})
+</script>
+
+<template>
+    <!-- 你的页面内容 -->
+    <view class="box" v-if="xjList.length != 0">
+        <view class="headpart">
+            <view class="title">{{ xjList.title }}</view>
+            <view class="time">投票开始时间：{{ xjList.start_time }}</view>
+            <view class="time">投票截止时间：{{ xjList.end_time }}</view>
+        </view>
+        <ex-list ref="reListRef" custom-list-type="custom" :on-form-search="doSearch">
+            <template v-slot="{ data }">
+                <view class="tppart">
+                    <view class="tpone" v-for="(row, index) of data" :key="'tpone' + index">
+                        <view class="topp">
+                            <img style="width: 96rpx; height: 96rpx; border-radius: 50%" :src="row.photo" alt="" />
+                            <view class="rightpart">
+                                <view class="name">
+                                    {{ row.name }}
+                                </view>
+                                <view class="class">
+                                    {{ row.position }}
+                                </view>
+                            </view>
+                        </view>
+                        <view class="bottomp">
+                            <view
+                                class="minbut"
+                                v-for="(item, ele) in buttlist"
+                                :key="ele"
+                                @click="selectBut(data, row.id, item.type, item.butname)"
+                                :class="{ active: row.vote_result === item.type }"
+                            >
+                                {{ item.butname }}
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </template>
+        </ex-list>
+        <view class="bottbutton">
+            <view class="qbty" @click="allChange">全部同意</view>
+            <view class="tjtp" @click="submit">提交投票</view>
+        </view>
+    </view>
+    <view style="display: grid; align-items: center; justify-content: center; width: 100%; height: 100vh; align-content: center" v-else>
+        <img style="width: 188px; height: 140px" src="@/static/img/Group.png" alt="" />
+        <text class="nodata">暂时没有选举 请刷新重试</text>
+    </view>
+    <u-modal
+        title="提示"
+        :show="showDialog"
+        width="650rpx"
+        :confirm-color="'#2979ff'"
+        :cancel-color="'#606266'"
+        :show-confirm-button="true"
+        :show-cancel-button="false"
+        :close-on-click-overlay="true"
+        @confirm="navto('pages/mine/index', 'reLaunch')"
+        @cancel="showDialog = false"
+        @close="showDialog = false"
+    >
+        请您签到之后再进行投票！
+    </u-modal>
+</template>
+
+<style scoped lang="scss">
+.box {
+    width: 100%;
+    background-color: #f9fafb;
+
+    .headpart {
+        width: 92%;
+        height: 194rpx;
+        border-radius: 24rpx;
+        background-color: #eff6ff;
+        margin: 32rpx auto;
+        padding: 20rpx 3%;
+
+        .title {
+            color: #2563eb;
+            font-size: 28rpx;
+            margin-top: 16rpx;
+        }
+
+        .time {
+            margin-top: 16rpx;
+            color: #4b5563;
+            font-size: 28rpx;
+        }
+    }
+
+    .tppart {
+        width: 100%;
+        max-height: 69vh;
+        overflow-y: auto;
+        display: grid;
+        justify-items: center;
+
+        .tpone {
+            width: 91%;
+            height: 264rpx;
+            padding: 20rpx 4%;
+            box-sizing: border-box;
+            border-radius: 24rpx;
+            background: linear-gradient(0deg, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.001)), #ffffff;
+            box-sizing: border-box;
+            border: 2rpx solid #f3f4f6;
+            box-shadow:
+                0rpx 2rpx 4rpx -2rpx rgba(0, 0, 0, 0.1),
+                0rpx 2rpx 6rpx 0rpx rgba(0, 0, 0, 0.1);
+            margin-top: 32rpx;
+            display: grid;
+
+            .topp {
+                display: flex;
+
+                .rightpart {
+                    margin-left: 32rpx;
+                    display: grid;
+                    justify-items: left;
+                    align-content: baseline;
+
+                    .name {
+                        font-family: Roboto;
+                        font-size: 28rpx;
+                        font-weight: 500;
+                        line-height: 42rpx;
+                        letter-spacing: normal;
+                        color: #000000;
+                        margin-top: 7rpx;
+                    }
+
+                    .class {
+                        font-family: Roboto;
+                        font-size: 28rpx;
+                        font-weight: normal;
+                        line-height: 40rpx;
+                        letter-spacing: normal;
+                        color: #6b7280;
+                        margin-top: 7rpx;
+                    }
+                }
+            }
+
+            .bottomp {
+                display: flex;
+                justify-content: space-between;
+                gap: 0rpx 20rpx;
+
+                .minbut {
+                    flex: 1;
+                    width: 190rpx;
+                    height: 76rpx;
+                    /* 自动布局 */
+                    display: flex;
+                    justify-content: center;
+                    padding: 16rpx 32rpx;
+                    flex-wrap: wrap;
+                    align-content: flex-start;
+                    border-radius: 8rpx;
+                    background: #ffffff;
+                    box-sizing: border-box;
+                    border: 2rpx solid #d1d5db;
+                    font-family: Roboto;
+                    font-size: 28rpx;
+                    font-weight: normal;
+                    line-height: 40rpx;
+                    text-align: center;
+                    letter-spacing: normal;
+                    color: #4b5563;
+                }
+
+                .minbut.active {
+                    border: 2rpx solid #2563eb;
+                    color: #2563eb;
+                }
+            }
+        }
+
+        .tpone:first-child {
+            margin-top: 0;
+        }
+    }
+
+    .bottbutton {
+        width: 100%;
+        height: 10vh;
+        display: flex;
+        padding: 24rpx 32rpx;
+        gap: 0rpx 24rpx;
+        flex-wrap: wrap;
+        align-content: flex-start;
+        background: #ffffff;
+        box-sizing: border-box;
+        border-width: 2rpx 0rpx 0rpx 0rpx;
+        border-style: solid;
+        border-color: #f3f4f6;
+        position: fixed;
+        bottom: 0;
+
+        .qbty {
+            width: 331rpx;
+            height: 90rpx;
+            /* 自动布局 */
+            display: flex;
+            box-sizing: border-box;
+            justify-content: center;
+            padding: 24rpx 0rpx;
+            gap: 0rpx 20rpx;
+            flex-wrap: wrap;
+            border-radius: 8rpx;
+            background: #eff6ff;
+            font-family: Roboto;
+            font-size: 28rpx;
+            font-weight: 500;
+            line-height: 42rpx;
+            text-align: center;
+            letter-spacing: normal;
+            color: #2563eb;
+        }
+
+        .tjtp {
+            width: 331rpx;
+            height: 90rpx;
+            /* 自动布局 */
+            display: flex;
+            box-sizing: border-box;
+            justify-content: center;
+            padding: 24rpx 0rpx;
+            gap: 0rpx 20rpx;
+            flex-wrap: wrap;
+            border-radius: 8rpx;
+            background: #2563eb;
+            font-family: Roboto;
+            font-size: 28rpx;
+            font-weight: 500;
+            line-height: 42rpx;
+            text-align: center;
+            letter-spacing: normal;
+            color: #ffffff;
+        }
+    }
+
+    .address-items {
+        padding: 20rpx 15rpx 32rpx 28rpx;
+        background-color: #fff;
+        border-bottom: 2rpx solid #f5f5f5;
+
+        .left {
+            flex: 1;
+            overflow: hidden;
+
+            .name {
+                font-size: 28rpx;
+                font-weight: 700;
+                color: #101010;
+                line-height: 40rpx;
+                margin-right: 16rpx;
+            }
+
+            .isdefault {
+                font-size: 20rpx;
+                font-weight: 400;
+                color: #fff;
+                padding: 4rpx 12rpx;
+                border-radius: 8rpx;
+                background: linear-gradient(90deg, #4778ff 0%, #4778ffb8 100%);
+            }
+
+            .info {
+                width: 100%;
+                color: #666;
+                font-size: 24rpx;
+                font-weight: 400;
+                margin-top: 12rpx;
+            }
+        }
+
+        .right {
+            width: 140rpx;
+            padding-left: 32rpx;
+            font-size: 24rpx;
+            font-weight: 400;
+            color: #4979ff;
+            text-align: right;
+        }
+    }
+
+    .buts {
+        width: 100%;
+        height: 10vh;
+        background-color: F3F4F6;
+        position: fixed;
+        bottom: 0;
+        border-top: 2rpx solid #ebebec;
+    }
+}
+.nodata {
+    margin-top: 43px;
+    font-family: Source Han Sans;
+    font-size: 18px;
+    font-weight: 500;
+    letter-spacing: normal;
+    color: #34343f;
+}
+</style>
diff --git a/src/store/user.ts b/src/store/user.ts
index 7aa721a..b7cfb50 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -36,7 +36,7 @@ export default defineStore(
                     .then((res) => {
                         const { data } = res as { data: userInfoStoreInt }
 
-                        userInfo.value = data
+                        userInfo.value = data || {}
 
                         resolve({ code: 1, data, message: 'SUCCESS' })
                     })