0107提交

pages/subpack/pages/apply/apply.vue

@@ -8,7 +8,7 @@
 				<view class="w-100p flex-column">
 					<view class="flex-row align-center">
 						<view style="width: 6rpx;height: 32rpx;background-color: #39A1FF;border-radius: 4rpx;"></view>
-						<text class="font-xmd text-black3" style="margin-left: 14rpx;">预约人信息</text>
+						<text class="font-xmd text-black3" style="margin-left: 14rpx;">申请人信息</text>
 					</view>
 					<view class="flex-column py-4 px-24 mt-24"
 						style="background: linear-gradient( 180deg, #E8F4FF 0%, #FFFFFF 100%);border-radius: 16rpx;">

pages/subpack/pages/bindInfo/bindInfo.vue

@@ -36,7 +36,7 @@
 					<text class="font font-weight-bolder text-black2">手机号码</text>
 				</view>
 				<view style="margin-left: 20rpx;">
-					<input v-model.trim="phone" type="number" :maxlength="11"></input>
+					<input v-model.trim="phone" type="number" placeholder="请输入手机号码" :maxlength="11"></input>
 				</view>
 			</view>
 

pages/subpack/pages/login/login.vue

@@ -22,13 +22,39 @@
 
 <script>
 	import {
-		loginUrl
+		loginUrl,
+		getUserInfoUrl
 	} from '@/common/config/api.js'
 	export default {
 		data() {
 			return {}
 		},
 		methods: {
+			getUserInfo() {
+				getUserInfoUrl({
+						custom: {
+							catch: true
+						}
+					})
+					.then(res => {
+						uni.hideLoading();
+						console.log('用户信息', res);
+						let user = {
+							avatar: this.avatarImg,
+							nickName: res.user.nickName,
+							phonenumber: res.user.phonenumber,
+							roles: res.roles
+						}
+						this.$u.vuex('vuex_user', user);
+						uni.switchTab({
+							url: '/pages/tabbar/application/application'
+						})
+					})
+					.catch(err => {
+						uni.hideLoading();
+						console.log(err);
+					})
+			},
 			// 利用code登录
 			loginByCode(code) {
 				// console.log('code', code);
@@ -41,9 +67,7 @@
 						console.log('微信登录', res);
 						if (res.token) {
 							this.$u.vuex('vuex_token', res.token);
-							return uni.switchTab({
-								url: '/pages/tabbar/application/application'
-							})
+							this.getUserInfo();
 						};
 						if (res.openId) {
 							// 没有注册过
@@ -55,8 +79,6 @@
 					.catch(err => {
 						console.log('err', err);
 					})
-				// 暂时登录成功
-				// 跳转去手机号码填写页面
 
 			},
 			// 微信登录

pages/subpack/pages/myInfo/info.vue

@@ -4,13 +4,18 @@
 		<u-cell-group :border="false" :customStyle="{background: '#fff', margin: '30rpx',  borderRadius: '20rpx'}">
 			<u-cell title="头像" isLink>
 				<template #value>
-					<up-avatar size="116rpx" :src="user.avatar" defaultUrl="/static/mine/avatar-def.png"
+					<up-avatar size="116rpx" :src="vuex_user.avatar" defaultUrl="/static/mine/avatar-def.png"
 						bgColor="#305BFF" />
 				</template>
 			</u-cell>
 			<u-cell title="姓名" isLink :border="false">
 				<template #value>
-					<view>{{user.nickName}}</view>
+					<view>{{vuex_user.nickName}}</view>
+				</template>
+			</u-cell>
+			<u-cell title="手机号码" :isLink="false" :border="false">
+				<template #value>
+					<view>{{vuex_user.phonenumber}}</view>
 				</template>
 			</u-cell>
 		</u-cell-group>
@@ -24,25 +29,36 @@
 <script setup>
 	import {
 		onMounted,
-		ref
+		ref,
+		getCurrentInstance
 	} from 'vue';
 	import {
 		useStore
 	} from 'vuex';
+
+	const {
+		proxy
+	} = getCurrentInstance();
+
+
+
 	// 获取 Vuex store 实例
 	const store = useStore();
 	const user = ref({
 		nickName: ' '
 	})
 
-	function logout() {
+	// 登出
+	const logout = () => {
 		uni.showModal({
 			title: '提示',
 			content: '您确定要退出登录吗?',
 			success(res) {
 				if (res.confirm) {
-					store.state.vuex_token = 'none';
-					store.state.vuex_user = {};
+					// store.state.vuex_token = 'none';
+					// store.state.vuex_user = {};
+					proxy.$u.vuex('vuex_token', '');
+					proxy.$u.vuex('vuex_login', false);
 					uni.redirectTo({
 						url: '/pages/subpack/pages/login/login'
 					})

pages/tabbar/application/application.vue

@@ -72,6 +72,9 @@
 				if (this.vuex_user.roles.includes('village')) {
 					return '护理申请'
 				}
+				if (this.vuex_user.roles.includes('area')) {
+					return '护理审核'
+				}
 			}
 		},
 		methods: {
@@ -80,7 +83,7 @@
 					.then(res => {
 						console.log('用户信息', res);
 						let user = {
-							avatar: this.avatarImg,
+							avatar: this.vuex_user.avatar || '',
 							nickName: res.user.nickName,
 							phonenumber: res.user.phonenumber,
 							roles: res.roles
@@ -119,11 +122,18 @@
 			},
 			// 点击预约
 			handleEnterClick() {
+				// 民政所
 				if (this.vuex_user.roles.includes('village')) {
 					return uni.navigateTo({
 						url: '/pages/subpack/pages/apply/apply'
 					})
 				}
+				// 民政局
+				if (this.vuex_user.roles.includes('area')) {
+					return uni.navigateTo({
+						url: '/pages/subpack/pages/application/list'
+					})
+				}
 			}
 		}
 	}

pages/tabbar/mine/mine.vue

@@ -4,7 +4,7 @@
 		<view class="top-box">
 			<u-image class="bg-box" width="690rpx" height="270rpx" src="/static/mine/user-center-bg.png" />
 			<div class="avatar-name">
-				<up-avatar size="116rpx" :src="user.avatar" defaultUrl="/static/mine/avatar-def.png"
+				<up-avatar size="116rpx" :src="vuex_user.avatar" defaultUrl="/static/mine/avatar-def.png"
 					bgColor="#305BFF" />
 				<!-- <u-image class="avatar" width="116rpx" bgColor="transparent" height="116rpx"
 					src="/static/mine/avatar-def.png" /> -->
@@ -46,6 +46,9 @@
 	import {
 		useStore
 	} from 'vuex';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
 	// 获取 Vuex store 实例
 	const store = useStore();
 	const user = ref({
@@ -61,11 +64,12 @@
 		company: '护理公司',
 		nurse: '护理员'
 	}
+
 	function handleRolesText() {
 		let roles = user.value.roles;
 		let roleText = [];
-		roles.map(item=>{
-			if(roleKV.hasOwnProperty(item)){
+		roles.map(item => {
+			if (roleKV.hasOwnProperty(item)) {
 				roleText.push(roleKV[item]);
 			}
 		})
@@ -114,6 +118,7 @@
 				font-size: 40rpx;
 				color: #000000;
 			}
+
 			.roles {
 				font-size: 28rpx;
 				margin-top: 10rpx;