From edd2b9e1470c5ba3a4527e28a9cdc0bf158f5ff9 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Tue, 26 Dec 2023 16:36:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FirstJob/components/recommend.vue |   4 +-
 src/components/FirstJob/detail.vue               | 197 ++++-------------------
 src/components/FirstJob/joblist.vue              |   8 +-
 src/utils/commonUtil.js                          |  10 +-
 src/views/main.vue                               |   3 +
 5 files changed, 46 insertions(+), 176 deletions(-)

diff --git a/src/components/FirstJob/components/recommend.vue b/src/components/FirstJob/components/recommend.vue
index badd4da..98b68ab 100644
--- a/src/components/FirstJob/components/recommend.vue
+++ b/src/components/FirstJob/components/recommend.vue
@@ -211,7 +211,7 @@ export default {
         // height: 45px;
         // margin: 12px 0;
         font-size: 18px;
-        font-weight: normal;
+        font-weight: bold;
         text-align: left;
         color: #4d575e;
         line-height: 18px;
@@ -247,7 +247,7 @@ export default {
       /deep/ .jobprice {
         margin-top: 16px;
         margin-bottom: 16px;
-        font-size: 16px;
+        font-size: 14px;
         text-align: left;
         color: #ff4400;
         line-height: 18px;
diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index 2cb334f..91ca00c 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -1,108 +1,5 @@
 <template>
   <div class="detail-container">
-    <!-- <a-modal
-      title="报名"
-      :visible="visible"
-      class="modal"
-      :confirm-loading="confirmLoading"
-      @ok="handleOk"
-      @cancel="handleCancel"
-      :maskClosable="false"
-      okText="提交"
-      cancelText="取消"
-      :destroyOnClose="true"
-    >
-      <a-form-model ref="ruleForm" :model="form" :rules="rules" :colon="false">
-        <a-form-model-item ref="name" label="姓名" prop="name">
-          <a-input
-            v-model="form.name"
-            placeholder="请输入老乡姓名"
-            @blur="
-              () => {
-                $refs.name.onFieldBlur();
-              }
-            "
-          />
-        </a-form-model-item>
-        <a-form-model-item ref="gender" label="性别" prop="gender">
-          <a-select v-model="form.gender" placeholder="请选择性别">
-            <a-select-option value="man">男</a-select-option>
-            <a-select-option value="woman">女</a-select-option>
-          </a-select>
-        </a-form-model-item>
-        <a-form-model-item ref="tel" label="年龄" prop="tel">
-          <a-input
-            v-model="form.age"
-            placeholder="请输入年龄"
-            @blur="
-              () => {
-                $refs.tel.onFieldBlur();
-              }
-            "
-          />
-        </a-form-model-item>
-        <a-form-model-item ref="peoplecard" label="民族" prop="peoplecard">
-          <a-select v-model="form.nation" placeholder="请选择民族">
-            <a-select-option
-              v-for="item in nationlist"
-              :key="item.id"
-              :value="item.id"
-              >{{ item.name }}</a-select-option
-            >
-          </a-select>
-        </a-form-model-item>
-        <a-form-model-item ref="peoplecard" label="身份证号" prop="peoplecard">
-          <a-input v-model="form.peoplecard" placeholder="请输入老乡身份证号" />
-        </a-form-model-item>
-        <a-form-model-item ref="peoplecard" label="家庭住址" prop="peoplecard">
-          <a-input v-model="form.location" placeholder="请输入家庭住址" />
-        </a-form-model-item>
-
-        <a-form-model-item ref="username" label="报名企业" prop="username">
-          <a-select v-model="form.firm" placeholder="请选择民族">
-            <a-select-option :value="id">{{ id }}</a-select-option>
-          </a-select>
-        </a-form-model-item>
-        <a-form-model-item ref="username" label="岗位" prop="username">
-          <a-select v-model="form.post" placeholder="请选择民族">
-            <a-select-option :value="id">{{ id }}</a-select-option>
-          </a-select>
-        </a-form-model-item>
-        <a-form-model-item ref="username" label="模式" prop="username">
-          <a-select v-model="form.pattern" placeholder="请选择民族">
-            <a-select-option :value="id">{{ id }}</a-select-option>
-          </a-select>
-        </a-form-model-item>
-        <a-form-model-item ref="username" label="政策" prop="username">
-          <a-select v-model="form.policy" placeholder="请选择民族">
-            <a-select-option :value="id">{{ id }}</a-select-option>
-          </a-select>
-        </a-form-model-item>
-        <a-form-model-item ref="username" label="代理" prop="username">
-          <a-select v-model="form.proxy" placeholder="请选择民族">
-            <a-select-option :value="id">{{ id }}</a-select-option>
-          </a-select>
-        </a-form-model-item>
-        <a-form-model-item ref="username" label="面试时间" prop="username">
-          <a-select v-model="form.facedate" placeholder="请选择民族">
-            <a-select-option :value="id">{{ id }}</a-select-option>
-          </a-select>
-        </a-form-model-item>
-      </a-form-model>
-    </a-modal>-->
-
-    <!-- <a-drawer
-			title="报名"
-			placement="right"
-			:closable="true"
-			:maskClosable="false"
-			:visible="visible"
-			labelAlign="right"
-			width="480"
-			@close="onClose"
-		>
-			<recordbill :visible.sync="visible" :firminfo="jobDetail"></recordbill>
-    </a-drawer>-->
     <!-- 面包屑 -->
     <a-breadcrumb class="w">
       <a-breadcrumb-item href>
@@ -171,38 +68,13 @@
                       jobDetail.salaryClassify,
                       jobDetail.salaryClassifyValue
                     )
-                  ">
-                    <!-- <template v-if="jobDetail.hourlyPay"
-                    ><span>{{ jobDetail.hourlyPay }}</span
-                    >元/小时</template
-                  >
-                  <template v-else-if="jobDetail.dayPay"
-                    ><span>{{ jobDetail.dayPay }}</span
-                    >元/日</template
-                    >-->
-                  </div>
+                  "></div>
                   <span style="font-size: 16px">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
                   <div class="jobpricemonth">
                     <span>{{ jobDetail.minMonthlyPay }}</span>-
                     <span>{{ jobDetail.maxMonthlyPay }}</span>元/月
                   </div>
                 </div>
-
-                <!-- <div class="billbutton">
-                <span>服务费 <i>1.5</i>元/小时</span>
-                <a-dropdown class="dropdown" :trigger="['click']">
-                  <a
-                    class="ant-dropdown-link"
-                    @click="(e) => e.preventDefault()"
-                  >
-                    报名
-                  </a>
-                  <a-menu slot="overlay">
-                    <a-menu-item @click="showmodal"> 抽屉 </a-menu-item>
-                    <a-menu-item @click="torecord"> 新页面</a-menu-item>
-                  </a-menu>
-                </a-dropdown>
-                </div>-->
               </div>
             </div>
             <div class="swiperBox">
@@ -226,20 +98,6 @@
             <a-modal :visible="previewVisible" wrapClassName="spic" centered :footer="null" @cancel="handleCancel">
               <video style="width: 100%; max-height: calc(100vh - 40px)" id="movie" autoplay :src="previewImage" controls="controls" />
             </a-modal>
-            <!-- <div class="swiperBox">
-              <div id="swiper">
-                <div class="swiper-wrapper">
-                  <div class="swiper-slide" v-for="(item, index) in [...storeImage]" :key="index">
-                    <img :src="item" alt @click="showImage(index)" style="cursor:pointer" />
-                  </div>
-                   <div class="swiper-slide" v-for="(item, index) in [...storeImage]" :key="index">
-                    <img :src="item" alt @click="showImage(index)" style="cursor:pointer" />
-                  </div>
-                </div>
-              </div>
-              <div class="swiper-button-next"></div>
-              <div class="swiper-button-prev"></div>
-            </div>-->
           </div>
           <div class="subsetright">
             <div class="topbox">
@@ -695,31 +553,33 @@
 					<h1 class="bottombox"><i>职位详版</i> <span class="copy" @click="copyText">复制</span></h1>
 					<p class="copyInfo">{{ jobDetail.jobDesp || "-" }}</p>
         </div>-->
-        <div class="companyinfo">
-          <div class="companydetail">
-            <h1 class="bottombox">
-              <i>企业详情</i>
-            </h1>
-            <!-- <p style="text-align: center">{{ jobDetail.aliasName || '-' }}</p> -->
-            <!-- <div class="imgbox">
+        <a-anchor @click.prevent class="rightFixed">
+          <div class="companyinfo">
+            <div class="companydetail">
+              <h1 class="bottombox">
+                <i>企业详情</i>
+              </h1>
+              <!-- <p style="text-align: center">{{ jobDetail.aliasName || '-' }}</p> -->
+              <!-- <div class="imgbox">
               <img v-if="storeImage.length !== 0" :src="storeImage[0]" alt />
               <img v-else src="../../../static/img/nopicture.png" alt />
-            </div>-->
-          </div>
-          <div class="companylocation" style="text-align:center;padding:0 20px 20px" v-if="positionInfo.lng">
-            <h2 style="padding:16px 0;font-weight:600">{{store.storeName || '-'}}</h2>
-            <p style="padding-bottom:20px;border-bottom:1px solid #eee;font-size:16px;text-indent:16px;color:#4d575ecc;white-space:pre-line;text-align:left">{{store.storeInfo || '-' }}</p>
-            <!-- <h1 class="bottombox">
+              </div>-->
+            </div>
+            <div class="companylocation" style="text-align:center;padding:0 20px 20px" v-if="positionInfo.lng">
+              <h2 style="padding:16px 0;font-weight:600">{{store.storeName || '-'}}</h2>
+              <p style="padding-bottom:20px;border-bottom:1px solid #eee;font-size:16px;text-indent:16px;color:#4d575ecc;white-space:pre-line;text-align:left">{{store.storeInfo || '-' }}</p>
+              <!-- <h1 class="bottombox">
               <i>企业位置</i>
-            </h1>-->
-            <div class="imgbox">
-              <!-- <GDMap/> -->
-              <GDMap :positionInfo="positionInfo"></GDMap>
-              <!-- <img src="../../assets/map.png" alt="" /> -->
+              </h1>-->
+              <div class="imgbox">
+                <!-- <GDMap/> -->
+                <GDMap :positionInfo="positionInfo"></GDMap>
+                <!-- <img src="../../assets/map.png" alt="" /> -->
+              </div>
             </div>
           </div>
-        </div>
-        <recommend />
+        </a-anchor>
+        <!-- <recommend /> -->
       </div>
     </div>
     <!-- <div class="hotTel">
@@ -956,8 +816,8 @@ export default {
       this.visible = false
       this.previewVisible = false
       let movie = document.querySelector('#movie')
-      console.dir(movie);
-      movie.pause();
+      console.dir(movie)
+      movie.pause()
       // this.form = {
       //   // 录单数据
       //   name: '',
@@ -1664,6 +1524,8 @@ export default {
     }
   }
   .maincontentright {
+    // position: sticky;
+    // top: 0;
     width: 240px;
     > div {
       margin-bottom: 16px;
@@ -1945,4 +1807,9 @@ export default {
     }
   }
 }
+.rightFixed {
+  /deep/.ant-anchor-ink {
+    display: none;
+  }
+}
 </style>
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index c64baf5..b281c86 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -237,7 +237,7 @@
       <div class="maincontentleft" style="padding-top: 50px">
         <div class="tabBar" @click="changeTab($event)">
           <div class="tabSubset" :class="{ active: signType == '' }" data-type="0">全部</div>
-          <div class="tabSubset" :class="{ active: signType == 1 }" data-type="1">自营</div>
+          <!-- <div class="tabSubset" :class="{ active: signType == 1 }" data-type="1">自营</div> -->
           <!-- <div class="tabSubset" :class="{ active: signType == 2 }" data-type="2">三方</div> -->
         </div>
         <div class="filter" :class="[filterStatus == 0 ? '' : 'nobd']" style>
@@ -279,13 +279,13 @@
                 <span class="sort">{{sortStr}}</span>
                 <a-menu slot="overlay">
                   <a-menu-item>
-                    <div class="sortMenu" :class="sortNum == 1 ?'active':''" @click="sortList('price')">工价优先</div>
+                    <div class="sortMenu" :class="sortNum == 1 ?'active':''" @click="sortList('price')">按工价</div>
                   </a-menu-item>
                   <a-menu-item>
-                    <div class="sortMenu" :class="sortNum == 2 ?'active':''" @click="sortList('juli')">距离优先</div>
+                    <div class="sortMenu" :class="sortNum == 2 ?'active':''" @click="sortList('juli')">按距离</div>
                   </a-menu-item>
                   <a-menu-item>
-                    <div class="sortMenu" :class="sortNum == 3 ?'active':''" @click="sortList('fuwufei')">佣金优先</div>
+                    <div class="sortMenu" :class="sortNum == 3 ?'active':''" @click="sortList('fuwufei')">按佣金</div>
                   </a-menu-item>
                 </a-menu>
               </a-dropdown>
diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js
index 8aeb2f7..32814ea 100644
--- a/src/utils/commonUtil.js
+++ b/src/utils/commonUtil.js
@@ -1508,17 +1508,17 @@ export function disposeJobListData (jobList) {
 export function getSalaryClassifyValue (salaryClassify, salaryClassifyValue) {
   var hourlyPay = moneyToFixed(salaryClassifyValue);
   if (salaryClassify == 0) {
-    return `<span>${hourlyPay}</span>元/小时`;
+    return `<span style='font-size:22px'>${hourlyPay}</span>元/小时`;
   } else if (salaryClassify == 1) {
-    return `<span>${hourlyPay}</span>元/天`;
+    return `<span style='font-size:22px'>${hourlyPay}</span>元/天`;
   } else if (salaryClassify == 2) {
-    return `补<span>${hourlyPay}</span>元`;
+    return `补<span style='font-size:22px'>${hourlyPay}</span>元`;
   } else if (salaryClassify == 3) {
-    return `返<span>${hourlyPay}</span>元`;
+    return `返<span style='font-size:22px'>${hourlyPay}</span>元`;
   } else if (salaryClassify == 4) {
     return "<i>计件</i>";
   } else if (salaryClassify == 5) {
-    return `保底<span>${hourlyPay}</span>元`;
+    return `保底<span style='font-size:22px'>${hourlyPay}</span>元`;
   } else if (salaryClassify == 6) {
     return `<i>面议</i>`;
   } else if (salaryClassify == 7) {
diff --git a/src/views/main.vue b/src/views/main.vue
index 98766cb..1f14776 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -625,6 +625,8 @@ export default {
       } else {
         // 正式环境，通过缓存获取
         localStorage.setItem('daotian_to_admin_token', obj.token)
+        localStorage.setItem('daotian_to_admin', JSON.stringify(obj))
+        localStorage.setItem('daotian_to_admin_token', obj.token)
         localStorage.setItem('daotian_to_admin_avatar', obj.imgSrc)
         localStorage.setItem('daotian_to_admin_username', obj.user.userName ? obj.user.userName : obj.user.nickName)
         localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId)
@@ -644,6 +646,7 @@ export default {
       } else {
         // 正式环境，通过缓存获取
         localStorage.setItem('daotian_to_admin_token', obj.token)
+        localStorage.setItem('daotian_to_admin', JSON.stringify(obj))
         localStorage.setItem('daotian_to_admin_avatar', obj.imgSrc)
         localStorage.setItem('daotian_to_admin_username', obj.user.userName ? obj.user.userName : obj.user.nickName)
         localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId)