Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

components.d.ts

@@ -21,7 +21,7 @@ declare module 'vue' {
     CtPagination: typeof import('./src/components/CtPagination/index.vue')['default']
     CtSearch: typeof import('./src/components/CtSearch/index.vue')['default']
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
-    DatePicker: typeof import('./src/components/FormUI/datePicker/index.vue')['default']
+    DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Details: typeof import('./src/components/Enterprise/details.vue')['default']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     HeadSearch: typeof import('./src/components/headSearch/index.vue')['default']

src/locales/en.js

@@ -13,6 +13,7 @@ export default {
     submittedSuccessfully: 'Submitted successful',
     addMsg: 'New successfully added',
     delMsg: 'Delete successful',
+    uploadPictures: 'upload pictures',
     uploadSucMsg: 'Upload successful',
     uploadErrMsg: 'Upload failed',
     fileSizeExceed: 'The file size cannot exceed 10M',

src/locales/zh-CN.js

@@ -13,6 +13,7 @@ export default {
     submittedSuccessfully: '提交成功',
     addMsg: '新增成功',
     delMsg: '删除成功',
+    uploadPictures: '上传图片',
     uploadSucMsg: '上传成功',
     uploadErrMsg: '上传失败',
     fileSizeExceed: '文件大小不能超过10M',

src/views/enterprise/components/register.vue

@@ -18,7 +18,6 @@
         <div class="file-box">
           <div class="file-item" v-if="licenseUrl">
             <v-img width="100%" height="100%" :src="licenseUrl"></v-img>
-            <!-- <v-img width="100%" height="100%" src="http://menduner.citupro.com:6868/admin-api/infra/file/24/get/cd7f5e26a239fb0ab335585e04c709b065f52832fc31539b3a5423224fc6d16c.png"></v-img> -->
           </div>
           <div class="file-item file-input-box" :class="{'verifyAct': fileVerify}" @click="openFileInput">
             <div class="icon text-center">

src/views/enterprise/systemManagement/informationSettingsComponents/basicInfo.vue

@@ -1,6 +1,6 @@
 <template>
-  <div style="width: 100%;">
-    <div class="tiShi">丰富详尽的企业介绍能提高求职者对贵企业的关注和了解，有助于达到更好的招聘效果</div>
+  <div>
+    <div class="topTip">丰富详尽的企业介绍能提高求职者对贵企业的关注和了解，有助于达到更好的招聘效果</div>
     <CtForm ref="CtFormRef" :items="formItems" style="width: 900px;margin: 0 auto">
       <template #name="{ item }">
         <div v-show="!item.show" class="text-right" style="width: 80px; line-height: 40px;">
@@ -163,7 +163,7 @@ const formItems = ref({
 formItems.value.options.forEach(e => { if (infoData[e.key]) e.value = infoData[e.key] })
 </script>
 <style lang="scss" scoped>
-.tiShi {
+.topTip {
   background-color: #f7f8fa;
   color: #2f3640;
   padding: 12px 20px;

src/views/enterprise/systemManagement/informationSettingsComponents/enterpriseAlbum.vue

@@ -1,9 +1,58 @@
 <template>
-  <div>enterpriseAlbum</div>
+  <div v-if="!imgList?.length" class="mt-10 text-center">
+    <Empty></Empty>
+    <v-btn prepend-icon="mdi mdi-upload" color="warning mt-10" @click="{}">{{ $t('common.uploadPictures') }}</v-btn>
+  </div>
+  <div v-else>
+    <div><v-btn prepend-icon="mdi mdi-upload" color="warning mb-5" @click="{}">{{ $t('common.uploadPictures') }}</v-btn></div>
+    <div class="imgItem" v-for="(item, index) in imgList" :key="index">
+      <v-img width="100%" height="100%" :src="item?.url || defaultUrl"></v-img>
+      <div class="operate">
+        <span style="font-size: 14px;">设置为封面</span>
+        <span class="mdi mdi-trash-can-outline"></span>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup>
+import { ref } from 'vue';
+
 defineOptions({name: 'informationSettingsComponents-enterpriseAlbum'})
+const imgList = ref([{ url: false }, { url: 1}])
+const defaultUrl = 'https://minio.citupro.com/dev/menduner/7.png'
 </script>
 <style lang="scss" scoped>
+.imgItem {
+  width: 172px; height: 172px;
+  border: 1px solid rgba(188, 188, 188, 0.5);
+  border-radius: 5px;
+  margin-right: 24px;
+  margin-bottom: 24px;
+  display: inline-block;
+  position: relative;
+  .operate {
+    display: none;
+  }
+  &:hover {
+    .operate {
+      position: absolute;
+      bottom: 0;
+      line-height: 32px;
+      background-color: #00000080;
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      padding: 0 4px;
+      span {
+        color: #fff;
+        cursor: pointer;
+      }
+    }
+  }
+}
+.mdi-image-broken-variant {
+  font-size: 24px;
+  color: rgba(188, 188, 188, 0.8);
+}
 </style>

src/views/enterprise/systemManagement/informationSettingsComponents/enterpriseLogo.vue

@@ -1,10 +1,86 @@
 <template>
-  <div>enterpriseLogo</div>
+  <div>
+    <div class="topTip">温馨提示：上传企业LOGO，可以获得更多的关注，提升招聘效果哦！</div>
+    <div class="logoBox d-flex py-4">
+      <div class="logoItem">
+        <span class="typeTitle">矩形LOGO</span>
+        <div class="d-flex mt-8">
+          <div class="file-item mr-4" style="width: 200px;">
+            <v-img v-if="rectangleImageUrl" width="100%" height="100%" :src="rectangleImageUrl"></v-img>
+            <span class="logo">LOGO</span>
+          </div>
+          <div class="d-flex flex-column justify-space-between">
+            <div>
+              <div class="uploadPrompt">LOGO大小：200*130像素</div>
+              <div class="uploadPrompt">仅支持JPG、JPEG、PNG常见图片类</div>
+              <div class="uploadPrompt">型，且文件小于5M</div>
+            </div>
+            <div>
+              <v-btn prepend-icon="mdi mdi-upload" color="warning mb-1" @click="{}">{{ $t('common.uploadPictures') }}</v-btn>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="logoItem">
+        <span class="typeTitle">正方形LOGO</span>
+        <div class="d-flex mt-8">
+          <div class="file-item mr-4" style="width: 130px;">
+            <v-img v-if="squareImageUrl" width="100%" height="100%" :src="squareImageUrl"></v-img>
+            <span class="logo">LOGO</span>
+          </div>
+          <div class="d-flex flex-column justify-space-between">
+            <div>
+              <div class="uploadPrompt">LOGO大小：200*130像素</div>
+              <div class="uploadPrompt">仅支持JPG、JPEG、PNG常见图片类</div>
+              <div class="uploadPrompt">型，且文件小于5M</div>
+            </div>
+            <div>
+              <v-btn prepend-icon="mdi mdi-upload" color="warning mb-1" @click="{}">{{ $t('common.uploadPictures') }}</v-btn>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup>
+import { ref } from 'vue';
+
 defineOptions({name: 'informationSettingsComponents-enterpriseLogo'})
 
+// 上传
+let rectangleImageUrl = ref('') // 矩形
+let squareImageUrl = ref('') // 正方形
 </script>
 <style lang="scss" scoped>
+.topTip {
+  background-color: #f7f8fa;
+  color: #2f3640;
+  padding: 12px 20px;
+  margin: 10px 0 20px;
+  font-size: 14px;
+}
+.uploadPrompt { font-size: 14px; line-height: 24px; }
+.logoBox {
+  .logoItem { width: 50%; padding-right: 10px; }
+  .typeTitle {
+    font-weight: bold;
+  }
+}
+.file-item {
+  height: 130px;
+  border-radius: 5px;
+  margin-right: 8px;
+  // margin-top: 24px;
+  border: 1px solid rgba(188, 188, 188, 0.5);
+  text-align: center;
+  .logo {
+    font-size: 38px;
+    font-weight: 900;
+    color: rgba(188, 188, 188, 0.65);
+    height: 100%;
+    line-height: 130px;
+  }
+}
 </style>