修复删除操作的一些bug

Chadwuo · Jan 21, 2022 · ee0bbb6 · ee0bbb6
1 parent ea37c12
commit ee0bbb6
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 57 deletions.
diff --git a/miniprogram/pages/bookEdit/index.js b/miniprogram/pages/bookEdit/index.js
@@ -67,44 +67,31 @@ Page({
     var that = this
     wx.showModal({
       title: '删除礼簿？',
-      // content: '该礼簿所有来往记录都将被删除，确定删除？',
-      content: '该礼簿所有来往记录不受影响，确定删除？',
+      content: '该礼簿所有来往记录都将被删除，确定删除？',
       success(res) {
         if (res.confirm) {
-          // 删除礼簿
-          db.collection('book').doc(that.data.id).remove({
-            success: function (res) {
-              wx.navigateBack()
-              wx.showToast({
-                title: '删除成功',
-              })
+          // 删除礼簿下所有记录
+          wx.cloud.callFunction({
+            name: 'lijiFunctions',
+            data: {
+              type: 'deleteAllData',
+              table: 'gift',
+              where: {
+                userId: app.globalData.user._id,
+                bookId: that.data.id,
+              }
             }
+          }).then(res => {
+            // 删除礼簿
+            db.collection('book').doc(that.data.id).remove({
+              success: function (res) {
+                wx.navigateBack()
+                wx.showToast({
+                  title: '删除成功',
+                })
+              }
+            })
           })
-          // // 删除礼簿下所有记录
-          // wx.cloud.callFunction({
-          //   name: 'lijiFunctions',
-          //   data: {
-          //     type: 'deleteAllData',
-          //     table: 'gift',
-          //     where: {
-          //       userId: app.globalData.user._id,
-          //       bookId: that.data.id,
-          //     }
-          //   }
-          // }).then(res => {
-          //   // todo删除记录成功 条件判断
-          //   console.log(res)
-
-          //   // 删除礼簿
-          //   db.collection('book').doc(that.data.id).remove({
-          //     success: function (res) {
-          //       wx.navigateBack()
-          //       wx.showToast({
-          //         title: '删除成功',
-          //       })
-          //     }
-          //   })
-          // })
         }
       }
     })

diff --git a/miniprogram/pages/books/books.js b/miniprogram/pages/books/books.js
@@ -58,15 +58,29 @@ Page({
           content: '该礼簿所有来往记录都将被删除，确定删除？',
           success(res) {
             if (res.confirm) {
-              db.collection('book').doc(that.data.actionId).remove({
-                success: function (res) {
-                  that.setData({
-                    giftBooks: that.data.giftBooks.filter(item => item._id != that.data.actionId)
-                  })
-                  wx.showToast({
-                    title: '删除成功',
-                  })
+              // 删除礼簿下所有记录
+              wx.cloud.callFunction({
+                name: 'lijiFunctions',
+                data: {
+                  type: 'deleteAllData',
+                  table: 'gift',
+                  where: {
+                    userId: app.globalData.user._id,
+                    bookId: that.data.actionId,
+                  }
                 }
+              }).then(res => {
+                // 删除礼簿
+                db.collection('book').doc(that.data.actionId).remove({
+                  success: function (res) {
+                    that.setData({
+                      giftBooks: that.data.giftBooks.filter(item => item._id != that.data.actionId)
+                    })
+                    wx.showToast({
+                      title: '删除成功',
+                    })
+                  }
+                })
               })
             }
           }
@@ -138,7 +152,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-   
+
   },
 
   /**

diff --git a/miniprogram/pages/friendEdit/index.js b/miniprogram/pages/friendEdit/index.js
@@ -48,22 +48,38 @@ Page({
     }
   },
   delFriend() {
+    app.globalData.refreshRequired.home = true
+    app.globalData.refreshRequired.book = true
     app.globalData.refreshRequired.friend = true
+    app.globalData.refreshRequired.profile = true
     let that = this
     wx.showModal({
       title: '删除联系人？',
       content: '该联系人所有来往记录都将被删除，确定删除？',
       success(res) {
         if (res.confirm) {
-          db.collection('friend').doc(that.data.id).remove({
-            success: function (res) {
-              wx.navigateBack({
-                delta: 2
-              })
-              wx.showToast({
-                title: '删除成功',
-              })
+          // 删除亲友下所有记录
+          wx.cloud.callFunction({
+            name: 'lijiFunctions',
+            data: {
+              type: 'deleteAllData',
+              table: 'gift',
+              where: {
+                userId: app.globalData.user._id,
+                friendId: that.data.id,
+              }
             }
+          }).then(res => {
+            db.collection('friend').doc(that.data.id).remove({
+              success: function (res) {
+                wx.navigateBack({
+                  delta: 2
+                })
+                wx.showToast({
+                  title: '删除成功',
+                })
+              }
+            })
           })
         }
       }

diff --git a/miniprogram/pages/friends/friends.js b/miniprogram/pages/friends/friends.js
@@ -25,16 +25,41 @@ Page({
       url: `/pages/friendEdit/index`,
     });
   },
-  onDelete() {
+  onDelete(e) {
+    app.globalData.refreshRequired.home = true
+    app.globalData.refreshRequired.book = true
+    app.globalData.refreshRequired.friend = true
+    app.globalData.refreshRequired.profile = true
+
+    let that = this
+    const friendId = e.currentTarget.dataset.friendid
     wx.showModal({
       title: '提示',
       content: '该联系人得所有人情往来记录都将被删除，确定删除？',
       confirmColor: '#F76664',
       success(res) {
         if (res.confirm) {
-          console.log('用户点击确定')
-        } else if (res.cancel) {
-          console.log('用户点击取消')
+          // 删除亲友下所有记录
+          wx.cloud.callFunction({
+            name: 'lijiFunctions',
+            data: {
+              type: 'deleteAllData',
+              table: 'gift',
+              where: {
+                userId: app.globalData.user._id,
+                friendId: friendId,
+              }
+            }
+          }).then(res => {
+            db.collection('friend').doc(friendId).remove({
+              success: function (res) {
+                that.loadData()
+                wx.showToast({
+                  title: '删除成功',
+                })
+              }
+            })
+          })
         }
       }
     })
@@ -58,7 +83,6 @@ Page({
         table: 'friend',
       }
     }).then(res => {
-      console.log(res)
       for (const item of res.result.data) {
         const firstLetter = item.firstLetter
         if (!isNaN(firstLetter)) {

diff --git a/miniprogram/pages/friends/friends.wxml b/miniprogram/pages/friends/friends.wxml
@@ -13,7 +13,7 @@
                 <van-cell-group inset>
                     <van-swipe-cell right-width="{{ 65 }}" wx:for="{{item.subItems}}" wx:for-item="data" wx:key="dataindex">
                         <van-cell title="{{data.name}}" size="large" bind:click="onFriendClick" data-friend='{{data}}'/>
-                        <van-button slot="right" type="danger" bind:click="onDelete">删除</van-button>
+                        <van-button slot="right" type="danger" bind:click="onDelete" data-friendid="{{data._id}}">删除</van-button>
                     </van-swipe-cell>
                 </van-cell-group>
             </view>