From 17f7cabd006f7dedde1afc0584749d23d9943eb2 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 17 Jul 2023 15:51:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=99=BB=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js             |  2 +-
 pages.json              | 16 +++++++++++++++-
 pages/oaHome/oaHome.vue | 25 +++++++++++++++++++------
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/api/user.js b/api/user.js
index 784ac2b..fca43c1 100644
--- a/api/user.js
+++ b/api/user.js
@@ -441,7 +441,7 @@ export function feedback(data) {
   return request.post("user/feedback", {
     ...data
   });
-}
+} 
 
 /**
  * 反馈列表
diff --git a/pages.json b/pages.json
index de9ba33..b469056 100644
--- a/pages.json
+++ b/pages.json
@@ -32,7 +32,21 @@
         "navigationBarTitleText": "我的"
       }
     }
-  ],
+      ,{
+            "path" : "pages/oaLogin/oaLogin",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "app-plus": {
+                  "titleNView": false
+                },
+                "mp-weixin": {
+                  "titleNView": false
+                }
+            }
+            
+        }
+    ],
   "subPackages": [{
     "root": "pages/views",
     "name": "views",
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index d30ff6d..c179231 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -18,7 +18,7 @@
           </view>
         </block>
       </view>
-      <view class="backlog">
+      <!-- <view class="backlog">
         <view class="">待办事项</view>
         <block v-for="(item,index) in ApproveList.slice(0,2)" :key="index">
           <view class="backlog_item flex_a_c_j_sb" @click="backlogDetails">
@@ -26,6 +26,19 @@
             <i class="iconfont icon-you"></i>
           </view>
         </block>
+      </view> -->
+      <view class="backlog">
+        <view class="head_title flex_a_c_j_sb">
+          <view class="">公告列表</view>
+          <view class="flex_a_c" @click="test">更多 <view class="iconfont icon-you"></view>
+          </view>
+        </view>
+        <block v-for="(item,index) in ApproveList.slice(0,2)" :key="index">
+          <view class="backlog_item flex_a_c_j_sb" @click="backlogDetails">
+            <view class="text">{{ item.content }}</view>
+            <i class="iconfont icon-you"></i>
+          </view>
+        </block>
       </view>
     </view>
 
@@ -123,10 +136,10 @@
         priority: '', // 任务紧急度
         myOaInfo: {
           thumb: '',
-          name: '',
-          mobile: '',
-          did_name: '',
-          label_name: '',
+          name: '张三',
+          mobile: '18933334444',
+          did_name: '技术部',
+          label_name: '技术专员',
         },
         ApproveList: []
       }
@@ -386,4 +399,4 @@
       }
     }
   }
-</style>
+</style>
\ No newline at end of file