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

src/views/recruit/personal/home/components/advertisement/preferred.vue

@@ -21,15 +21,26 @@
       <div class="desc">
         <p v-html="result?.introduce?.describe"></p>
       </div>
-			<div v-if="result?.introduce?.thumbnail?.length" class="culture my-15">
-        <div v-for="(k, i) in result.introduce.thumbnail" :key="i" class="culture-item">
-          <v-img :src="k" :lazy-src="k" width="350" height="230" contain>
-						<template v-slot:placeholder>
-							<v-row align="center" class="fill-height ma-0" justify="center">
-								<v-progress-circular color="grey-lighten-5" indeterminate></v-progress-circular>
-							</v-row>
-						</template>
-					</v-img>
+			<div v-if="result?.introduce?.thumbnail?.length" class="my-15">
+        <div class="culture" v-if="result?.introduce?.thumbnail?.length > 1">
+          <div v-for="(k, i) in result.introduce.thumbnail" :key="i" class="culture-item">
+            <v-img :src="k" :lazy-src="k" width="350" height="230" contain>
+              <template v-slot:placeholder>
+                <v-row align="center" class="fill-height ma-0" justify="center">
+                  <v-progress-circular color="grey-lighten-5" indeterminate></v-progress-circular>
+                </v-row>
+              </template>
+            </v-img>
+          </div>
+        </div>
+        <div v-else>
+          <v-img :src="result.introduce.thumbnail[0]" :lazy-src="result.introduce.thumbnail[0]" width="1184" height="500" contain>
+            <template v-slot:placeholder>
+              <v-row align="center" class="fill-height ma-0" justify="center">
+                <v-progress-circular color="grey-lighten-5" indeterminate></v-progress-circular>
+              </v-row>
+            </template>
+          </v-img>
         </div>
       </div>
       <div v-if="result?.introduce?.bigPicture?.url">

src/views/recruit/personal/home/index.vue

@@ -73,7 +73,11 @@ const preferredContent = ref({})
 const getSystemWebContent = async () => {
   const data = await getWebContent()
   // 优选集团
-  preferred.value = data.pcHomePreferred
+  preferred.value = data.pcHomePreferred ? data.pcHomePreferred.sort((a, b) => {
+    const sortA = a.sort || Infinity
+    const sortB = b.sort || Infinity
+    return sortA - sortB
+  }) : []
   preferredContent.value = data.appPreferredGroup
   // 顶部广告
   topAdvertise.value = data.pcTop && data.pcTop.length ? data.pcTop[0].img : ''