From e70033fd804d699968ac85eafef0c17a884aac20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Fri, 20 Sep 2024 16:28:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preparationByPlan/addTask/addTask.vue     |   2 +-
 .../preparationByPlan/index.vue               |  23 +-
 pages/mine/about/index.vue                    | 125 +++++----
 pages/mine/help/index.vue                     | 199 ++++++++-------
 pages/mine/index.vue                          |  21 +-
 pages/mine/info/edit.vue                      | 237 +++++++++---------
 pages/mine/info/index.vue                     |  70 +++---
 store/modules/user.js                         |  12 +-
 8 files changed, 361 insertions(+), 328 deletions(-)

diff --git a/pages/materialManagement/preparationByPlan/addTask/addTask.vue b/pages/materialManagement/preparationByPlan/addTask/addTask.vue
index 2dea440..6dd5ed5 100644
--- a/pages/materialManagement/preparationByPlan/addTask/addTask.vue
+++ b/pages/materialManagement/preparationByPlan/addTask/addTask.vue
@@ -155,7 +155,7 @@ export default {
 
 <style scoped>
 	.scroll-view{
-		height: 1000rpx;
+		height: 960rpx;
 		padding-bottom: 40rpx;
 	}
 </style>
diff --git a/pages/materialManagement/preparationByPlan/index.vue b/pages/materialManagement/preparationByPlan/index.vue
index 8235825..1815283 100644
--- a/pages/materialManagement/preparationByPlan/index.vue
+++ b/pages/materialManagement/preparationByPlan/index.vue
@@ -9,14 +9,22 @@
 				<uni-forms-item label="线别">
 					<uni-data-select v-model="query.lineCode" :localdata="lineOptions" @change="getList()"></uni-data-select>
 				</uni-forms-item>
-				<button type="primary" @click="getList()">查询</button>
+				<button type="primary" plain @click="getList()">
+					<uni-icons color="#2979ff" type="search" size="18"></uni-icons>
+					查询
+				</button>
 			</uni-forms>
 		</view>
-		<uni-list style="width: 100%">
-			<uni-list-item v-for="(item, index) in dataList" :key="index" :title="item.title" rightText="任务详情" link @click="onListItemClick(item)"></uni-list-item>
-		</uni-list>
+		<scroll-view class="scroll-view" scroll-y="true">
+			<uni-list style="width: 100%">
+				<uni-list-item v-for="(item, index) in dataList" :key="index" :title="item.title" rightText="任务详情" link @click="onListItemClick(item)"></uni-list-item>
+			</uni-list>
+		</scroll-view>
 		<view class="bottom-box">
-			<button type="primary" @click="doAddTask">新建备料任务</button>
+			<button type="primary" @click="doAddTask">
+				<uni-icons color="#fff" type="plusempty" size="18"></uni-icons>
+				新建备料任务
+			</button>
 		</view>
 	</view>
 </template>
@@ -141,5 +149,8 @@ export default {
 .card-box {
 	width: 100%;
 }
-
+.scroll-view {
+	height: 760rpx;
+	padding-bottom: 40rpx;
+}
 </style>
diff --git a/pages/mine/about/index.vue b/pages/mine/about/index.vue
index d3f6255..a16a4ad 100644
--- a/pages/mine/about/index.vue
+++ b/pages/mine/about/index.vue
@@ -1,75 +1,74 @@
 <template>
-  <view class="about-container">
-    <view class="header-section text-center">
-      <image style="width: 150rpx;height: 150rpx;" src="/static/logo200.png" mode="widthFix">
-      </image>
-      <uni-title type="h2" title="若依移动端"></uni-title>
-    </view>
+	<view class="about-container">
+		<view class="header-section text-center">
+			<image style="width: 150rpx; height: 150rpx" src="/static/logo.png" mode="widthFix"></image>
+			<uni-title type="h2" title="车镜实业"></uni-title>
+		</view>
 
-    <view class="content-section">
-      <view class="menu-list">
-        <view class="list-cell list-cell-arrow">
-          <view class="menu-item-box">
-            <view>版本信息</view>
-            <view class="text-right">v{{version}}</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow">
-          <view class="menu-item-box">
-            <view>官方邮箱</view>
-            <view class="text-right">ruoyi@xx.com</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow">
-          <view class="menu-item-box">
-            <view>服务热线</view>
-            <view class="text-right">400-999-9999</view>
-          </view>
-        </view>
-        <view class="list-cell list-cell-arrow">
-          <view class="menu-item-box">
-            <view>公司网站</view>
-            <view class="text-right">
-              <uni-link :href="url" :text="url" showUnderLine="false"></uni-link>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
+		<view class="content-section">
+			<view class="menu-list">
+				<view class="list-cell list-cell-arrow">
+					<view class="menu-item-box">
+						<view>版本信息</view>
+						<view class="text-right">v{{ version }}</view>
+					</view>
+				</view>
+				<view class="list-cell list-cell-arrow">
+					<view class="menu-item-box">
+						<view>官方邮箱</view>
+						<view class="text-right">doan@163.com</view>
+					</view>
+				</view>
+				<view class="list-cell list-cell-arrow">
+					<view class="menu-item-box">
+						<view>服务热线</view>
+						<view class="text-right">17351662861</view>
+					</view>
+				</view>
+				<view class="list-cell list-cell-arrow">
+					<view class="menu-item-box">
+						<view>公司网站</view>
+						<view class="text-right">
+							<uni-link :href="url" :text="url" showUnderLine="false"></uni-link>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 
-    <view class="copyright">
+		<!-- <view class="copyright">
       <view>Copyright &copy; 2022 ruoyi.vip All Rights Reserved.</view>
-    </view>
-  </view>
+    </view> -->
+	</view>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        url: getApp().globalData.config.appInfo.site_url,
-        version: getApp().globalData.config.appInfo.version
-      }
-    }
-  }
+export default {
+	data() {
+		return {
+			url: getApp().globalData.config.appInfo.site_url,
+			version: getApp().globalData.config.appInfo.version
+		};
+	}
+};
 </script>
 
 <style lang="scss">
-  page {
-    background-color: #f8f8f8;
-  }
+page {
+	background-color: #f8f8f8;
+}
 
-  .copyright {
-    margin-top: 50rpx;
-    text-align: center;
-    line-height: 60rpx;
-    color: #999;
-  }
+.copyright {
+	margin-top: 50rpx;
+	text-align: center;
+	line-height: 60rpx;
+	color: #999;
+}
 
-  .header-section {
-    display: flex;
-    padding: 30rpx 0 0;
-    flex-direction: column;
-    align-items: center;
-  }
-</style>
+.header-section {
+	display: flex;
+	padding: 30rpx 0 0;
+	flex-direction: column;
+	align-items: center;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mine/help/index.vue b/pages/mine/help/index.vue
index d2e4374..6fe4bdc 100644
--- a/pages/mine/help/index.vue
+++ b/pages/mine/help/index.vue
@@ -1,112 +1,117 @@
 <template>
-  <view class="help-container">
-    <view v-for="(item, findex) in list" :key="findex" :title="item.title" class="list-title">
-      <view class="text-title">
-        <view :class="item.icon"></view>{{ item.title }}
-      </view>
-      <view class="childList">
-        <view v-for="(child, zindex) in item.childList" :key="zindex" class="question" hover-class="hover"
-          @click="handleText(child)">
-          <view class="text-item">{{ child.title }}</view>
-          <view class="line" v-if="zindex !== item.childList.length - 1"></view>
-        </view>
-      </view>
-    </view>
-  </view>
+	<view class="help-container">
+		<view v-for="(item, findex) in list" :key="findex" :title="item.title" class="list-title">
+			<view class="text-title">
+				<view :class="item.icon"></view>
+				{{ item.title }}
+			</view>
+			<view class="childList">
+				<view v-for="(child, zindex) in item.childList" :key="zindex" class="question" hover-class="hover" @click="handleText(child)">
+					<view class="text-item">{{ child.title }}</view>
+					<view class="line" v-if="zindex !== item.childList.length - 1"></view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        list: [{
-            icon: 'iconfont icon-github',
-            title: '若依问题',
-            childList: [{
-              title: '若依开源吗？',
-              content: '开源'
-            }, {
-              title: '若依可以商用吗？',
-              content: '可以'
-            }, {
-              title: '若依官网地址多少？',
-              content: 'http://ruoyi.vip'
-            }, {
-              title: '若依文档地址多少？',
-              content: 'http://doc.ruoyi.vip'
-            }]
-          },
-          {
-            icon: 'iconfont icon-help',
-            title: '其他问题',
-            childList: [{
-              title: '如何退出登录？',
-              content: '请点击[我的] - [应用设置] - [退出登录]即可退出登录',
-            }, {
-              title: '如何修改用户头像？',
-              content: '请点击[我的] - [选择头像] - [点击提交]即可更换用户头像',
-            }, {
-              title: '如何修改登录密码？',
-              content: '请点击[我的] - [应用设置] - [修改密码]即可修改登录密码',
-            }]
-          }
-        ]
-      }
-    },
-    methods: {
-      handleText(item) {
-        this.$tab.navigateTo(`/pages/common/textview/index?title=${item.title}&content=${item.content}`)
-      }
-    }
-  }
+export default {
+	data() {
+		return {
+			list: [
+				// {
+				//          icon: 'iconfont icon-github',
+				//          title: '若依问题',
+				//          childList: [{
+				//            title: '若依开源吗？',
+				//            content: '开源'
+				//          }, {
+				//            title: '若依可以商用吗？',
+				//            content: '可以'
+				//          }, {
+				//            title: '若依官网地址多少？',
+				//            content: 'http://ruoyi.vip'
+				//          }, {
+				//            title: '若依文档地址多少？',
+				//            content: 'http://doc.ruoyi.vip'
+				//          }]
+				//        },
+				{
+					icon: 'iconfont icon-help',
+					title: '其他问题',
+					childList: [
+						{
+							title: '如何退出登录？',
+							content: '请点击[我的] - [应用设置] - [退出登录]即可退出登录'
+						},
+						{
+							title: '如何修改用户头像？',
+							content: '请点击[我的] - [选择头像] - [点击提交]即可更换用户头像'
+						},
+						{
+							title: '如何修改登录密码？',
+							content: '请点击[我的] - [应用设置] - [修改密码]即可修改登录密码'
+						}
+					]
+				}
+			]
+		};
+	},
+	methods: {
+		handleText(item) {
+			this.$tab.navigateTo(`/pages/common/textview/index?title=${item.title}&content=${item.content}`);
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-  page {
-    background-color: #f8f8f8;
-  }
+page {
+	background-color: #f8f8f8;
+}
 
-  .help-container {
-    margin-bottom: 100rpx;
-    padding: 30rpx;
-  }
+.help-container {
+	margin-bottom: 100rpx;
+	padding: 30rpx;
+}
 
-  .list-title {
-    margin-bottom: 30rpx;
-  }
+.list-title {
+	margin-bottom: 30rpx;
+}
 
-  .childList {
-    background: #ffffff;
-    box-shadow: 0px 0px 10rpx rgba(193, 193, 193, 0.2);
-    border-radius: 16rpx;
-    margin-top: 10rpx;
-  }
+.childList {
+	background: #ffffff;
+	box-shadow: 0px 0px 10rpx rgba(193, 193, 193, 0.2);
+	border-radius: 16rpx;
+	margin-top: 10rpx;
+}
 
-  .line {
-    width: 100%;
-    height: 1rpx;
-    background-color: #F5F5F5;
-  }
+.line {
+	width: 100%;
+	height: 1rpx;
+	background-color: #f5f5f5;
+}
 
-  .text-title {
-    color: #303133;
-    font-size: 32rpx;
-    font-weight: bold;
-    margin-left: 10rpx;
+.text-title {
+	color: #303133;
+	font-size: 32rpx;
+	font-weight: bold;
+	margin-left: 10rpx;
 
-    .iconfont {
-      font-size: 16px;
-      margin-right: 10rpx;
-    }
-  }
+	.iconfont {
+		font-size: 16px;
+		margin-right: 10rpx;
+	}
+}
 
-  .text-item {
-    font-size: 28rpx;
-    padding: 24rpx;
-  }
+.text-item {
+	font-size: 28rpx;
+	padding: 24rpx;
+}
 
-  .question {
-    color: #606266;
-    font-size: 28rpx;
-  }
-</style>
+.question {
+	color: #606266;
+	font-size: 28rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index b46bc47..ff57abc 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -22,21 +22,21 @@
 
 		<view class="content-section">
 			<view class="mine-actions grid col-4 text-center">
-				<view class="action-item" @click="handleJiaoLiuQun">
-					<view class="iconfont icon-friendfill text-pink icon"></view>
-					<text class="text">交流群</text>
+				<view class="action-item" @click="handleBuilding">
+					<view class="iconfont icon-friendfill text-orange icon"></view>
+					<text class="text">同事</text>
 				</view>
 				<view class="action-item" @click="handleBuilding">
 					<view class="iconfont icon-service text-blue icon"></view>
-					<text class="text">在线客服</text>
+					<text class="text">客服</text>
 				</view>
 				<view class="action-item" @click="handleBuilding">
 					<view class="iconfont icon-community text-mauve icon"></view>
-					<text class="text">反馈社区</text>
+					<text class="text">反馈</text>
 				</view>
 				<view class="action-item" @click="handleBuilding">
-					<view class="iconfont icon-dianzan text-green icon"></view>
-					<text class="text">点赞我们</text>
+					<view class="iconfont icon-share text-green icon"></view>
+					<text class="text">分享</text>
 				</view>
 			</view>
 
@@ -74,6 +74,11 @@
 import storage from '@/utils/storage';
 
 export default {
+	onShow() {
+		// this.$store.dispatch('GetInfo').then((res) => {
+		// 	// this.$tab.reLaunch('/pages/index');
+		// });
+	},
 	data() {
 		return {
 			name: this.$store.state.user.name,
@@ -118,7 +123,7 @@ export default {
 			this.$tab.navigateTo('/pages/mine/about/index');
 		},
 		handleJiaoLiuQun() {
-			this.$modal.showToast('QQ群：①133713780、②146013835');
+			this.$modal.showToast('模块建设中~');
 		},
 		handleBuilding() {
 			this.$modal.showToast('模块建设中~');
diff --git a/pages/mine/info/edit.vue b/pages/mine/info/edit.vue
index 519540a..f1bd3d9 100644
--- a/pages/mine/info/edit.vue
+++ b/pages/mine/info/edit.vue
@@ -1,127 +1,138 @@
 <template>
-  <view class="container">
-    <view class="example">
-      <uni-forms ref="form" :model="user" labelWidth="80px">
-        <uni-forms-item label="用户昵称" name="nickName">
-          <uni-easyinput v-model="user.nickName" placeholder="请输入昵称" />
-        </uni-forms-item>
-        <uni-forms-item label="手机号码" name="phonenumber">
-          <uni-easyinput v-model="user.phonenumber" placeholder="请输入手机号码" />
-        </uni-forms-item>
-        <uni-forms-item label="邮箱" name="email">
-          <uni-easyinput v-model="user.email" placeholder="请输入邮箱" />
-        </uni-forms-item>
-        <uni-forms-item label="性别" name="sex" required>
-          <uni-data-checkbox v-model="user.sex" :localdata="sexs" />
-        </uni-forms-item>
-      </uni-forms>
-      <button type="primary" @click="submit">提交</button>
-    </view>
-  </view>
+	<view class="container">
+		<view class="example">
+			<uni-forms ref="form" :model="user" labelWidth="80px">
+				<uni-forms-item label="用户昵称" name="nickName">
+					<uni-easyinput v-model="user.nickName" placeholder="请输入昵称" />
+				</uni-forms-item>
+				<uni-forms-item label="手机号码" name="phonenumber">
+					<uni-easyinput v-model="user.phonenumber" placeholder="请输入手机号码" />
+				</uni-forms-item>
+				<uni-forms-item label="邮箱" name="email">
+					<uni-easyinput v-model="user.email" placeholder="请输入邮箱" />
+				</uni-forms-item>
+				<uni-forms-item label="性别" name="sex" required>
+					<uni-data-checkbox v-model="user.sex" :localdata="sexs" />
+				</uni-forms-item>
+			</uni-forms>
+			<button type="primary" @click="submit">提交</button>
+		</view>
+	</view>
 </template>
 
 <script>
-  import { getUserProfile } from "@/api/system/user"
-  import { updateUserProfile } from "@/api/system/user"
+import { getUserProfile } from '@/api/system/user';
+import { updateUserProfile } from '@/api/system/user';
 
-  export default {
-    data() {
-      return {
-        user: {
-          nickName: "",
-          phonenumber: "",
-          email: "",
-          sex: ""
-        },
-        sexs: [{
-          text: '男',
-          value: "0"
-        }, {
-          text: '女',
-          value: "1"
-        }],
-        rules: {
-          nickName: {
-            rules: [{
-              required: true,
-              errorMessage: '用户昵称不能为空'
-            }]
-          },
-          phonenumber: {
-            rules: [{
-              required: true,
-              errorMessage: '手机号码不能为空'
-            }, {
-              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-              errorMessage: '请输入正确的手机号码'
-            }]
-          },
-          email: {
-            rules: [{
-              required: true,
-              errorMessage: '邮箱地址不能为空'
-            }, {
-              format: 'email',
-              errorMessage: '请输入正确的邮箱地址'
-            }]
-          }
-        }
-      }
-    },
-    onLoad() {
-      this.getUser()
-    },
-    onReady() {
-      this.$refs.form.setRules(this.rules)
-    },
-    methods: {
-      getUser() {
-        getUserProfile().then(response => {
-          this.user = response.data
-        })
-      },
-      submit(ref) {
-        this.$refs.form.validate().then(res => {
-          updateUserProfile(this.user).then(response => {
-            this.$modal.msgSuccess("修改成功")
-          })
-        })
-      }
-    }
-  }
+export default {
+	data() {
+		return {
+			user: {
+				nickName: '',
+				phonenumber: '',
+				email: '',
+				sex: ''
+			},
+			sexs: [
+				{
+					text: '男',
+					value: 0
+				},
+				{
+					text: '女',
+					value: 1
+				}
+			],
+			rules: {
+				nickName: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '用户昵称不能为空'
+						}
+					]
+				},
+				phonenumber: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '手机号码不能为空'
+						},
+						{
+							pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+							errorMessage: '请输入正确的手机号码'
+						}
+					]
+				},
+				email: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '邮箱地址不能为空'
+						},
+						{
+							format: 'email',
+							errorMessage: '请输入正确的邮箱地址'
+						}
+					]
+				}
+			}
+		};
+	},
+	onLoad() {
+		this.getUser();
+	},
+	onReady() {
+		this.$refs.form.setRules(this.rules);
+	},
+	methods: {
+		getUser() {
+			getUserProfile().then((response) => {
+				this.user = response.data.user;
+			});
+		},
+		submit(ref) {
+			this.$refs.form.validate().then((res) => {
+				updateUserProfile(this.user).then((response) => {
+					this.$modal.msgSuccess('修改成功');
+				});
+			});
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-  page {
-    background-color: #ffffff;
-  }
+page {
+	background-color: #ffffff;
+}
 
-  .example {
-    padding: 15px;
-    background-color: #fff;
-  }
+.example {
+	padding: 15px;
+	background-color: #fff;
+}
 
-  .segmented-control {
-    margin-bottom: 15px;
-  }
+.segmented-control {
+	margin-bottom: 15px;
+}
 
-  .button-group {
-    margin-top: 15px;
-    display: flex;
-    justify-content: space-around;
-  }
+.button-group {
+	margin-top: 15px;
+	display: flex;
+	justify-content: space-around;
+}
 
-  .form-item {
-    display: flex;
-    align-items: center;
-    flex: 1;
-  }
+.form-item {
+	display: flex;
+	align-items: center;
+	flex: 1;
+}
 
-  .button {
-    display: flex;
-    align-items: center;
-    height: 35px;
-    line-height: 35px;
-    margin-left: 10px;
-  }
+.button {
+	display: flex;
+	align-items: center;
+	height: 35px;
+	line-height: 35px;
+	margin-left: 10px;
+}
 </style>
diff --git a/pages/mine/info/index.vue b/pages/mine/info/index.vue
index 65c861a..52f89ce 100644
--- a/pages/mine/info/index.vue
+++ b/pages/mine/info/index.vue
@@ -1,44 +1,44 @@
 <template>
-  <view class="container">
-    <uni-list>
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'person-filled'}" title="昵称" :rightText="user.nickName" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'phone-filled'}" title="手机号码" :rightText="user.phonenumber" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'email-filled'}" title="邮箱" :rightText="user.email" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'auth-filled'}" title="岗位" :rightText="postGroup" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'staff-filled'}" title="角色" :rightText="roleGroup" />
-      <uni-list-item showExtraIcon="true" :extraIcon="{type: 'calendar-filled'}" title="创建日期" :rightText="user.createTime" />
-    </uni-list>
-  </view>
+	<view class="container">
+		<uni-list>
+			<uni-list-item showExtraIcon="true" :extraIcon="{ type: 'person-filled' }" title="昵称" :rightText="user.nickName" />
+			<uni-list-item showExtraIcon="true" :extraIcon="{ type: 'phone-filled' }" title="手机号码" :rightText="user.phonenumber" />
+			<uni-list-item showExtraIcon="true" :extraIcon="{ type: 'email-filled' }" title="邮箱" :rightText="user.email" />
+			<uni-list-item showExtraIcon="true" :extraIcon="{ type: 'auth-filled' }" title="岗位" :rightText="postGroup" />
+			<uni-list-item showExtraIcon="true" :extraIcon="{ type: 'staff-filled' }" title="角色" :rightText="roleGroup" />
+			<uni-list-item showExtraIcon="true" :extraIcon="{ type: 'calendar-filled' }" title="创建日期" :rightText="user.createTime" />
+		</uni-list>
+	</view>
 </template>
 
 <script>
-  import { getUserProfile } from "@/api/system/user"
+import { getUserProfile } from '@/api/system/user';
 
-  export default {
-    data() {
-      return {
-        user: {},
-        roleGroup: "",
-        postGroup: ""
-      }
-    },
-    onLoad() {
-      this.getUser()
-    },
-    methods: {
-      getUser() {
-        getUserProfile().then(response => {
-          this.user = response.data
-          this.roleGroup = response.roleGroup
-          this.postGroup = response.postGroup
-        })
-      }
-    }
-  }
+export default {
+	data() {
+		return {
+			user: {},
+			roleGroup: '',
+			postGroup: ''
+		};
+	},
+	onLoad() {
+		this.getUser();
+	},
+	methods: {
+		getUser() {
+			getUserProfile().then((response) => {
+				this.user = response.data.user;
+				this.roleGroup = response.data.roles + '';
+				this.postGroup = response.data.postGroup;
+			});
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-  page {
-    background-color: #ffffff;
-  }
+page {
+	background-color: #ffffff;
+}
 </style>
diff --git a/store/modules/user.js b/store/modules/user.js
index 168d9e2..d5f7566 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -56,7 +56,6 @@ const user = {
 			const uuid = userInfo.uuid
 			return new Promise((resolve, reject) => {
 				login(username, password, code, uuid).then(res => {
-					console.log(res)
 					setToken(res.data)
 					commit('SET_TOKEN', res.data)
 					resolve()
@@ -73,17 +72,20 @@ const user = {
 		}) {
 			return new Promise((resolve, reject) => {
 				getInfo().then(res => {
-					const user = res.user
+					console.log(res);
+					const user = res.data.user
+					
 					const avatar = (user == null || user.avatar == "" || user.avatar == null) ?
 						require("@/static/images/profile.jpg") : baseUrl + user.avatar
 					const username = (user == null || user.userName == "" || user.userName ==
 						null) ? "" : user.userName
-					if (res.roles && res.roles.length > 0) {
-						commit('SET_ROLES', res.roles)
-						commit('SET_PERMISSIONS', res.permissions)
+					if (res.data.roles && res.data.roles.length > 0) {
+						commit('SET_ROLES', res.data.roles)
+						commit('SET_PERMISSIONS', res.data.permissions)
 					} else {
 						commit('SET_ROLES', ['ROLE_DEFAULT'])
 					}
+					console.log(username,avatar,res.data.roles);
 					commit('SET_NAME', username)
 					commit('SET_AVATAR', avatar)
 					resolve(res)