Merge branch 'master' into cyl/master-0804

cyl/master-0804
wangxia 3 months ago
commit 4612c061f0

@ -22,7 +22,7 @@
<block class="" v-for="(item, index) in jobArray" :key="index"> <block class="" v-for="(item, index) in jobArray" :key="index">
<view class="item g_position_rela g_mb_10 g_ml_12 g_mr_12 g_bg_f g_radius_8 g_border_e_b" :class="from == 'share' ? 'g_pl_32' : ''"> <view class="item g_position_rela g_mb_10 g_ml_12 g_mr_12 g_bg_f g_radius_8 g_border_e_b" :class="from == 'share' ? 'g_pl_32' : ''">
<view class="g_p_10 g_position_rela" style="" @click="handleCard(item, index)"> <view class="g_p_10 g_position_rela" style="" @click="handleCard(item, index)">
<i class="iconfont icon-yitingzhao" v-if="item.recruitment == 2 && from != 'mine'" style="position: absolute; right: 30px; top: 50%; transform: translateY(-50%); color: #ff4d4f; font-size: 80px; z-index: 1"></i> <i class="iconfont icon-yitingzhao" v-if="item.recruitment == 2 && from != 'mine'" style="position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%); color: #ff4d4f; font-size: 80px; z-index: 1"></i>
<view class="m-top g_flex_row_between"> <view class="m-top g_flex_row_between">
<view class="g_flex_1 g_flex_column_between"> <view class="g_flex_1 g_flex_column_between">
<view class="g_flex_1 g_flex_row_between g_lh_1"> <view class="g_flex_1 g_flex_row_between g_lh_1">
@ -102,9 +102,6 @@
<text class="g_fs_14">登录后查看</text> <text class="g_fs_14">登录后查看</text>
</view> --> </view> -->
</view> </view>
<view class="checkBox" hover-class="none" v-if="from == 'share'" @click.stop="checkJob(item)">
<checkbox class="biggerSize" style="transform: scale(0.8, 0.8)" color="g_c_main" :checked="item.checked" :value="item.checked"></checkbox>
</view>
</view> </view>
<view class="" @click.stop> <view class="" @click.stop>
<view class="g_flex_row_between flex_center g_border_e_t g_p_8" v-if="from == 'mine'"> <view class="g_flex_row_between flex_center g_border_e_t g_p_8" v-if="from == 'mine'">
@ -125,6 +122,9 @@
</view> </view>
</view> </view>
</view> </view>
<view class="checkBox" hover-class="none" v-if="from == 'share'" @click.stop="checkJob(item)">
<checkbox class="biggerSize" style="transform: scale(0.8, 0.8)" color="g_c_main" :checked="item.checked" :value="item.checked"></checkbox>
</view>
</view> </view>
</block> </block>
<view class="g_mt_32 g_pb_32 g_c_9 g_pl_12 g_text_c" v-if="isShowLoginBtn && jobArray.length > 0" hover-class="none"> <view class="g_mt_32 g_pb_32 g_c_9 g_pl_12 g_text_c" v-if="isShowLoginBtn && jobArray.length > 0" hover-class="none">
@ -600,7 +600,7 @@ export default {
left: 4px; left: 4px;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
height: 100px; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;

@ -160,15 +160,15 @@ export default {
}, },
lowerTipStyle() { lowerTipStyle() {
if (this.lowerHandlePosition < 90) { if (this.lowerHandlePosition < 90) {
return `left: ${this.lowerHandlePosition}%;` return `left: ${this.lowerHandlePosition}%;padding-bottom:4px`
} }
return `right: ${100 - this.lowerHandlePosition}%;transform: translate(50%, -100%);` return `right: ${100 - this.lowerHandlePosition}%;transform: translate(50%, -100%);padding-bottom:4px`
}, },
higherTipStyle() { higherTipStyle() {
if (this.higherHandlePosition < 90) { if (this.higherHandlePosition < 90) {
return `left: ${this.higherHandlePosition}%;` return `left: ${this.higherHandlePosition}%;padding-bottom:4px`
} }
return `right: ${100 - this.higherHandlePosition}%;transform: translate(50%, -100%);` return `right: ${100 - this.higherHandlePosition}%;transform: translate(50%, -100%);padding-bottom:4px`
}, },
}, },
created: function() {}, created: function() {},

@ -10,7 +10,7 @@
<view style="padding: 0 10px 32px 0"> <view style="padding: 0 10px 32px 0">
<view class="sub" id="age"> <view class="sub" id="age">
<view class="title">年龄</view> <view class="title">年龄</view>
<view class="content g_bg_f"> <view class="content g_bg_f g_pl_6 g_pr_6">
<slider-range style="width: 98vw" class="g_bg_f" :value="rangeValue" :min="rangeMin" :max="rangMax" :step="1" :bar-height="3" :height="20" :format="format" :block-size="26" :active-color="globalData.themeColor" :decorationVisible="true" @change="handleRangeChange"></slider-range> <slider-range style="width: 98vw" class="g_bg_f" :value="rangeValue" :min="rangeMin" :max="rangMax" :step="1" :bar-height="3" :height="20" :format="format" :block-size="26" :active-color="globalData.themeColor" :decorationVisible="true" @change="handleRangeChange"></slider-range>
</view> </view>
</view> </view>

@ -9,11 +9,11 @@
<!-- <div @click="showPop = true"> 1123 </div> --> <!-- <div @click="showPop = true"> 1123 </div> -->
<!-- `calc(${navInfo.windowHeight}px - ${navInfo.navigationBarHeight + navInfo.statusBarHeight}px)` --> <!-- `calc(${navInfo.windowHeight}px - ${navInfo.navigationBarHeight + navInfo.statusBarHeight}px)` -->
<scroll-view class="m-list" id="listBox" :scroll-into-view="scrollTo" :style="{ height: `100vh ` }" :scroll-y="true" @scrolltolower="reachBottom" @scroll="checkScroll"> <scroll-view class="m-list" id="listBox" :scroll-into-view="scrollTo" :style="{ height: `100vh ` }" :scroll-y="true" @scrolltolower="reachBottom" @scroll="checkScroll">
<div class hover-class="none" hover-stop-propagation="false"> <div class="g_h_all" hover-class="none" hover-stop-propagation="false">
<div class="g_position_rela g_flex_row_between"> <div class="g_position_rela g_flex_row_between flex_center g_ml_10 g_mr_10">
<div class="the_city g_flex_column_center" style hover-class="thover" @click="goCity"> <div class="the_city g_flex_column_center" style hover-class="thover" @click="goCity">
<div class="g_flex_row_center"> <div class="g_flex_row_center">
<div class="g_fs_16 g_fw_600 g_ml_10" style="min-width: 36px; display: inline-block">{{ selectedCity }}</div> <div class="g_fs_16 g_fw_600 " style="min-width: 36px; display: inline-block">{{ selectedCity }}</div>
<div class="g_flex_column_center"> <div class="g_flex_column_center">
<div class="iconfont icon-zhankai g_fs_12" style="display: inline-block"></div> <div class="iconfont icon-zhankai g_fs_12" style="display: inline-block"></div>
</div> </div>
@ -24,8 +24,12 @@
<u-search height="80" v-model="keyword" @input="checkLength" @clear="searchJob" @search="searchJob" class="" placeholder="搜索职位名称" bg-color="#fff" :show-action="false" placeholder-class="g_c_c" search-icon-color="#999999" :maxlength="20"></u-search> <u-search height="80" v-model="keyword" @input="checkLength" @clear="searchJob" @search="searchJob" class="" placeholder="搜索职位名称" bg-color="#fff" :show-action="false" placeholder-class="g_c_c" search-icon-color="#999999" :maxlength="20"></u-search>
<!-- <div class="g_w_all g_h_40 g_position_abso" style="left: 0; z-index: 9999; top: 0; height: 100%" @click.stop="goSearch"></div> --> <!-- <div class="g_w_all g_h_40 g_position_abso" style="left: 0; z-index: 9999; top: 0; height: 100%" @click.stop="goSearch"></div> -->
</div> </div>
<div hover-class="none" class="g_bg_main g_flex_column_center g_radius_50 g_w_40 g_h_40 g_text_c g_c_f g_fs_11 g_fw_600" style="" hover-stop-propagation="false" @click="toShare" v-if="isLogin && userInfo.agencyId">
<div class="g_mb_3" style="line-height: 1">分享</div>
<div class="" style="line-height: 1">职位</div>
</div>
</div> </div>
<div> <div style="min-height:100vh">
<div class="sticky" v-if="isLogin"> <div class="sticky" v-if="isLogin">
<div class="g_flex_row_between flex_center" :class="toTop ? 'g_bg_f' : 'g_bg_f_5'" :style="{ 'box-shadow': toTop ? '0px 2px 3px 0px rgba(214, 214, 214, 0.3)' : '' }" id="tttop"> <div class="g_flex_row_between flex_center" :class="toTop ? 'g_bg_f' : 'g_bg_f_5'" :style="{ 'box-shadow': toTop ? '0px 2px 3px 0px rgba(214, 214, 214, 0.3)' : '' }" id="tttop">
<div class="g_flex_1"> <div class="g_flex_1">
@ -94,17 +98,14 @@
</div> </div>
<div class="g_h_8"></div> <div class="g_h_8"></div>
<g-list-job from="home" @uploadList="getList" bg="#ededed" class="g_h_all" :list="query.list" :active="tabInfo.active" @shareJob="shareJob" :loading="loading" :speed="speed" :query="query" :isShowLoginBtn="isLogin ? false : true" :emptyText="isLogin ? (tabInfo.active == 0 || tabInfo.active == 2 ? '嘿,这里还没有数据呢' : '您还未收藏职位,快去试试收藏职位吧') : '你好,此服务仅限人力资源行业受邀商家登录,请确认'" /> <g-list-job from="home" @uploadList="getList" bg="#ededed" class="" :list="query.list" :active="tabInfo.active" @shareJob="shareJob" :loading="loading" :speed="speed" :query="query" :isShowLoginBtn="isLogin ? false : true" :emptyText="isLogin ? (tabInfo.active == 0 || tabInfo.active == 2 ? '嘿,这里还没有数据呢' : '您还未收藏职位,快去试试收藏职位吧') : '你好,此服务仅限人力资源行业受邀商家登录,请确认'" />
</div> </div>
</div> </div>
</scroll-view> </scroll-view>
<div hover-class="none" style="position: fixed; right: 20px; bottom: 20px; z-index: 0" hover-stop-propagation="false" @click="toRecord" v-if="isLogin && userInfo.agencyId"> <div hover-class="none" style="position: fixed; right: 20px; bottom: 20px; z-index: 0" hover-stop-propagation="false" @click="toRecord" v-if="isLogin && userInfo.agencyId">
<g-panel-image :url="cdnBaseImg + 'quick_application0610.svg'" size="96" /> <g-panel-image :url="cdnBaseImg + 'quick_application0610.svg'" size="96" />
</div> </div>
<div hover-class="none" class="g_bg_main g_flex_column_center g_radius_50 g_w_48 g_h_48 g_text_c g_c_f g_fs_12 g_fw_600" style="position: fixed; right: 20px; bottom: 70px; z-index: 0" hover-stop-propagation="false" @click="toShare" v-if="isLogin && userInfo.agencyId">
<div class="g_mb_3" style="line-height: 1">分享</div>
<div class="" style="line-height: 1">职位</div>
</div>
<g-filter :show.sync="whichOneShow" @hideDrawer="(e) => (whichOneShow = e)" ref="filterChild" top="43px" :getFilterDataNew="getFilterData" @filterObj="receiveFromChild"></g-filter> <g-filter :show.sync="whichOneShow" @hideDrawer="(e) => (whichOneShow = e)" ref="filterChild" top="43px" :getFilterDataNew="getFilterData" @filterObj="receiveFromChild"></g-filter>
<u-popup v-model="showPop" mode="bottom" uZindex="9999" border-radius="12" :closeable="true" :mask-close-able="true"> <u-popup v-model="showPop" mode="bottom" uZindex="9999" border-radius="12" :closeable="true" :mask-close-able="true">

@ -28,7 +28,7 @@
{{ agencyInfo.agencyName || agencyInfo.fullName || "-" }} {{ agencyInfo.agencyName || agencyInfo.fullName || "-" }}
</view> </view>
<view style="position: relative"> <view style="position: relative">
<i class="iconfont icon-gengduo11" style="line-height: 22px; font-size: 13px; margin-left: 4px"></i> <i class="iconfont icon-gengduo11" style="font-size: 13px; margin-left: 4px"></i>
<view class="g_radius_50 g_text_c" style="position: absolute; right: -2px; top: 0; color: #fff; background-color: #ff4400; font-size: 12px; width: 6px; height: 6px" v-if="waitNus"> </view> <view class="g_radius_50 g_text_c" style="position: absolute; right: -2px; top: 0; color: #fff; background-color: #ff4400; font-size: 12px; width: 6px; height: 6px" v-if="waitNus"> </view>
</view> </view>
</view> </view>

Loading…
Cancel
Save