Merge remote-tracking branch 'origin/bin' into media-css

pages/careerfair/careerfair.vue

@@ -111,6 +111,7 @@ import { onLoad, onShow } from '@dcloudio/uni-app';
 import Tabbar from '@/components/tabbar/midell-box.vue';
 import useLocationStore from '@/stores/useLocationStore';
 import { storeToRefs } from 'pinia';
+import config from '@/config';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
 const { $api, navTo, cloneDeep, debounce } = inject('globalFunction');
 const weekList = ref([]);
@@ -143,6 +144,12 @@ onLoad(() => {
     getFair('refresh');
 });
 
+const handleItemClick = (item) => {
+    lightAppJssdk.navigation.hide({
+        url: config.virtualJobFair,
+    });
+};
+
 function toSelectDate() {
     navTo('/packageA/pages/selectDate/selectDate', {
         query: {
@@ -174,7 +181,9 @@ function changeSwiperMsgType(e) {
 
 function seemsg(index) {
     if (index === 1) {
-        return $api.msg('功能确定中');
+        handleItemClick();
+        // $api.msg('功能确定中');
+        return;
     }
     state.current = index;
 }
@@ -204,7 +213,7 @@ function getFair(type = 'add') {
     if (currentDay.value?.fullDate) {
         params.zphjbsj = currentDay.value.fullDate.replace(/-/g, '');
     }
-    $api.createRequest('/app/internal/jobFairThirdPart', params, 'GET', true).then((resData) => {
+    $api.createRequest('/app/internal/jobFairThirdPart', params, 'GET', false).then((resData) => {
         const { rows, total } = resData;
         if (type === 'add') {
             // const str = pageState.pageSize * (pageState.page - 1);

pages/login/login.vue

@@ -1,5 +1,5 @@
 <template>
-    <AppLayout title="AI+就业服务程序">
+    <AppLayout title="就业服务程序">
         <tabcontrolVue :current="tabCurrent">
             <template v-slot:tab0>
                 <view class="login-content">
@@ -109,9 +109,10 @@
             </template>
         </tabcontrolVue>
         <SelectJobs ref="selectJobsModel"></SelectJobs>
-        <view class="backdoor" @click="loginbackdoor">
+        <!-- 后门 -->
+        <!--        <view class="backdoor" @click="loginbackdoor">
             <uni-icons type="gift-filled" size="30"></uni-icons>
-        </view>
+        </view> -->
     </AppLayout>
 </template>
 
@@ -153,6 +154,7 @@ const fromValue = reactive({
 
 onLoad((parmas) => {
     getTreeselect();
+    $api.msg('请完善微简历');
 });
 
 onMounted(() => {});
@@ -283,7 +285,7 @@ function loginTest() {
         password: 'test',
     };
     $api.createRequest('/app/login', params, 'post').then((resData) => {
-        $api.msg('模拟帐号密码测试登录成功');
+        $api.msg('模拟帐号密码测试登录成功， 测试环境使用模拟定位');
         loginSetToken(resData.token).then((resume) => {
             if (resume.data.jobTitleId) {
                 // 设置推荐列表，每次退出登录都需要更新

pages/mine/mine.vue

@@ -56,7 +56,7 @@
                     </view>
                     <view class="row-right">已认证</view>
                 </view>
-                <view class="main-row btn-feel">
+                <view class="main-row btn-feel" @click="handleItemClick('素质测评')">
                     <view class="row-left">
                         <image class="left-img" src="@/static/icon/server2.png"></image>
                         <text class="left-text">素质测评</text>
@@ -65,7 +65,7 @@
                         <uni-icons class="icon" color="#909090" type="right" size="14"></uni-icons>
                     </view>
                 </view>
-                <view class="main-row btn-feel">
+                <view class="main-row btn-feel" @click="handleItemClick('模拟面试')">
                     <view class="row-left">
                         <image class="left-img" src="@/static/icon/server3.png"></image>
                         <text class="left-text">AI面试</text>
@@ -82,7 +82,7 @@
                     <view class="row-right">已开启</view>
                 </view>
             </view>
-            <view class="card-back button-click" @click="logOut">退出登录</view>
+            <!-- <view class="card-back button-click" @click="logOut">退出登录</view> -->
             <uni-popup ref="popup" type="dialog">
                 <uni-popup-dialog
                     mode="base"
@@ -107,6 +107,7 @@ import { storeToRefs } from 'pinia';
 import Tabbar from '@/components/tabbar/midell-box.vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import FileUploader from '@/utils/FileUploader.js';
+import config from '@/config';
 const { $api, navTo } = inject('globalFunction');
 import useUserStore from '@/stores/useUserStore';
 const popup = ref(null);
@@ -137,6 +138,28 @@ function selectFile() {
     // });
 }
 function chooseFileUploadTest(pam) {}
+
+const handleItemClick = (item) => {
+    switch (item) {
+        case '素质测评':
+            lightAppJssdk.navigation.hide({
+                url: config.Quality_assessment_URL,
+            });
+            break;
+        case '就业指导':
+            lightAppJssdk.navigation.hide({
+                url: config.Career_guidance,
+            });
+            break;
+        case '模拟面试':
+            lightAppJssdk.navigation.hide({
+                url: config.mock_interview,
+            });
+            break;
+        default:
+            $api.msg('暂未开放');
+    }
+};
 </script>
 
 <style lang="stylus" scoped>

pages/search/search.vue

@@ -2,7 +2,12 @@
     <view class="container">
         <view>
             <view class="top">
-                <image class="btnback button-click" src="@/static/icon/back.png" @click="navBack"></image>
+                <image
+                    v-if="isMiniProgram"
+                    class="btnback button-click"
+                    src="@/static/icon/back.png"
+                    @click="navBack"
+                ></image>
                 <view class="search-box">
                     <uni-icons
                         class="iconsearch"
@@ -91,6 +96,8 @@ import { useColumnCount } from '@/hook/useColumnCount';
 import { usePagination } from '@/hook/usePagination';
 import img from '@/static/icon/filter.png';
 const { longitudeVal, latitudeVal } = storeToRefs(useLocationStore());
+import useUserStore from '@/stores/useUserStore';
+const { isMiniProgram } = storeToRefs(useUserStore());
 const searchValue = ref('');
 const historyList = ref([]);
 const listCom = ref([]);
@@ -253,9 +260,10 @@ function getJobList(type = 'add') {
             const str = pageState.pageSize * (pageState.page - 1);
             const end = listCom.value.length;
             const reslist = rows;
-            listCom.value.splice(str, end, ...reslist);
+            // listCom.value.splice(str, end, ...reslist);
+            listCom.value = [...listCom.value, ...reslist];
         } else {
-            listCom.value = rows;
+            listCom.value = [...rows];
         }
         pageState.total = resData.total;
         pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);