Merge pull request #32 from Chadwuo/one-piece

v2.2.1

README.md

@@ -24,7 +24,15 @@
 
 ### 效果图
 
-<img src="doc/demo.jpg">
+<table>
+  <tr>
+    <td><img src="doc/image1.jpeg"></td>
+    <td><img src="doc/image2.jpeg"></td>
+    <td><img src="doc/image3.jpeg"></td>
+    <td><img src="doc/image4.jpeg"></td>
+    <td><img src="doc/image5.jpeg"></td>
+  </tr>
+ </table>
 
 ### 文件目录说明
 
@@ -67,6 +75,7 @@ li-ji-weapp
 - [wl-pinyin](https://www.npmjs.com/package/wl-pinyin)：汉字转拼音库
 - [dayjs](https://github.com/iamkun/dayjs)：Moment.js 的 2kB 轻量化方案，拥有同样强大的 API
 - [wx-calendar](https://github.com/lspriv/wx-calendar)：借鉴了MIUI 12日历的部分设计，制作适合微信小程序的日历
+- [relationship](https://github.com/mumuy/relationship)：中国亲戚关系计算器
 - <s>腾讯云（涨价了，负担不起，已迁移至阿里云）</s>
 - [阿里云 Serverless](https://serverless.aliyun.com)：阿里云 Serverless
 - [今日诗词 API](https://www.jinrishici.com)：![今日诗词](https://v2.jinrishici.com/one.svg)

miniprogram/config/mp-sdk.js

@@ -4,7 +4,7 @@ export const colorUISdk = new ColorUISdk({
     //当前环境，produce，dev，host
     env: 'dev',
     //实际项目版本
-    version: '2.2.0',
+    version: '2.2.1',
     api: {
         //生产环境
         produce: {

miniprogram/pages/about/index.js

@@ -40,9 +40,6 @@ Page({
         this.setData({
             version: getApp().colorUISdk.version
         })
-        wx.showShareMenu({
-            menus: ['shareAppMessage', 'shareTimeline']
-        })
     },
 
     /**
@@ -92,7 +89,14 @@ Page({
      */
     onShareAppMessage: function () {
         return {
-            title: '每一份人情都值得礼记',
+            title: '可能是东半球最好用的人情记账工具',
+			path: "pages/start/index",
+			imageUrl: '/static/img/share.jpg'
         }
     },
+	onShareTimeline: function () {
+		return {
+			title: '可能是东半球最好用的人情记账工具'
+		}
+	}
 })

miniprogram/pages/book/details/index.js

@@ -9,9 +9,12 @@ Page({
     pageNo: 0,
   },
   onSearch() {
-    wx.showToast({
-      title: '搜索...马上写完，真的',
-      icon: 'none',
+    if (!this.data.keyword) {
+      this.loadData(1)
+      return
+    }
+    this.setData({
+      giftList: this.data.giftList.filter(i => i.friendInfo.name.includes(this.data.keyword))
     })
   },
   onAddGift() {

miniprogram/pages/friend/index.js

@@ -19,9 +19,16 @@ Page({
     })
   },
   onSearch() {
-    wx.showToast({
-      title: '搜索...马上写完，真的',
-      icon: 'none',
+    if (!this.data.keyword) {
+      this.loadData(1)
+      return
+    }
+    for (let item of this.data.friendsList) {
+      item.subItems = item.subItems.filter(x => x.name.includes(this.data.keyword))
+    }
+
+    this.setData({
+      friendsList: this.data.friendsList
     })
   },
   onFriendClick(e) {

miniprogram/pages/giftOut/index.js

@@ -22,9 +22,12 @@ Page({
     })
   },
   onSearch() {
-    wx.showToast({
-      title: '搜索...马上写完，真的',
-      icon: 'none',
+    if (!this.data.keyword) {
+      this.loadData(1)
+      return
+    }
+    this.setData({
+      giftList: this.data.giftList.filter(i => i.friendInfo.name.includes(this.data.keyword))
     })
   },
   onGiftClick(e) {

miniprogram/pages/mine/index.js

@@ -75,9 +75,6 @@ Page({
 			avatarUrl: app.userInfo.avatarUrl,
 			nickName: app.userInfo.nickName,
 		})
-		wx.showShareMenu({
-			menus: ['shareAppMessage', 'shareTimeline']
-		})
 	},
 	// 选择头像
 	onChooseAvatar(e) {

miniprogram/pages/relationship/index.js

@@ -144,5 +144,19 @@ Page({
    */
   onShareAppMessage() {
 
-  }
+  },
+  /**
+	 * 用户点击右上角分享
+	 */
+	onShareAppMessage: function () {
+		return {
+      title: '亲戚关系计算器',
+      path: "pages/relationship/index",
+		}
+	},
+	onShareTimeline: function () {
+		return {
+			title: '亲戚关系计算器'
+		}
+	}
 })