UI调整

mes-ui/mini-app/index.html

@@ -25,7 +25,7 @@
     <!--app-html-->
   </div>
   <script type="module" src="/src/main.ts"></script>
-  //
+  <!-- // -->
   <script>
     //   var _hmt = _hmt || []
     //   ;(function () {

mes-ui/mini-app/src/pages.json

@@ -133,6 +133,13 @@
       "style": {
         "navigationBarTitleText": "修改密码"
       }
+    },
+    {
+    	"path" : "pages/messageNotification/messageNotification",
+    	"style" : 
+    	{
+    		"navigationBarTitleText" : "消息通知"
+    	}
     } 
     ],
   "globalStyle": {

mes-ui/mini-app/src/pages/index/components/CategoryPanel.vue

@@ -15,6 +15,7 @@ defineProps<{
 }>()
 
 const handleToBooking = (item: Object) => {
+  console.log('点击了分类', JSON.stringify(item))
   if (item.auth) {
     const path = item.path
     const url = `/pages/${path}/${path}`
@@ -30,8 +31,16 @@ const handleToBooking = (item: Object) => {
     <template v-if="list.length">
       <view class="category-item" hover-class="none" v-for="item in list" :key="item.path"
         @click="handleToBooking(item)">
+       
+ <view v-if="item.unReadCount>=0" class="center-msg">
+  <span class="msg-text">消息通知</span>
+  <text class="unread-badge" v-if="item.unReadCount>0">{{ item.unReadCount }}</text>
+</view> 
+<view v-else >
    <image v-if="item.auth" class="icon" :src="item.imgUrl" mode="scaleToFill"></image>
    <image v-else class="icon" :src="item.defaultImgUrl" mode="scaleToFill"></image>
+</view>
+           
       </view>
     </template>
     <view v-else class="empty-data">
@@ -42,4 +51,31 @@ const handleToBooking = (item: Object) => {
 
 <style lang="scss">
 @import '../styles/category.scss';
+.center-msg {
+  position: relative;
+  width: 100%;
+  height: 240rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.msg-text {
+  font-size: 32rpx;
+  color: #333;
+  width: 100%;
+  text-align: center;
+}
+.unread-badge {
+  position: absolute;
+  top: 20rpx;
+  right: 28rpx;
+  background: #ff4d4f;
+  color: #fff;
+  border-radius: 20rpx;
+  padding: 0 12rpx;
+  font-size: 24rpx;
+  min-width: 32rpx;
+  text-align: center;
+  z-index: 1;
+}
 </style>

mes-ui/mini-app/src/pages/index/index.vue

@@ -1,103 +1,121 @@
 <script setup lang="ts">
-import { onLoad, onShow } from '@dcloudio/uni-app'
+import { onLoad, onShow } from "@dcloudio/uni-app";
-import { useLoginStore } from '@/stores/modules/login'
+import { useLoginStore } from "@/stores/modules/login";
-import { computed, ref, reactive } from 'vue'
+import { computed, ref, reactive } from "vue";
-import CustomNavbar from './components/CustomNavbar.vue'
+import CustomNavbar from "./components/CustomNavbar.vue";
-import CategoryPanel from './components/CategoryPanel.vue'
+import CategoryPanel from "./components/CategoryPanel.vue";
-import footRight from './components/footRight.vue'
+import footRight from "./components/footRight.vue";
-import PageSkeleton from './components/PageSkeleton.vue'
+import PageSkeleton from "./components/PageSkeleton.vue";
-import { getHomeCategoryAPI } from '@/services/home'
+import { getHomeCategoryAPI, getUnreadMessage } from "@/services/home";
 // 获取前台分类数据
 const categoryList = ref([
   {
-    path: 'approveOrder',
+    path: "approveOrder",
-    name: '订单批准',
+    name: "订单批准",
     auth: false,
-    imgUrl: '/static/images/approveOrder.png',
+    imgUrl: "/static/images/approveOrder.png",
-    defaultImgUrl: '/static/images/approveOrder-default.png',
+    defaultImgUrl: "/static/images/approveOrder-default.png",
   },
   {
-    path: 'unqualifiedNotification',
+    path: "unqualifiedNotification",
-    name: '品质异常通知',
+    name: "品质异常通知",
     auth: false,
-    imgUrl: '/static/images/unqualifiedNotification.png',
+    imgUrl: "/static/images/unqualifiedNotification.png",
-    defaultImgUrl: '/static/images/unqualifiedNotification-default.png',
+    defaultImgUrl: "/static/images/unqualifiedNotification-default.png",
   },
   {
-    path: 'productionReport',
+    path: "productionReport",
-    name: '生产报工',
+    name: "生产报工",
     auth: false,
-    imgUrl: '/static/images/productionReport.png',
+    imgUrl: "/static/images/productionReport.png",
-    defaultImgUrl: '/static/images/productionReport-default.png',
+    defaultImgUrl: "/static/images/productionReport-default.png",
   },
   {
-    path: 'assembleReport',
+    path: "assembleReport",
-    name: '装配报工',
+    name: "装配报工",
     auth: false,
-    imgUrl: '/static/images/assembleReport.png',
+    imgUrl: "/static/images/assembleReport.png",
-    defaultImgUrl: '/static/images/assembleReport-default.png',
+    defaultImgUrl: "/static/images/assembleReport-default.png",
   },
   {
     path: "pgMaster",
     name: "过程检报工",
     auth: true,
     imgUrl: "/static/images/guochengjian.png",
-	  defaultImgUrl: "/static/images/assembleReport-default.png"
+    defaultImgUrl: "/static/images/assembleReport-default.png",
   },
   {
     path: "zjPgMaster",
     name: "终检报工",
     auth: true,
     imgUrl: "/static/images/zhongjian.png",
-	  defaultImgUrl: "/static/images/assembleReport-default.png"
+    defaultImgUrl: "/static/images/assembleReport-default.png",
   },
   {
     path: "moJuSheJiReport",
     name: "进度上报",
     auth: true,
     imgUrl: "/static/images/mojusheji.png",
-	  defaultImgUrl: "/static/images/assembleReport-default.png"
+    defaultImgUrl: "/static/images/assembleReport-default.png",
   },
-]) 
+  {
-const loginStore = useLoginStore()
+    path: "messageNotification",
+    name: "消息通知",
+    auth: true,
+    imgUrl: "",
+    defaultImgUrl: "",
+    unReadCount: 0, // 未读消息数
+  },
+]);
+const loginStore = useLoginStore();
 const isLogin = computed(() => {
-  const accessToken = loginStore.userInfo?.accessToken
+  const accessToken = loginStore.userInfo?.accessToken;
-  const storage_token = uni.getStorageSync('storage_userInfo')?.accessToken
+  const storage_token = uni.getStorageSync("storage_userInfo")?.accessToken;
-  return !!accessToken || !!storage_token
+  return !!accessToken || !!storage_token;
-})
+});
 // 是否加载中标记
-const isLoading = ref(false)
+const isLoading = ref(false);
 // 页面加载
 onShow(async () => {
   if (isLogin.value) {
-    await getHomeCategory()
+    await getHomeCategory();
   } else {
     categoryList.value.forEach((e) => {
-      e.auth = true
+      e.auth = true;
-    })
+    });
   }
-})
+});
 const getHomeCategory = async () => {
-  isLoading.value = true
+  isLoading.value = true;
-  const params = {}
+
-  const data = await getHomeCategoryAPI(params)
+  const params = {};
-  const menus = data?.menus.find((e) => e.path == '/applet')?.children || []
+  const data = await getHomeCategoryAPI(params);
+  const menus = data?.menus.find((e) => e.path == "/applet")?.children || [];
   if (menus.length) {
-    const arr = []
+    const arr = [];
     categoryList.value.forEach((e) => {
-      const target = menus.find((q) => q.path == e.path)
+      const target = menus.find((q) => q.path == e.path);
-      e.auth = !!target
+      e.auth = !!target;
-    })
+    });
+  }
+  const unReadCount = await getUnreadMessage();
+  // 把未读数放到消息通知项
+  const msgItem = categoryList.value.find(
+    (e) => e.path === "messageNotification"
+  );
+  if (msgItem) {
+    msgItem.unReadCount = unReadCount;
+    msgItem.auth=true
   }
   if (loginStore.userInfo.userId) {
     const obj = {
       ...loginStore.userInfo,
-      nickname: data.user.nickname
+      nickname: data.user.nickname,
-    }
+    };
-    loginStore.setInfo(obj)
+    loginStore.setInfo(obj);
-  }
-  isLoading.value = false
   }
+  isLoading.value = false;
+};
 </script>
 <template>
   <view class="viewport">
@@ -118,7 +136,7 @@ const getHomeCategory = async () => {
 page {
   height: 100%;
   overflow: hidden;
-  background-color: #F8FAFD;
+  background-color: #f8fafd;
 }
 
 .viewport {

mes-ui/mini-app/src/pages/messageNotification/components/dataItem.vue

@@ -0,0 +1,401 @@
+<script setup lang="ts">
+import { onMounted, computed, ref } from "vue";
+import { onLoad, onShow } from "@dcloudio/uni-app";
+import { getApproveOrderAPI, getMessage, read } from "@/services/approveOrder";
+import { useLoginStore } from "@/stores/modules/login";
+import { formatDate } from "@/utils/index";
+const userStore = useLoginStore();
+const dictInfo = userStore.dictInfo;
+const propertyDictData =
+  dictInfo.filter((e) => e.dictType == "heli_project_property") || [];
+// 是否分页结束
+const isFinish = ref(false);
+// 是否触发下拉刷新
+const isTriggered = ref(false);
+// 定义 porps
+const props = defineProps<{
+  orderState: number;
+}>();
+
+// 是否加载中标记，用于防止滚动触底触发多次请求
+const isLoading = ref(false);
+// 请求参数
+const queryParams: Required<any> = {
+  pageNo: 1,
+  pageSize: 20,
+  status: props.orderState,
+  isSnapshot: 0,
+};
+
+const dataList = ref([]);
+const getListData = async () => {
+  if (isLoading.value) return;
+  if (isFinish.value === true) {
+    return uni.showToast({ icon: "none", title: "没有更多数据~" });
+  }
+  isLoading.value = true;
+  const data = await getMessage(queryParams);
+  isLoading.value = false;
+  data.list.forEach((e) => {
+    const obj = propertyDictData.find((q) => q.value == e.property) || {};
+    e.property = obj?.label;
+    e.createTime = formatDate(e.createTime, "YYYY-MM-DD HH:mm:ss");
+    // e.projectStartTime = formatDate(e.projectStartTime, 'YYYY-MM-DD')
+    // e.projectEndTime = formatDate(e.projectEndTime, 'YYYY-MM-DD')
+  });
+  dataList.value.push(...data.list);
+  // 判断是否还有更多数据
+  if (data.list.length < queryParams.pageSize) {
+    isFinish.value = true;
+  } else {
+    queryParams.pageNo++;
+  }
+};
+function handlerRead(id: any) {
+  isLoading.value = true;
+  read(id)
+    .then(() => {
+      isLoading.value = false;
+      onRefresherrefresh();
+    })
+    .catch((err) => {
+      isLoading.value = false;
+    });
+}
+onMounted(async () => {
+  console.log("props", props);
+  await getListData();
+});
+onShow(async () => {
+  isLoading.value = false;
+  queryParams.pageNo = 1;
+  dataList.value = [];
+  isFinish.value = false;
+  await getListData();
+});
+
+const handleDetail = (id) => {
+  const url = `/pages/approveOrder/approveOrder-detail?id=${id}`;
+  uni.navigateTo({ url });
+};
+
+// 自定义下拉刷新被触发
+const onRefresherrefresh = async () => {
+  // 开始动画
+  isTriggered.value = true;
+  // 重置数据
+  queryParams.pageNo = 1;
+  dataList.value = [];
+  isFinish.value = false;
+  // 加载数据
+  await getListData();
+  // 关闭动画
+  isTriggered.value = false;
+};
+// const searchVal = ref('')
+// const handleSearch = async () => {
+//   let dataListDefault = []
+//   const code = searchVal.value
+//   if (code) {
+//     dataListDefault = dataList.value
+//     dataList.value = dataList.value.filter((e) => {
+//       return e.code == code
+//     })
+//   } else {
+//     dataList.value = dataListDefault
+//   }
+// }
+</script>
+<template>
+  <view class="cont">
+    <!-- <view class="search" v-if="dataList.length > 5">
+      <view class="title"></view>
+      <input class="uni-input" v-model="searchVal" @change="handleSearch" placeholder="根据编号搜索" />
+    </view> -->
+    <scroll-view
+      enable-back-to-top
+      scroll-y
+      class="data-list"
+      refresher-enabled
+      :refresher-triggered="isTriggered"
+      @refresherrefresh="onRefresherrefresh"
+      @scrolltolower="getListData"
+    >
+      <view class="item" v-for="item in dataList" :key="item.id">
+        <!-- 方案1: 使用 flex 布局，推荐 -->
+        <view
+          class="hd"
+          style="
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+          "
+        >
+          <view style="display: flex; flex-direction: column">
+            <view class="statusLabel">{{ item.thingname }}</view>
+            <view
+              class="product-item"
+              style="margin: 0; color: #333; font-size: 22rpx"
+              >{{ item.createTime }}</view
+            >
+          </view>
+          <view
+            class="read-btn"
+            v-if="orderState == 0"
+            @click="handlerRead(item.id)"
+            >已读</view
+          >
+        </view>
+        <view class="md">
+          <view class="product-item"
+            >客户简称：<span class="item-value">{{ item.attr6 }}</span></view
+          >
+          <view class="product-item"
+            >项目名称：<span class="item-value">{{ item.attr7 }}</span></view
+          >
+          <view class="product-item"
+            >子项目名称：<span class="item-value">{{ item.attr8 }}</span></view
+          >
+          <view class="product-item"
+            >备注内容：<span class="item-value">{{ item.attr9 }}</span></view
+          >
+        </view>
+      </view>
+      <!-- 底部提示文字 -->
+      <view
+        class="loading-text"
+        :style="{ paddingBottom: safeAreaInsets?.bottom + 'px' }"
+      >
+        {{ isFinish ? "没有更多数据~" : "正在加载..." }}
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<style lang="scss">
+// 订单列表
+.search {
+  padding: 4rpx;
+  width: 80%;
+  margin: 30rpx auto;
+
+  .uni-input {
+    border: 1px solid #d1d6db;
+    height: 60rpx;
+    line-height: 60rpx;
+    padding: 4rpx 10rpx;
+    font-size: 32rpx;
+    border-radius: 6rpx;
+  }
+}
+
+.data-list {
+  height: 90vh;
+  .item {
+    position: relative;
+    padding: 20rpx 0;
+    margin: 20rpx 20rpx;
+    border-radius: 10rpx;
+    background-color: #fff;
+
+    .hd {
+      padding: 10rpx;
+      font-size: 28rpx;
+      display: flex;
+      align-items: center;
+
+      .statusLabel {
+        font-size: 28rpx;
+        font-weight: 500;
+        color: #333333;
+        margin-right: 20rpx;
+      }
+      .read-btn {
+        font-size: 24rpx;
+        padding: 6rpx 24rpx;
+        border: 1rpx solid #3775f6;
+        border-radius: 30rpx;
+        color: #3775f6;
+        background: #f7f8fa;
+        margin-left: auto;
+      }
+    }
+
+    .md {
+      position: relative;
+      padding: 10rpx;
+      min-height: 100rpx;
+      font-size: 28rpx;
+      border-top: 2rpx solid #f2f2f2;
+
+      .product-item {
+        margin: 20rpx 0;
+        display: flex;
+        font-size: 22rpx;
+        align-items: center;
+        color: #737d88;
+        .item-value {
+          color: #333;
+        }
+      }
+    }
+
+    &:last-child {
+      padding-bottom: 40rpx;
+    }
+  }
+
+  .status {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 28rpx;
+    color: #999;
+    margin-bottom: 15rpx;
+
+    .date {
+      color: #666;
+      flex: 1;
+    }
+
+    .primary {
+      color: #ff9240;
+    }
+
+    .icon-delete {
+      line-height: 1;
+      margin-left: 10rpx;
+      padding-left: 10rpx;
+      border-left: 1rpx solid #e3e3e3;
+    }
+  }
+
+  .goods {
+    display: flex;
+    margin-bottom: 20rpx;
+
+    .cover {
+      width: 170rpx;
+      height: 170rpx;
+      margin-right: 20rpx;
+      border-radius: 10rpx;
+      overflow: hidden;
+      position: relative;
+
+      .image {
+        width: 170rpx;
+        height: 170rpx;
+      }
+    }
+
+    .quantity {
+      position: absolute;
+      bottom: 0;
+      right: 0;
+      line-height: 1;
+      padding: 6rpx 4rpx 6rpx 8rpx;
+      font-size: 24rpx;
+      color: #fff;
+      border-radius: 10rpx 0 0 0;
+      background-color: rgba(0, 0, 0, 0.6);
+    }
+
+    .meta {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+    }
+
+    .name {
+      height: 80rpx;
+      font-size: 26rpx;
+      color: #444;
+    }
+
+    .type {
+      line-height: 1.8;
+      padding: 0 15rpx;
+      margin-top: 10rpx;
+      font-size: 24rpx;
+      align-self: flex-start;
+      border-radius: 4rpx;
+      color: #888;
+      background-color: #f7f7f8;
+    }
+
+    .more {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 22rpx;
+      color: #333;
+    }
+  }
+
+  .payment {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    line-height: 1;
+    padding: 20rpx 0;
+    text-align: right;
+    color: #999;
+    font-size: 28rpx;
+    border-bottom: 1rpx solid #eee;
+
+    .quantity {
+      font-size: 24rpx;
+      margin-right: 16rpx;
+    }
+
+    .amount {
+      color: #444;
+      margin-left: 6rpx;
+    }
+
+    .symbol {
+      font-size: 20rpx;
+    }
+  }
+
+  .action {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    padding-top: 20rpx;
+
+    .button {
+      width: 180rpx;
+      height: 60rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-left: 20rpx;
+      border-radius: 60rpx;
+      border: 1rpx solid #ccc;
+      font-size: 26rpx;
+      color: #444;
+    }
+
+    .secondary {
+      color: #3775f6;
+      border-color: #3775f6;
+    }
+
+    .primary {
+      color: #fff;
+      background-color: #3775f6;
+      border-color: #3775f6;
+    }
+  }
+
+  .loading-text {
+    text-align: center;
+    font-size: 28rpx;
+    color: #666;
+    padding: 20rpx 0;
+  }
+}
+</style>import type { stringify } from 'querystring';

mes-ui/mini-app/src/pages/messageNotification/components/showFileWx.vue

@@ -0,0 +1,38 @@
+<template>
+  <view>
+    <web-view :src="showUrl" />
+  </view>
+</template>
+ 
+<script>
+import { ref, onMounted, onUnmounted } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+ 
+export default {
+  setup() {
+    const showUrl = ref('');
+ 
+    // 使用 onLoad 生命周期钩子
+    onLoad((options) => {
+      console.log('页面加载中...');
+      console.log(options.fileUrl);
+      if (options.fileUrl) {
+        showUrl.value = `https://star.hz-hl.com/FileServer/onlinePreview?url=${options.fileUrl}`;
+        console.log(showUrl.value);
+      }
+    });
+ 
+    // 使用 onMounted 生命周期钩子（虽然在这个例子中可能不是必需的，因为 onLoad 已经足够）
+    onMounted(() => {
+      console.log('Vue 组件挂载完成');
+    });
+    return {
+      showUrl,
+    };
+  },
+};
+</script>
+ 
+<style scoped>
+/* 你的样式 */
+</style>

mes-ui/mini-app/src/pages/messageNotification/messageNotification.vue

@@ -0,0 +1,150 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import dataItem from './components/dataItem.vue'
+ 
+// tabs 数据
+const orderTabs = ref([
+  { status: 0, title: '未读', isRender: false },
+  { status: 1, title: '已读', isRender: false },
+])
+ 
+// 高亮下标
+const activeIndex = ref(0)
+const handleIndexChange = (index: any) => {
+  orderTabs.value.forEach((e) => {
+    e.isRender = false
+  })
+  activeIndex.value = index
+  orderTabs.value[index].isRender = true
+}
+onLoad(async (options) => {
+ 
+    orderTabs.value.forEach((e, index) => {
+      e.isRender = e.status ==0
+      if (e.isRender) {
+        activeIndex.value = index
+      }
+    })
+  
+})
+</script>
+
+<template>
+  <view class="viewport">
+    <view class="tabs">
+      <text
+        class="item"
+        :class="{ active: activeIndex == index }"
+        v-for="(item, index) in orderTabs"
+        :key="item.title"
+        @tap="handleIndexChange(index)"
+      >
+        {{ item.title }}
+      </text>
+      <!-- 游标 -->
+      <view class="cursor" :style="{ left: activeIndex ? '65%' : '14%' }"></view>
+    </view>
+    <!-- 滑动容器 -->
+    <swiper
+      class="swiper"
+      :current="activeIndex"
+      @change="handleIndexChange($event.detail.current)"
+    >
+      <!-- 滑动项 -->
+      <swiper-item v-for="item in orderTabs" :key="item.title">
+        <dataItem v-if="item.isRender" :order-state="item.status" />
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<style lang="scss">
+page {
+  height: 100%;
+}
+
+.viewport {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  // background-color: #3775F6;
+  .navbar {
+    width: 750rpx;
+    color: #000;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 9;
+    /* background-color: #f8f8f8; */
+    background-color: #3775f6;
+
+    .wrap {
+      position: relative;
+      background-color: #3775f6;
+
+      .title {
+        height: 44px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-size: 32rpx;
+        /* color: #000; */
+        color: #fff;
+      }
+
+      .back {
+        position: absolute;
+        left: 0;
+        height: 44px;
+        width: 44px;
+        font-size: 44rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        /* color: #000; */
+        color: #fff;
+      }
+    }
+  }
+
+  .tabs {
+    display: flex;
+    justify-content: space-around;
+    line-height: 60rpx;
+    position: relative;
+    z-index: 9;
+    width: 100%;
+
+    .item {
+      flex: 1;
+      text-align: center;
+      padding: 20rpx;
+      font-size: 28rpx;
+      color: #1D2129;
+
+      &.active {
+        color: #356899;
+      }
+    }
+
+    .cursor {
+      position: absolute;
+      left: 13%;
+      bottom: 0;
+      width: 20%;
+      height: 6rpx;
+      padding: 0 50rpx;
+      background-color: #356899;
+      /* 过渡效果 */
+      transition: all 0.4s;
+    }
+  }
+
+  // swiper
+  .swiper {
+    background-color: #f7f7f8;
+  }
+}
+</style>

mes-ui/mini-app/src/pages/productionReport/components/dataItem.vue

@@ -1,164 +1,246 @@
 <script setup lang="ts">
-	import { onMounted, computed, ref } from 'vue'
+import { onMounted, computed, ref } from "vue";
-	import { onLoad, onShow } from '@dcloudio/uni-app'
+import { onLoad, onShow } from "@dcloudio/uni-app";
-	import { getListAPI, getDictAPI, getListWxAPI, getTaskDetailAPI } from '@/services/productionReport'
+import {
-	import { useLoginStore } from '@/stores/modules/login'
+  getListAPI,
-	import { formatDate } from '@/utils/index'
+  getDictAPI,
+  getListWxAPI,
+  getTaskDetailAPI,
+} from "@/services/productionReport";
+import { useLoginStore } from "@/stores/modules/login";
+import { formatDate } from "@/utils/index";
 
-	const userStore = useLoginStore()
+const userStore = useLoginStore();
-	const userId = userStore.userInfo.userId
+const userId = userStore.userInfo.userId;
 
 // 是否分页结束
-	const isFinish = ref(false)
+const isFinish = ref(false);
 // 是否触发下拉刷新
-	const isTriggered = ref(false)
+const isTriggered = ref(false);
 // 定义 porps
 const props = defineProps<{
-		orderState : string
+  orderState: string;
-	}>()
+}>();
-	const noticeMsg = ref('')
+const noticeMsg = ref("");
 const isOverBeforeProcedure = async (id: number) => {
   //console.log(props.orderState)
   const params = {
     id,
-		}
+  };
-		const data = await getTaskDetailAPI(params)
+  const data = await getTaskDetailAPI(params);
-		console.log(data.testYn)
+  console.log(data.testYn);
   if (data.beforeProcedureStatus == 0) {
     //如果上一道工序没结束
-			noticeMsg.value =  '上一道工序尚未完成报工！';
+    noticeMsg.value = "上一道工序尚未完成报工！";
     return true;
   } else {
     return false;
   }
-	}
+};
 const statusText = computed(() => {
-		const text = props.orderState == '0,1' ? '处理' : '查看'
+  const text = props.orderState == "0,1" ? "处理" : "查看";
-		return text
+  return text;
-	})
+});
 // 是否加载中标记，用于防止滚动触底触发多次请求
-	const isLoading = ref(false)
+const isLoading = ref(false);
 // 请求参数
 const queryParams: Required<any> = {
   pageNo: 1,
   pageSize: 5,
   owner: userId, //
   procedureStatusList: props.orderState, // 工序完成状态列表
-		dispatchType: 'PRODUCTION', // 派工类型
+  dispatchType: "PRODUCTION", // 派工类型
   isReport: 1, // 是否需要报工
   //20250601新增，项目名称/子项目名称
-		subOrDetailName:'',
+  subOrDetailName: "",
-	}
+};
-	const dataList = ref([])
+const dataList = ref([]);
 const getListData = async () => {
-		if(props.orderState == '2'){
+  if (props.orderState == "2") {
-			queryParams.subOrDetailName = '';
+    queryParams.subOrDetailName = "";
   }
   // 如果数据出于加载中，退出函数
-		if (isLoading.value) return
+  if (isLoading.value) return;
   if (isFinish.value === true) {
-			return uni.showToast({ icon: 'none', title: '没有更多数据~' })
+    return uni.showToast({ icon: "none", title: "没有更多数据~" });
   }
-		isLoading.value = true
+  isLoading.value = true;
   // 发送请求
   // const data = await getListAPI(queryParams)
-		const data = await getListWxAPI(queryParams)
+  const data = await getListWxAPI(queryParams);
-		isLoading.value = false
+  isLoading.value = false;
   data.list.forEach((e) => {
-			e.orderTime = formatDate(e.orderTime, 'YYYY-MM-DD')
+    e.orderTime = formatDate(e.orderTime, "YYYY-MM-DD");
-			e.startTime = formatDate(e.startTime, 'YYYY-MM-DD')
+    e.startTime = formatDate(e.startTime, "YYYY-MM-DD");
-			e.endTime = formatDate(e.endTime, 'YYYY-MM-DD')
+    e.endTime = formatDate(e.endTime, "YYYY-MM-DD");
-		})
+  });
   // 数组追加
-		dataList.value.push(...data.list)
+  dataList.value.push(...data.list);
   // 分页条件
   if (queryParams.pageNo < data.total) {
     // 页码累加
-			queryParams.pageNo++
+    queryParams.pageNo++;
   } else {
     // 分页已结束
-			isFinish.value = true
+    isFinish.value = true;
   }
-	}
+};
-	const todayStr = ref('');
+const todayStr = ref("");
 onMounted(async () => {
   const today = new Date();
   const year = today.getFullYear();
-		const month = String(today.getMonth() + 1).padStart(2, '0');
+  const month = String(today.getMonth() + 1).padStart(2, "0");
-		const day = String(today.getDate()).padStart(2, '0');
+  const day = String(today.getDate()).padStart(2, "0");
 
   todayStr.value = `${year}-${month}-${day}`;
-		await getListData()
+  await getListData();
-	})
+});
 
 onShow(async () => {
-		isFinish.value = false
+  isFinish.value = false;
-		isLoading.value = false
+  isLoading.value = false;
-		queryParams.pageNo = 1
+  queryParams.pageNo = 1;
-		dataList.value = []
+  dataList.value = [];
-		await getListData()
+  await getListData();
-	})
+});
 
 const handleDetail = async (item) => {
   var isoverBefore = await isOverBeforeProcedure(item.id);
   if (isoverBefore == true) {
     uni.showToast({
       title: noticeMsg.value,
-				icon: 'none',
+      icon: "none",
       duration: 2000,
-			})
+    });
-			return
+    return;
-		}
-		const url = `/pages/productionReport/productionReport-detail?id=${item.id}`
-		uni.navigateTo({ url })
   }
+  const url = `/pages/productionReport/productionReport-detail?id=${item.id}`;
+  uni.navigateTo({ url });
+};
 
 // 自定义下拉刷新被触发
 const onRefresherrefresh = async () => {
   // 开始动画
-		isTriggered.value = true
+  isTriggered.value = true;
   // 重置数据
-		queryParams.pageNo = 1
+  queryParams.pageNo = 1;
-		dataList.value = []
+  dataList.value = [];
-		isFinish.value = false
+  isFinish.value = false;
   // 加载数据
-		await getListData()
+  await getListData();
   // 关闭动画
-		isTriggered.value = false
+  isTriggered.value = false;
-	}
+};
-	 const searchVal = ref('')
+const searchVal = ref("");
 // const dataListDefault = ref([])
 const handleSearch = async (e) => {
-
   queryParams.subOrDetailName = e.inputValue;
   queryParams.pageNo = 1;
   isFinish.value = false;
-	  dataList.value = []
+  dataList.value = [];
-	  await getListData()
+  await getListData();
+};
 
+
+
+
+const handleScan = () => {
+  uni.scanCode({
+    success: (res) => {
+      searchVal.value = res.result
+      handleSearch({ inputValue: res.result })
+    },
+    fail: () => {
+      uni.showToast({ title: '扫码失败', icon: 'none' })
+    }
+  })
 }
 </script>
 <template>
   <view class="cont">
-		<view class="search"  v-if="props.orderState == '0,1' ">
+    <!-- <view class="search"  v-if="props.orderState == '0,1' ">
 	<spring-search-box  :showScan="true"  :showReset="true"   bgColor="#E2F3FF"   @input="(e) => handleSearch(e)" placeholderColor="#28A0F8" searchColor="#28A0F8" v-model="searchVal" :mode="3" @change="(e) => handleSearch(e)"  placeholder="请输入项目或子项目名称" clearable></spring-search-box>
 		
-			<!-- <spring-search-box :showScan="true" :showReset="true"   bgColor="#E2F3FF"   @input="(e) => handleSearch(e)" placeholderColor="#28A0F8" searchColor="#28A0F8" v-model="searchVal" :mode="3" @change="(e) => handleSearch(e)"  placeholder="请输入项目或子项目名称"></spring-search-box -->
+		</view> -->
-<!-- 		  <input class="uni-input" v-model="searchVal"  placeholder="请输入项目或子项目名称" />
+    <view class="search" v-if="props.orderState == '0,1'">
-		  <button><uni-icons type="search" size="30" class="icons" @click="handleSearch"></uni-icons></button> -->
+      <view
+        style="
+          width: 100%;
+          display: flex;
+          align-items: center;
+          background: #e2f3ff;
+          border-radius: 20rpx;
+          padding: 0 8rpx;
+          height: 50px;
+        "
+      >
+        <input
+          class="uni-input"
+          v-model="searchVal"
+          placeholder="请输入项目或子项目名称"
+          :placeholder-style="'color:#28A0F8;'"
+          style="
+            flex: 1;
+            background: transparent;
+            border: none;
+            outline: none;
+            font-size: 25rpx;
+            color: #28a0f8;
+            height: 50px;
+            line-height: 50px;
+          "
+          @input="handleSearch({ inputValue: searchVal })"
+          clearable
+        />
+        <view
+          style="
+            background: none;
+            border: none;
+            padding: 0 10rpx;
+            height: 50px;
+            display: flex;
+            align-items: center;
+          "
+          @click="handleScan"
+        >
+          <uni-icons type="scan" size="28" color="#28A0F8"></uni-icons>
         </view>
-		<scroll-view enable-back-to-top scroll-y class="data-list" refresher-enabled :refresher-triggered="isTriggered"
+      </view>
-			@refresherrefresh="onRefresherrefresh" @scrolltolower="getListData">
+    </view>
-			<view class="item" v-for="item in dataList" :key="item.id" @click="handleDetail(item)">
+    <scroll-view
+      enable-back-to-top
+      scroll-y
+      class="data-list"
+      refresher-enabled
+      :refresher-triggered="isTriggered"
+      @refresherrefresh="onRefresherrefresh"
+      @scrolltolower="getListData"
+    >
+      <view
+        class="item"
+        v-for="item in dataList"
+        :key="item.id"
+        @click="handleDetail(item)"
+      >
         <view class="hd">
           <view class="num">派工单：</view>
-					<view class="statusLabel">{{ '(单号：'+ item.dispatchCode+')　'}}</view>
+          <view class="statusLabel">{{
-					<view class="num">{{ '下工序：'+ (item.nextProcedureName == null ? '无':item.nextProcedureName)}}</view>
+            "(单号：" + item.dispatchCode + ")　"
+          }}</view>
+          <view class="num">{{
+            "下工序：" +
+            (item.nextProcedureName == null ? "无" : item.nextProcedureName)
+          }}</view>
           <!-- 		    <view  class="statusLabel " ></view> -->
         </view>
         <view class="md">
-					<view class="product-item">项目名称：{{ item.projectCode + ' ' + item.projectName }}</view>
+          <view class="product-item"
-					<view class="product-item">子项目：{{ item.projectSubCode || '' }} {{' ' + item.projectSubName }}</view>
+            >项目名称：{{ item.projectCode + " " + item.projectName }}</view
+          >
+          <view class="product-item"
+            >子项目：{{ item.projectSubCode || "" }}
+            {{ " " + item.projectSubName }}</view
+          >
           <view class="product-row">
             <view class="row-item">
               <view class="label">零件名称: {{ item.materialName }}</view>
@@ -187,13 +269,24 @@
               <view class="val high-color">{{ item.totalWorkTime }}</view>
             </view>
           </view>
-					<view class="product-item" :style=" (item.endTime < todayStr)&&props.orderState != '2' ? 'color:red':null">预计生产日期：{{ item.startTime }} ～ {{ item.endTime }}</view>
+          <view
+            class="product-item"
+            :style="
+              item.endTime < todayStr && props.orderState != '2'
+                ? 'color:red'
+                : null
+            "
+            >预计生产日期：{{ item.startTime }} ～ {{ item.endTime }}</view
+          >
         </view>
         <view class="statusText">{{ statusText }}</view>
       </view>
       <!-- 底部提示文字 -->
-			<view class="loading-text" :style="{ paddingBottom: safeAreaInsets?.bottom + 'px' }">
+      <view
-				{{ isFinish ? '没有更多数据~' : '正在加载...' }}
+        class="loading-text"
+        :style="{ paddingBottom: safeAreaInsets?.bottom + 'px' }"
+      >
+        {{ isFinish ? "没有更多数据~" : "正在加载..." }}
       </view>
     </scroll-view>
   </view>
@@ -224,7 +317,6 @@
 }
 
 .data-list {
-
   height: 90vh;
 
   .item {
@@ -241,7 +333,7 @@
 
       .statusLabel {
         font-size: 24rpx;
-					color: #737D88;
+        color: #737d88;
       }
     }
 
@@ -250,13 +342,13 @@
       padding: 10rpx;
       min-height: 100rpx;
       font-size: 28rpx;
-				border-top: 2rpx solid #F2F2F2;
+      border-top: 2rpx solid #f2f2f2;
 
       .product-item {
         margin: 20rpx 0;
         display: flex;
         align-items: center;
-					color: #737D88
+        color: #737d88;
       }
 
       .product-row {
@@ -264,7 +356,7 @@
         display: flex;
         flex-direction: row;
         justify-content: space-between;
-					color: #737D88;
+        color: #737d88;
 
         .row-item {
           flex: 1;
@@ -274,14 +366,13 @@
           }
 
           .val {
-							color: #1D2129;
+            color: #1d2129;
 
             &.high-color {
-								color: #00B42A
+              color: #00b42a;
             }
           }
         }
-
       }
     }
 
@@ -294,7 +385,7 @@
       padding: 10rpx 30rpx;
       border-radius: 10rpx;
       font-size: 24rpx;
-				background: linear-gradient(149deg, #2DACE6 4%, #356899 98%);
+      background: linear-gradient(149deg, #2dace6 4%, #356899 98%);
       color: #fff;
     }
 
@@ -438,14 +529,14 @@
     }
 
     .secondary {
-				color: #3775F6;
+      color: #3775f6;
-				border-color: #3775F6;
+      border-color: #3775f6;
     }
 
     .primary {
       color: #fff;
-				background-color: #3775F6;
+      background-color: #3775f6;
-				border-color: #3775F6;
+      border-color: #3775f6;
     }
   }
 
@@ -456,4 +547,5 @@
     padding: 20rpx 0;
   }
 }
+
 </style>import type { stringify } from 'querystring';

mes-ui/mini-app/src/services/approveOrder.ts

@@ -8,6 +8,24 @@
  */
 import { http } from '@/utils/http'
 
+
+
+
+export const getMessage = (data: Object) => {
+  return http<any[]>({
+    method: 'POST',
+    url: '/heli/bdgzsomthing/getMessage',
+    data,
+  })
+}
+
+export const read = (id:any) => {
+  return http<any[]>({
+    method: 'GET',
+    url: '/heli/bdgzsomthing/read?id=' + id,
+    data: {},
+  })
+}
 export const getApproveOrderAPI = (data: Object) => {
   return http<any[]>({
     method: 'GET',

mes-ui/mini-app/src/services/constants.ts

@@ -9,5 +9,5 @@
 // export const serviceDomain = 'https://nxhs.cjyx.cc'
  // export const serviceDomain = 'https://star.hz-hl.com'
 // export const serviceDomain = 'http://222.71.165.187:9010'
- export const serviceDomain = 'http://localhost:8080'
+//  export const serviceDomain = 'http://localhost:8080'
-// export const serviceDomain = 'https://nxhs.cjyx.cc'
+export const serviceDomain = 'https://nxhs.cjyx.cc'

mes-ui/mini-app/src/services/home.ts

@@ -17,3 +17,10 @@ export const getHomeCategoryAPI = () => {
     url: '/system/auth/get-permission-info',
   })
 }
+
+export const getUnreadMessage = () => {
+  return http<CategoryItem[]>({
+    method: 'GET',
+    url: '/heli/bdgzsomthing/unreadMessage',
+  })
+}