Merge remote-tracking branch 'origin/master'

k94314517

2024-02-23 3c456949b70671cc2ad95ad5395dfaceda519f17

 company/src/components/common/UploadAvatarImage.vue

@@ -10,7 +10,7 @@
      :on-success="handleAvatarSuccess"
      :on-error="uploadError"
      :before-upload="beforeAvatarUpload">
      <img v-if=" file.imgurlfull" :src="file.imgurlfull" :style="customStyle" class="avatar">
      <img v-if=" file.imgurlfull" style="width: 100%;" :src="file.imgurlfull" :style="customStyle" class="avatar">
      <div v-else :style="customStyle">
        <i class="el-icon-plus avatar-uploader-icon"></i>
        <div class="tips-style">{{ tipsLabel }}</div>
@@ -68,7 +68,7 @@
</script>

<style lang="scss" scoped>
$image-width: 100px;
$image-width: 90px;
.avatar-uploader {
  width: $image-width;
  height: $image-width;
@@ -78,8 +78,6 @@
  border-radius: 6px;
  cursor: pointer;
  position: relative;
  width: $image-width;
  height: $image-width;
  overflow: hidden;
}
.avatar-uploader .el-upload:hover {
@@ -94,8 +92,8 @@
  text-align: center;
}
.avatar {
  width: $image-width;
  height: $image-width;
  width: 100% !important;
  height: auto !important;
  display: block;
}
.tips-style {