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

components.d.ts

@@ -31,7 +31,7 @@ declare module 'vue' {
     HeadSearch: typeof import('./src/components/headSearch/index.vue')['default']
     HotPromoted: typeof import('./src/components/Enterprise/hotPromoted.vue')['default']
     Img: typeof import('./src/components/Upload/img.vue')['default']
-    ImgCropper: typeof import('./src/components/Upload/ImgCropper.vue')['default']
+    ImgCropper: typeof import('./src/components/ImgCropper/index.vue')['default']
     'Index copy': typeof import('./src/components/CtForm/index copy.vue')['default']
     IndustryTypeCard: typeof import('./src/components/industryTypeCard/index.vue')['default']
     Info: typeof import('./src/components/Enterprise/info.vue')['default']

src/components/Upload/ImgCropper.vue → src/components/ImgCropper/index.vue

@@ -6,7 +6,7 @@
     title="图片裁剪"
     :footer="true"
     submitText="裁剪"
-    @close="isShowModal = false; cancel"
+    @close="cancel"
     @submit="getResult"
   >
     <!-- <div class="text-end"> -->
@@ -101,7 +101,7 @@ const corpPresetMode = computed(() => {
     ...props.presetMode
   }
 })
-const emits = defineEmits(["close"])
+const emits = defineEmits(["close", 'submit'])
 
 watch(() => props.visible, (val) => {
   isShowModal.value = val
@@ -119,7 +119,7 @@ watch(() => props.image, (val) => {
 
 const isShowModal = ref(false)
 const pic = ref('')
-const result = reactive({
+let result = reactive({
   dataURL: '',
   blobURL: '',
 })
@@ -146,12 +146,12 @@ async function getResult() {
       const r = new FileReader()
       r.readAsDataURL(f)
       r.onload = function () {
-        emits("close", { result, file: f })
+        emits("submit", { result, file: f })
       }
     });
   } else {
     // console.log("crop")
-    emits("close", { result, file })
+    emits("submit", { result, file })
   }
 }
 
@@ -179,6 +179,12 @@ function ready() {
 }
 
 function cancel() {
+  isShowModal.value = false
+  pic.value = ''
+  result = {
+    dataURL: '',
+    blobURL: ''
+  }
   emits("close")
 }
 </script>

src/components/Loading/index.vue

@@ -32,4 +32,26 @@ defineProps({
   75% {text-shadow:-33ch 0 #000,-22ch 0 #dbf03f,-11ch 0 #f03756,  0ch 0 #6fedf8,11ch 0 #000}
   100%{text-shadow:-44ch 0 #000,-33ch 0 #dbf03f,-22ch 0 #f03756,-11ch 0 #6fedf8, 0ch 0 #000}
 }
+
+
+// .loader {
+//   width: 120px;
+//   height: 22px;
+//   border-radius: 20px;
+//   color: #00897b;
+//   border: 2px solid;
+//   position: relative;
+// }
+// .loader::before {
+//   content: "";
+//   position: absolute;
+//   margin: 2px;
+//   inset: 0 100% 0 0;
+//   border-radius: inherit;
+//   background: currentColor;
+//   animation: l6 2s infinite;
+// }
+// @keyframes l6 {
+//     100% {inset:0}
+// }
 </style>

src/utils/package.js

@@ -6,7 +6,7 @@ export const packData = {
         title: '普通版',
         price: 388,
         type: '大众会员套餐',
-        equity: ['职位发布：20个', '发布岗位指定：无限']
+        equity: ['职位发布：20个', '发布岗位置顶：无限']
       },
       {
         title: '基础版',
@@ -40,7 +40,7 @@ export const packData = {
       {
         title: '14天双周卡',
         price: 38,
-        equity: ['职位发布：1个', '发布岗位指定：1次/天']
+        equity: ['职位发布：1个', '发布岗位置顶：1次/天']
       },
       {
         title: '30天月卡',
@@ -84,12 +84,12 @@ export const packData = {
       {
         title: '精英会员',
         price: 56000,
+        recommend: true,
         equity: ['职位发布：70个', '简历下载：800份', '职位刷新点数: 不限', '职位极速推广：2次（800份）', '广告：首页焦点广告2周（233*62）', '子账号：10个']
       },
       {
         title: '白金会员',
         price: 72000,
-        recommend: true,
         equity: ['职位发布：80个', '简历下载：600份', '职位刷新点数: 不限', '职位极速推广：2次（1000份）', '广告：首页黄金广告3周（300*68）', '子账号：10个']
       },
       {

src/views/recruit/enterprise/informationSetting/index.vue

@@ -22,7 +22,7 @@
   </v-card>
 
   <Loading :visible="overlay"></Loading>
-  <ImgCropper :visible="isShowCopper" :image="selectPic" :cropBoxResizable="true" @close="handleHideCopper" :aspectRatio="1 / 1"></ImgCropper>
+  <ImgCropper :visible="isShowCopper" :image="selectPic" :cropBoxResizable="true" @submit="handleHideCopper" :aspectRatio="1 / 1" @close="isShowCopper = false"></ImgCropper>
 </template>
 
 <script setup>

src/views/recruit/enterprise/positionManagement/components/item.vue

@@ -65,10 +65,10 @@
               <span class="lines"></span>
               <span class="cursor-pointer" @click="handleEdit(val)">{{ $t('common.edit') }}</span>
             </div>
-            <div v-if="tab === 4">
+            <!-- <div v-if="tab === 4">
               <span class="lines"></span>
               <span class="cursor-pointer">{{ $t('common.close') }}</span>
-            </div>
+            </div> -->
           </div>
         </div>
       </div>

src/views/recruit/personal/remuse/components/basicInfo.vue

@@ -101,7 +101,7 @@
   </div>
   
   <Loading :visible="overlay"></Loading>
-  <!-- <ImgCropper :visible="isShowCopper" :image="selectPic" :cropBoxResizable="true" @close="handleHideCopper" :aspectRatio="1 / 1"></ImgCropper> -->
+  <!-- <ImgCropper :visible="isShowCopper" :image="selectPic" :cropBoxResizable="true" @submit="handleHideCopper" :aspectRatio="1 / 1" @close="isShowCopper = false"></ImgCropper> -->
 </template>
 
 <script setup>