flat:合并冲突

packageA/pages/selectDate/selectDate.vue

@@ -59,10 +59,10 @@ const pages = reactive({
     year: 0,
     month: 0,
 });
-
 const hasZphDateArray = ref([]);
 
 onLoad((options) => {
+    updateDateArray();
     if (options.date) {
         current.value = {
             date: options?.date || null,

pages/index/components/index-refactor.vue

@@ -596,7 +596,16 @@ function getJobRecommend(type = 'add') {
 
                     if (question) {
                         comd.jobCategory = question;
-                        data.unshift(comd);
+                        // 生成随机插入位置，排除前两个和最后两个位置
+                        let insertIndex;
+                        if (data.length <= 4) {
+                            // 如果数据长度小于等于4，直接插入到中间位置
+                            insertIndex = Math.floor(data.length / 2);
+                        } else {
+                            // 生成2到data.length-2之间的随机位置
+                            insertIndex = Math.floor(Math.random() * (data.length - 4)) + 2;
+                        }
+                        data.splice(insertIndex, 0, comd);
                     }
                 }
                 const reslist = dataToImg(data);

pages/msglog/read.vue

@@ -1,6 +1,6 @@
 <template>
     <scroll-view scroll-y class="main-scroll">
-        <view class="scrollmain">
+        <view v-if="msgList.length" class="scrollmain">
             <view
                 class="list-card press-button"
                 v-for="(item, index) in msgList"
@@ -37,6 +37,7 @@
             </view>
             <empty v-if="!msgList.length"></empty>
         </view>
+        <empty v-else pdTop="200" content="暂无消息~"></empty>
     </scroll-view>
 </template>
 

pages/msglog/unread.vue

@@ -1,6 +1,6 @@
 <template>
     <scroll-view scroll-y class="main-scroll">
-        <view class="scrollmain">
+        <view v-if="unreadMsgList.length" class="scrollmain">
             <view
                 class="list-card press-button"
                 v-for="(item, index) in unreadMsgList"
@@ -35,6 +35,7 @@
             </view>
             <empty v-if="!unreadMsgList.length"></empty>
         </view>
+        <empty v-else pdTop="200" content="暂无消息~"></empty>
     </scroll-view>
 </template>