Merge remote-tracking branch 'origin/master'

h5app/src/components/bImage.vue

@@ -175,7 +175,7 @@ export default defineComponent({
     padding: 0 5px;
 
     img {
-      height: 73px;
+      height: 100%;
       object-fit: cover;
       border-radius: 10px;
       width: 100%;

h5app/src/router/index.ts

@@ -177,6 +177,10 @@ const routes: Array<RouteRecordRaw> = [
             {
                 path: 'tabMain/userQrCode/index',
                 component: () => import('@/views/pages/userQrCode/index.vue')
+            },
+            {
+                path: 'tabWork/userQrCode/index',
+                component: () => import('@/views/pages/userQrCode/index.vue')
             }
         ]
     },

h5app/src/views/pages/jobUserInfo/index.vue

@@ -171,8 +171,8 @@ export default defineComponent({
   }
 
   .img-item:first-child,.img-item:first-child img{
-    width: 150px;
-    height:150px;
+    width: 120px;
+
   }
 
   .img-item:not(:first-child){

h5app/src/views/pages/work/track/index.vue

@@ -2,6 +2,9 @@
   <ion-page class="list-page">
     <ion-header class="header-theme2 header-theme3">
       <ion-toolbar>
+        <ion-buttons slot="start">
+          <ion-icon :icon="arrowBackOutline" @click="onBack"></ion-icon>
+        </ion-buttons>
         <ion-title>工作轨迹</ion-title>
       </ion-toolbar>
     </ion-header>
@@ -24,6 +27,8 @@ import {getLongitudeLatitudeList} from "../../../../api/position";
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import {useUserStore} from "../../../../store/modules/user";
 import dayjs from 'dayjs';
+import {arrowBackOutline} from 'ionicons/icons';
+import {useRouter} from "vue-router";
 
 const presentAlert = async (header, message) => {
   const alert = await alertController.create({
@@ -40,6 +45,7 @@ const presentAlert = async (header, message) => {
 export default defineComponent({
   name: 'user_track',
   setup() {
+    const router = useRouter();
     const userStore = useUserStore();
     const user = ref(userStore.getUserInfo);
     const startDate = ref(dayjs(new Date()).format('YYYY-MM-DD'));
@@ -99,6 +105,10 @@ export default defineComponent({
       setLine();
     };
 
+    const onBack = () => {
+      router.push('/tabs/tabWork');
+    }
+
     /*window.onload = initMap;*/
 
     onIonViewDidEnter(() => {
@@ -107,7 +117,9 @@ export default defineComponent({
 
     return {
       startDate,
-      search
+      search,
+      onBack,
+      arrowBackOutline
     }
   }
 });

h5app/src/views/sapp/tabWork.vue

@@ -78,7 +78,7 @@
          <div class="content-title">我的应用</div>
          <div class="content-applist">
            <div class="tool-box">
-             <a class="tool-item box-line"  @click="router.push('/tabs/tabMain/userQrCode/index')">
+             <a class="tool-item box-line"  @click="router.push('/tabs/tabWork/userQrCode/index')">
                <div class="tool-img">
                  <img src="@/assets/icon/qrcode.png">
                </div>

vue/src/views/companyService/post/edit.vue

@@ -28,7 +28,7 @@
       <a-row justify="start">
         <a-col flex="520px">
           <a-form-item label="工种名称" :label-col="{ span: 5 }"
-                       name="workCategoryName" :rules="[{ required: true, message: '请选择行业工种!' }]">
+                       name="workCategoryName" :rules="[{ required: true, message: '请选择工种名称!' }]">
             <a-cascader :load-data="loadLevelWorkCategoryList" v-model:value="dataModel.workCategoryName"
                         :options="firstWorkCategoryList" change-on-select @change="workCategoryChange">
             </a-cascader>
@@ -454,7 +454,7 @@ export default defineComponent(
           message.error("请选择完整的岗位信息！")
         }
         if(!postCompany.dataModel.hasWorkCategory){
-          message.error("请选择完整的行业工种！");
+          message.error("请选择完整的工种信息！");
           return;
         }
         console.log("当前岗位信息",postCompany.dataModel);