编辑企业信息

api/system/dict.js

@@ -10,3 +10,13 @@ export function getDictBatchByType(params) {
 		params
 	})
 }
+
+/**
+ * 获取部门树
+ */
+export function getDeptTree() {
+	return request({
+		url: `/system/dept/list-all-simple`,
+		method: 'GET'
+	})
+}

components/cs-page/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="container">
-		<s-header :title="title" :isTab="isTab" :isCustom="isCustom">
+    <s-header :title="title" :isTab="isTab" :isCustom="isCustom" @goback="$emit('goback')">
       <slot name="header"></slot>
     </s-header>
     <view class="view">

main.js

@@ -6,7 +6,8 @@ import './permission' // permission
 import * as dict from '@/utils/dict.js'
 // 引入uView
 import uView from '@/uni_modules/uview-ui'
-
+// import mpShare from '@/uni_modules/uview-ui/libs/mixin/mpShare.js'
+// Vue.mixin(mpShare)
 // 挂载全局对象
 Vue.use(plugins).use(uView)
 

pages.json

@@ -47,6 +47,10 @@
 		"root": "sub",
 		"pages": [{
 			"path": "owner/edit"
+		}, {
+			"path": "owner/invite"
+		}, {
+			"path": "enterprise/edit"
 		}]
 	}],
 	"tabBar": {

pages/login.vue

@@ -16,9 +16,12 @@
 export default {
   name: 'Login',
   data() {
-    return {}
+    return {
+      invateId: ''
+    }
   },
-  onLoad() {
+  onLoad(res) {
+    this.invateId = res.invateId
     this.init()
   },
   methods: {
@@ -42,15 +45,21 @@ export default {
       this.$store.dispatch('GetInfo').then(res => {
         const { data } = res
         const { user } = data
-        if (user.mobile) {
+        if (this.invateId) {
+          uni.navigateTo({
+            url: `/sub/enterprise/edit?invateId=${this.invateId}`
+          })
+          return
+        }
+        if (user.audit) {
           uni.switchTab({
             url: '/pages/index'
           })
-        } else {
+          return
+        }
         uni.navigateTo({
           url: '/sub/owner/edit'
         })
-        }
       })
     }
   }

pages/owner.vue

@@ -10,13 +10,13 @@
       <view class="section wd-flex wd-flex-row wd-justify-between wd-items-center" @tap="edit">
         <view class="wd-flex wd-flex-col" style="gap: 4px">
           <view class="wd-flex wd-flex-row" style="gap: 8px">
-						<text class="wd-font-800">姓名</text>
+            <text class="wd-font-800">{{ user.realName }}</text>
-						<u-tag text="部门" shape="circle" bgColor="#000" borderColor="#000" size="mini"></u-tag>
+            <u-tag :text="user.dept.name" shape="circle" bgColor="#000" borderColor="#000" size="mini"></u-tag>
           </view>
-					<view class="">手机号</view>
+          <view class="moblie">{{ user.mobile }}</view>
         </view>
         <view class="wd-flex wd-flex-row" style="gap: 10px">
-					<u-avatar src="/static/images/avatar.jpg"></u-avatar>
+          <u-avatar :src="user.avatar"></u-avatar>
           <u-icon name="arrow-right"></u-icon>
         </view>
       </view>
@@ -50,6 +50,15 @@
           <u-icon name="arrow-right"></u-icon>
         </view>
       </view>
+      <view class="section wd-flex wd-flex-row wd-justify-between" @click="invite">
+        <view class="wd-flex wd-flex-row" style="gap: 8px">
+          <u--image src="/static/images/owner/phone.png" width="20px" height="20px" mode="aspectFit"></u--image>
+          <text class="wd-font-800">企业入驻</text>
+        </view>
+        <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
+          <u-icon name="arrow-right"></u-icon>
+        </view>
+      </view>
       <view class="section wd-flex wd-flex-row wd-justify-between">
         <view class="wd-flex wd-flex-row" style="gap: 8px">
           <u--image src="/static/images/owner/phone.png" width="20px" height="20px" mode="aspectFit"></u--image>
@@ -65,17 +74,32 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
+import { getUserProfile } from '@/api/system/user.js'
 export default {
   data() {
-		return {}
+    return {
+      user: {}
+    }
+  },
+  computed: {},
+  onShow() {
+    this.init()
   },
   methods: {
+    init() {
+      getUserProfile().then(res => {
+        this.user = res.data
+      })
+    },
     edit() {
       uni.navigateTo({
-				url: '/sub/owner/edit',
+        url: '/sub/owner/edit'
-				fail: (err) => {
+      })
-					console.log(err)
+    },
-				}
+    invite() {
+      uni.navigateTo({
+        url: '/sub/owner/invite'
       })
     }
   }
@@ -102,5 +126,8 @@ export default {
     margin-bottom: $cs-gap;
     padding: 24px;
   }
+  .moblie {
+    color: $uni-text-color-grey;
+  }
 }
 </style>

static/scss/index.scss

@@ -1,6 +1,12 @@
 // global
-@import "./global.scss";
+@import './global.scss';
 // color-ui
-@import "@/static/scss/colorui.css";
+@import '@/static/scss/colorui.css';
 // iconfont
-@import "@/static/font/iconfont.css";
+@import '@/static/font/iconfont.css';
+
+.icon-box {
+  padding: 5px;
+  border-radius: 50%;
+  box-shadow: 0 0 4px 2px $cs-shadow-color;
+}

store/getters.js

@@ -3,6 +3,8 @@ const getters = {
 	avatar: state => state.user.avatar,
 	name: state => state.user.name,
 	roles: state => state.user.roles,
-  permissions: state => state.user.permissions
+	permissions: state => state.user.permissions,
+	userId: state => state.user.id,
+	phone: state => state.user.phone
 }
 export default getters

store/modules/user.js

@@ -15,16 +15,25 @@ const baseUrl = config.baseUrl
 
 const user = {
 	state: {
-		id: 0, // 用户编号
+		id: storage.get(constant.userId),
 		name: storage.get(constant.name),
 		avatar: storage.get(constant.avatar),
+		phone: storage.get(constant.phone),
 		roles: storage.get(constant.roles),
 		permissions: storage.get(constant.permissions)
 	},
-
 	mutations: {
 		SET_ID: (state, id) => {
 			state.id = id
+			storage.set(constant.userId, id)
+		},
+		SET_NAME: (state, name) => {
+			state.name = name
+			storage.set(constant.name, name)
+		},
+		SET_PHONE: (state, phone) => {
+			state.phone = phone
+			storage.set(constant.phone, phone)
 		},
 		SET_AVATAR: (state, avatar) => {
 			state.avatar = avatar
@@ -39,7 +48,6 @@ const user = {
 			storage.set(constant.permissions, permissions)
 		}
 	},
-
 	actions: {
 		// 登录
 		Login({
@@ -67,16 +75,16 @@ const user = {
 			return new Promise((resolve, reject) => {
 				getInfo().then(res => {
 					const user = res.data.user
-					const avatar = (user == null || user.avatar === "" || user.avatar == null) ? require(
-						"@/static/images/avatar.jpg") : user.avatar
 					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_ID', res.data.user.id)
+					commit('SET_ID', user.id)
-					commit('SET_AVATAR', avatar)
+					commit('SET_AVATAR', user.avatar)
+					commit('SET_NAME', user.name)
+					commit('SET_PHONE', user.mobile)
 					resolve(res)
 				}).catch(error => {
 					reject(error)
@@ -104,4 +112,6 @@ const user = {
 	}
 }
 
+
+
 export default user

sub/owner/edit.vue

@@ -1,8 +1,10 @@
 <template>
   <cs-page isCustom>
     <template #header>
-      <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
+      <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px" @click="goBack">
-        <u-icon name="arrow-left" v-if="form.mobile"></u-icon>
+        <view class="icon-box" v-if="form.audit">
+          <u-icon name="arrow-left" size="12"></u-icon>
+        </view>
         <text class="wd-font-800 wd-text-16">编辑个人信息</text>
       </view>
     </template>
@@ -36,18 +38,14 @@
         </view>
       </view>
       <!-- 用户性别 -->
-      <view class="section wd-flex wd-flex-row wd-justify-between wd-items-center">
+      <view
+        class="section wd-flex wd-flex-row wd-justify-between wd-items-center"
+        @click="showPicker('system_user_sex', 'sex')"
+      >
         <text class="wd-font-800">性别</text>
         <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
-          <input
+          <text v-if="form.sex">{{ $dict.echoDicValue(dictMap.system_user_sex, form.sex.toString()) }}</text>
-            class="wd-text-right"
+          <text class="placeholder" v-else>请选择性别</text>
-            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>
@@ -66,76 +64,75 @@
         </view>
       </view>
       <!-- 所属部门 -->
-      <view class="section wd-flex wd-flex-row wd-justify-between wd-items-center">
+      <view
+        class="section wd-flex wd-flex-row wd-justify-between wd-items-center"
+        @click="showPicker('dept', 'deptId')"
+      >
         <text class="wd-font-800">部门</text>
         <view class="wd-flex wd-flex-row wd-items-center" style="gap: 8px">
-          <input
+          <text v-if="form.deptId">{{ $dict.echoDicValue(dictMap.dept, form.deptId) }}</text>
-            class="wd-text-right"
+          <text class="placeholder" v-else>请选择部门</text>
-            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>
+      <button class="button" v-if="form.audit == 1">
+        {{ $dict.echoDicValue(dictMap.user_audit_type, form.audit) }}
+      </button>
+      <button class="button" @click="submit" v-else>提交</button>
     </view>
     <u-picker
       :show="picker.show"
-      :columns="picker.columns"
+      :columns="picker.data"
       @cancel="closePicker"
       closeOnClickOverlay
+      keyName="label"
+      ref="uPicker"
       @close="closePicker"
+      @confirm="confirmPicker"
     ></u-picker>
   </cs-page>
 </template>
 
 <script>
-import { getUserProfile, uploadAvatar } from '@/api/system/user.js'
+import { getUserProfile, updateUserProfile } from '@/api/system/user.js'
-import { getDictBatchByType } from '@/api/system/dict.js'
+import { uploadFile } from '@/api/system/file.js'
+import { getDictBatchByType, getDeptTree } from '@/api/system/dict.js'
 export default {
   data() {
     return {
       dictMap: {},
+      deptTree: [],
       form: {
         avatar: undefined,
         realName: undefined,
         mobile: undefined,
-        department: undefined,
+        deptId: undefined,
         sex: undefined
       },
       picker: {
         show: false,
-        colums: []
+        key: '',
+        data: []
       }
     }
   },
-  onLoad() {
+  async onLoad() {
-    this.getDict()
+    await this.getDict()
   },
   onShow() {
-    // this.init()
+    this.init()
   },
   methods: {
-    showPicker() {
+    showPicker(type, key) {
+      this.picker.data.push(this.dictMap[type])
+      this.picker.key = key
       this.picker.show = true
     },
     closePicker() {
       this.picker = {
         show: false,
-        colums: []
+        key: '',
+        data: []
       }
     },
     init() {
@@ -143,21 +140,95 @@ export default {
         this.form = res.data
       })
     },
-    getDict() {
+    async getDict() {
-      getDictBatchByType({ type: ['system_user_sex', 'wx_user_type'].join(',') }).then(res => {
+      const dict = await getDictBatchByType({ type: ['system_user_sex', 'user_audit_type'].join(',') })
-        this.dictMap = res.data
+
+      const dept = await getDeptTree()
+      this.dictMap = {
+        ...dict.data,
+        dept: dept.data.map(i => {
+          return {
+            ...i,
+            label: i.name,
+            value: i.id
+          }
         })
+      }
     },
     chooseAvatar(e) {
       const data = {
-        name: 'avatarFile',
+        name: 'file',
         filePath: e.detail.avatarUrl
       }
-      uploadAvatar(data).then(res => {
+      uploadFile(data).then(res => {
-        this.init()
+        this.form.avatar = res.data
+      })
+    },
+    validateForm() {
+      const requiredFields = [
+        {
+          key: 'avatar',
+          message: '请上传头像'
+        },
+        {
+          key: 'realName',
+          message: '真实姓名不能为空'
+        },
+        {
+          key: 'sex',
+          message: '请选择性别'
+        },
+        {
+          key: 'mobile',
+          message: '手机号码不能为空'
+        },
+        {
+          key: 'deptId',
+          message: '请选择所属部门'
+        }
+      ]
+
+      for (const field of requiredFields) {
+        if (!this.form[field.key]) {
+          uni.showToast({
+            title: field.message,
+            icon: 'none'
+          })
+          return false
+        }
+      }
+
+      const mobilePattern = /^1[3-9]\d{9}$/ // 中国手机号正则表达式
+      if (!mobilePattern.test(this.form.mobile)) {
+        uni.showToast({
+          title: '请输入有效的手机号',
+          icon: 'none'
+        })
+        return false
+      }
+
+      return true
+    },
+    submit() {
+      if (!this.validateForm()) return
+      updateUserProfile(this.form).then(res => {
+        console.log(res)
+      })
+    },
+
+    confirmPicker(e) {
+      const { value } = e
+      this.form[this.picker.key] = value[0].value
+      this.closePicker()
+    },
+    goBack() {
+      if (this.form.audit) {
+        uni.switchTab({
+          url: '/pages/owner'
         })
       }
     }
+  }
 }
 </script>
 

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

@@ -8,11 +8,11 @@
       <view class="operation" v-if="isTab">
         <text class="title">{{ title }}</text>
       </view>
-      <view class="operation wd-flex wd-flex-row wd-items-center" style="gap: 10px" v-else @tap="goback()">
+      <view class="operation wd-flex wd-flex-row wd-items-center" style="gap: 10px" v-else @tap="goback">
         <view class="icon-box">
           <u-icon name="arrow-left" size="12"></u-icon>
         </view>
-        <text class="title wd-text-16">{{ title }}</text>
+        <text class="title wd-text-16 wd-font-800">{{ title }}</text>
       </view>
     </view>
   </view>
@@ -37,9 +37,7 @@ export default {
   },
   methods: {
     goback() {
-      uni.switchTab({
+      this.$emit('goback')
-        url: '/pages/owner'
-      })
     }
   }
 }
@@ -53,8 +51,7 @@ export default {
     height: 6vh;
   }
   .operation {
-    padding: 5px 10px;
+    padding: 10px;
-    padding-bottom: 15px;
     .title {
       color: #000;
     }

utils/constant.js

@@ -2,7 +2,9 @@ const constant = {
 	avatar: 'vuex_avatar',
 	name: 'vuex_name',
 	roles: 'vuex_roles',
-   permissions: 'vuex_permissions'
+	permissions: 'vuex_permissions',
- }
+	userId: 'vuex_userId',
+	phone: 'vuex_phone'
+}
 
- export default constant
+export default constant

utils/dict.js

@@ -4,5 +4,36 @@
  * @param {Object} value
  */
 export function echoDicValue(dict, value) {
-	return dict.find(d => d.value == value.toString()).label || ''
+	return dict.find(d => d.value == value).label || ''
+}
+
+/**
+ * 构造树型结构数据
+ *
+ * @param {*} data 数据源
+ * @param {*} id id字段 默认 'id'
+ * @param {*} parentId 父节点字段 默认 'parentId'
+ * @param {*} children 孩子节点字段 默认 'children'
+ * @param {*} rootId 根Id 默认 0
+ */
+export function handleTree(
+	data,
+	id = 'id',
+	parentId = 'parentId',
+	children = 'children',
+	rootId = 0,
+) {
+	// 对源数据深度克隆
+	const cloneData = JSON.parse(JSON.stringify(data));
+	// 循环所有项
+	const treeData = cloneData.filter((father) => {
+		let branchArr = cloneData.filter((child) => {
+			//返回每一项的子级数组
+			return father[id] === child[parentId];
+		});
+		branchArr.length > 0 ? (father.children = branchArr) : '';
+		//返回第一层
+		return father[parentId] === rootId;
+	});
+	return treeData !== '' ? treeData : data;
 }

utils/request.js

@@ -1,7 +1,7 @@
 import store from '@/store'
 import config from '@/config'
 import {
-	getAccessToken
+	getRefreshToken
 } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import {
@@ -17,8 +17,8 @@ const request = config => {
 	// 是否需要设置 token
 	const isToken = (config.headers || {}).isToken === false
 	config.header = config.header || {}
-	if (getAccessToken() && !isToken) {
+	if (getRefreshToken() && !isToken) {
-		config.header['Authorization'] = 'Bearer ' + getAccessToken()
+		config.header['Authorization'] = 'Bearer ' + getRefreshToken()
 	}
 	// 设置租户 TODO 芋艿：强制 1 先
 	config.header['tenant-id'] = '1';

utils/storage.js

@@ -4,7 +4,9 @@ import constant from './constant'
 let storageKey = 'storage_data'
 
 // 存储节点变量名
-let storageNodeKeys = [constant.avatar, constant.name, constant.roles, constant.permissions]
+let storageNodeKeys = [constant.avatar, constant.roles, constant.permissions, constant.userId, constant
+	.name, constant.phone
+]
 
 // 存储的数据
 let storageData = uni.getStorageSync(storageKey) || {}

utils/upload.js

@@ -1,7 +1,7 @@
 import store from '@/store'
 import config from '@/config'
 import {
-	getAccessToken
+	getRefreshToken
 } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import {
@@ -17,8 +17,8 @@ const upload = config => {
 	// 是否需要设置 token
 	const isToken = (config.headers || {}).isToken === false
 	config.header = config.header || {}
-	if (getAccessToken() && !isToken) {
+	if (getRefreshToken() && !isToken) {
-		config.header['Authorization'] = 'Bearer ' + getAccessToken()
+		config.header['Authorization'] = 'Bearer ' + getRefreshToken()
 	}
 	// get请求映射params参数
 	if (config.params) {