编辑用户信息

.gitignore

@@ -1,17 +1,8 @@
-######################################################################
-# Build Tools
-
 /unpackage/*
 /node_modules/*
-
-######################################################################
-# Development Tools
-
 /.idea/*
 /.vscode/*
 /.hbuilderx/*
-
 package-lock.json
 yarn.lock
 
-/unpackage/

App.vue

@@ -17,7 +17,7 @@ export default {
       // 初始化应用配置
       this.initConfig()
       // 检查用户登录状态
-			// this.checkLogin()
+      this.checkLogin()
     },
     initConfig() {
       this.globalData.config = config

api/system/dict.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+
+/**
+ * 获取字典
+ */
+export function getDictBatchByType(params) {
+	return request({
+		url: `/system/dict-data/lists_dict_type`,
+		method: 'GET',
+		params
+	})
+}

api/system/user.js

@@ -34,7 +34,7 @@ export function updateUserProfile(data) {
 // 用户头像上传
 export function uploadAvatar(data) {
 	return upload({
-    url: '/system/user/profile/update-avatar',
+		url: '/admin-api/system/user/profile/update-avatar',
 		method: 'PUT',
 		name: data.name,
 		filePath: data.filePath

main.js

@@ -3,7 +3,7 @@ import App from './App'
 import store from './store' // store
 import plugins from './plugins' // plugins
 import './permission' // permission
-
+import * as dict from '@/utils/dict.js'
 // 引入uView
 import uView from '@/uni_modules/uview-ui'
 
@@ -14,6 +14,7 @@ Vue.config.productionTip = false
 
 // 挂载vuex
 Vue.prototype.$store = store
+Vue.prototype.$dict = dict
 
 App.mpType = 'app'
 

manifest.json

@@ -3,7 +3,7 @@
 	"appid": "__UNI__25A9D80",
 	"description": "",
 	"versionName": "1.0.0",
-	"versionCode": "100",
+	"versionCode": 1,
 	"transformPx": false,
 	"app-plus": {
 		"usingComponents": true,

pages/login.vue

@@ -1,6 +1,13 @@
 <template>
   <view class="container">
-		<u--image src="/static/favicon.png" width="180px" height="80px" mode="aspectFit" :fade="true" duration="450"></u--image>
+    <u--image
+      src="/static/favicon.png"
+      width="180px"
+      height="80px"
+      mode="aspectFit"
+      :fade="true"
+      duration="450"
+    ></u--image>
     <text class="title">智慧生态</text>
   </view>
 </template>
@@ -17,7 +24,7 @@ export default {
   methods: {
     init() {
       uni.login({
-				success: (res) => {
+        success: res => {
           // 系统登录
           this.$store
             .dispatch('Login', {
@@ -25,8 +32,23 @@ export default {
               code: res.code,
               state: 'default'
             })
-						.then((res) => {
+            .then(() => {
-							console.log('store.login', res)
+              this.loginSuccess()
+            })
+        }
+      })
+    },
+    loginSuccess() {
+      this.$store.dispatch('GetInfo').then(res => {
+        const { data } = res
+        const { user } = data
+        if (user.mobile) {
+          uni.switchTab({
+            url: '/pages/index'
+          })
+        } else {
+          uni.navigateTo({
+            url: '/sub/owner/edit'
           })
         }
       })

permission.js

@@ -22,27 +22,28 @@ function checkWhite(url) {
 // 页面跳转验证拦截器
 let list = ["navigateTo", "redirectTo", "reLaunch", "switchTab"]
 list.forEach(item => {
-	// uni.addInterceptor(item, {
+	uni.addInterceptor(item, {
-	// 	invoke(to) {
+		invoke(to) {
-	// 		if (getAccessToken()) {
+			console.log('addInterceptor', to);
-	// 			if (to.path === loginPage) {
+			if (getAccessToken()) {
-	// 				uni.reLaunch({
+				if (to.path === loginPage) {
-	// 					url: "/"
+					uni.reLaunch({
-	// 				})
+						url: "/"
-	// 			}
+					})
-	// 			return true
+				}
-	// 		} else {
+				return true
-	// 			if (checkWhite(to.url)) {
+			} else {
-	// 				return true
+				if (checkWhite(to.url)) {
-	// 			}
+					return true
-	// 			uni.reLaunch({
+				}
-	// 				url: loginPage
+				uni.reLaunch({
-	// 			})
+					url: loginPage
-	// 			return false
+				})
-	// 		}
+				return false
-	// 	},
+			}
-	// 	fail(err) {
+		},
-	// 		console.log(err)
+		fail(err) {
-	// 	}
+			console.log(err)
-	// })
+		}
+	})
 })

store/modules/user.js

@@ -26,10 +26,6 @@ const user = {
 		SET_ID: (state, id) => {
 			state.id = id
 		},
-		SET_NAME: (state, name) => {
-			state.name = name
-			storage.set(constant.name, name)
-		},
 		SET_AVATAR: (state, avatar) => {
 			state.avatar = avatar
 			storage.set(constant.avatar, avatar)
@@ -51,10 +47,11 @@ const user = {
 		}, userInfo) {
 			return new Promise((resolve, reject) => {
 				login(userInfo).then(res => {
-					console.log('Login', res);
+					const {
-					res = res.data;
+						data
+					} = res
 					// 设置 token
-					setToken(res)
+					setToken(data)
 					resolve()
 				}).catch(error => {
 					reject(error)
@@ -69,19 +66,16 @@ const user = {
 		}) {
 			return new Promise((resolve, reject) => {
 				getInfo().then(res => {
-					res = res.data; // 读取 data 数据
+					const user = res.data.user
-					const user = res.user
 					const avatar = (user == null || user.avatar === "" || user.avatar == null) ? require(
 						"@/static/images/avatar.jpg") : user.avatar
-					const nickname = (user == null || user.nickname === "" || user.nickname == null) ? "" : user
-						.nickname
 					if (res.roles && res.roles.length > 0) {
 						commit('SET_ROLES', res.roles)
 						commit('SET_PERMISSIONS', res.permissions)
 					} else {
 						commit('SET_ROLES', ['ROLE_DEFAULT'])
 					}
-					commit('SET_NAME', nickname)
+					commit('SET_ID', res.data.user.id)
 					commit('SET_AVATAR', avatar)
 					resolve(res)
 				}).catch(error => {

sub/owner/edit.vue

@@ -1,26 +1,53 @@
 <template>
-	<cs-page title="编辑个人信息">
+  <cs-page isCustom>
+    <template #header>
+      <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
+        <u-icon name="arrow-left" v-if="form.mobile"></u-icon>
+        <text class="wd-font-800 wd-text-16">编辑个人信息</text>
+      </view>
+    </template>
     <view class="container">
       <!-- 我的头像 -->
       <view class="section wd-flex wd-flex-row wd-justify-between wd-items-center">
         <text class="wd-font-800">我的头像</text>
-				<view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
+        <button
-					<u-avatar src="/static/images/avatar.jpg"></u-avatar>
+          class="wd-flex wd-flex-row wd-items-center avatarBtn"
+          style="gap: 8px"
+          type="balanced"
+          open-type="chooseAvatar"
+          @chooseavatar="chooseAvatar"
+        >
+          <u-avatar :src="form.avatar"></u-avatar>
           <u-icon name="arrow-right"></u-icon>
-				</view>
+        </button>
       </view>
       <!-- 真实姓名 -->
       <view class="section wd-flex wd-flex-row wd-justify-between wd-items-center">
-				<text class="wd-font-800">真实姓名</text>
+        <text class="wd-font-800">姓名</text>
         <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
-					<input class="wd-text-right" type="text" placeholder-class="txt" placeholder="请输入" v-model="form.realName" />
+          <input
+            class="wd-text-right"
+            type="text"
+            placeholder-class="txt"
+            placeholder="请输入姓名"
+            v-model="form.realName"
+          />
           <u-icon name="arrow-right" color="#99A1B7" size="16"></u-icon>
         </view>
       </view>
       <!-- 用户性别 -->
       <view class="section wd-flex wd-flex-row wd-justify-between wd-items-center">
-				<text class="wd-font-800">用户性别</text>
+        <text class="wd-font-800">性别</text>
         <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
+          <input
+            class="wd-text-right"
+            type="number"
+            placeholder-class="txt"
+            placeholder="请选择性别"
+            v-model="form.sex"
+            disabled
+            @click="showPicker()"
+          />
           <u-icon name="arrow-right" color="#99A1B7" size="16"></u-icon>
         </view>
       </view>
@@ -28,33 +55,108 @@
       <view class="section wd-flex wd-flex-row wd-justify-between wd-items-center">
         <text class="wd-font-800">手机号码</text>
         <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
-					<input class="wd-text-right" type="number" placeholder-class="txt" placeholder="请输入" v-model="form.mobile" />
+          <input
+            class="wd-text-right"
+            type="number"
+            placeholder-class="txt"
+            placeholder="请输入手机号码"
+            v-model="form.mobile"
+          />
           <u-icon name="arrow-right" color="#99A1B7" size="16"></u-icon>
         </view>
       </view>
       <!-- 所属部门 -->
       <view class="section wd-flex wd-flex-row wd-justify-between wd-items-center">
-				<text class="wd-font-800">所属部门</text>
+        <text class="wd-font-800">部门</text>
+        <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
+          <input
+            class="wd-text-right"
+            type="number"
+            placeholder-class="txt"
+            placeholder="请选择部门"
+            v-model="form.dept"
+            disabled
+            @click="showPicker()"
+          />
+          <u-icon name="arrow-right" color="#99A1B7" size="16"></u-icon>
+        </view>
+      </view>
+      <!-- 身份 -->
+      <view class="section wd-flex wd-flex-row wd-justify-between wd-items-center" @click="showPicker()">
+        <text class="wd-font-800">角色</text>
         <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
+          <text v-if="form.userType">{{ $dict.echoDicValue(dictMap.wx_user_type, form.userType) }}</text>
+          <text class="placeholder" v-else>请选择角色</text>
           <u-icon name="arrow-right" color="#99A1B7" size="16"></u-icon>
         </view>
       </view>
       <button class="button">提交</button>
     </view>
+    <u-picker
+      :show="picker.show"
+      :columns="picker.columns"
+      @cancel="closePicker"
+      closeOnClickOverlay
+      @close="closePicker"
+    ></u-picker>
   </cs-page>
 </template>
 
 <script>
+import { getUserProfile, uploadAvatar } from '@/api/system/user.js'
+import { getDictBatchByType } from '@/api/system/dict.js'
 export default {
   data() {
     return {
+      dictMap: {},
       form: {
         avatar: undefined,
         realName: undefined,
         mobile: undefined,
-				department: undefined
+        department: undefined,
+        sex: undefined
+      },
+      picker: {
+        show: false,
+        colums: []
       }
     }
+  },
+  onLoad() {
+    this.getDict()
+  },
+  onShow() {
+    // this.init()
+  },
+  methods: {
+    showPicker() {
+      this.picker.show = true
+    },
+    closePicker() {
+      this.picker = {
+        show: false,
+        colums: []
+      }
+    },
+    init() {
+      getUserProfile().then(res => {
+        this.form = res.data
+      })
+    },
+    getDict() {
+      getDictBatchByType({ type: ['system_user_sex', 'wx_user_type'].join(',') }).then(res => {
+        this.dictMap = res.data
+      })
+    },
+    chooseAvatar(e) {
+      const data = {
+        name: 'avatarFile',
+        filePath: e.detail.avatarUrl
+      }
+      uploadAvatar(data).then(res => {
+        this.init()
+      })
+    }
   }
 }
 </script>
@@ -83,5 +185,21 @@ export default {
     line-height: 40px;
     box-sizing: border-box;
   }
+  .placeholder {
+    color: $uni-text-color-grey;
+  }
+  button {
+    padding-left: 0;
+    padding-right: 0;
+  }
+  .avatarBtn {
+    background-color: #fff;
+    flex: 1;
+    justify-content: flex-end;
+    &::after {
+      content: '';
+      display: none;
+    }
+  }
 }
 </style>

uni_modules/s-components/s-header/index.vue

@@ -4,7 +4,7 @@
     <view class="operation" v-if="isCustom">
       <slot></slot>
     </view>
-		<view class="" v-else>
+    <view v-else>
       <view class="operation" v-if="isTab">
         <text class="title">{{ title }}</text>
       </view>
@@ -50,10 +50,11 @@ export default {
   background-color: #fff;
   box-shadow: 0 1px 2px 1px $cs-shadow-color;
   .fit-content {
-		height: 8vh;
+    height: 6vh;
   }
   .operation {
     padding: 5px 10px;
+    padding-bottom: 15px;
     .title {
       color: #000;
     }

utils/dict.js

@@ -0,0 +1,8 @@
+/**
+ * 回显字典值
+ * @param {Object} dict
+ * @param {Object} value
+ */
+export function echoDicValue(dict, value) {
+	return dict.find(d => d.value == value.toString()).label || ''
+}

utils/request.js

@@ -63,8 +63,6 @@ const request = config => {
 				} else if (code !== 200) {
 					toast(msg)
 					reject(code)
-				} else {
-					toast(msg)
 				}
 				resolve(res.data)
 			})

utils/ruoyi.js

@@ -16,7 +16,7 @@ export function parseTime(time, pattern) {
 		if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
 			time = parseInt(time)
 		} else if (typeof time === 'string') {
-      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm),'');
+			time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
 		}
 		if ((typeof time === 'number') && (time.toString().length === 10)) {
 			time = time * 1000

utils/upload.js

@@ -1,8 +1,14 @@
 import store from '@/store'
 import config from '@/config'
-import { getAccessToken } from '@/utils/auth'
+import {
+	getAccessToken
+} from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { toast, showConfirm, tansParams } from '@/utils/common'
+import {
+	toast,
+	showConfirm,
+	tansParams
+} from '@/utils/common'
 
 let timeout = 10000
 const baseUrl = config.baseUrl
@@ -41,7 +47,9 @@ const upload = config => {
 					showConfirm("登录状态已过期，您可以继续留在该页面，或者重新登录?").then(res => {
 						if (res.confirm) {
 							store.dispatch('LogOut').then(res => {
-                  uni.reLaunch({ url: '/pages/login/login' })
+								uni.reLaunch({
+									url: '/pages/login/login'
+								})
 							})
 						}
 					})
@@ -55,7 +63,9 @@ const upload = config => {
 				}
 			},
 			fail: (error) => {
-          let { message } = error
+				let {
+					message
+				} = error
 				if (message == 'Network Error') {
 					message = '后端接口连接异常'
 				} else if (message.includes('timeout')) {