Browse Source

修改bug

dev
岳鹏龙 11 months ago
parent
commit
cd99668402
  1. 2
      src/api/user.ts
  2. 2
      src/pages.json
  3. 8
      src/pages/electionList/info.vue
  4. 77
      src/pages/mine/index.vue
  5. 859
      src/pages/votingElection/index.vue
  6. 20
      src/store/user.ts

2
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({ return request.http({
url: '/api/member_name', url: '/api/member_name',
method: 'GET', method: 'GET',

2
src/pages.json

@ -57,7 +57,7 @@
"path": "pages/mine/index", "path": "pages/mine/index",
"style": { "style": {
"navigationBarTitleText": "个人信息", "navigationBarTitleText": "个人信息",
"enablePullDownRefresh": true "enablePullDownRefresh": false
} }
}, },
{ {

8
src/pages/electionList/info.vue

@ -60,16 +60,16 @@ onLoad((opt) => {
<view class="progress"> <view class="progress">
<view class="flex-center-between progress-text"> <view class="flex-center-between progress-text">
<text>同意</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> </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>
<view class="progress"> <view class="progress">
<view class="flex-center-between progress-text"> <view class="flex-center-between progress-text">
<text>反对</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> </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>
<view class="progress"> <view class="progress">
<view class="flex-center-between progress-text"> <view class="flex-center-between progress-text">

77
src/pages/mine/index.vue

@ -8,6 +8,7 @@ const userStore = useUserStore()
const isHandleUserInfo = computed(() => Object.keys(userStore.userInfo).length === 0) const isHandleUserInfo = computed(() => Object.keys(userStore.userInfo).length === 0)
const keyword = ref('') const keyword = ref('')
const keyword2 = ref('')
const list = ref<dateListtype[]>([]) const list = ref<dateListtype[]>([])
@ -19,35 +20,47 @@ const navto = (url: string, params = {}) => uni.$util.goToPage({ url, params })
const getList = uni.$util.throttle(() => { const getList = uni.$util.throttle((type) => {
if (keyword.value === '') { console.log(keyword.value,keyword2.value);
uni.showToast({ title: '请输入姓名', icon: 'none' }) if(type === 1) {
return if (keyword.value === '') {
} uni.showToast({ title: type==1?'请输入姓名':'请输入单位', icon: 'none' })
return
// uni.showLoading({ mask: true, title: '...' }) }
listApi({ name: keyword.value, meetId: userStore.meetId })
listApi({ name: keyword.value, meetId: userStore.meetId }) .then((res) => {
.then((res) => { const { data } = res as { data: dateListtype[] }
const { data } = res as { data: dateListtype[] } list.value = data || []
list.value = data || [] })
// uni.hideLoading() } else {
}) if (keyword2.value === '') {
.catch(() => uni.hideLoading()) 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 = () => { const updateUserInfo = () => {
getSign({ openid: userStore.openId, meetId: userStore.meetId })
userStore.bindUser(list.value[activeKey.value].id as number).then(() => { userStore.bindUser(list.value[activeKey.value].id as number).then(() => {
reset() reset()
uni.showToast({ title: '提交成功,等待投票!', icon: 'none' }) uni.showToast({ title: '提交成功,等待投票!', icon: 'none' })
userStore.getUserInfo()
}) })
getSign({ openid: userStore.openId, meetId: userStore.meetId }) setTimeout(()=> {
userStore.getUserInfomobile()
},1000)
} }
const reset = () => { const reset = () => {
activeKey.value = 0 activeKey.value = 0
keyword.value = '' keyword.value = ''
keyword2.value = ''
list.value = [] list.value = []
} }
@ -99,8 +112,13 @@ onPullDownRefresh(() => userStore.getUserInfo())
<view class="userview-search box flex"> <view class="userview-search box flex">
<view class="userview-search-label">姓名</view> <view class="userview-search-label">姓名</view>
<input class="flex1" type="text" placeholder="请输入您的姓名" v-model="keyword" placeholder-class="placeholder" /> <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>
<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"> <block v-if="list.length > 0">
<view <view
@ -127,7 +145,7 @@ onPullDownRefresh(() => userStore.getUserInfo())
<ex-empty v-show="list.length <= 0" /> <ex-empty v-show="list.length <= 0" />
<view class="flex-center-evenly"> <view class="flex-center-evenly">
<view class="bts plain" v-if="list.length > 0" @click.stop="updateUserInfo">确认信息</view> <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> </view>
</block> </block>
@ -174,13 +192,13 @@ onPullDownRefresh(() => userStore.getUserInfo())
<u-icon @click.stop="openPopup('work_unit', '工作单位')" name="edit-pen-fill" color="#2563EB" size="38rpx" /> <u-icon @click.stop="openPopup('work_unit', '工作单位')" name="edit-pen-fill" color="#2563EB" size="38rpx" />
</view> </view>
</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-label">职位</view>
<view class="userview-info-item-content flex"> <view class="userview-info-item-content flex">
<text>{{ userStore.userInfo.position }}</text> <text>{{ userStore.userInfo.position }}</text>
<u-icon @click.stop="openPopup('position', '职位')" name="edit-pen-fill" color="#2563EB" size="38rpx" /> <u-icon @click.stop="openPopup('position', '职位')" name="edit-pen-fill" color="#2563EB" size="38rpx" />
</view> </view>
</view> </view> -->
</view> </view>
<view class="userview-info box admin"> <view class="userview-info box admin">
<view>* 姓名和电话信息需要管理员修改</view> <view>* 姓名和电话信息需要管理员修改</view>
@ -264,6 +282,7 @@ onPullDownRefresh(() => userStore.getUserInfo())
} }
&-bts { &-bts {
padding: 0 20rpx;
color: #2563eb; color: #2563eb;
} }
} }
@ -327,5 +346,21 @@ onPullDownRefresh(() => userStore.getUserInfo())
background-color: #eff6ff; 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> </style>

859
src/pages/votingElection/index.vue

@ -1,445 +1,442 @@
<script setup lang="ts"> <script setup lang="ts">
import { getVoteprogress, voteMember, getMember_mobile, getIs_sign } from '../../api/votingElection' import { getVoteprogress, voteMember, getMember_mobile, getIs_sign } from '../../api/votingElection'
import useUserStore from '@/store/user' import useUserStore from '@/store/user'
import { isEmptyObject } from '@/utils/common' import { isEmptyObject } from '@/utils/common'
import { getSign, getmemberMobileGet } from '@/api/login' import { getSign, getmemberMobileGet } from '@/api/login'
const userStore = useUserStore() const userStore = useUserStore()
const showDialogRef = ref() const showDialogRef = ref()
const reListRef = ref()
const xjList = ref<any>({})
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('用户点击取消')
}
}
})
}
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 })
}
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 onConfirm = () => uni.reLaunch({ url: '/pages/mine/index?meetId=' + userStore.meetId })
const doSearch = (_formData: { page: number; limit: number }, onSuccess: Function) => { onShow(() => {
setTimeout(()=> { nextTick(() => {
getVoteprogress(userStore.meetId).then((res) => { if (userStore.mobile === '') {
const { data } = res as { data: { candidate: any[] } } uni.navigateTo({
xjList.value = data || {} url: '/pages/login/login'
onSuccess({
data: {
data: data.candidate || [],
total: (data.candidate || []).length
}
}) })
}) } else if (isEmptyObject(userStore.userInfo)) {
},1000) showDialogRef.value.show = true
} } else if (!userStore.showtoast) {
userStore.showtoast = true
const buttlist = ref([ uni.showToast({ title: '登录成功!', icon: 'success', duration: 1000 })
{ } else {
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()
}
})
})
</script> </script>
<template> <template>
<!-- 你的页面内容 --> <!-- 你的页面内容 -->
<view class="box" v-if="xjList.length != 0"> <view class="box" v-if="xjList.length != 0">
<view class="headpart"> <view class="headpart">
<view class="title">{{ xjList.title }}</view> <view class="title">{{ xjList.title }}</view>
<view class="time">投票开始时间{{ xjList.start_time }}</view> <view class="time">投票开始时间{{ xjList.start_time }}</view>
<view class="time">投票截止时间{{ xjList.end_time }}</view> <view class="time">投票截止时间{{ xjList.end_time }}</view>
</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="tppart"> <view class="tpone" v-for="(row, index) of params" :key="row.id + index">
<view class="tpone" v-for="(row, index) of data" :key="'tpone' + index"> <view class="topp">
<view class="topp"> <text class="number">{{row.num}}</text>
<img style="width: 96rpx; height: 96rpx; border-radius: 50%" :src="row.photo" alt="" /> <!-- <img style="width: 96rpx; height: 96rpx; border-radius: 50%;margin-left: 10rpx;" :src="row.photo" alt="" /> -->
<view class="rightpart"> <view class="rightpart">
<view class="name"> <view class="name">
{{ row.name }} {{ row.name }}
</view> </view>
<view class="class"> <!-- <view class="class">
{{ row.position }} {{ row.position }}
</view> </view> -->
</view> </view>
</view> </view>
<view class="bottomp"> <view class="bottomp">
<view <view class="minbut" v-for="(item, index) in buttlist" :key="index"
class="minbut" @click="selectBut(params, row.id, item.type, item.butname)"
v-for="(item, ele) in buttlist" :class="{ active: row.vote_result === item.type }">
:key="ele" {{ item.butname }}
@click="selectBut(data, row.id, item.type, item.butname)" </view>
:class="{ active: row.vote_result === item.type }" </view>
> </view>
{{ item.butname }} </view>
</view> <view class="bottbutton">
</view> <view class="qbty" @click="allChange">全部同意</view>
</view> <view class="tjtp" @click="submit">提交投票</view>
</view> </view>
</template> </view>
</ex-list>
<view class="bottbutton"> <ex-empty v-else tips=" " :height="80">
<view class="qbty" @click="allChange">全部同意</view> <image style="width: 376rpx" mode="widthFix" src="@/static/img/Group.png" />
<view class="tjtp" @click="submit">提交投票</view> <view class="nodata">暂时没有选举 请刷新重试</view>
</view> </ex-empty>
</view>
<ex-dialog ref="showDialogRef" title="提示" :on-confirm="onConfirm">请您签到之后再进行投票</ex-dialog>
<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> </template>
<style scoped lang="scss"> <style scoped lang="scss">
.box { .box {
width: 100%; width: 100%;
background-color: #f9fafb; background-color: #f9fafb;
.headpart { .headpart {
width: 92%; width: 92%;
height: 194rpx; height: 194rpx;
border-radius: 24rpx; border-radius: 24rpx;
background-color: #eff6ff; background-color: #eff6ff;
margin: 32rpx auto; margin: 32rpx auto;
padding: 20rpx 3%; padding: 20rpx 3%;
.title { .title {
color: #2563eb; color: #2563eb;
font-size: 28rpx; font-size: 28rpx;
margin-top: 16rpx; margin-top: 16rpx;
} }
.time { .time {
margin-top: 16rpx; margin-top: 16rpx;
color: #4b5563; color: #4b5563;
font-size: 28rpx; font-size: 28rpx;
} }
} }
.tppart { .tppart {
width: 100%; width: 100%;
max-height: 69vh; max-height: calc(100vh - 400rpx);
overflow-y: auto; overflow-y: auto;
display: grid; display: grid;
justify-items: center; justify-items: center;
.tpone { .tpone {
width: 91%; width: 91%;
height: 264rpx; height: 264rpx;
padding: 20rpx 4%; padding: 20rpx 4%;
box-sizing: border-box; box-sizing: border-box;
border-radius: 24rpx; border-radius: 24rpx;
background: linear-gradient(0deg, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.001)), #ffffff; background: linear-gradient(0deg, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.001)), #ffffff;
box-sizing: border-box; box-sizing: border-box;
border: 2rpx solid #f3f4f6; border: 2rpx solid #f3f4f6;
box-shadow: box-shadow:
0rpx 2rpx 4rpx -2rpx rgba(0, 0, 0, 0.1), 0rpx 2rpx 4rpx -2rpx rgba(0, 0, 0, 0.1),
0rpx 2rpx 6rpx 0rpx rgba(0, 0, 0, 0.1); 0rpx 2rpx 6rpx 0rpx rgba(0, 0, 0, 0.1);
margin-top: 32rpx; margin-top: 32rpx;
display: grid; display: grid;
.topp { .topp {
display: flex; display: flex;
align-items: center;
.rightpart {
margin-left: 32rpx; .number {
display: grid; font-family: Roboto;
justify-items: left; font-size: 28rpx;
align-content: baseline; font-weight: 500;
line-height: 42rpx;
.name { letter-spacing: normal;
font-family: Roboto; color: #000000;
font-size: 28rpx; }
font-weight: 500;
line-height: 42rpx; .rightpart {
letter-spacing: normal; margin-left: 32rpx;
color: #000000; display: grid;
margin-top: 7rpx; justify-items: left;
} align-content: baseline;
.class { .name {
font-family: Roboto; font-family: Roboto;
font-size: 28rpx; font-size: 28rpx;
font-weight: normal; font-weight: 500;
line-height: 40rpx; line-height: 42rpx;
letter-spacing: normal; letter-spacing: normal;
color: #6b7280; color: #000000;
margin-top: 7rpx; margin-top: 7rpx;
} }
}
} .class {
font-family: Roboto;
.bottomp { font-size: 28rpx;
display: flex; font-weight: normal;
justify-content: space-between; line-height: 40rpx;
gap: 0rpx 20rpx; letter-spacing: normal;
color: #6b7280;
.minbut { margin-top: 7rpx;
flex: 1; }
width: 190rpx; }
height: 76rpx; }
/* 自动布局 */
display: flex; .bottomp {
justify-content: center; display: flex;
padding: 16rpx 32rpx; justify-content: space-between;
flex-wrap: wrap; gap: 0rpx 20rpx;
align-content: flex-start;
border-radius: 8rpx; .minbut {
background: #ffffff; flex: 1;
box-sizing: border-box; width: 190rpx;
border: 2rpx solid #d1d5db; height: 76rpx;
font-family: Roboto; /* 自动布局 */
font-size: 28rpx; display: flex;
font-weight: normal; justify-content: center;
line-height: 40rpx; padding: 16rpx 32rpx;
text-align: center; flex-wrap: wrap;
letter-spacing: normal; align-content: flex-start;
color: #4b5563; border-radius: 8rpx;
} background: #ffffff;
box-sizing: border-box;
.minbut.active { border: 2rpx solid #d1d5db;
border: 2rpx solid #2563eb; font-family: Roboto;
color: #2563eb; font-size: 28rpx;
} font-weight: normal;
} line-height: 40rpx;
} text-align: center;
letter-spacing: normal;
.tpone:first-child { color: #4b5563;
margin-top: 0; }
}
} .minbut.active {
border: 2rpx solid #2563eb;
.bottbutton { color: #2563eb;
width: 100%; }
height: 10vh; }
display: flex; }
padding: 24rpx 32rpx;
gap: 0rpx 24rpx; .tpone:first-child {
flex-wrap: wrap; margin-top: 0;
align-content: flex-start; }
background: #ffffff; }
box-sizing: border-box;
border-width: 2rpx 0rpx 0rpx 0rpx; .bottbutton {
border-style: solid; width: 100%;
border-color: #f3f4f6; height: 10vh;
position: fixed; display: flex;
bottom: 0; padding: 24rpx 32rpx;
gap: 0rpx 24rpx;
.qbty { flex-wrap: wrap;
width: 331rpx; align-content: flex-start;
height: 90rpx; background: #ffffff;
/* 自动布局 */ box-sizing: border-box;
display: flex; border-width: 2rpx 0rpx 0rpx 0rpx;
box-sizing: border-box; border-style: solid;
justify-content: center; border-color: #f3f4f6;
padding: 24rpx 0rpx; position: fixed;
gap: 0rpx 20rpx; bottom: 0;
flex-wrap: wrap;
border-radius: 8rpx; .qbty {
background: #eff6ff; width: 331rpx;
font-family: Roboto; height: 90rpx;
font-size: 28rpx; /* 自动布局 */
font-weight: 500; display: flex;
line-height: 42rpx; box-sizing: border-box;
text-align: center; justify-content: center;
letter-spacing: normal; padding: 24rpx 0rpx;
color: #2563eb; gap: 0rpx 20rpx;
} flex-wrap: wrap;
border-radius: 8rpx;
.tjtp { background: #eff6ff;
width: 331rpx; font-family: Roboto;
height: 90rpx; font-size: 28rpx;
/* 自动布局 */ font-weight: 500;
display: flex; line-height: 42rpx;
box-sizing: border-box; text-align: center;
justify-content: center; letter-spacing: normal;
padding: 24rpx 0rpx; color: #2563eb;
gap: 0rpx 20rpx; }
flex-wrap: wrap;
border-radius: 8rpx; .tjtp {
background: #2563eb; width: 331rpx;
font-family: Roboto; height: 90rpx;
font-size: 28rpx; /* 自动布局 */
font-weight: 500; display: flex;
line-height: 42rpx; box-sizing: border-box;
text-align: center; justify-content: center;
letter-spacing: normal; padding: 24rpx 0rpx;
color: #ffffff; gap: 0rpx 20rpx;
} flex-wrap: wrap;
} border-radius: 8rpx;
background: #2563eb;
.address-items { font-family: Roboto;
padding: 20rpx 15rpx 32rpx 28rpx; font-size: 28rpx;
background-color: #fff; font-weight: 500;
border-bottom: 2rpx solid #f5f5f5; line-height: 42rpx;
text-align: center;
.left { letter-spacing: normal;
flex: 1; color: #ffffff;
overflow: hidden; }
}
.name {
font-size: 28rpx; .address-items {
font-weight: 700; padding: 20rpx 15rpx 32rpx 28rpx;
color: #101010; background-color: #fff;
line-height: 40rpx; border-bottom: 2rpx solid #f5f5f5;
margin-right: 16rpx;
} .left {
flex: 1;
.isdefault { overflow: hidden;
font-size: 20rpx;
font-weight: 400; .name {
color: #fff; font-size: 28rpx;
padding: 4rpx 12rpx; font-weight: 700;
border-radius: 8rpx; color: #101010;
background: linear-gradient(90deg, #4778ff 0%, #4778ffb8 100%); line-height: 40rpx;
} margin-right: 16rpx;
}
.info {
width: 100%; .isdefault {
color: #666; font-size: 20rpx;
font-size: 24rpx; font-weight: 400;
font-weight: 400; color: #fff;
margin-top: 12rpx; padding: 4rpx 12rpx;
} border-radius: 8rpx;
} background: linear-gradient(90deg, #4778ff 0%, #4778ffb8 100%);
}
.right {
width: 140rpx; .info {
padding-left: 32rpx; width: 100%;
font-size: 24rpx; color: #666;
font-weight: 400; font-size: 24rpx;
color: #4979ff; font-weight: 400;
text-align: right; margin-top: 12rpx;
} }
} }
.buts { .right {
width: 100%; width: 140rpx;
height: 10vh; padding-left: 32rpx;
background-color: F3F4F6; font-size: 24rpx;
position: fixed; font-weight: 400;
bottom: 0; color: #4979ff;
border-top: 2rpx solid #ebebec; text-align: right;
} }
} }
.nodata {
margin-top: 43px; .buts {
font-family: Source Han Sans; width: 100%;
font-size: 18px; height: 10vh;
font-weight: 500; background-color: F3F4F6;
letter-spacing: normal; position: fixed;
color: #34343f; 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> </style>

20
src/store/user.ts

@ -2,7 +2,7 @@
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
import { getPrefixName } from '@/config' import { getPrefixName } from '@/config'
import { getOpenid } from '@/api/login' 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 { interface userInfoStoreInt {
[n: string]: any [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) { function bindUser(id: number) {
return new Promise<any>((resolve, reject) => { return new Promise<any>((resolve, reject) => {
bindApi({ id, openid: openId.value }) bindApi({ id, openid: openId.value })
@ -82,7 +97,8 @@ export default defineStore(
getopenid, getopenid,
bindUser, bindUser,
getUserInfo, getUserInfo,
logOut logOut,
getUserInfomobile
} }
}, },
{ {

Loading…
Cancel
Save