From cd996684020269c3c0ce8a58257636fcbc009e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E9=B9=8F=E9=BE=99?= <1547476325@qq.com>
Date: Tue, 13 May 2025 11:55:00 +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/user.ts                    |   2 +-
 src/pages.json                     |   2 +-
 src/pages/electionList/info.vue    |   8 +-
 src/pages/mine/index.vue           |  77 ++-
 src/pages/votingElection/index.vue | 861 ++++++++++++++---------------
 src/store/user.ts                  |  20 +-
 6 files changed, 509 insertions(+), 461 deletions(-)

diff --git a/src/api/user.ts b/src/api/user.ts
index 81ce8ce..4e67679 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -31,7 +31,7 @@ export function getMember_mobile(data: any) {
     })
 }
 
-export function list(data: { name: string, meetId: string }) {
+export function list(data: any) {
     return request.http({
         url: '/api/member_name',
         method: 'GET',
diff --git a/src/pages.json b/src/pages.json
index af32e8a..a0eaa51 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -57,7 +57,7 @@
             "path": "pages/mine/index",
             "style": {
                 "navigationBarTitleText": "个人信息",
-                "enablePullDownRefresh": true
+                "enablePullDownRefresh": false
             }
         },
         {
diff --git a/src/pages/electionList/info.vue b/src/pages/electionList/info.vue
index bb9fa31..d3a0e54 100644
--- a/src/pages/electionList/info.vue
+++ b/src/pages/electionList/info.vue
@@ -60,16 +60,16 @@ onLoad((opt) => {
             <view class="progress">
                 <view class="flex-center-between progress-text">
                     <text>同意</text>
-                    <text class="b">{{ v.agree_num }} 票({{ toFixed2(v.ageree_percent) }}%)</text>
+                    <text class="b">{{ v.agree_num }} 票({{ toFixed2(v.agree_percent) }}%)</text>
                 </view>
-                <u-line-progress :percentage="v.ageree_percent" height="8rpx" active-color="#2563EB" :show-text="false" />
+                <u-line-progress :percentage="v.agree_percent" height="8rpx" active-color="#2563EB" :show-text="false" />
             </view>
             <view class="progress">
                 <view class="flex-center-between progress-text">
                     <text>反对</text>
-                    <text class="e">{{ v.disagree_num }} 票({{ toFixed2(v.giveup_percent) }}%)</text>
+                    <text class="e">{{ v.disagree_num }} 票({{ toFixed2(v.disagree_percent) }}%)</text>
                 </view>
-                <u-line-progress :percentage="v.giveup_percent" height="8rpx" active-color="#ef4444" :show-text="false" />
+                <u-line-progress :percentage="v.disagree_percent" height="8rpx" active-color="#ef4444" :show-text="false" />
             </view>
             <view class="progress">
                 <view class="flex-center-between progress-text">
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index 10d291a..c2bdb39 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -8,6 +8,7 @@ const userStore = useUserStore()
 const isHandleUserInfo = computed(() => Object.keys(userStore.userInfo).length === 0)
 
 const keyword = ref('')
+const keyword2 = ref('')
 
 const list = ref<dateListtype[]>([])
 
@@ -19,35 +20,47 @@ const navto = (url: string, params = {}) => uni.$util.goToPage({ url, params })
 
 
 
-const getList = uni.$util.throttle(() => {
-    if (keyword.value === '') {
-        uni.showToast({ title: '请输入姓名', icon: 'none' })
-        return
-    }
-
-    // uni.showLoading({ mask: true, title: '加载中...' })
-
-    listApi({ name: keyword.value, meetId: userStore.meetId })
-        .then((res) => {
-            const { data } = res as { data: dateListtype[] }
-            list.value = data || []
-            // uni.hideLoading()
-        })
-        .catch(() => uni.hideLoading())
+const getList = uni.$util.throttle((type) => {
+	console.log(keyword.value,keyword2.value);
+	if(type === 1) {
+		if (keyword.value === '') {
+			uni.showToast({ title: type==1?'请输入姓名':'请输入单位', icon: 'none' })
+			return
+		}
+		listApi({ name: keyword.value, meetId: userStore.meetId })
+			.then((res) => {
+				const { data } = res as { data: dateListtype[] }
+				list.value = data || []
+			})
+	} else {
+		if (keyword2.value === '') {
+			uni.showToast({ title: type==1?'请输入姓名':'请输入单位', icon: 'none' })
+			return
+		}
+		listApi({ work_unit: keyword2.value, meetId: userStore.meetId })
+			.then((res) => {
+				const { data } = res as { data: dateListtype[] }
+				list.value = data || []
+			})
+	}
 })
 
 const updateUserInfo = () => {
+	getSign({ openid: userStore.openId, meetId: userStore.meetId })
     userStore.bindUser(list.value[activeKey.value].id as number).then(() => {
         reset()
         uni.showToast({ title: '提交成功，等待投票！', icon: 'none' })
-		userStore.getUserInfo()
     })
-	getSign({ openid: userStore.openId, meetId: userStore.meetId })
+	setTimeout(()=> {
+		userStore.getUserInfomobile()
+		
+	},1000)
 }
 
 const reset = () => {
     activeKey.value = 0
     keyword.value = ''
+    keyword2.value = ''
     list.value = []
 }
 
@@ -99,8 +112,13 @@ onPullDownRefresh(() => userStore.getUserInfo())
             <view class="userview-search box flex">
                 <view class="userview-search-label">姓名</view>
                 <input class="flex1" type="text" placeholder="请输入您的姓名" v-model="keyword" placeholder-class="placeholder" />
-                <view class="userview-search-bts" @click.stop="getList">搜索</view>
+                <view class="userview-search-bts" @click="getList(1)">搜索</view>
             </view>
+			<view class="userview-search box flex">
+			    <view class="userview-search-label">单位</view>
+			    <input class="flex1" type="text" placeholder="请输入您的单位" v-model="keyword2" placeholder-class="placeholder" />
+			    <view class="userview-search-bts" @click="getList(2)">搜索</view>
+			</view>
 
             <block v-if="list.length > 0">
                 <view
@@ -127,7 +145,7 @@ onPullDownRefresh(() => userStore.getUserInfo())
             <ex-empty v-show="list.length <= 0" />
             <view class="flex-center-evenly">
                 <view class="bts plain" v-if="list.length > 0" @click.stop="updateUserInfo">确认信息</view>
-                <view class="bts" @click="navto('pages/mine/add')">新建信息</view>
+                <view :class="list.length > 0?'bts':'bts1'" @click="navto('pages/mine/add')">新建信息</view>
             </view>
         </block>
 
@@ -174,13 +192,13 @@ onPullDownRefresh(() => userStore.getUserInfo())
                         <u-icon @click.stop="openPopup('work_unit', '工作单位')" name="edit-pen-fill" color="#2563EB" size="38rpx" />
                     </view>
                 </view>
-                <view class="flex-center-between userview-info-item">
+                <!-- <view class="flex-center-between userview-info-item">
                     <view class="userview-info-item-label">职位</view>
                     <view class="userview-info-item-content flex">
                         <text>{{ userStore.userInfo.position }}</text>
                         <u-icon @click.stop="openPopup('position', '职位')" name="edit-pen-fill" color="#2563EB" size="38rpx" />
                     </view>
-                </view>
+                </view> -->
             </view>
             <view class="userview-info box admin">
                 <view>* 姓名和电话信息需要管理员修改</view>
@@ -264,6 +282,7 @@ onPullDownRefresh(() => userStore.getUserInfo())
         }
 
         &-bts {
+			padding: 0 20rpx;
             color: #2563eb;
         }
     }
@@ -327,5 +346,21 @@ onPullDownRefresh(() => userStore.getUserInfo())
             background-color: #eff6ff;
         }
     }
+	.bts1 {
+		color: #2563eb;
+		font-size: 28rpx;
+		line-height: 40rpx;
+		text-align: center;
+		border-radius: 8rpx;
+		padding: 24rpx 80rpx;
+		letter-spacing: 4rpx;
+		// border: 1rpx solid #2563eb;
+		// background-color: #2563eb;
+		
+		&.plain {
+		    color: #2563eb;
+		    background-color: #eff6ff;
+		}
+	}
 }
 </style>
diff --git a/src/pages/votingElection/index.vue b/src/pages/votingElection/index.vue
index fa8bbfb..481b0ec 100644
--- a/src/pages/votingElection/index.vue
+++ b/src/pages/votingElection/index.vue
@@ -1,445 +1,442 @@
 <script setup lang="ts">
-import { getVoteprogress, voteMember, getMember_mobile, getIs_sign } from '../../api/votingElection'
-import useUserStore from '@/store/user'
-import { isEmptyObject } from '@/utils/common'
-	import { getSign, getmemberMobileGet   } from '@/api/login'
-
-const userStore = useUserStore()
-
-const showDialogRef = ref()
-
-const reListRef = ref()
+	import { getVoteprogress, voteMember, getMember_mobile, getIs_sign } from '../../api/votingElection'
+	import useUserStore from '@/store/user'
+	import { isEmptyObject } from '@/utils/common'
+	import { getSign, getmemberMobileGet } from '@/api/login'
+
+	const userStore = useUserStore()
+
+	const showDialogRef = ref()
+
+
+	const xjList = ref<any>({})
+	const params = ref<any>([])
+
+	const isButton = ref(true)
+
+
+
+	onLoad(() => {
+		getVoteprogress(userStore.meetId).then((res : any) => {
+			xjList.value = res.data
+			params.value = res.data.candidate
+		})
+
+		if (userStore.userInfo.length !== 0) {
+			getSign({ openid: userStore.openId, meetId: userStore.meetId })
+		}
+
+	})
+
+
+	const buttlist = ref([
+		{
+			type: 1,
+			butname: '同意'
+		},
+		{
+			type: 2,
+			butname: '反对'
+		},
+		{
+			type: 3,
+			butname: '弃权'
+		}
+	])
+
+	const selectBut = (data : any, cardid : any, type : number, butname : string) => {
+		console.log(isButton.value);
+		if (isButton.value) {
+			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.forEach((ele : { id : any }) => {
+				if (ele.id === target.id) {
+					ele = target
+				}
+			})
+		}
+	}
+	const allChange = () => {
+		uni.showModal({
+			title: '您本轮选举全投同意票',
+			content: '确定吗？',
+			success: function (res) {
+				if (res.confirm) {
+					params.value.forEach((ele : { vote_result : number }) => {
+						ele.vote_result = 1
+					})
+				} else if (res.cancel) {
+					console.log('用户点击取消')
+				}
+			}
+		})
+	}
 
-const xjList = ref<any>({})
+	function extractTwoProps(arr : any, key1 : string, key2 : string) {
+		return arr.map(({ [key1]: prop1, [key2]: prop2 }) => ({
+			[key1]: prop1,
+			[key2]: prop2
+		}))
+	}
+	const submit = () => {
+		const allHaveProperty = params.value.every((item : any) => 'vote_result' in item);
+		if (allHaveProperty) {
+			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 : any) => {
+					if (res.code === 1) {
+						uni.showToast({ title: res.msg, icon: 'success', duration: 1000 })
+						isButton.value = false
+					}
+					else if (res.msg === '您已投票') {
+						console.log(res.msg);
+						isButton.value = false
+					}
+				})
+			}
+		} else {
+			uni.showToast({ title: '有未选投票', icon: 'fail', duration: 1000 })
+		}
 
+	}
 
+	const onConfirm = () => uni.reLaunch({ url: '/pages/mine/index?meetId=' + userStore.meetId })
 
-onLoad(() => {
-	// if(options.meetId){
-	// 	getmemberMobileGet({ openid: userStore.openId, mobile: userStore.mobile, meetId: userStore.meetId}).then((res: any)=> {
-	// 		console.log(res.data.length,666666666666);
-	// 		if(res.data.length === 0) {
-	// 			uni.reLaunch({ url: '/pages/mine/index?meetId='+ userStore.meetId })
-	// 		} else {
-	// 			userStore.userInfo = res.data
-	// 			getSign({ openid: userStore.openId, meetId: userStore.meetId })
-	// 		}
-	// 	})
-	// }
-	if(userStore.userInfo.length !== 0) {
-		getSign({ openid: userStore.openId, meetId: userStore.meetId })
-	}
-	
-})
-
-const doSearch = (_formData: { page: number; limit: number }, onSuccess: Function) => {
-	setTimeout(()=> {
-			getVoteprogress(userStore.meetId).then((res) => {
-				const { data } = res as { data: { candidate: any[] } }
-				xjList.value = data || {}
-				onSuccess({
-					data: {
-						data: data.candidate || [],
-						total: (data.candidate || []).length
-					}
+	onShow(() => {
+		nextTick(() => {
+			if (userStore.mobile === '') {
+				uni.navigateTo({
+					url: '/pages/login/login'
 				})
-			})
-	},1000)
-}
-
-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.candidate?.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) => {
-            uni.showToast({ title: res.msg, icon: 'success', duration: 1000 })
-        })
-    }
-}
-
-const onConfirm = () => uni.reLaunch({ url: '/pages/mine/index?meetId='+ userStore.meetId })
-
-onShow(() => {
-    nextTick(() => {
-        if (userStore.mobile === '') {
-            uni.navigateTo({
-                url: '/pages/login/login'
-            })
-        } else if (isEmptyObject(userStore.userInfo)) {
-            showDialogRef.value.show = true
-        } else if (!userStore.showtoast) {
-            userStore.showtoast = true
-            uni.showToast({ title: '登录成功！', icon: 'success', duration: 1000 })
-            setTimeout(() => reListRef.value.refreshFn(), 1100)
-        } else {
-            reListRef.value.refreshFn()
-        }
-    })
-})
+			} else if (isEmptyObject(userStore.userInfo)) {
+				showDialogRef.value.show = true
+			} else if (!userStore.showtoast) {
+				userStore.showtoast = true
+				uni.showToast({ title: '登录成功！', icon: 'success', duration: 1000 })
+			} else {
+			}
+		})
+	})
 </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" :is-perform-search="false">
-            <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">
+	<!-- 你的页面内容 -->
+	<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>
+
+		<view class="tppart">
+			<view class="tpone" v-for="(row, index) of params" :key="row.id + index">
+				<view class="topp">
+					<text class="number">{{row.num}}</text>
+					<!-- <img style="width: 96rpx; height: 96rpx; border-radius: 50%;margin-left: 10rpx;" :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>
-
-    <ex-empty v-else tips=" " :height="80">
-        <image style="width: 376rpx" mode="widthFix" src="@/static/img/Group.png" />
-        <view class="nodata">暂时没有选举 请刷新重试</view>
-    </ex-empty>
-
-    <ex-dialog ref="showDialogRef" title="提示" :on-confirm="onConfirm">请您签到之后再进行投票！</ex-dialog>
+                                </view> -->
+					</view>
+				</view>
+				<view class="bottomp">
+					<view class="minbut" v-for="(item, index) in buttlist" :key="index"
+						@click="selectBut(params, row.id, item.type, item.butname)"
+						:class="{ active: row.vote_result === item.type }">
+						{{ item.butname }}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="bottbutton">
+			<view class="qbty" @click="allChange">全部同意</view>
+			<view class="tjtp" @click="submit">提交投票</view>
+		</view>
+	</view>
+
+	<ex-empty v-else tips=" " :height="80">
+		<image style="width: 376rpx" mode="widthFix" src="@/static/img/Group.png" />
+		<view class="nodata">暂时没有选举 请刷新重试</view>
+	</ex-empty>
+
+	<ex-dialog ref="showDialogRef" title="提示" :on-confirm="onConfirm">请您签到之后再进行投票！</ex-dialog>
 </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>
+	.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: calc(100vh - 400rpx);
+			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;
+					align-items: center;
+
+					.number {
+						font-family: Roboto;
+						font-size: 28rpx;
+						font-weight: 500;
+						line-height: 42rpx;
+						letter-spacing: normal;
+						color: #000000;
+					}
+
+					.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: 86rpx;
+		font-family: Source Han Sans;
+		font-size: 36rpx;
+		font-weight: 500;
+		letter-spacing: normal;
+		color: #34343f;
+	}
+</style>
\ No newline at end of file
diff --git a/src/store/user.ts b/src/store/user.ts
index cafcc51..b2f4e36 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -2,7 +2,7 @@
 import { defineStore } from 'pinia'
 import { getPrefixName } from '@/config'
 import { getOpenid } from '@/api/login'
-import { infoForOpenid, bind as bindApi } from '@/api/user'
+import { infoForOpenid,getMember_mobile, bind as bindApi } from '@/api/user'
 
 interface userInfoStoreInt {
     [n: string]: any
@@ -47,6 +47,21 @@ export default defineStore(
             })
         }
 
+        function getUserInfomobile() { 
+            return new Promise<any>( (resolve, reject) => {
+					 getMember_mobile({ openid: openId.value})
+					    .then((res) => {
+								const { data } = res as { data: userInfoStoreInt }
+								userInfo.value = data || {}
+								resolve({ code: 1, data, message: 'SUCCESS' })
+					    })
+					    .catch((err) => {
+					        reject(err)
+					    })
+                
+            })
+        }
+
         function bindUser(id: number) {
             return new Promise<any>((resolve, reject) => {
                 bindApi({ id, openid: openId.value })
@@ -82,7 +97,8 @@ export default defineStore(
             getopenid,
             bindUser,
             getUserInfo,
-            logOut
+            logOut,
+			getUserInfomobile
         }
     },
     {