From a193cef232062bf8b865cedb0d0daa106af09b78 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 4 Sep 2023 09:42:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9B=B4=E6=96=B0=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7=E8=8A=82=E6=B5=81=E6=93=8D=E4=BD=9C,=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E7=94=A8=E6=88=B7=E8=BF=9E=E7=BB=AD=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=9A=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaHome/oaHome.vue                  |  2 +-
 pages/oaMy/oaMy.vue                      |  2 +-
 subpkg/updateArchives/updateArchives.vue | 30 +++++++++++++++++-------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 05fc457..1ca1f39 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -24,7 +24,7 @@
       <view v-if="uniMP" style="height: 44px;">
         <u-icon name="arrow-left" color="#fff" size="20" @click="leftClick"></u-icon>
       </view>
-      <!-- <view style="height: 30rpx"></view> -->
+      <view v-else style="height: 30rpx"></view>
       <!-- <view v-if="uniMP" style="height: 44px;"></view> -->
       <!-- #endif -->
       <view class="my_info">
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index 5552c83..48c0adf 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -13,7 +13,7 @@
       <view v-if="uniMP" style="height: 44px;">
         <u-icon name="arrow-left" color="#fff" size="20" @click="leftClick"></u-icon>
       </view>
-      <!-- <view style="height: 30rpx"></view> -->
+      <view v-else style="height: 30rpx"></view>
 			<!-- <view style="height: 100rpx"></view> -->
       <!-- <view v-if="uniMP" style="height: 44px"></view> -->
 			<!-- #endif -->
diff --git a/subpkg/updateArchives/updateArchives.vue b/subpkg/updateArchives/updateArchives.vue
index d987dff..b742e6d 100644
--- a/subpkg/updateArchives/updateArchives.vue
+++ b/subpkg/updateArchives/updateArchives.vue
@@ -56,6 +56,8 @@
       </u--form>
       <!-- <button @click="addArchives" class="btn">完成更新</button> -->
       <mybtn text="完成更新" @click="addArchives"></mybtn>
+      <u-modal :show="modelShow" title="警告" content='确定要删除该信息吗' closeOnClickOverlay showCancelButton
+      	@close="modelShow=false" @cancel="modelShow=false" @confirm="deleteDemand(deleteIndex)"></u-modal>
     </view>
   </view>
 </template>
@@ -111,6 +113,8 @@
         showDemandList: [], //更多需求展示列表
         updateFlag: true,
         task_id: 0,
+        modelShow: false, // 是否显示删除提示框
+        deleteIndex: -1, // 删除标记
         formData: {
           id_card: '',
           sex: '',
@@ -210,22 +214,32 @@
         }
       },
       // 确认添加需求
-      changeDemand: throttle(function(e) {
+      changeDemand(e){
+        this.$u.throttle(()=>this.addDemand(e), 2000)
+      },
+      addDemand(e){
+        uni.showLoading({
+          title: '添加中',
+          mask: true
+        })
         this.demandShow = false;
         if (e.value[1]) {
           this.showDemandList.push(e.value[1]);
         } else {
           this.showDemandList.push(e.value[0]);
         }
-      }, 3000),
+        this.$nextTick(()=>{
+          uni.hideLoading();
+        })
+      },
       // 删除需求
       removeShowDemand(index) {
-        uni.showModal({
-          title: '确定删除这一部分内容吗',
-          success: (res) => {
-            if (res.confirm) this.showDemandList.splice(index, 1);
-          }
-        })
+        this.modelShow = true;
+        this.deleteIndex = index;
+      },
+      deleteDemand(index){
+        this.showDemandList.splice(index, 1);
+        this.modelShow = false;
       }
     },
     onPullDownRefresh() {