新增个人中心页面

.env.production

@@ -3,4 +3,4 @@ VITE_API_TIME_OUT=10000
 VITE_PASSWORD_SECRET_KEY===ad-distribute=
 VITE_IMAGE_DOMAIN=https://hccake-img.oss-cn-shanghai.aliyuncs.com
 # 用来回显图片
-VITE_SERVERURL=http://39.100.77.21:8000
+VITE_SERVERURL=http://39.100.77.21:8001

src/api/personCenter/index.ts

@@ -22,7 +22,7 @@ export function saveConfiguration(saveConfigurationDto: SysConfigurationDTO) {
     gender: saveConfigurationDto.gender,
     userId: saveConfigurationDto.userId,
     nickname: saveConfigurationDto.nickname,
-    phone: saveConfigurationDto.phone,
+    phoneNumber: saveConfigurationDto.phoneNumber,
     username: saveConfigurationDto.username
   })
 }

src/api/personCenter/types.ts

@@ -12,6 +12,6 @@ export interface SysConfigurationDTO {
   userId: number | undefined
   // jobNumber: number
   nickname: string | undefined
-  phone: string | undefined
+  phoneNumber: string | undefined
   username: string | undefined
 }

src/layouts/components/RightContent/AvatarDropdown.vue

@@ -5,7 +5,17 @@
 
   <header-dropdown v-else overlay-class-name="avatar-dropdown">
     <span :class="[$style.action, $style.account]">
-      <a-avatar size="small" :class="$style.avatar" :src="currentUser.avatar" alt="avatar" />
+      <!-- <a-avatar size="small" :class="$style.avatar" :src="currentUser.avatar" alt="avatar" /> -->
+      <a-avatar
+        size="small"
+        :class="$style.avatar"
+        :src="
+          userStore.userInfo?.avatar
+            ? envs.VITE_SERVERURL + '/avatar/' + userStore.userInfo?.avatar
+            : Avatar
+        "
+        alt="avatar"
+      />
       <span :class="[$style.name, 'anticon']">{{ currentUser.nickname }}</span>
     </span>
 
@@ -41,8 +51,9 @@ import { Modal } from 'ant-design-vue'
 import { logout } from '@/api/auth'
 import { useUserStore } from '@/stores/user-store'
 import { loginPath } from '@/config'
-import { fileAbsoluteUrl } from '@/utils/file-utils'
+// import { fileAbsoluteUrl } from '@/utils/file-utils'
 import { useMultiTabStore } from '@/stores/multitab-store'
+import Avatar from '@/assets/images/avatar.png'
 
 const multiTabStore = useMultiTabStore()
 
@@ -56,13 +67,15 @@ const props = withDefaults(defineProps<GlobalHeaderRightProps>(), {
 })
 const loading = ref(false)
 
+const envs = import.meta.env
+
 const userStore = useUserStore()
 
 const currentUser = computed(() => {
   const userInfo = userStore.userInfo
   return {
     nickname: userInfo?.nickname,
-    avatar: userInfo?.avatar ? fileAbsoluteUrl(userInfo?.avatar) : ''
+    avatar: userInfo?.avatar ? userInfo?.avatar : ''
   }
 })
 

src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue

@@ -113,22 +113,6 @@
             :rules="[{ required: true, message: '请输入小区名称', trigger: 'change' }]"
             name="detailAddress"
           >
-            <!-- <a-input id="tipinput" ref="detailAddressRef" v-model:value="formModel.detailAddress" autocomplete="off"
-              placeholder="请输入小区名称" :title="(formModel.address && formModel.address.length < 2) || !formModel.address
-                  ? '请先选择省市区'
-                  : ''
-                " class="custom-tooltip" :disabled="title === '编辑预约' || title === '编辑'" :readonly="title === '详情' ||
-    title === '分发' ||
-    (formModel.address && formModel.address.length < 2) ||
-    !formModel.address
-    " /> -->
-            <!-- {{ formModel.address.length }} -->
-            <!-- :readonly="
-                title === '详情' ||
-                title === '分发' ||
-                (formModel.address && formModel.address.length < 2) ||
-                !formModel.address
-              " -->
             <a-select
               v-model:value="formModel.detailAddress"
               show-search
@@ -441,7 +425,155 @@ import {
 import type { CustomerDTO, GeopoliticalCustomersRecord } from '@/api/geopoliticalCustomers/types'
 import axios from 'axios'
 
-//获取小区下拉框提示列表数据
+//省市区二级
+// import { provincesAndCitiesAndAutonomousRegions } from '@/utils/geopolitical-customers'
+
+//dom中可以写成:rules = 'rulesData'
+// const rulesData = {
+//   required: true,
+//   trigger: 'change'
+// }
+
+onMounted(() => {
+  //省市区下拉框列表数据
+  provincesAndCitiesAndAutonomousOptions.value = window.globalProvincesAndCitiesAndAutonomousRegions
+  // if (provincesAndCitiesAndAutonomousRegions) {
+  //   const addressArray = JSON.parse(JSON.stringify(provincesAndCitiesAndAutonomousRegions))
+  //   const arr: any[] = []
+  //   addressArray.forEach((item: any) => {
+  //     item.children.forEach((it: any) => {
+  //       if (it.children) {
+  //         delete it.children
+  //       }
+  //     })
+  //     arr.push(item)
+  //   })
+  //   provincesAndCitiesAndAutonomousOptions.value = arr
+  // }
+})
+
+//省市区、半径动态生成只读/禁用样式
+const isDisabled = ref(false)
+const isReadOnly = ref(false)
+const dynamicClass = computed(() => ({
+  'custom-disabled-style': isDisabled.value,
+  'custom-readonly-style': isReadOnly.value
+}))
+//预约日期、预约时间动态生成只读/禁用样式
+const reservationTimeisReadOnly = ref(false)
+const reservationTimeClass = computed(() => ({
+  'custom-readonly-style': reservationTimeisReadOnly.value
+}))
+//小区动态生成只读/禁用样式
+const isDetailAddressDisabled = ref(false)
+const isDetailAddressReadOnly = ref(false)
+
+const isDetailAddressReadOnlyDynamicClass = computed(() => ({
+  'custom-disabled-style': isDetailAddressDisabled.value,
+  'custom-readonly-style':
+    isDetailAddressReadOnly.value ||
+    (formModel.address && formModel.address.length < 2) ||
+    !formModel.address
+}))
+
+const formRef = ref<FormInstance>()
+
+// const city = ref<string | undefined>('')
+// const cityAnddistinguish = ref<string | undefined>('')
+
+//省市区下拉框列表数据
+const provincesAndCitiesAndAutonomousOptions: any = ref([])
+//省市区change
+const addressChange = async (value: any) => {
+  // console.log(value, 'value')
+  formModel.detailAddress = ''
+
+  if (value) {
+    formModel.economize = value[0]
+    formModel.market = value[1]
+    formModel.distinguish = value[2]
+    // console.log(value.length, 'value.length')
+    // if (value.length === 2) {
+    //   formModel.detailAddress = value[0] + value[1]
+    // } else if (value.length === 3) {
+    //   formModel.detailAddress = value[0] + value[1] + value[2]
+    // }
+    console.log('formModel.detailAddress', formModel.detailAddress)
+
+    // city.value = value[1].slice(0, -1)
+    // cityAnddistinguish.value = value[1] + value[2]
+    // await auto(value[1])
+  }
+}
+
+//区域半径下拉框列表数据(不需要改变的数据不要绑定ref)
+const radiusOptions = ref<SelectProps['options']>([
+  {
+    id: '3000',
+    name: '3km'
+  },
+  {
+    id: '5000',
+    name: '5km'
+  },
+  {
+    id: '10000',
+    name: '10km'
+  }
+])
+//区域半径change
+const radiusChange = (value: SelectValue) => {
+  formModel.radius = value
+}
+
+//根据地址搜索出来的门店数据
+const listData: any = ref([])
+
+//预约时间下拉框列表数据(根据后端返回的营业时间生成)
+const generateTimeSlots = (tradeStartTime: string, tradeEndTime: string) => {
+  const startHour = Number(tradeStartTime.split(':')[0])
+  const startMinute = Number(tradeStartTime.split(':')[1])
+  const endHour = Number(tradeEndTime.split(':')[0])
+  const endMinute = Number(tradeEndTime.split(':')[1])
+
+  const timeSlots = []
+  for (let hour = startHour; hour <= endHour; hour++) {
+    for (let minute = 0; minute < 60; minute += 30) {
+      if (hour === startHour && minute < startMinute) {
+        continue
+      }
+      if (hour === endHour && minute >= endMinute) {
+        break
+      }
+
+      const startTime = `${hour.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')}`
+      const endTime = `${(hour + Math.floor(minute / 30)).toString().padStart(2, '0')}:${(
+        (minute + 30) %
+        60
+      )
+        .toString()
+        .padStart(2, '0')}`
+      const timeSlot = {
+        label: `${startTime}~${endTime}`,
+        value: `${startTime}~${endTime}`
+      }
+      timeSlots.push(timeSlot)
+    }
+  }
+
+  return timeSlots
+}
+
+//创建 AMap.Geocoder 实例,AMap.Geocoder 是高德地图 JavaScript API 中的一个类，用于将地理描述转换为经纬度坐标或将经纬度坐标转换为地理描述
+const newAmapGeocoder = () => {
+  AMap.plugin('AMap.Geocoder', function () {
+    geocoder.value = new AMap.Geocoder({
+      city: '全国' // city 指定进行编码查询的城市，支持传入城市名、adcode 和 citycode
+    })
+  })
+}
+
+//通过接口获取小区下拉框提示列表数据
 const key = ref('435631c2ed6e33af778b42b46b2260ee') //web服务 高德api
 const searchData = (city: string, keywords: string, callback: any) => {
   axios
@@ -468,7 +600,7 @@ const searchData = (city: string, keywords: string, callback: any) => {
 //小区下拉框提示列表数据
 const searchDataList = ref<any[]>([])
 
-//获取小区下拉框提示列表数据防抖节流
+//获取小区下拉框提示列表数据
 let timeout: any
 function fetch(val: string, callback: any) {
   const dist: string = formModel.distinguish ? formModel.distinguish : formModel.market || ''
@@ -496,20 +628,11 @@ function fetch(val: string, callback: any) {
       })
     }
   }
-
+  //节流控制
   timeout = setTimeout(fake, 300)
 }
 
-//创建 AMap.Geocoder 实例,AMap.Geocoder 是高德地图 JavaScript API 中的一个类，用于将地理描述转换为经纬度坐标或将经纬度坐标转换为地理描述
+//小区a-select鼠标移入/移出触发事件(文本框值变化时回调)
-const newAmapGeocoder = () => {
-  AMap.plugin('AMap.Geocoder', function () {
-    geocoder.value = new AMap.Geocoder({
-      city: '全国' // city 指定进行编码查询的城市，支持传入城市名、adcode 和 citycode
-    })
-  })
-}
-
-//小区a-select鼠标移入/移出触发事件
 const handleSearch = (val: string) => {
   if (val) {
     formModel.detailAddress = val
@@ -522,24 +645,23 @@ const handleSearch = (val: string) => {
 
 //小区a-select select事件
 const handleSelect = (val: string) => {
-  console.log(val, 'val')
   formModel.detailAddress = val
-  // getLocation('')
   newAmapGeocoder()
   getCenterMarkerAddress()
 }
-//根据门店名称去获取中心点
+//小区a-select的select事件时根据门店名称去获取中心点
 const accordingStorenameGetCenter = (pois: any) => {
   isName.value = false
   getCenterMarker('select', pois[0].location.lng, pois[0].location.lat)
 }
-//根据详细地址区获取中心点
+//小区a-select的select事件时根据详细地址区获取中心点
 const accordingAddressGetCenter = () => {
   isName.value = true
   newAmapGeocoder()
   getLocation('select')
 }
-//标记中心点封装的方法
+
+//输入详细地址去获取经纬度从而标记中心点封装的方法
 const getLocation = (type: string) => {
   // console.log(address, '标记中心点address')
   const addressValue =
@@ -585,6 +707,42 @@ const getLocation = (type: string) => {
   })
 }
 //标记中心点封装的方法
+const getCenterMarker = (type: string, lng: number, lat: number) => {
+  formModel.otherAddressesInfo = `${lng},${lat}`
+  console.log(lng, lat, 'lng')
+  // 设置地图中心点
+  map.value.setCenter([lng, lat]) // 将经度和纬度作为参数传入
+  if (type === 'match' || type === 'select') {
+    //修改地图的缩放级别
+    map.value.setZoom(12) // 设置新的缩放级别，例如12
+  }
+
+  if (previousMarker.value && type === 'select') {
+    map.value.remove(markerCenter.value) // 从地图上移除之前的中心点标记物
+  }
+  // 创建标记并添加到地图上
+  markerCenter.value = new AMap.Marker({
+    position: [lng, lat], // 设定标记的位置为地图中心点
+    zIndex: 100 // 设置标记点的 z-index 值为 100
+  })
+
+  // 设置标记点的样式
+  markerCenter.value.setIcon(
+    new AMap.Icon({
+      image: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_r.png', // 使用红色标记点的图标 URL
+      size: new AMap.Size(18, 30), // 图标尺寸
+      imageSize: new AMap.Size(18, 30) // 图片尺寸
+    })
+  )
+
+  markerCenter.value.setMap(map.value) // 将标记添加到地图上
+  previousMarker.value = marker // 将新的中心点标记物赋值给 previousMarker
+
+  if (type === 'match') {
+    pagingQuery(lng, lat)
+  }
+}
+//标记中心点封装的方法
 const getCenterMarkerAddress = () => {
   createSearchService()
   const addressValue = formModel.address?.toString().split(',').join('') + formModel.detailAddress
@@ -659,145 +817,6 @@ const getCenterMarkerAddress = () => {
   })
 }
 
-//省市区二级
-// import { provincesAndCitiesAndAutonomousRegions } from '@/utils/geopolitical-customers'
-
-//dom中可以写成:rules = 'rulesData'
-// const rulesData = {
-//   required: true,
-//   trigger: 'change'
-// }
-
-onMounted(() => {
-  //省市区下拉框列表数据
-  provincesAndCitiesAndAutonomousOptions.value = window.globalProvincesAndCitiesAndAutonomousRegions
-  // if (provincesAndCitiesAndAutonomousRegions) {
-  //   const addressArray = JSON.parse(JSON.stringify(provincesAndCitiesAndAutonomousRegions))
-  //   const arr: any[] = []
-  //   addressArray.forEach((item: any) => {
-  //     item.children.forEach((it: any) => {
-  //       if (it.children) {
-  //         delete it.children
-  //       }
-  //     })
-  //     arr.push(item)
-  //   })
-  //   provincesAndCitiesAndAutonomousOptions.value = arr
-  // }
-})
-
-//省市区、半径动态生成只读/禁用样式
-const isDisabled = ref(false)
-const isReadOnly = ref(false)
-const dynamicClass = computed(() => ({
-  'custom-disabled-style': isDisabled.value,
-  'custom-readonly-style': isReadOnly.value
-}))
-//预约日期、预约时间动态生成只读/禁用样式
-const reservationTimeisReadOnly = ref(false)
-const reservationTimeClass = computed(() => ({
-  'custom-readonly-style': reservationTimeisReadOnly.value
-}))
-//小区动态生成只读/禁用样式
-const isDetailAddressDisabled = ref(false)
-const isDetailAddressReadOnly = ref(false)
-
-const isDetailAddressReadOnlyDynamicClass = computed(() => ({
-  'custom-disabled-style': isDetailAddressDisabled.value,
-  'custom-readonly-style':
-    isDetailAddressReadOnly.value ||
-    (formModel.address && formModel.address.length < 2) ||
-    !formModel.address
-}))
-
-const formRef = ref<FormInstance>()
-
-// const city = ref<string | undefined>('')
-// const cityAnddistinguish = ref<string | undefined>('')
-
-//省市区下拉框列表数据
-const provincesAndCitiesAndAutonomousOptions: any = ref([])
-//省市区change
-const addressChange = async (value: any) => {
-  // console.log(value, 'value')
-  formModel.detailAddress = ''
-
-  if (value) {
-    formModel.economize = value[0]
-    formModel.market = value[1]
-    formModel.distinguish = value[2]
-    // console.log(value.length, 'value.length')
-    // if (value.length === 2) {
-    //   formModel.detailAddress = value[0] + value[1]
-    // } else if (value.length === 3) {
-    //   formModel.detailAddress = value[0] + value[1] + value[2]
-    // }
-    console.log('formModel.detailAddress', formModel.detailAddress)
-
-    // city.value = value[1].slice(0, -1)
-    // cityAnddistinguish.value = value[1] + value[2]
-    // await auto(value[1])
-  }
-}
-
-//区域半径下拉框列表数据(不需要改变的数据不要绑定ref)
-const radiusOptions = ref<SelectProps['options']>([
-  {
-    id: '3000',
-    name: '3km'
-  },
-  {
-    id: '5000',
-    name: '5km'
-  },
-  {
-    id: '10000',
-    name: '10km'
-  }
-])
-//区域半径change
-const radiusChange = (value: SelectValue) => {
-  formModel.radius = value
-}
-
-//根据地址搜索出来的门店数据
-const listData: any = ref([])
-
-//预约时间下拉框列表数据(根据后端返回的营业时间生成)
-const generateTimeSlots = (tradeStartTime: string, tradeEndTime: string) => {
-  const startHour = Number(tradeStartTime.split(':')[0])
-  const startMinute = Number(tradeStartTime.split(':')[1])
-  const endHour = Number(tradeEndTime.split(':')[0])
-  const endMinute = Number(tradeEndTime.split(':')[1])
-
-  const timeSlots = []
-  for (let hour = startHour; hour <= endHour; hour++) {
-    for (let minute = 0; minute < 60; minute += 30) {
-      if (hour === startHour && minute < startMinute) {
-        continue
-      }
-      if (hour === endHour && minute >= endMinute) {
-        break
-      }
-
-      const startTime = `${hour.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')}`
-      const endTime = `${(hour + Math.floor(minute / 30)).toString().padStart(2, '0')}:${(
-        (minute + 30) %
-        60
-      )
-        .toString()
-        .padStart(2, '0')}`
-      const timeSlot = {
-        label: `${startTime}~${endTime}`,
-        value: `${startTime}~${endTime}`
-      }
-      timeSlots.push(timeSlot)
-    }
-  }
-
-  return timeSlots
-}
-
 //经纬度
 const lng = ref<number | undefined>()
 const lat = ref<number | undefined>()
@@ -910,6 +929,11 @@ const pagingQuery = (lng: number | undefined, lat: number | undefined) => {
 const accordingStorenameMatch = (pois: any) => {
   isName.value = false
   getCenterMarker('match', pois[0].location.lng, pois[0].location.lat)
+  console.log(
+    pois[0].location.lng,
+    pois[0].location.lat,
+    'pois[0].location.lng, pois[0].location.lat'
+  )
 }
 //匹配时根据详细地址区获取中心点
 const accordingAddressMatch = () => {
@@ -1107,9 +1131,9 @@ interface customStoreEntitiesItem {
   //预约时间
   reservationTime: string
 }
-//是否发送请求了,发送了就要就行表格刷新
+//是否发送请求了,发送了就要执行表格刷新
 const isSubmit = ref(false)
-//提交请求操作
+//报名、暂存提交请求操作
 const submitOperate = () => {
   //移除address属性
   const filteredObj = Object.fromEntries(
@@ -1392,41 +1416,6 @@ const map = ref<any>({})
 //逆向地理编码：将 地理坐标（经纬度） 转换成 地址描述信息，对应为AMap.Geocoder的getAddress方法
 const geocoder = ref<any>({})
 
-//标记中心点封装的方法
-const getCenterMarker = (type: string, lng: number, lat: number) => {
-  // 设置地图中心点
-  map.value.setCenter([lng, lat]) // 将经度和纬度作为参数传入
-  if (type === 'match' || type === 'select') {
-    //修改地图的缩放级别
-    map.value.setZoom(12) // 设置新的缩放级别，例如12
-  }
-
-  if (previousMarker.value && type === 'select') {
-    map.value.remove(markerCenter.value) // 从地图上移除之前的中心点标记物
-  }
-  // 创建标记并添加到地图上
-  markerCenter.value = new AMap.Marker({
-    position: [lng, lat], // 设定标记的位置为地图中心点
-    zIndex: 100 // 设置标记点的 z-index 值为 100
-  })
-
-  // 设置标记点的样式
-  markerCenter.value.setIcon(
-    new AMap.Icon({
-      image: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_r.png', // 使用红色标记点的图标 URL
-      size: new AMap.Size(18, 30), // 图标尺寸
-      imageSize: new AMap.Size(18, 30) // 图片尺寸
-    })
-  )
-
-  markerCenter.value.setMap(map.value) // 将标记添加到地图上
-  previousMarker.value = marker // 将新的中心点标记物赋值给 previousMarker
-
-  if (type === 'match') {
-    console.log(type, 'type')
-    pagingQuery(lng, lat)
-  }
-}
 const searchService = ref<any>({})
 // 创建地点搜索服务实例
 const createSearchService = () => {
@@ -1443,155 +1432,152 @@ const createSearchService = () => {
 //   getCenterMarkerAddress('select')
 // }
 const isName = ref<boolean>(false)
-const selectedTipCurrent = ref<any>()
+// const selectedTipCurrent = ref<any>()
-// 当用户选择输入提示结果后进行查询操作
+// // 当用户选择输入提示结果后进行查询操作
-const performQuery = (selectedTip: any, detailAddress: string) => {
+// const performQuery = (selectedTip: any, detailAddress: string) => {
-  console.log('performQuery')
+//   selectedTipCurrent.value = selectedTip
-
+//   //标记中心点
-  selectedTipCurrent.value = selectedTip
+//   // 创建地点搜索服务实例
-  //标记中心点
+//   const searchService = new AMap.PlaceSearch({
-  // 创建地点搜索服务实例
+//     // 在这里填写您的高德地图 API Key
-  const searchService = new AMap.PlaceSearch({
+//     key: '1d3839a0fe4ad113f7d88ec3775107b7',
-    // 在这里填写您的高德地图 API Key
+//     // 指定地点搜索服务的版本号
-    key: '1d3839a0fe4ad113f7d88ec3775107b7',
+//     version: '2.0'
-    // 指定地点搜索服务的版本号
+//   })
-    version: '2.0'
+//   const addressValue = formModel.address?.toString().split(',').join('') + selectedTip.name
-  })
+//   // 执行地点搜索
-  const addressValue = formModel.address?.toString().split(',').join('') + selectedTip.name
+//   searchService.search(addressValue, (status: any, result: any) => {
-  // 执行地点搜索
+//     if (status === 'complete' && result.info === 'OK') {
-  searchService.search(addressValue, (status: any, result: any) => {
+//       // 处理搜索结果
-    if (status === 'complete' && result.info === 'OK') {
+//       const pois = result.poiList.pois
-      // 处理搜索结果
+//       console.log(pois, 'pois')
-      const pois = result.poiList.pois
+//       console.log(formModel.detailAddress, 'formModel.detailAddress')
-      console.log(pois, 'pois')
+//       // 对获取到的兴趣点列表进行处理
-      console.log(formModel.detailAddress, 'formModel.detailAddress')
+//       // console.log(pois, 'pois')
-      // 对获取到的兴趣点列表进行处理
+//       // console.log(pois[0].location.lng, pois[0].location.lat, 'pois经纬度')
-      // console.log(pois, 'pois')
+//       if (pois[0].name === formModel.detailAddress) {
-      // console.log(pois[0].location.lng, pois[0].location.lat, 'pois经纬度')
+//         isName.value = false
-      if (pois[0].name === formModel.detailAddress) {
+//         getCenterMarker('select', pois[0].location.lng, pois[0].location.lat)
-        isName.value = false
+//         formModel.otherAddressesInfo = `${pois[0].location.lng},${pois[0].location.lat}`
-        getCenterMarker('select', pois[0].location.lng, pois[0].location.lat)
+//       } else {
-        formModel.otherAddressesInfo = `${pois[0].location.lng},${pois[0].location.lat}`
+//         isName.value = true
-      } else {
+//         console.log(selectedTipCurrent.value, 'selectedTipCurrent.value')
-        isName.value = true
+//         // getLocation(selectedTipCurrent.value)
-        console.log(selectedTipCurrent.value, 'selectedTipCurrent.value')
+//       }
-        // getLocation(selectedTipCurrent.value)
+//     } else {
-      }
+//       // 地点搜索失败的处理逻辑
-    } else {
+//       console.log('地点搜索失败')
-      // 地点搜索失败的处理逻辑
+//     }
-      console.log('地点搜索失败')
+//   })
-    }
+//   // if (isName.value) {
-  })
+//   //   console.log(isName.value, 'isName.value')
-  // if (isName.value) {
+
-  //   console.log(isName.value, 'isName.value')
+//   // }
-
+//   // const geocoder = new AMap.Geocoder()
-  // }
+//   // const location = selectedTip.location
-  // const geocoder = new AMap.Geocoder()
+//   // if (location) {
-  // const location = selectedTip.location
+//   //   // 使用地理编码查询
-  // if (location) {
+//   //   geocoder.getAddress(location, function (status: any, result: any) {
-  //   // 使用地理编码查询
+//   //     if (status === 'complete' && result.info === 'OK') {
-  //   geocoder.getAddress(location, function (status: any, result: any) {
+//   //       // 处理查询结果
-  //     if (status === 'complete' && result.info === 'OK') {
+//   //       const address = result.regeocode.formattedAddress
-  //       // 处理查询结果
+//   //       console.log('查询结果：', address)
-  //       const address = result.regeocode.formattedAddress
+//   //       console.log(detailAddress, 'detailAddress')
-  //       console.log('查询结果：', address)
+
-  //       console.log(detailAddress, 'detailAddress')
+//   //       // 进行其他操作...
-
+//   //       match()
-  //       // 进行其他操作...
+
-  //       match()
+//   //       // detailAddress = detailAddress.substring(0, 14)
-
+//   //       // if (detailAddress === '浙江省杭州市上城区九和路8号华侨国际·新侨创智中心') {
-  //       // detailAddress = detailAddress.substring(0, 14)
+//   //       //   detailAddress = detailAddress.substring(0, detailAddress.indexOf('号') + 1)
-  //       // if (detailAddress === '浙江省杭州市上城区九和路8号华侨国际·新侨创智中心') {
+//   //       //   console.log(detailAddress, 'detailAddress1111')
-  //       //   detailAddress = detailAddress.substring(0, detailAddress.indexOf('号') + 1)
+//   //       //   //标记中心点
-  //       //   console.log(detailAddress, 'detailAddress1111')
+//   //       //   getCenterMarker('select', detailAddress)
-  //       //   //标记中心点
+//   //       //   formModel.otherAddressesInfo = detailAddress
-  //       //   getCenterMarker('select', detailAddress)
+//   //       // } else {
-  //       //   formModel.otherAddressesInfo = detailAddress
+//   //       //   //标记中心点
-  //       // } else {
+//   //       //   getCenterMarker('select', detailAddress)
-  //       //   //标记中心点
+//   //       //   formModel.otherAddressesInfo = detailAddress
-  //       //   getCenterMarker('select', detailAddress)
+//   //       // }
-  //       //   formModel.otherAddressesInfo = detailAddress
+//   //     }
-  //       // }
+//   //   })
-  //     }
+//   // } else {
-  //   })
+//   //   message.info('地址错误,请重新进行选择')
-  // } else {
+//   // }
-  //   message.info('地址错误,请重新进行选择')
+// }
-  // }
-}
-
-const detailAddress = ref<string>('')
-const detailAddressRef = ref()
-const auto = async (value: string) => {
-  await AMap.plugin('AMap.AutoComplete', function () {
-    console.log(autoComplete.value, 'value')
-    //AutoComplete实例已存在，赋值失败;想变成动态的，就得动态赋值;死就没有发生变化,不需要重新赋值
-    // if (autoComplete.value) {
-    //   autoComplete.value.setCity(value)
-    // } else {
-    // 实例化Autocomplete
-    const autoOptions = {
-      // city: value, // 限定城市，默认全国
-      // city: '330000', // 限定城市，默认全国
-      input: 'tipinput'
-      // keywords: formModel.address?.toString().split(',').join('') + formModel.detailAddress,
-      // citylimit: true, // 设置要限制的省市区
-      // noLocation: true // 禁用定位功能
-    }
-
-    // 创建新的 AMap.AutoComplete 实例
-    autoComplete.value = new AMap.AutoComplete(autoOptions)
-    // }
-    setTimeout(() => {
-      autoComplete.value?.on('select', (e: any) => {
-        // detailAddressRef.value.stateValue.getValue()
-        // detailAddressRef.value.stateValue = 123
-        console.log(
-          detailAddressRef.value.stateValue,
-          'detailAddressRef.value.stateValue.getValue()'
-        )
-        console.log(detailAddressRef.value, 'detailAddressRef.value.value')
-        console.log(e.poi, 'e.poi')
-        const selectedTip = e.poi // 获取用户选择的提示结果对象
-        console.log(
-          formModel.economize,
-          formModel.market,
-          formModel.distinguish,
-          'formModel.economize && formModel.market && formModel.distinguish'
-        )
-        if (formModel.distinguish) {
-          if (formModel.economize && formModel.market) {
-            const result = selectedTip.name.replace(
-              formModel.economize + formModel.market + formModel.distinguish,
-              ''
-            )
-            const address = formModel.economize + formModel.market + formModel.distinguish + result // 将选中的提示项名称赋值给输入框的值（使用 v-model 来绑定）
-            // formModel.detailAddress = address
-            const tipInput = document.querySelector('#tipinput') as HTMLElement
-
-            tipInput.innerHTML = address
-            // setTimeout(() => {
-            //   detailAddressRef.value.stateValue = address
-            // })
-            console.log(result, 'result')
-            console.log(formModel.detailAddress, 'formModel.detailAddress')
-          }
-        } else {
-          if (formModel.economize && formModel.market) {
-            const result = selectedTip.name.replace(formModel.economize + formModel.market, '')
-            const address = formModel.economize + formModel.market + result // 将选中的提示项名称赋值给输入框的值（使用 v-model 来绑定）
-            formModel.detailAddress = address
-            detailAddressRef.value.stateValue = address
-
-            console.log(formModel.detailAddress, 'formModel.detailAddress')
-          }
-        }
 
-        detailAddress.value = selectedTip.district + selectedTip.address
+// const detailAddress = ref<string>('')
-        performQuery(selectedTip, detailAddress.value) // 执行查询操作
+// const detailAddressRef = ref()
-      })
+// const auto = async (value: string) => {
-    }, 300)
+//   await AMap.plugin('AMap.AutoComplete', function () {
-  })
+//     //AutoComplete实例已存在，赋值失败;想变成动态的，就得动态赋值;死就没有发生变化,不需要重新赋值
-}
+//     // if (autoComplete.value) {
+//     //   autoComplete.value.setCity(value)
+//     // } else {
+//     // 实例化Autocomplete
+//     const autoOptions = {
+//       // city: value, // 限定城市，默认全国
+//       // city: '330000', // 限定城市，默认全国
+//       input: 'tipinput'
+//       // keywords: formModel.address?.toString().split(',').join('') + formModel.detailAddress,
+//       // citylimit: true, // 设置要限制的省市区
+//       // noLocation: true // 禁用定位功能
+//     }
+
+//     // 创建新的 AMap.AutoComplete 实例
+//     autoComplete.value = new AMap.AutoComplete(autoOptions)
+//     // }
+//     setTimeout(() => {
+//       autoComplete.value?.on('select', (e: any) => {
+//         // detailAddressRef.value.stateValue.getValue()
+//         // detailAddressRef.value.stateValue = 123
+//         console.log(
+//           detailAddressRef.value.stateValue,
+//           'detailAddressRef.value.stateValue.getValue()'
+//         )
+//         console.log(detailAddressRef.value, 'detailAddressRef.value.value')
+//         console.log(e.poi, 'e.poi')
+//         const selectedTip = e.poi // 获取用户选择的提示结果对象
+//         console.log(
+//           formModel.economize,
+//           formModel.market,
+//           formModel.distinguish,
+//           'formModel.economize && formModel.market && formModel.distinguish'
+//         )
+//         if (formModel.distinguish) {
+//           if (formModel.economize && formModel.market) {
+//             const result = selectedTip.name.replace(
+//               formModel.economize + formModel.market + formModel.distinguish,
+//               ''
+//             )
+//             const address = formModel.economize + formModel.market + formModel.distinguish + result // 将选中的提示项名称赋值给输入框的值（使用 v-model 来绑定）
+//             // formModel.detailAddress = address
+//             const tipInput = document.querySelector('#tipinput') as HTMLElement
+
+//             tipInput.innerHTML = address
+//             // setTimeout(() => {
+//             //   detailAddressRef.value.stateValue = address
+//             // })
+//             console.log(result, 'result')
+//             console.log(formModel.detailAddress, 'formModel.detailAddress')
+//           }
+//         } else {
+//           if (formModel.economize && formModel.market) {
+//             const result = selectedTip.name.replace(formModel.economize + formModel.market, '')
+//             const address = formModel.economize + formModel.market + result // 将选中的提示项名称赋值给输入框的值（使用 v-model 来绑定）
+//             formModel.detailAddress = address
+//             detailAddressRef.value.stateValue = address
+
+//             console.log(formModel.detailAddress, 'formModel.detailAddress')
+//           }
+//         }
+
+//         detailAddress.value = selectedTip.district + selectedTip.address
+//         performQuery(selectedTip, detailAddress.value) // 执行查询操作
+//       })
+//     }, 300)
+//   })
+// }
 
 //创建地图
 const initMap = async () => {
@@ -1599,7 +1585,7 @@ const initMap = async () => {
     // center: [120.1551, 30.2741], // 地图中心点经纬度
     zoom: 18 // 缩放级别
   })
-  await auto('全国')
+  // await auto('全国')
   if (title.value === '编辑预约' || title.value === '编辑') {
     //标记中心点
     getCenterMarker(

src/views/login/components/LoginContent.vue

@@ -127,6 +127,7 @@ function store(res: LoginResult) {
 
   // 存储用户信息
   const info = res.info
+  console.log(info, 'info')
   const roleCodes = res.attributes?.roleCodes || []
   const permissions = res.attributes?.permissions || []
   userStore.userInfo = {

src/views/system/userCenter/center/updatePass.vue

@@ -63,16 +63,18 @@ interface formRuleItem {
   pass: Array<object>
   confirmPass: Array<object>
 }
-const confirmPass = (rule: any, value: any, callback: any) => {
+const confirmPass = (rule: any, value: any) => {
-  if (value) {
+  return new Promise<void>((resolve, reject) => {
-    if (formModel.pass !== value) {
+    if (value) {
-      callback(new Error('两次输入的密码不一致'))
+      if (formModel.pass !== value) {
+        reject('两次输入的密码不一致')
+      } else {
+        resolve()
+      }
     } else {
-      callback()
+      reject('请再次输入密码')
     }
-  } else {
+  })
-    callback(new Error('请再次输入密码'))
-  }
 }
 // 表单校验规则
 const formRule = ref<formRuleItem>({

src/views/system/userCenter/personCenter.vue

@@ -3,26 +3,19 @@
     <a-row :gutter="20">
       <a-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10" style="margin-bottom: 10px">
         <a-card class="box-card" title="个人信息">
-          <!-- <div slot="header" class="clearfix">
-            <span>个人信息</span>
-          </div> -->
           <div>
             <div v-if="user" style="text-align: center">
               <div class="a-upload">
-                <!-- :src="user.avatarName ? baseApi + '/avatar/' + user.avatarName : Avatar" -->
-                <!-- {{ 'http://39.100.77.21:8001/avatar/' + currentUser.avatar }} -->
-                <!-- {{ envs.VITE_SERVERURL + '/avatar/' + currentUser.avatar }} -->
                 <img
                   :src="
-                    currentUser.avatar
+                    userStore.userInfo?.avatar
-                      ? envs.VITE_SERVERURL + '/avatar/' + currentUser.avatar
+                      ? envs.VITE_SERVERURL + '/avatar/' + userStore.userInfo?.avatar
                       : Avatar
                   "
                   title="点击上传头像"
                   class="avatar"
                   @click="toggleShow"
                 />
-                <!-- :params="params" -->
                 <myUpload
                   v-model="show"
                   :headers="headers"
@@ -36,42 +29,25 @@
               <li>
                 <div style="height: 100%">
                   <login-outlined /> 登录账号
-                  <!-- <svg-icon icon-class="login" /> 登录账号 -->
+                  <div class="user-right">{{ userStore.userInfo?.username || '' }}</div>
-                  <div class="user-right">{{ currentUser.username || '' }}</div>
                 </div>
               </li>
               <li>
                 <smile-outlined /> 用户昵称
-                <!-- <svg-icon icon-class="user1" /> 用户昵称 -->
+                <div class="user-right">{{ userStore.userInfo?.nickname }}</div>
-                <div class="user-right">{{ currentUser.nickname }}</div>
               </li>
               <li>
                 <user-outlined /> 用户角色
                 <div class="user-right">{{ userRole }}</div>
-                <!-- <svg-icon icon-class="user" /> 用户角色 -->
-                <!-- <div v-for="item in user.roles" :key="item.id" class="user-right">
-                  &nbsp;{{ item.name }}
-                </div> -->
               </li>
-              <!-- <li v-if="user.organizeName">
-                <svg-icon icon-class="dept" /> 所属小组
-                <div class="user-right">{{ user.organizeName }}</div>
-              </li> -->
               <li>
                 <phone-outlined /> 手机号码
-                <!-- <svg-icon icon-class="phone" /> 手机号码 -->
+                <div class="user-right">{{ userStore.userInfo?.phoneNumber }}</div>
-                <div class="user-right">{{ currentUser.phoneNumber }}</div>
               </li>
-              <!-- <li v-if="user.email">
-                <experiment-outlined /> 用户邮箱
-                <div class="user-right">{{ user.email }}</div>
-              </li> -->
               <li>
                 <safety-certificate-outlined /> 安全设置
-                <!-- <svg-icon icon-class="anq" /> 安全设置 -->
                 <div class="user-right">
                   <a @click="modifyPassword">修改密码</a>
-                  <!-- <a @click="$refs.email.dialog = true">修改邮箱</a> -->
                 </div>
               </li>
             </ul>
@@ -92,12 +68,9 @@
                 :label-col="{ sm: { span: 24 }, md: { span: 3 } }"
                 :wrapper-col="{ sm: { span: 24 }, md: { span: 20 } }"
               >
-                <!-- <a-form-item label="工号">
-                  <a-input v-model="form.jobNumber" style="width: 35%" />
-                  <span style="color: #C0C0C0;margin-left: 10px;">工号</span>
-                </a-form-item> -->
                 <a-form-item
                   label="昵称"
+                  name="nickName"
                   :rules="[
                     { required: true, message: '请输入用户昵称', trigger: 'blur' },
                     { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
@@ -108,6 +81,7 @@
                 </a-form-item>
                 <a-form-item
                   label="手机号"
+                  name="phone"
                   :rules="[{ required: true, trigger: 'blur', validator: validPhone }]"
                 >
                   <a-input v-model:value="formModel.phone" style="width: 40%" />
@@ -119,10 +93,6 @@
                     <a-radio label="女" :value="2">女</a-radio>
                   </a-radio-group>
                 </a-form-item>
-                <!-- <a-form-item label="企微验证">
-                  <a-input v-model="form.greetMessage" style="width: 35%;" />
-                  <span style="color: #C0C0C0;margin-left: 10px;">用作企微好友添加验证模板</span>
-                </a-form-item> -->
                 <a-form-item :wrapper-col="{ offset: 3, span: 4 }">
                   <a-button :loading="saveLoading" size="mini" type="primary" @click="doSubmit"
                     >保存配置</a-button
@@ -130,191 +100,34 @@
                 </a-form-item>
               </a-form>
             </a-tab-pane>
-            <!-- 线索规则 -->
-            <!-- <a-tab-pane v-if="user.isManager" key="2" tab="规则线索">
-              <div>
-                <div class="pan-item">
-                  <label class="pan-label">线索回收</label>
-                  <a-input
-                    v-model="configureRule.recycleNumber"
-                    type="Number"
-                    style="width: 120px"
-                  />
-                  <a-select
-                    v-model="configureRule.recycleUnit"
-                    placeholder="请选择"
-                    class="ml-10"
-                    style="width: 90px"
-                  >
-                    <a-option label="天" value="0" />
-                    <a-option label="周" value="1" />
-                    <a-option label="月" value="2" />
-                  </a-select>
-                  <span style="color: #c0c0c0; margin-left: 10px; font-size: 14px"
-                    >线索指定时长内没有完结自动进入公海</span
-                  >
-                </div>
-                <div class="pan-item">
-                  <label class="pan-label">线索公示</label>
-                  <a-input v-model="configureRule.idleNumber" type="Number" style="width: 120px" />
-                  <a-select
-                    v-model="configureRule.idleUnit"
-                    placeholder="请选择"
-                    class="ml-10"
-                    style="width: 90px"
-                  >
-                    <a-option label="时" value="0" />
-                    <a-option label="天" value="1" />
-                  </a-select>
-                  <span style="color: #c0c0c0; margin-left: 10px; font-size: 14px"
-                    >线索进入公海后公示时长</span
-                  >
-                </div>
-                <div class="pan-item">
-                  <label class="pan-label" />
-                  <a-button
-                    :loading="saveLoading"
-                    size="mini"
-                    class=""
-                    type="primary"
-                    @click="configureRuleSubmit"
-                    >保存配置</a-button
-                  >
-                </div>
-              </div>
-            </a-tab-pane> -->
-            <!--    操作日志    -->
-            <!-- <a-tab-pane v-if="user.addWeChatFlag" key="3" tab="企微模版">
-              <div class="u-flex">
-                <a-input
-                  v-if="inputVisible"
-                  ref="saveTagInput"
-                  v-model="inputValue"
-                  class="input-new-tag"
-                  type="textarea"
-                  :rows="2"
-                  placeholder="请输入内容"
-                />
-                <a-button
-                  v-if="inputVisible"
-                  class="filter-item ml-10"
-                  size="mini"
-                  type="primary"
-                  @click.stop="toAdd"
-                >
-                  保存
-                </a-button>
-                <a-button
-                  v-if="inputVisible"
-                  class="filter-item"
-                  size="mini"
-                  @click.stop="inputVisible = false"
-                >
-                  取消
-                </a-button>
-                <a-button
-                  v-else-if="!inputVisible"
-                  class="filter-item"
-                  size="mini"
-                  type="primary"
-                  icon="a-icon-plus"
-                  @click.stop="showInput"
-                >
-                  新增
-                </a-button>
-              </div> -->
-            <!-- <a-table
-                :data="templateArr"
-                :loading="templateLoading"
-                :header-cell-style="{ 'text-align': 'left' }"
-                style="width: 100%"
-              >
-                <a-table-column prop="greatMessage" label="消息内容" />
-                <a-table-column prop="status" label="是否默认">
-                  <template #default="scope">
-                    <span :style="{ color: scope.row.isDefault == 1 ? '#67c23a' : '' }">{{
-                      scope.row.isDefault == 1 ? '当前默认' : '否'
-                    }}</span>
-                  </template>
-                </a-table-column>
-                <a-table-column prop="createTime" label="创建日期">
-                  <template #default="scope">
-                    <span>{{ parseTime(scope.row.createTime) }}</span>
-                  </template>
-                </a-table-column>
-                <a-table-column align="center">
-                  <template #default="scope">
-                    <a-button
-                      slot="reference"
-                      type="danger"
-                      size="mini"
-                      @click="toDelete(scope.row.id)"
-                      >删除</a-button
-                    >
-                    <a-button
-                      v-if="scope.row.isDefault != 1"
-                      size="mini"
-                      type="primary"
-                      @click="toEdit(scope.row.id)"
-                      >设置默认</a-button
-                    >
-                  </template>
-                </a-table-column>
-              </a-table> -->
-            <!-- </a-tab-pane> -->
-            <!--分页组件-->
-            <!-- <a-pagination
-              :total="total"
-              :current-page="page + 1"
-              style="margin-top: 8px;"
-              layout="total, prev, pager, next, sizes"
-              @size-change="sizeChange"
-              @current-change="pageChange"
-            />
-            </a-tab-pane> -->
           </a-tabs>
         </a-card>
       </a-col>
     </a-row>
-    <!-- <updateEmail ref="email" :email="user.email" /> -->
-    <updatePass ref="pass" />
     <!-- 修改密码弹窗 -->
-    <updatepass-modal ref="gupdatepassModalRef" />
+    <updatepass-modal ref="updatepassModalRef" />
   </div>
 </template>
 
 <script setup lang="ts">
+//头像上传组件
 import 'babel-polyfill'
-
 import myUpload from 'vue-image-crop-upload'
-// import { mapGetters } from 'vuex'
-import updatePass from './center/updatePass.vue'
-// import { getToken } from '@/utils/auth'
-// import store from '@/store'
-// import Cookies from 'js-cookie'
-// import { isvalidPhone } from '@/utils/validate'
-// import crud from '@/mixins/crud'
-// import { editUser } from '@/api/system/user'
 import Avatar from '@/assets/images/avatar.png'
-// import {
-//   wechatSendMessageList,
-//   wechatSendMessageAdd,
-//   changeIsDefault,
-//   wechatSendMessageDel,
-//   getpoolQuery,
-//   setPoolConfigure
-// } from '@/api/index'
 //修改密码弹窗
 import UpdatepassModal from '@/views/system/userCenter/center/updatePass.vue'
 import { FormAction } from '@/hooks/form'
-//保存配置
+//保存配置、获取角色和图片
 import { saveConfiguration, getUserInfo } from '@/api/personCenter'
 //头像
 import { useUserStore } from '@/stores/user-store'
+import { loginPath } from '@/config'
+import { logout } from '@/api/auth'
+import { useMultiTabStore } from '@/stores/multitab-store'
+import type { FormInstance } from 'ant-design-vue'
+import { doRequest } from '@/utils/axios/request'
+import { message } from 'ant-design-vue'
 // import { fileAbsoluteUrl } from '@/utils/file-utils'
-// import { serverAddress } from '../../../../vite.config'
-// import config from '@/../vite.config'
-const envs = import.meta.env
 
 const activeKey = ref('1')
 const user = ref({
@@ -322,22 +135,48 @@ const user = ref({
 })
 //myUpload显示隐藏
 const show = ref<boolean>(false)
+//获取url拼接的ip
+const envs = import.meta.env
 
-//头像
+//用户信息
 const userStore = useUserStore()
-
+onMounted(() => {
-const currentUser = computed(() => {
+  formModel.phone = userStore.userInfo?.phoneNumber
-  const userInfo = userStore.userInfo
+  formModel.gender = userStore.userInfo?.gender
-  console.log(userInfo, 'userInfo')
+  getUserInfoData()
-  return {
-    nickname: userInfo?.nickname,
-    username: userInfo?.username,
-    phoneNumber: userInfo?.phoneNumber,
-    avatar: userInfo?.avatar ? userInfo?.avatar : '',
-    gender: userInfo?.gender,
-    userId: userInfo?.userId
-  }
 })
+//用户角色
+const userRole = ref<string>('')
+//获取用户信息
+const getUserInfoData = () => {
+  doRequest(getUserInfo(toRaw(userStore.userInfo?.userId)), {
+    onSuccess: (res: any) => {
+      if (res.code === 200) {
+        if (userStore.userInfo) {
+          userStore.userInfo.nickname = res.data.nickname ? res.data.nickname : ''
+          userStore.userInfo.phoneNumber = res.data.phoneNumber ? res.data.phoneNumber : ''
+          userStore.userInfo.avatar = res.data.avatar ? res.data.avatar : ''
+        }
+        userRole.value = res.data.roleList[0].name
+        formModel.nickName = res.data.nickname
+        formModel.gender = res.data.gender
+      }
+    }
+  })
+}
+
+// const currentUser = computed(() => {
+//   const userInfo = userStore.userInfo
+//   console.log(userInfo, 'userInfo')
+//   return {
+//     nickname: userInfo?.nickname,
+//     username: userInfo?.username,
+//     phoneNumber: userInfo?.phoneNumber,
+//     avatar: userInfo?.avatar ? userInfo?.avatar : '',
+//     gender: userInfo?.gender,
+//     userId: userInfo?.userId
+//   }
+// })
 interface formModelItem {
   nickName?: string
   phone?: string
@@ -349,100 +188,49 @@ const formModel = reactive<formModelItem>({
   phone: '',
   gender: undefined
 })
-const formRule = ref<any>({
-  nickName: [
-    { required: true, message: '请输入用户昵称', trigger: 'blur' },
-    { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
-  ]
-})
-//用户角色
-const userRole = ref<string>('')
-// const serverAddress = ref<any>('')
-onMounted(() => {
-  formModel.nickName = currentUser.value.nickname
-  formModel.phone = currentUser.value.phoneNumber
-  formModel.gender = currentUser.value.gender
-  // console.log(serverAddress, 'serverAddress')
-  getUserInfoData()
-  // baseUrl.value = import.meta.env.VITE_API_URL
-
-  // console.log(baseUrl.value, 'baseUrl')
-})
-const getUserInfoData = () => {
-  doRequest(getUserInfo(toRaw(currentUser.value.userId)), {
-    onSuccess: (res: any) => {
-      if (res.code === 200) {
-        console.log(res.data.roleList[0].name, 'res')
-        userRole.value = res.data.roleList[0].name
-        currentUser.value.avatar = res.data.avatar ? res.data.avatar : ''
-        // fileAbsoluteUrl(userInfo?.avatar)
 
-        console.log(currentUser.value.avatar, 'currentUser.value.avatar')
-      }
-    }
-  })
-}
 //手机号校验
 const isvalidPhone = (phone: string) => {
   const reg = /^1([38][0-9]|4[014-9]|[59][0-35-9]|6[2567]|7[0-8])\d{8}$/
   return reg.test(phone)
 }
 // 自定义验证
-const validPhone = (rule: any, value: any, callback: any) => {
+const validPhone = (rule: any, value: any) => {
   if (!value) {
-    callback(new Error('请输入电话号码'))
+    return Promise.reject('请输入电话号码')
   } else if (!isvalidPhone(value)) {
-    callback(new Error('请输入正确的11位手机号码'))
+    return Promise.reject('请输入正确的11位手机号码')
   } else {
-    callback()
+    return Promise.resolve()
   }
 }
-//预约ref
+//修改密码ref
-const gupdatepassModalRef = ref<InstanceType<typeof UpdatepassModal>>()
+const updatepassModalRef = ref<InstanceType<typeof UpdatepassModal>>()
 //修改密码
 const modifyPassword = () => {
-  gupdatepassModalRef.value?.open(FormAction.CREATE, currentUser.value.userId)
+  updatepassModalRef.value?.open(FormAction.CREATE, userStore.userInfo?.userId)
 }
-//保存配置
+//保存配置loading
 const saveLoading = ref<boolean>(false)
 //修改头像
 const { accessToken } = useUserStore()
 const headers = ref({
   Authorization: 'Bearer ' + accessToken
-  // 'Access-Control-Allow-Origin': '*'
 })
-console.log(headers.value.Authorization, 'Authorization')
+const baseUrl = import.meta.env.VITE_API_URL
+const updateAvatarApi = baseUrl + '/system/user/avatar'
+const router = useRouter()
+
+const multiTabStore = useMultiTabStore()
 const toggleShow = () => {
   show.value = !show.value
 }
 const cropUploadSuccess = (jsonData: any, field: any) => {
   // store.dispatch('GetInfo').then(() => {})
   getUserInfoData()
-  // const userStore = useUserStore()
-  // const currentUser = computed(() => {
-  //   const userInfo = userStore.userInfo
-  //   console.log(userInfo, 'userInfo')
-  //   return {
-  //     nickname: userInfo?.nickname,
-  //     username: userInfo?.username,
-  //     phoneNumber: userInfo?.phoneNumber,
-  //     avatar: userInfo?.avatar ? fileAbsoluteUrl(userInfo?.avatar) : '',
-  //     gender: userInfo?.gender,
-  //     userId: userInfo?.userId
-  //   }
-  // })
 }
-const baseUrl = import.meta.env.VITE_API_URL
 
-const updateAvatarApi = baseUrl + '/system/user/avatar'
+// 失败处理
-console.log(updateAvatarApi, 'baseUrl')
-const router = useRouter()
-import { loginPath } from '@/config'
-import { logout } from '@/api/auth'
-import { useMultiTabStore } from '@/stores/multitab-store'
-
-const multiTabStore = useMultiTabStore()
-//     // 失败处理
 const errorImg = (err: any) => {
   const response = JSON.parse(err.message)
   const code = response.code
@@ -470,10 +258,7 @@ const errorImg = (err: any) => {
   }
 }
 const form = ref<FormInstance>()
-import type { FormInstance } from 'ant-design-vue'
+
-import { doRequest } from '@/utils/axios/request'
-import { message } from 'ant-design-vue'
-import { env } from 'process'
 const doSubmit = () => {
   // if (this.$refs['form']) {
   //   this.$refs['form'].validate(valid => {
@@ -491,223 +276,33 @@ const doSubmit = () => {
   //     }
   //   })
   // }
-
   form.value
     ?.validate()
     .then(() => {
       doRequest(
         saveConfiguration(
           toRaw({
-            gender: currentUser.value.gender,
+            gender: formModel.gender,
-            userId: currentUser.value.userId,
+            userId: userStore.userInfo?.userId,
-            nickname: '管理员',
+            nickname: formModel.nickName,
-            phone: currentUser.value.phoneNumber,
+            phoneNumber: formModel.phone,
-            username: currentUser.value.username
+            username: userStore.userInfo?.username
           })
         ),
         {
           onSuccess: (res: any) => {
-            // if (res.code === 200) {
+            if (res.code === 200) {
-            message.success('编辑成功')
+              getUserInfoData()
-            // }
+              message.success('编辑成功')
+            }
           }
         }
       )
-      // if (formModel.customStoreEntities.length === 0) {
-      //   message.info('请先添加预约门店')
-      // } else {
-      //   formModel.enrollStatus = 0
-      //   submitOperate()
-      //   // handleSubmit()
-      // }
     })
     .catch(err => {
       console.log('校验失败err', err)
     })
 }
-
-// const params = ref({
-//   userId: currentUser.value.userId
-// })
-
-//tab
-// const handleClick = (tab: any, event: any) => {
-//   if (tab.name === 'template') {
-//     totemplateArr()
-//   }
-//   if (tab.name === 'clueRule') {
-//     getpoolQuery()
-//   }
-// }
-// const totemplateArr = () => {
-//   this.templateLoading = true
-//   wechatSendMessageList().then(res => {
-//     this.templateLoading = false
-//     this.templateArr = res.data
-//   })
-// }
-// export default {
-//   name: 'Center',
-//   components: { updatePass, myUpload },
-//   // mixins: [crud],
-//   data() {
-//     // 自定义验证
-//     const validPhone = (rule, value, callback) => {
-//       if (!value) {
-//         callback(new Error('请输入电话号码'))
-//       } else if (!isvalidPhone(value)) {
-//         callback(new Error('请输入正确的11位手机号码'))
-//       } else {
-//         callback()
-//       }
-//     }
-//     return {
-//       show: false,
-//       Avatar: Avatar,
-//       c: 3,
-//       activeName: 'first',
-//       saveLoading: false,
-//       inputVisible: false, // input操作
-//       inputValue: '',
-//       templateLoading: false,
-//       baseApi: '',
-//       headers: {
-//         Authorization: 'Bearer ' //+ getToken()
-//       },
-//       form: {},
-//       configureRule: {
-//         recycleNumber: '',
-//         recycleUnit: '0',
-//         jobNumber: '',
-//         idleNumber: '',
-//         idleUnit: '0',
-//         id: ''
-//       }, // 配置线索规则
-//       rules: {
-//         nickName: [
-//           { required: true, message: '请输入用户昵称', trigger: 'blur' },
-//           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
-//         ],
-//         phone: [{ required: true, trigger: 'blur', validator: validPhone }]
-//       },
-//       templateArr: [],
-//       user: {
-//         username: ''
-//       }
-//     }
-//   },
-//   computed: {
-//     // ...mapGetters(['user', 'updateAvatarApi', 'baseImgUrl'])
-//   },
-//   created() {
-//     // this.form = {
-//     //   id: this.user.id,
-//     //   nickName: this.user.nickName,
-//     //   gender: this.user.gender,
-//     //   phone: this.user.phone,
-//     //   jobNumber: this.user.jobNumber
-//     // }
-//     // this.baseApi = this.baseImgUrl
-//     // store.dispatch('GetInfo').then(() => {})
-//   },
-//   methods: {
-//     totemplateArr() {
-//       this.templateLoading = true
-//       wechatSendMessageList().then(res => {
-//         this.templateLoading = false
-//         this.templateArr = res.data
-//       })
-//     },
-//     showInput() {
-//       this.inputVisible = true
-//       this.$nextTick(() => {
-//         this.$refs.saveTagInput.focus()
-//       })
-//     },
-
-//     handleInputConfirm() {
-//       this.inputVisible = false
-//       this.inputValue = ''
-//     },
-//     toAdd() {
-//       wechatSendMessageAdd({
-//         greatMessage: this.inputValue
-//       }).then(res => {
-//         this.handleInputConfirm()
-//         this.totemplateArr()
-//       })
-//     },
-//     toEdit(id) {
-//       changeIsDefault({
-//         isDefault: 1,
-//         id: id
-//       }).then(res => {
-//         this.$notify({
-//           title: '成功',
-//           message: '操作成功',
-//           type: 'success'
-//         })
-//         this.totemplateArr()
-//       })
-//     },
-//     toDelete(id) {
-//       wechatSendMessageDel({
-//         id: id
-//       }).then(res => {
-//         this.$notify({
-//           title: '成功',
-//           message: '删除成功',
-//           type: 'success'
-//         })
-//         this.totemplateArr()
-//       })
-//     },
-
-//     handleClick(tab, event) {
-//       if (tab.name === 'template') {
-//         this.totemplateArr()
-//       }
-//       if (tab.name === 'clueRule') {
-//         this.getpoolQuery()
-//       }
-//     },
-//     beforeInit() {
-//       this.url = 'api/logs/user'
-//       return true
-//     },
-
-//     // 查询线索配置规则
-//     getpoolQuery() {
-//       getpoolQuery({ companyId: this.user.companyId }).then(res => {
-//         if (res.data) {
-//           this.configureRule = res.data
-//         }
-//       })
-//     },
-//     configureRuleSubmit() {
-//       if (!this.configureRule.recycleNumber || Number(this.configureRule.recycleNumber) <= 0) {
-//         this.$message.warning('请设置线索自动回收公海时长')
-//         return false
-//       }
-//       if (!this.configureRule.idleNumber || Number(this.configureRule.idleNumber) < 0) {
-//         this.$message.warning('请设置线索公示时长')
-//         return false
-//       }
-//       this.configureRule.companyId = this.user.companyId
-//       this.saveLoading = true
-//       setPoolConfigure(this.configureRule)
-//         .then(res => {
-//           this.saveLoading = false
-//           this.$message.success('操作成功')
-//           this.getpoolQuery()
-//         })
-//         .catch(() => {
-//           this.saveLoading = false
-//           this.$message.error('设置失败')
-//         })
-//     }
-//   }
-// }
 </script>
 
 <style lang="less" scoped>