消息中心、工作报告代码优化

src/App.vue

@@ -7,7 +7,6 @@ import { defineComponent, getCurrentInstance, inject, nextTick, onMounted, watch
 /*----------------------------------store引入-----------------------------------*/
 /*----------------------------------公共方法引入-----------------------------------*/
 import config from "./config";
-import { storageSystem } from "@/utils/storage";
 import JKeyListen from "@/utils/keyListen.js";
 /*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();

src/manifest.json

@@ -1,9 +1,9 @@
 {
     "name" : "综合智慧云",
     "appid" : "__UNI__36DE3A0",
-    "description" : "综合智慧云app，助力企业数字化转型升级",
-    "versionName" : "2.1.3",
-    "versionCode" : 13,
+    "description" : "综合智慧云APP，是一款助力于企业数字化的应用平台，帮助企业提升办公效率，实现组织数字化和业务数字化。",
+    "versionName" : "2.1.5",
+    "versionCode" : 15,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

src/pages/business/common/projectMange/record/index.vue

@@ -41,8 +41,8 @@
     <template #default>
       <u-loading-page :loading="state.loading" fontSize="16" style="z-index: 99"></u-loading-page>
       <view class="content-area" v-for="(group, date) in proxy.$common.groupedItems(state.dataList, 'createTime')" :key="date">
-        <view class="content-area-time font12">{{ proxy.$common.jktTimes(date, "否") }}</view>
-        <view class="content-area-center radius bg-white" v-for="(el, ind) in group" :key="ind" @click="goContentDetails(el)">
+        <view class="content-area-time font14">{{ proxy.$common.jktTimes(date, "否") }}</view>
+        <view class="content-area-center bg-white" v-for="(el, ind) in group" :key="ind" @click="goContentDetails(el)">
           <view class="flex mb10">
             <u-avatar
               class="content-area-center-avatar mr10"
@@ -58,9 +58,14 @@
               <view class="content-area-center-time font12">{{ proxy.$common.jktTimes(el.createTime.replace("T", " ")) }}</view>
             </view>
           </view>
-          <view>
+          <view class="mb5">
             <u-text :text="el.contentText.slice(0, 100) + '···'" color="#666666" size="14"></u-text>
           </view>
+          <view class="flex">
+            <u-tag class="mr10" type="info" text="已读" size="mini" plain v-if="el.readFlag === 1" style="margin: 0 auto"></u-tag>
+            <u-tag class="mr10" type="error" text="未读" size="mini" plain v-if="el.readFlag === 0" style="margin: 0 auto"></u-tag>
+            <u-text class="" type="primary" text="全文" size="14"></u-text>
+          </view>
         </view>
       </view>
     </template>
@@ -158,6 +163,7 @@ function tabsClick(e) {
 onReady(() => {});
 
 onShow(() => {
+  init();
   //调用系统主题颜色
   proxy.$settingStore.systemThemeColor([1]);
 });
@@ -170,9 +176,10 @@ onLoad((options) => {
 <style lang="scss" scoped>
 .content-area {
   &-time {
-    padding: 10px 0;
-    text-align: center;
-    color: #909399;
+    padding: 10px;
+    text-align: left;
+    color: #000000;
+    font-weight: 600;
   }
 
   &-center {

src/pages/common/appMessage/index.vue

@@ -1,27 +1,37 @@
 <template>
   <oa-scroll
     customClass="appMessage-container scroll-height"
-    :refresherLoad="false"
-    :refresherEnabled="false"
-    :refresherEnabledTitle="false"
+    :pageSize="state.size"
+    :total="state.total"
+    :refresherLoad="true"
+    :refresherEnabled="true"
     :refresherDefaultStyle="'none'"
     :refresherThreshold="44"
+    :lowerThreshold="44"
     :refresherBackground="'#f5f6f7'"
+    @load="load"
+    @refresh="refresh"
     :data-theme="'theme-' + proxy.$settingStore.themeColor.name"
   >
     <template #default>
-      <view class="content-area">
-        <u-empty v-if="noticeList.length <= 0 && state.loading" text="暂无数据" mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png"> </u-empty>
-        <view :id="index == noticeList.length - 1 ? 'bottomInfo' : ''" v-for="(all, index) in noticeList" :key="index" v-show="noticeList.length > 0" @click="goContentDetails(all)">
-          <view class="content-area-center radius bg-white list-cell list-cell-arrow">
-            <view class="">
-              <!-- <image class="content-area-center-image-bg" :src="all.img" /> -->
-              <view class="content-area-center-title font16">{{ all.infoTitle }}</view>
-              <view class="content-area-center-time font14">{{ all.createTime.substring(5, 10) }} {{ all.createTime.substring(11, 16) }}</view>
-            </view>
-            <view class="content-area-center-cont font14">{{ all.infoContent }}</view>
-            <view class="content-area-center-status font12" :style="{ color: all.readFlag == 0 ? 'rgb(20, 158, 255)' : '#ccc' }">{{ all.readFlag == 0 ? "未读" : "已读" }}</view>
+      <u-loading-page :loading="state.loading" fontSize="16" style="z-index: 99"></u-loading-page>
+
+      <view class="content-area" v-for="(group, date) in proxy.$common.groupedItems(state.noticeList, 'createTime')" :key="date">
+        <view class="content-area-time font14">{{ proxy.$common.jktTimes(date, "否") }}</view>
+        <view
+          class="content-area-center flex bg-white list-cell list-cell-arrow"
+          :id="ind == noticeList.length - 1 ? 'bottomInfo' : ''"
+          v-for="(el, ind) in group"
+          :key="ind"
+          v-show="noticeList.length > 0"
+          @click="goContentDetails(el)"
+        >
+          <view style="width: 100%; max-width: 100%">
+            <view class="content-area-center-title font16">{{ el.infoTitle }}</view>
+            <view class="content-area-center-cont font14">{{ el.infoContent }}</view>
           </view>
+          <view class="content-area-center-badge"><u-badge :isDot="el.readFlag == 0 ? true : false" type="error"></u-badge></view>
+          <view class="content-area-center-time font14">{{ proxy.$common.jktTimes(el.createTime.replace("T", " ")) }}</view>
         </view>
       </view>
     </template>
@@ -41,17 +51,16 @@ import { getMceList, updateMceReceiveStatus } from "@/api/mine/info.js";
 const { proxy } = getCurrentInstance();
 /*----------------------------------变量声明-----------------------------------*/
 const state = reactive({
-  loading: false,
-  infoType: undefined, //消息类型
-
   scrollIntoView: "",
-  tabsCurrent: 0,
-
-  allInfoList: [],
+  loading: false,
   noticeList: [],
+  size: 10,
+  current: 1,
+  total: 0,
+  options: {},
 });
 
-const { scrollIntoView, tabsCurrent, noticeList } = toRefs(state);
+const { scrollIntoView, noticeList } = toRefs(state);
 
 /**
  * @跳转相应类型系统
@@ -76,40 +85,58 @@ function goContentDetails(e) {
  * @api接口调用
  */
 function infoListApi(options) {
-  proxy.$modal.loading("加载中");
-
   uni.setNavigationBarTitle({
     title: options?.typeName ? options?.typeName : "消息列表",
   });
 
+  state.loading = true;
   getMceList({
+    size: state.size,
+    current: state.current,
     infoType: options?.type,
-  }).then((requset) => {
-    let data = requset.data.records;
-    if (requset.status === "SUCCESS") {
-      state.noticeList = data;
-      state.loading = true;
-    }
-    setTimeout(() => {
-      scrollIntoView.value = "bottomInfo";
-    }, 0);
-
-    setTimeout(() => {
-      proxy.$modal.closeLoading();
-    }, 100);
-
-    if ("id" in options) {
-      state.noticeList.forEach((e) => {
-        if (e.id == options.id) {
-          goContentDetails(e);
-        }
-      });
-    }
-  });
+  })
+    .then((requset) => {
+      if (requset.status === "SUCCESS") {
+        state.noticeList = requset.data.records;
+        state.total = requset.data.total;
+        state.loading = false;
+      }
+      setTimeout(() => {
+        scrollIntoView.value = "bottomInfo";
+      }, 0);
+
+      if ("id" in options) {
+        state.noticeList.forEach((e) => {
+          if (e.id == options.id) {
+            goContentDetails(e);
+          }
+        });
+      }
+    })
+    .catch((err) => {
+      state.loading = false;
+    });
+}
+
+/**
+ * @scrollView加载数据
+ */
+function load() {
+  state.size += 10;
+  infoListApi(state.options);
+}
+
+/**
+ * @scrollView刷新数据
+ */
+function refresh() {
+  state.size = 10;
+  infoListApi(state.options);
 }
 
 onLoad((options) => {
-  infoListApi(options);
+  state.options = options;
+  infoListApi(state.options);
 });
 
 onReady(() => {});
@@ -132,61 +159,52 @@ onNavigationBarButtonTap((e) => {
   opacity: 1 !important;
 }
 
-.appMessage-container {
-  padding-bottom: 1px;
+.content-area {
+  padding: 0 10px;
+
+  &-time {
+    padding: 10px;
+    text-align: left;
+    color: #000000;
+    font-weight: 600;
+  }
 
-  .content-area {
-    > div {
-      vertical-align: middle;
+  &-center {
+    margin: 0;
+    padding: 15px;
+    overflow: hidden;
+    border-bottom: 1px solid #eaeef1;
+
+    &:nth-child(2) {
+      border-radius: 10px 10px 0 0;
     }
-    &-center {
-      margin: 14px 10px -2px;
-      width: calc(100% - 20px);
-      padding: 10px;
-      overflow: hidden;
-      position: relative;
-      &-image-bg {
-        width: 40px;
-        height: 40px;
-        display: inline-block;
-        vertical-align: middle;
-      }
-      &-title {
-        color: #000;
-        display: inline-block;
-        vertical-align: middle;
-        white-space: nowrap; /* 确保文本在一行内显示 */
-        overflow: hidden; /* 隐藏超出容器的内容 */
-        text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
-        width: 70%; /* 定义容器宽度 */
-      }
-      &-time {
-        color: #909399;
-        float: right;
-        margin-right: 14px;
-      }
-      &-cont {
-        color: #ccc;
-        margin-top: 16px;
-        white-space: nowrap; /* 确保文本在一行内显示 */
-        overflow: hidden; /* 隐藏超出容器的内容 */
-        text-overflow: ellipsis; /* 使用省略号表示被截断的文本 */
-        width: 100%; /* 定义容器宽度 */
-      }
-      &-status {
-        margin-top: 16px;
-        text-align: right;
-        width: 100%;
-      }
+
+    &:last-child {
+      border-radius: 0 0 10px 10px;
+      border-bottom: 0px solid #eaeef1;
+    }
+
+    &-avatar {
+      margin: auto 0;
+    }
+
+    &-title {
+      margin: 0 0 10px 0;
+      font-weight: 600;
+      color: #000000;
+    }
+
+    &-cont {
+      color: #666666;
+    }
+
+    &-badge {
+      margin: auto 10px auto 0;
+    }
+
+    &-time {
+      margin: auto 15px auto 0;
     }
   }
 }
-.list-cell::after {
-  position: absolute;
-}
-.list-cell-arrow::before {
-  position: absolute;
-  top: 18px;
-  right: 10px;
-}
 </style>

src/plugins/common.plugins.js

@@ -118,7 +118,7 @@ export default {
       } else {
         var newTime = time.split(" ")[1]
         var newTime2 = newTime.split(":")
-        return "今天 " + newTime2[0] + ":" + newTime2[1];
+        return newTime2[0] + ":" + newTime2[1];
       }
     } else if (newday == 1) {
       if (isTime == "否") {
@@ -126,11 +126,17 @@ export default {
       } else {
         var newTime = time.split(" ")[1]
         var newTime2 = newTime.split(":")
-        return "昨天 " + newTime2[0] + ":" + newTime2[1];
+        return newTime2[0] + ":" + newTime2[1];
       }
     } else {
-      var newTime = time.split(" ")[0]
-      return newTime
+      var newTime = time.split(" ")
+
+      if (isTime == "否") {
+        return newTime[0]
+      } else {
+        var newTime2 = newTime[1].split(":")
+        return newTime2[0] + ":" + newTime2[1];
+      }
     }
   },
   /**