Merge remote-tracking branch 'yudao/dev' into dev-to-dev

src/components/Cropper/src/CropperAvatar.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="user-info-head" @click="open()">
     <img v-if="sourceValue" :src="sourceValue" alt="avatar" class="img-circle img-lg" />
+    <img v-if="!sourceValue" :src="avatar" alt="avatar" class="img-circle img-lg" />
     <el-button v-if="showBtn" :class="`${prefixCls}-upload-btn`" @click="open()">
       {{ btnText ? btnText : t('cropper.selectImage') }}
     </el-button>
@@ -17,6 +18,7 @@ import { useDesign } from '@/hooks/web/useDesign'
 import { propTypes } from '@/utils/propTypes'
 import { useI18n } from 'vue-i18n'
 import CopperModal from './CopperModal.vue'
+import avatar from '@/assets/imgs/avatar.jpg'
 
 defineOptions({ name: 'CropperAvatar' })
 

src/views/Profile/components/UserAvatar.vue

@@ -4,7 +4,7 @@
       ref="cropperRef"
       :btnProps="{ preIcon: 'ant-design:cloud-upload-outlined' }"
       :showBtn="false"
-      :value="avatar"
+      :value="img"
       width="120px"
       @change="handelUpload"
     />
@@ -13,15 +13,13 @@
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
 import { uploadAvatar } from '@/api/system/user/profile'
+import { CropperAvatar } from '@/components/Cropper'
 
 defineOptions({ name: 'UserAvatar' })
 
-const props = defineProps({
+defineProps({
   img: propTypes.string.def('')
 })
-const avatar = computed(() => {
-  return props.img
-})
 
 const cropperRef = ref()
 const handelUpload = async ({ data }) => {