优化 多处细节

cloudfunctions/lijiFunctions/lookupGiftFriend/index.js

@@ -7,10 +7,11 @@ const db = cloud.database()
 var $ = db.command.aggregate
 exports.main = async (event, context) => {
   const wxContext = cloud.getWXContext();
+  let whereVal = event.where || {
+    _openid: wxContext.OPENID,
+  }
   return await db.collection('gift').aggregate()
-    .match({
-      _openid: wxContext.OPENID,
-    })
+    .match(whereVal)
     .skip(event.page * event.limit)
     .limit(event.limit)
     .lookup({

miniprogram/app.json

@@ -92,6 +92,7 @@
         "van-dropdown-item": "@vant/weapp/dropdown-item/index",
         "barrage": "/components/barrage",
         "van-submit-bar": "@vant/weapp/submit-bar/index",
-        "van-notice-bar": "@vant/weapp/notice-bar/index"
+        "van-notice-bar": "@vant/weapp/notice-bar/index",
+        "van-datetime-picker": "@vant/weapp/datetime-picker/index"
     }
 }

miniprogram/pages/bookDetails/index.js

@@ -1,4 +1,5 @@
 const app = getApp()
+const dayjs = require('dayjs');
 const db = wx.cloud.database()
 Page({
     data: {
@@ -7,41 +8,56 @@ Page({
         pageNo: 0,
         pageEnd: false,
     },
-    // 分页获取数据
-    getPage(page, limit) {
-        return db.collection('gift')
-            .where({
-                userId: app.globalData.user._id,
-                bookId: this.data.bookId
+    formatDate(date) {
+        return dayjs(date).format('YYYY-MM-DD');
+    },
+    loadData(page) {
+        // 如果服务已经停止
+        if (app.globalData.serviceStopped) {
+            this.setData({
+                service_stopped: true,
+                giftList: []
             })
-            .orderBy('luckyDay', 'desc')
-            .skip(page * limit)
-            .limit(limit)
-            .get()
+            return
+        }
+        if (page == 0) {
+            this.data.giftList = []
+        }
+        let that = this
+        wx.cloud.callFunction({
+            name: 'lijiFunctions',
+            data: {
+                type: 'lookupGiftFriend',
+                page: page,
+                limit: 10,
+                where: {
+                    userId: app.globalData.user._id,
+                    bookId: this.data.bookId
+                }
+            }
+        }).then(res => {
+            if (res.result.list.length === 0) {
+                that.data.pageEnd = true
+                return
+            }
+            let datas = this.data.giftList.concat(res.result.list)
+            datas.map(i => {
+                if (i.luckDay) {
+                    i.luckDay = that.formatDate(i.luckDay)
+                }
+            })
+            that.setData({
+                giftList: datas,
+                pageNo: that.data.pageNo + 1
+            });
+        })
     },
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-        let that = this
-        that.setData({
-            bookId: options.bookId,
-        });
-        this.data.pageNo = 0
-        this.getPage(this.data.pageNo, 10).then(res => {
-            if (res.data.length === 0) {
-                this.setData({
-                    pageEnd: true,
-                });
-            }
-            this.setData({
-                giftList: res.data,
-                pageNo: this.data.pageNo + 1
-            });
-        })
-        wx.setNavigationBarTitle({
-            title: ''
-        })
+        this.data.bookId = options.bookId
+        this.loadData(0)
     },
     /**
      * 生命周期函数--监听页面初次渲染完成
@@ -82,20 +98,8 @@ Page({
      * 页面上拉触底事件的处理函数
      */
     onReachBottom: function () {
-        let that = this
         if (!this.data.pageEnd) {
-            // this.setData({
-            //   loading: true,
-            // });
-            this.getPage(this.data.pageNo, 10).then(res => {
-                if (res.data.length > 0) {
-                    let datas = that.data.giftList.concat(res.data)
-                    this.data.pageNo + 1
-                    this.setData({
-                        giftList: datas
-                    });
-                }
-            })
+            this.loadData(this.data.pageNo)
         }
     },
 

miniprogram/pages/bookDetails/index.wxml

@@ -4,7 +4,7 @@
         <van-empty wx:if="{{giftList.length===0}}" description="还没有记录哦~"></van-empty>
         <view class='nav acea-row row-middle' wx:for="{{giftList}}" wx:key="index">
             <view class='content'>
-                <view class='title'>{{item.name}}</view>
+                <view class='title'>{{item.friendInfo.name}}</view>
                 <view class='info'>{{item.name}}</view>
                 <view class='info'>{{item.luckDay}}</view>
             </view>

miniprogram/pages/books/books.js

@@ -108,23 +108,29 @@ Page({
     })
   },
 
-  loadData() {
+  loadData(page) {
+    if (page == 0) {
+      this.data.giftBooks = []
+    }
     this.setData({
-      pageNo: 0,
       isHideTips: app.globalData.user.tips_hide_book
     })
     let that = this
     wx.cloud.callFunction({
       name: 'lijiFunctions',
       data: {
         type: 'lookupBookGift',
-        page: this.data.pageNo,
+        page: page,
         limit: 10
       }
     }).then(res => {
-      const resList = that.computeTotal(res.result.list)
+      if (res.result.list.length === 0) {
+        that.data.pageEnd = true
+        return
+      }
+      const resList = that.computeTotal(this.data.giftBooks.concat(res.result.list))
       that.setData({
-        giftBooks: resList,
+        giftList: resList,
         pageNo: that.data.pageNo + 1
       });
     })
@@ -134,7 +140,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.loadData()
+
   },
 
   /**
@@ -148,7 +154,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.loadData(0)
   },
 
   /**
@@ -180,22 +186,7 @@ Page({
    */
   onReachBottom: function () {
     if (!this.data.pageEnd) {
-      wx.cloud.callFunction({
-        name: 'lijiFunctions',
-        data: {
-          type: 'lookupBookGift',
-          page: this.data.pageNo,
-          limit: 10
-        }
-      }).then(res => {
-        if (res.result.list.length > 0) {
-          const resList = that.computeTotal(this.data.giftBooks.concat(res.result.list))
-          this.setData({
-            giftList: resList,
-            pageNo: that.data.pageNo + 1
-          });
-        }
-      })
+      this.loadData(this.data.pageNo)
     }
   },
 

miniprogram/pages/friendDetails/index.js

@@ -1,4 +1,5 @@
 const app = getApp()
+const dayjs = require('dayjs');
 const db = wx.cloud.database()
 Page({
   data: {
@@ -12,6 +13,9 @@ Page({
     sadCount: '0',
     sadTotal: '0.00',
   },
+  formatDate(date) {
+    return dayjs(date).format('YYYY-MM-DD');
+  },
   // 计算统计往来记录
   computedGiftTotal() {
     const $ = db.command.aggregate
@@ -76,7 +80,12 @@ Page({
         });
       } else {
         that.setData({
-          giftList: res.data,
+          giftList: res.data.map(i => {
+            if (i.luckDay) {
+              i.luckDay = that.formatDate(i.luckDay)
+            }
+            return i
+          }),
           pageNo: that.data.pageNo + 1
         });
       }
@@ -145,7 +154,12 @@ Page({
           let datas = this.data.giftList.concat(res.data)
           this.data.pageNo + 1
           this.setData({
-            giftList: datas
+            giftList: datas.map(i => {
+              if (i.luckDay) {
+                i.luckDay = that.formatDate(i.luckDay)
+              }
+              return i
+            }),
           });
         }
       })

miniprogram/pages/friends/friends.js

@@ -106,11 +106,7 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-    this.onShow()
 
-    setTimeout(() => {
-      wx.stopPullDownRefresh()
-    }, 2000);
   },
 
   /**

miniprogram/pages/friends/friends.json

@@ -1,5 +1,4 @@
 {
   "navigationBarTitleText": "亲友",
-  "enablePullDownRefresh": true,
   "usingComponents": {}
 }

miniprogram/pages/giftAdd/index.js

@@ -7,8 +7,9 @@ Page({
      * 页面的初始数据
      */
     data: {
-        minDate: new Date().setFullYear((new Date().getFullYear()-1)),
-        luckDay: dayjs().format('YYYY-MM-DD'),
+        minDate: new Date().setMonth((new Date().getMonth() - 6)),
+        luckDay: '',
+        luckDayFormat: dayjs().format('YYYY-MM-DD'),
         name: '',
         bookId: '',
         bookName: '',
@@ -19,7 +20,7 @@ Page({
         friendName: '',
         showCalendar: false,
         tip: '',
-        price: 0
+        price: 0,
     },
     formatDate(date) {
         return dayjs(date).format('YYYY-MM-DD');
@@ -57,12 +58,10 @@ Page({
                 title: '保存成功',
             })
             that.setData({
-                luckDay: dayjs().format('YYYY-MM-DD'),
                 name: '',
                 bookId: '',
                 bookName: '',
                 money: '',
-                type: '收',
                 wishes: '',
                 friendName: '',
                 friendId: '',
@@ -87,6 +86,11 @@ Page({
                         friendId: res.data[0]._id,
                         tip: `已有同名联系人【${res.data[0].name}】，记录会添加在与该亲友的来往记录中`
                     });
+                } else {
+                    // 名字改了 数据库没有相关人信息，friendId 置空
+                    that.setData({
+                        friendId: '',
+                    });
                 }
             })
     },
@@ -106,10 +110,12 @@ Page({
             showCalendar: false
         });
     },
+    // 日历选择
     onConfirm(event) {
         this.setData({
             showCalendar: false,
-            luckDay: this.formatDate(event.detail),
+            luckDayFormat: this.formatDate(event.detail),
+            luckDay: event.detail,
         });
     },
     onGiftTypeChange(event) {
@@ -167,7 +173,8 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow: function () {
-
+        // 这什么问题  在data里赋值不起作用？？？
+        this.data.luckDay = new Date()
     },
 
     /**

miniprogram/pages/giftAdd/index.wxml

@@ -4,7 +4,7 @@
             <van-tab title="收礼" name="收"></van-tab>
             <van-tab title="送礼" name="送"></van-tab>
         </van-tabs>
-        <van-cell title="{{ luckDay }}" is-link icon="calendar-o" bind:click="onDisplay" />
+        <van-cell title="{{ luckDayFormat }}" is-link icon="calendar-o" bind:click="onDisplay" />
         <van-field label="姓名" left-icon="contact" right-icon="friends-o" model:value="{{ friendName }}" placeholder="亲友" bind:click-icon="onSelectFriends" bind:blur="onFriendBlur" />
         <van-field label="事由" left-icon="point-gift-o" model:value="{{ name }}" placeholder="事由" />
         <van-field label="礼金" left-icon="balance-o" model:value="{{ money }}" type="digit" placeholder="{{type}}礼金额" bind:blur="onMoneyBlur" />