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

src/views/recruit/enterprise/talentPool/index copy.vue

@@ -11,7 +11,7 @@
       <v-btn class="ml-8" :disabled="!selectAll" color="primary" variant="tonal" size="small">邀请面试</v-btn>
       <v-btn class="mx-3" :disabled="!selectAll" color="primary" variant="tonal" size="small">简历回复</v-btn>
       <v-btn :disabled="!selectAll" color="primary" variant="tonal" size="small">批量导出</v-btn>
-      <v-btn class="mx-3" :disabled="!selectAll" color="primary" variant="tonal" size="small">踢出人才库</v-btn>
+      <v-btn class="mx-3" :disabled="!selectAll" color="primary" variant="tonal" size="small">移除</v-btn>
       <v-btn :disabled="!selectAll" color="primary" variant="tonal" size="small">移动到回收站</v-btn>
       <v-btn class="ml-3" :disabled="!selectAll" color="primary" variant="tonal" size="small">加入黑名单</v-btn>
     </div>
@@ -46,7 +46,7 @@
           <div>
             <!-- <v-btn color="primary" variant="tonal" @click.stop="{}">和TA聊聊</v-btn>
             <v-btn class="ml-3" color="primary" @click.stop="{}">邀请面试</v-btn> -->
-            <v-btn class="ml-3" color="primary" variant="tonal" @click.stop="handleRemove(val)">踢出人才库</v-btn>
+            <v-btn class="ml-3" color="primary" variant="tonal" @click.stop="handleRemove(val)">移除</v-btn>
           </div>
         </div>
         <div class="d-flex mx-5 bottom cursor-pointer">

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

@@ -32,7 +32,7 @@
           </template>
         </template>
         <template v-slot:[`item.actions`]="{ item }">
-          <v-btn color="primary" variant="text" @click="handleRemove(item)">踢出人才库</v-btn>
+          <v-btn color="primary" variant="text" @click="handleRemove(item)">移除</v-btn>
           <v-btn color="primary" variant="text" @click="talentPoolDetails(item)">人才详情</v-btn>
         </template>
       </v-data-table>

src/views/recruit/enterprise/tradingOrder/components/pointsAndBalance.vue

@@ -172,7 +172,7 @@ const stopInterval = async () => {
   padding: 2px 18px;
   color: var(--color-666);
 }
-.active {
+  // .active {
   // border: 2px solid #cf990c;
   // background: linear-gradient(rgb(255, 242, 214) 8.86%, rgb(255, 225, 177) 100%);;
   // .priceBox {
@@ -182,7 +182,7 @@ const stopInterval = async () => {
   //   color: var(--v-error-base);
   //   background-color: #fff4e7;
   // }
-}
+  // }
 .custom-input-num {
   border: none;
   outline: none;