flat: 合并

pages/chat/components/ai-paging.vue

@@ -240,7 +240,7 @@
                 </scroll-view>
             </view>
         </view>
-        <PopupFeeBack ref="feeback" @onSend="confirmFeeBack"></PopupFeeBack>
+        <PopupFeeBack ref="feeback" @onClose="colseFeeBack" @onSend="confirmFeeBack"></PopupFeeBack>
         <MsgTips ref="feeBackTips" content="已收到反馈，感谢您的关注" title="反馈成功" :icon="successIcon"></MsgTips>
     </view>
 </template>
@@ -268,9 +268,9 @@ import WaveDisplay from './WaveDisplay.vue';
 import FileIcon from './fileIcon.vue';
 import FileText from './fileText.vue';
 // 系统功能hook和阿里云hook
-import { useAudioRecorder } from '@/hook/useRealtimeRecorder.js';
+import { useAudioRecorder } from '@/hook/useRealtimeRecorder2.js';
 // import { useAudioRecorder } from '@/hook/useSystemSpeechReader.js';
-import { useTTSPlayer } from '@/hook/useTTSPlayer.js';
+import { useTTSPlayer } from '@/hook/useTTSPlayer2.js';
 // import { useTTSPlayer } from '@/hook/useSystemPlayer.js';
 // 全局
 const { $api, navTo, throttle } = inject('globalFunction');
@@ -612,17 +612,23 @@ function userGoodFeedback(msg) {
     // $api.msg('该功能正在开发中，敬请期待后续更新！');
     feeback.value?.open();
     feebackData.value = msg;
+    uni.hideTabBar()
 }
 
 function confirmFeeBack(value) {
     useChatGroupDBStore()
         .badFeedback(feebackData.value, value)
         .then(() => {
+            uni.showTabBar()
             feeback.value?.close();
             feeBackTips.value?.open();
         });
 }
 
+function colseFeeBack() {
+    uni.showTabBar()
+}
+
 function readMarkdown(value, index) {
     speechIndex.value = index;
     if (speechIndex.value !== index) {

pages/chat/components/popupbadFeeback.vue

@@ -1,5 +1,5 @@
 <template>
-    <uni-popup ref="popup" type="bottom" borderRadius="12px 12px 0 0" background-color="#F6F6F6">
+    <uni-popup ref="popup" type="bottom" borderRadius="12px 12px 0 0" @change="changePopup" background-color="#F6F6F6">
         <view class="feeback">
             <view class="titile">反馈</view>
             <view class="pop-h3">针对问题</view>
@@ -38,7 +38,7 @@
 
 <script setup>
 import { ref, inject } from 'vue';
-const emit = defineEmits(['onSend']);
+const emit = defineEmits(['onSend', 'onClose']);
 const { $api } = inject('globalFunction');
 const popup = ref(null);
 const inputText = ref('');
@@ -66,6 +66,13 @@ function close() {
     popup.value.close();
 }
 
+function changePopup(e) {
+    if (e.show) {
+    } else {
+        emit('onClose');
+    }
+}
+
 function send() {
     const text = getLabel();
     if (text) {

pages/index/components/index-two.vue

@@ -62,7 +62,8 @@
                             </view>
                         </template>
                     </custom-waterfalls-flow>
-                    <loadmore ref="loadmoreRef"></loadmore>
+                    <empty v-if="!list.length"></empty>
+                    <loadmore v-if="list.length >= pageSize" ref="loadmoreRef"></loadmore>
                 </view>
             </scroll-view>
         </view>
@@ -203,6 +204,7 @@ defineExpose({ loadData });
             text-overflow: clip;
             .scroll-content{
                 padding: 24rpx
+                height: calc(100% - 48rpx)
             }
 
 .nav-filter

pages/login/login.vue

@@ -313,7 +313,7 @@ function complete() {
 .backdoor{
     position: fixed;
     left: 0;
-    bottom: 200rpx;
+    bottom: 300rpx;
 }
 .input-nx
     position: relative

pages/msglog/read.vue

@@ -15,14 +15,15 @@
                     ></image>
                     <image
                         class="card-img-flame"
-                        v-if="item.title === '职位上新'"
+                        v-else-if="item.title === '职位上新'"
                         src="/static/icon/msgtype2.png"
                     ></image>
                     <image
                         class="card-img-flame"
-                        v-if="item.title === '系统通知'"
+                        v-else-if="item.title === '系统通知'"
                         src="/static/icon/msgtype3.png"
                     ></image>
+                    <image class="card-img-flame" v-else src="/static/icon/msgtype3.png"></image>
                     <view class="subscript" v-if="item.notReadCount || !item.isRead">
                         {{ item.notReadCount || '' }}
                     </view>
@@ -72,6 +73,9 @@ function seeDetail(item, index) {
         case '系统通知':
             navTo('/packageA/pages/systemNotification/systemNotification');
             break;
+        default:
+            useReadMsg().markAsRead(item, index);
+            navTo('/packageA/pages/newJobPosition/newJobPosition');
     }
 }
 

pages/msglog/unread.vue

@@ -15,14 +15,15 @@
                     ></image>
                     <image
                         class="card-img-flame"
-                        v-if="item.title === '职位上新'"
+                        v-else-if="item.title === '职位上新'"
                         src="/static/icon/msgtype2.png"
                     ></image>
                     <image
                         class="card-img-flame"
-                        v-if="item.title === '系统通知'"
+                        v-else-if="item.title === '系统通知'"
                         src="/static/icon/msgtype3.png"
                     ></image>
+                    <image class="card-img-flame" v-else src="/static/icon/msgtype3.png"></image>
                     <view class="subscript" v-if="item.notReadCount">{{ item.notReadCount }}</view>
                 </view>
                 <view class="card-info">
@@ -59,6 +60,19 @@ async function loadData() {
 
 function seeDetail(item) {
     console.log(item);
+    switch (item.title) {
+        case '职位上新':
+            useReadMsg().markAsRead(item, index);
+            navTo('/packageA/pages/newJobPosition/newJobPosition');
+            break;
+        case '招聘会预约提醒':
+            useReadMsg().markAsRead(item, index);
+            navTo('/packageA/pages/reservation/reservation');
+            break;
+        case '系统通知':
+            navTo('/packageA/pages/systemNotification/systemNotification');
+            break;
+    }
 }
 
 defineExpose({ loadData });