From bbd4291df45794a49e3527f6ae76e4ce61a07d66 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 12 二月 2026 11:04:17 +0800
Subject: [PATCH] Merge branch 'dev_new' of http://114.132.189.42:9002/r/product-inventory-APP-before into dev_new

---
 src/api/login.js |   94 +++++++++++++++++++++++++++++++++++------------
 1 files changed, 70 insertions(+), 24 deletions(-)

diff --git a/src/api/login.js b/src/api/login.js
index 649f59c..29a149d 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,27 +1,13 @@
 import request from '@/utils/request'
 
 // 鐧诲綍鏂规硶
-export function login(username, password, code, uuid) {
+export function loginCheckFactory(username, password) {
   const data = {
     username,
     password,
-    code,
-    uuid
   }
   return request({
-    url: '/login',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data: data
-  })
-}
-
-// 娉ㄥ唽鏂规硶
-export function register(data) {
-  return request({
-    url: '/register',
+    url: '/loginCheckFactory',
     headers: {
       isToken: false
     },
@@ -46,14 +32,74 @@
   })
 }
 
-// 鑾峰彇楠岃瘉鐮�
-export function getCodeImg() {
+// 鑾峰彇鍏徃鍒楄〃
+export function userLoginFacotryList(params) {
   return request({
-    url: '/captchaImage',
-    headers: {
-      isToken: false
-    },
+    url: '/userLoginFacotryList',
     method: 'get',
-    timeout: 20000
+    params: params
   })
-}
\ No newline at end of file
+}
+
+// 鑾峰彇鏈繃鏈熷叕鍛婃暟閲�
+export function noticesList(params) {
+  return request({
+    url: '/collaborativeApproval/notice/page',
+    method: 'get',
+    params: params
+  })
+}
+
+// 鍙戦�佸鎴风鎺ㄩ�佹爣璇嗗埌鏈嶅姟鍣�
+export function updateClientId(data) {
+  return request({
+    url: '/system/client/addOrUpdateClientId',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 鏌ヨ鍏憡鍒楄〃
+export function listNotice(query) {
+  return request({
+    url: '/system/notice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 鑾峰彇鏈娑堟伅鏁伴噺
+export function getNoticeCount(consigneeId) {
+  return request({
+    url: '/system/notice/getCount',
+    method: 'get',
+    params: { consigneeId }
+  })
+}
+
+// 鏍囪娑堟伅涓哄凡璇�
+export function markAsRead(noticeId, status) {
+  return request({
+    url: "/system/notice",
+    method: "put",
+    data: { noticeId, status },
+  });
+}
+
+// 涓�閿爣璁版墍鏈夋秷鎭负宸茶
+export function markAllAsRead() {
+  return request({
+    url: "/system/notice/readAll",
+    method: "post",
+  });
+}
+
+// 纭娑堟伅
+export function confirmMessage(noticeId, status) {
+  return request({
+    url: "/system/notice",
+    method: "put",
+    data: { noticeId, status },
+  });
+}

--
Gitblit v1.9.3