diff --git a/README.md b/README.md index cd8d692d..e5d85b9c 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@

- 礼尚往来，是中华民族的传统美德，老一辈人一般会在举行宴席的时候用手写人情簿的方式来记录每一个亲友的送礼，然后在对方有宴席邀请的时候翻阅人情簿，计算出送礼金额。这种方式存在很多弊端，比如人情簿丢失、无法携带在身边、很难搜索到某个人的送礼记录、由于手写原因无法辨认清楚内容等等。 + 礼尚往来，是中华民族的传统美德，老一辈人一般会在举行宴席的时候用手写人情簿的方式来记录每一个亲友的送礼。这种方式存在很多弊端，比如人情簿丢失、无法携带在身边、很难搜索到某个人的送礼记录、由于手写原因无法辨认清楚内容等等。 - 「礼记」是一款微信小程序，方便随时随地查看和记录亲友的礼金情况。随身携带、快速查找人情、统计汇总礼金、亲友往来明细、家庭共享记账、安全可靠。 + 「礼记」致力于记录和管理人情来往记录，给你方便快捷的人情记账体验！专业又懂你的人情记账软件，共享记账，全家人共享账本，多维度查询统计人情来往。 --- @@ -75,7 +75,7 @@ li-ji-weapp ### 版权说明 -该项目签署了GPL-3.0授权许可，详情请参阅 [LICENSE.txt](https://github.com/chadwuo/li-ji-weapp/blob/master/LICENSE)，请自由地享受和参与开源。 +礼记 使用 GPL-3.0 开源许可协议，在此之前请您务必了解该协议的许可说明以及遵守该协议的法律条件，详情请参阅 [LICENSE.txt](https://github.com/chadwuo/li-ji-weapp/blob/master/LICENSE)。 ### 鸣谢 diff --git a/miniprogram/alicloud/services/giftOut.js b/miniprogram/alicloud/services/giftOut.js index 3cbd95ec..f16a96e9 100644 --- a/miniprogram/alicloud/services/giftOut.js +++ b/miniprogram/alicloud/services/giftOut.js @@ -146,6 +146,7 @@ exports.addGiftOut = async (parameter) => { userId: userInfo._id, friendId: parameter.friendId, title: parameter.title, + icon: parameter.icon, date: parameter.date, money: Number(parameter.money), remarks: parameter.remarks @@ -176,6 +177,7 @@ exports.updateGiftOut = async (parameter) => { $set: { friendId: parameter.friendId, title: parameter.title, + icon: parameter.icon, date: parameter.date, money: Number(parameter.money), remarks: parameter.remarks diff --git a/miniprogram/app.json b/miniprogram/app.json index b0f25308..8181568c 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -53,6 +53,7 @@ }, "lazyCodeLoading": "requiredComponents", "sitemapLocation": "sitemap.json", + "darkmode": true, "usingComponents": { "ui-sys": "mp-cu/colorUI/components/ui-sys/ui-sys", "ui-title": "mp-cu/colorUI/components/ui-title/ui-title", diff --git a/miniprogram/config/mp-sdk.js b/miniprogram/config/mp-sdk.js index 0ade8405..b130d1c6 100644 --- a/miniprogram/config/mp-sdk.js +++ b/miniprogram/config/mp-sdk.js @@ -4,7 +4,7 @@ export const colorUISdk = new ColorUISdk({ //当前环境，produce，dev，host env: 'dev', //实际项目版本 - version: '2.2.3', + version: '2.2.7', api: { //生产环境 produce: { diff --git a/miniprogram/mp-cu/colorUI/scss/style/_background.scss b/miniprogram/mp-cu/colorUI/scss/style/_background.scss index 5e4dc0f4..c45e1c32 100644 --- a/miniprogram/mp-cu/colorUI/scss/style/_background.scss +++ b/miniprogram/mp-cu/colorUI/scss/style/_background.scss @@ -63,7 +63,7 @@ color: $white !important; } .bg-red-gradient { - background-image: linear-gradient(45deg, #f33a41, #ed0586) !important; + background-image: linear-gradient(45deg, #F76664, #fea894) !important; color: $white !important; } .bg-pink-gradient { diff --git a/miniprogram/mp-sdk/icon/doc.scss b/miniprogram/mp-sdk/icon/doc.scss index 5341ec0a..877f68ef 100644 --- a/miniprogram/mp-sdk/icon/doc.scss +++ b/miniprogram/mp-sdk/icon/doc.scss @@ -450,3 +450,55 @@ .cicon-wifi-off:before {content: "\e6d3";} .cicon-yamaxun:before {content: "\e7b7";} .cicon-zuoji:before {content: "\e754";} + +@font-face { + font-family: 'iconfont'; + src: url('data:font/ttf;charset=utf-8;base64,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AAAAAAAKACsBPAABAAAAAAALABMBkAADAAEECQAAACYAAAADAAEECQABABAAPAADAAEECQACAA4AVwADAAEECQADABAAbwADAAEECQAEABAAigADAAEECQAFABYApQADAAEECQAGABAAyQADAAEECQAKAFYA5AADAAEECQALACYBaABDAHIAZQBhAHQAZQBkACAAYgB5ACAAaQBjAG8AbgBmAG8AbgB0AABDcmVhdGVkIGJ5IGljb25mb250AABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABSAGUAZwB1AGwAYQByAABSZWd1bGFyAABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABWAGUAcgBzAGkAbwBuACAAMQAuADAAAFZlcnNpb24gMS4wAABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAHMAdgBnADIAdAB0AGYAIABmAHIAbwBtACAARgBvAG4AdABlAGwAbABvACAAcAByAG8AagBlAGMAdAAuAABHZW5lcmF0ZWQgYnkgc3ZnMnR0ZiBmcm9tIEZvbnRlbGxvIHByb2plY3QuAABoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAABodHRwOi8vZm9udGVsbG8uY29tAAAAAAIAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAEAAgECAQMBBAEFAQYBBwEIAQkBCgxqaWFveXVwZWl4dW4GamllaHVuB3NoZW5ncmkGbGFvcmVuBXFpbnppCHNhbmd6YW5nCHFpYW9xaWFuBnlpeXVhbgd6aG91c3VpAAAAAf//AAIAAQAAAAwAAAAWAAAAAgABAAMACwABAAQAAAACAAAAAAAAAAEAAAAA1aQnCAAAAADgSxQZAAAAAOBLFBk=') format('truetype'); + font-weight: normal; + font-style: normal; + font-display: swap; +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-shengri:before { + content: "\e613"; +} + +.icon-qiaoqian:before { + content: "\e656"; +} + +.icon-laoren:before { + content: "\e614"; +} + +.icon-yiyuan:before { + content: "\e6fd"; +} + +.icon-jiaoyu:before { + content: "\e60d"; +} + +.icon-jiehun:before { + content: "\e60e"; +} + +.icon-qinzi:before { + content: "\e615"; +} + +.icon-sangzang:before { + content: "\e616"; +} + +.icon-zhousui:before { + content: "\e742"; +} \ No newline at end of file diff --git a/miniprogram/package-lock.json b/miniprogram/package-lock.json index 08300b2e..d247de8e 100644 --- a/miniprogram/package-lock.json +++ b/miniprogram/package-lock.json @@ -9,30 +9,36 @@ "version": "2.0.0", "license": "ISC", "dependencies": { - "@alicloud/mpserverless-sdk": "^3.1.1", - "@vant/weapp": "^1.10.2", + "@alicloud/mpserverless-sdk": "^3.1.3", + "@vant/weapp": "^1.10.15", "dayjs": "^1.10.7", + "lin-ui": "^0.9.13", "wl-pinyin": "^1.0.1" } }, "node_modules/@alicloud/mpserverless-sdk": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@alicloud/mpserverless-sdk/-/mpserverless-sdk-3.1.1.tgz", - "integrity": "sha512-ERyGk6FPduBJh0U+edyKq3zyKB2ScEj0Bv7ReY4yUGPrzePMyLDFVvBgFwheemyodyDYpcXgZaQfox5V/ernrA==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@alicloud/mpserverless-sdk/-/mpserverless-sdk-3.1.3.tgz", + "integrity": "sha512-69QjM6G5JcPduZL7QdB/5XcZd9jKGWhV1ipzVOXED6aXAWozmBrNPavGqIwyE2mszzeB0qUpriliuZWgfrML9w==", "engines": { "node": ">=8.0.0" } }, "node_modules/@vant/weapp": { - "version": "1.10.4", - "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.10.4.tgz", - "integrity": "sha512-S0T6myy4Ve4ZClRujJKP1Eu5hP5GFkVeQH587uakhacrQ+9Fp23gfnmo+dKMf7FbjTRqQu+ehxcr0Ba75iV8HA==" + "version": "1.10.15", + "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.10.15.tgz", + "integrity": "sha512-swM4k3pVwt/6Tnijvq86paLiKE1CzbrBQ4lR7+9uRhwKOM0HS3ooK1Q4IjSEyxQ59ZFKmYYvZln77RZcnSDqmA==" }, "node_modules/dayjs": { "version": "1.10.7", "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.7.tgz", "integrity": "sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg=" }, + "node_modules/lin-ui": { + "version": "0.9.13", + "resolved": "https://registry.npmmirror.com/lin-ui/-/lin-ui-0.9.13.tgz", + "integrity": "sha512-RFRq1D+jCkhFzVCe/Y4C/NnWEK21ZiY961/HJR3mHmHmdq5IkrNBt/39WsUuWcDPty48WaY/3IipOPBBD+7ttw==" + }, "node_modules/wl-pinyin": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/wl-pinyin/download/wl-pinyin-1.0.1.tgz", @@ -41,20 +47,25 @@ }, "dependencies": { "@alicloud/mpserverless-sdk": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@alicloud/mpserverless-sdk/-/mpserverless-sdk-3.1.1.tgz", - "integrity": "sha512-ERyGk6FPduBJh0U+edyKq3zyKB2ScEj0Bv7ReY4yUGPrzePMyLDFVvBgFwheemyodyDYpcXgZaQfox5V/ernrA==" + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@alicloud/mpserverless-sdk/-/mpserverless-sdk-3.1.3.tgz", + "integrity": "sha512-69QjM6G5JcPduZL7QdB/5XcZd9jKGWhV1ipzVOXED6aXAWozmBrNPavGqIwyE2mszzeB0qUpriliuZWgfrML9w==" }, "@vant/weapp": { - "version": "1.10.4", - "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.10.4.tgz", - "integrity": "sha512-S0T6myy4Ve4ZClRujJKP1Eu5hP5GFkVeQH587uakhacrQ+9Fp23gfnmo+dKMf7FbjTRqQu+ehxcr0Ba75iV8HA==" + "version": "1.10.15", + "resolved": "https://registry.npmmirror.com/@vant/weapp/-/weapp-1.10.15.tgz", + "integrity": "sha512-swM4k3pVwt/6Tnijvq86paLiKE1CzbrBQ4lR7+9uRhwKOM0HS3ooK1Q4IjSEyxQ59ZFKmYYvZln77RZcnSDqmA==" }, "dayjs": { "version": "1.10.7", "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.7.tgz", "integrity": "sha1-LPX5Gt0oEWdIRAhmoKHSbzps5Gg=" }, + "lin-ui": { + "version": "0.9.13", + "resolved": "https://registry.npmmirror.com/lin-ui/-/lin-ui-0.9.13.tgz", + "integrity": "sha512-RFRq1D+jCkhFzVCe/Y4C/NnWEK21ZiY961/HJR3mHmHmdq5IkrNBt/39WsUuWcDPty48WaY/3IipOPBBD+7ttw==" + }, "wl-pinyin": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/wl-pinyin/download/wl-pinyin-1.0.1.tgz", diff --git a/miniprogram/package.json b/miniprogram/package.json index 6a2e75a5..ecb9c59f 100644 --- a/miniprogram/package.json +++ b/miniprogram/package.json @@ -9,9 +9,10 @@ "author": "chadwuo", "license": "ISC", "dependencies": { - "@alicloud/mpserverless-sdk": "^3.1.1", - "@vant/weapp": "^1.10.2", + "@alicloud/mpserverless-sdk": "^3.1.3", + "@vant/weapp": "^1.10.15", "dayjs": "^1.10.7", + "lin-ui": "^0.9.13", "wl-pinyin": "^1.0.1" } } diff --git a/miniprogram/pages/about/index.wxml b/miniprogram/pages/about/index.wxml index e1e21dab..31170b11 100644 --- a/miniprogram/pages/about/index.wxml +++ b/miniprogram/pages/about/index.wxml @@ -9,20 +9,23 @@ - 礼尚往来，是中华民族的传统美德，老一辈人一般会在举行宴席的时候用手写人情簿的方式来记录每一个亲友的送礼，然后在对方有宴席邀请的时候翻阅人情簿，计算出送礼金额。这种方式存在很多弊端，比如人情簿丢失、无法携带在身边、很难搜索到某个人的送礼记录、由于手写原因无法辨认清楚内容等等。 + 礼尚往来，是中华民族的传统美德，老一辈人一般会在举行宴席的时候用手写人情簿的方式来记录每一个亲友的送礼。这种方式存在很多弊端，比如人情簿丢失、无法携带在身边、很难搜索到某个人的送礼记录、由于手写原因无法辨认清楚内容等等。 - 「礼记」是一款微信小程序，方便随时随地查看和记录亲友的礼金情况。随身携带、快速查找人情、统计汇总礼金、亲友往来明细、家庭共享记账、安全可靠。 + 「礼记」致力于记录和管理人情来往记录，给你方便快捷的人情记账体验！专业又懂你的人情记账软件，共享记账，全家人共享账本，多维度查询统计人情来往。每一份人情都值得礼记。 - + Chadwuo v{{version}} + + li-ji-weapp Github + GPL-3.0 license diff --git a/miniprogram/pages/analysis/index.wxml b/miniprogram/pages/analysis/index.wxml index a2d5160c..b8226a9f 100644 --- a/miniprogram/pages/analysis/index.wxml +++ b/miniprogram/pages/analysis/index.wxml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/miniprogram/pages/backup/index.wxml b/miniprogram/pages/backup/index.wxml index b4e9df08..45a00b6b 100644 --- a/miniprogram/pages/backup/index.wxml +++ b/miniprogram/pages/backup/index.wxml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/miniprogram/pages/book/details/index.js b/miniprogram/pages/book/details/index.js index 8cae79fa..62f0f266 100644 --- a/miniprogram/pages/book/details/index.js +++ b/miniprogram/pages/book/details/index.js @@ -97,27 +97,27 @@ Page({ /** * 生命周期函数--监听页面初次渲染完成 */ - onReady: function () { }, + onReady: function () {}, /** * 生命周期函数--监听页面显示 */ - onShow: function () { }, + onShow: function () {}, /** * 生命周期函数--监听页面隐藏 */ - onHide: function () { }, + onHide: function () {}, /** * 生命周期函数--监听页面卸载 */ - onUnload: function () { }, + onUnload: function () {}, /** * 页面相关事件处理函数--监听用户下拉动作 */ - async onPullDownRefresh() { }, + async onPullDownRefresh() {}, /** * 页面上拉触底事件的处理函数 diff --git a/miniprogram/pages/book/details/index.wxml b/miniprogram/pages/book/details/index.wxml index ba42552c..f175bd59 100644 --- a/miniprogram/pages/book/details/index.wxml +++ b/miniprogram/pages/book/details/index.wxml @@ -1,20 +1,28 @@ + - + - - {{item.friendInfo.name}} - 贺礼 - {{item.money}} - 元 + + + + {{item.friendInfo.name}} + {{item.friendInfo.relation}} + + + + {{item.money}} + 礼金 + + \ No newline at end of file diff --git a/miniprogram/pages/calendar/index.js b/miniprogram/pages/calendar/index.js index 4c60ce80..da0cdba6 100644 --- a/miniprogram/pages/calendar/index.js +++ b/miniprogram/pages/calendar/index.js @@ -5,7 +5,8 @@ Page({ * 页面的初始数据 */ data: { - date: '' + date: '', + darkMode: wx.getSystemInfoSync().theme == 'dark' }, handleCalendarLoad({ detail diff --git a/miniprogram/pages/calendar/index.wxml b/miniprogram/pages/calendar/index.wxml index ea9e4585..4f089e4b 100644 --- a/miniprogram/pages/calendar/index.wxml +++ b/miniprogram/pages/calendar/index.wxml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/miniprogram/pages/family/index.scss b/miniprogram/pages/family/index.scss index 2f27e932..37e99fb0 100644 --- a/miniprogram/pages/family/index.scss +++ b/miniprogram/pages/family/index.scss @@ -1,10 +1 @@ /* pages/family/index.wxss */ - -.open-btn { - position: absolute; - top: 0; - left: 0; - min-height: 4em; - width: 100%; - opacity: 0; -} \ No newline at end of file diff --git a/miniprogram/pages/family/index.wxml b/miniprogram/pages/family/index.wxml index 6e37253f..a34e9c53 100644 --- a/miniprogram/pages/family/index.wxml +++ b/miniprogram/pages/family/index.wxml @@ -8,7 +8,7 @@ {{inviteFamily.word}} - + @@ -30,12 +30,9 @@ Tips:长按成员来打开操作按钮。 - - - 邀请家庭成员 - - - + + + diff --git a/miniprogram/pages/giftOut/edit/index.js b/miniprogram/pages/giftOut/edit/index.js index d3afde78..a3a7b67a 100644 --- a/miniprogram/pages/giftOut/edit/index.js +++ b/miniprogram/pages/giftOut/edit/index.js @@ -10,28 +10,52 @@ Page({ friendId: '', friendName: '', title: '', + icon: '', date: {}, money: '', remarks: '', - columns: ['结婚', '满月', '乔迁', '开业', '生日', '生病', '白事', '自定义'], - pickerCustom: false + columns: [{ + name: '结婚', + icon: 'iconfont icon-jiehun' + }, { + name: '宝宝', + icon: 'iconfont icon-qinzi' + }, { + name: '周岁', + icon: 'iconfont icon-zhousui' + }, { + name: '乔迁', + icon: 'iconfont icon-qiaoqian' + }, { + name: '生日', + icon: 'iconfont icon-shengri' + }, { + name: '升学', + icon: 'iconfont icon-jiaoyu' + }, { + name: '大寿', + icon: 'iconfont icon-laoren' + }, { + name: '探望', + icon: 'iconfont icon-yiyuan' + }, { + name: '白事', + icon: 'iconfont icon-sangzang' + }, { + name: '其他', + icon: 'cicon-moneybag-o' + }, ], }, - showTitlePicker() { + iconChange(e) { + let { + selected + } = e.currentTarget.dataset + this.setData({ - pickerCustom: false + title: selected.name, + icon: selected.icon }) - }, - bindPickerChange: function (e) { - let sel_val = this.data.columns[e.detail.value] - if (sel_val == '自定义') { - this.setData({ - pickerCustom: true - }) - } else { - this.setData({ - title: sel_val - }) - } + }, async onSave() { const eventChannel = this.getOpenerEventChannel() diff --git a/miniprogram/pages/giftOut/edit/index.wxml b/miniprogram/pages/giftOut/edit/index.wxml index d2996869..985b23e8 100644 --- a/miniprogram/pages/giftOut/edit/index.wxml +++ b/miniprogram/pages/giftOut/edit/index.wxml @@ -1,6 +1,15 @@ + + + + + {{item.name}} + + + + @@ -11,16 +20,12 @@ - + - - - - - + diff --git a/miniprogram/pages/giftOut/index.js b/miniprogram/pages/giftOut/index.js index 4e9b2c58..f7e5daee 100644 --- a/miniprogram/pages/giftOut/index.js +++ b/miniprogram/pages/giftOut/index.js @@ -1,6 +1,5 @@ // pages/giftOut/index.js const giftOutService = require('../../alicloud/services/giftOut') - Page({ /** * 页面的初始数据 @@ -10,7 +9,7 @@ Page({ pageNo: 0, giftList: [], total: '0.00', - keyword: '' + keyword: '', }, // 监听用户滑动页面事件。 onPageScroll(e) { @@ -83,27 +82,27 @@ Page({ /** * 生命周期函数--监听页面初次渲染完成 */ - onReady: function () { }, + onReady: function () {}, /** * 生命周期函数--监听页面显示 */ - onShow: function () { }, + onShow: function () {}, /** * 生命周期函数--监听页面隐藏 */ - onHide: function () { }, + onHide: function () {}, /** * 生命周期函数--监听页面卸载 */ - onUnload: function () { }, + onUnload: function () {}, /** * 页面相关事件处理函数--监听用户下拉动作 */ - onPullDownRefresh: function () { }, + onPullDownRefresh: function () {}, /** * 页面上拉触底事件的处理函数 diff --git a/miniprogram/pages/giftOut/index.wxml b/miniprogram/pages/giftOut/index.wxml index fba62e39..7626a6be 100644 --- a/miniprogram/pages/giftOut/index.wxml +++ b/miniprogram/pages/giftOut/index.wxml @@ -1,5 +1,5 @@ - + @@ -10,17 +10,19 @@ - - - {{item.date.value}} - {{ item.date.lunar_month }}{{ item.date.lunar_day }} + + + - - {{item.friendInfo.name}} - {{item.title}} - 送礼 - {{item.money}} - 元 + + + {{item.friendInfo.name}} + {{item.title}} + {{item.date.value}} {{ item.date.lunar_month }}{{ item.date.lunar_day }} + + + {{item.money}} + diff --git a/miniprogram/pages/giftReceive/edit/index.wxml b/miniprogram/pages/giftReceive/edit/index.wxml index bd197a62..792a83c5 100644 --- a/miniprogram/pages/giftReceive/edit/index.wxml +++ b/miniprogram/pages/giftReceive/edit/index.wxml @@ -5,7 +5,7 @@ - + diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index 425d8460..ccade3a3 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -1,6 +1,7 @@ + - + 礼记 @@ -11,7 +12,7 @@ - {{ item.title||'' }} + {{ item.title||'' }} 共 {{ item.giftCount||0 }} 笔 @@ -20,8 +21,8 @@ {{ item.date.lunar_month }}{{ item.date.lunar_day }} - - + + diff --git a/miniprogram/pages/mine/index.js b/miniprogram/pages/mine/index.js index 933a297e..4a80ef63 100644 --- a/miniprogram/pages/mine/index.js +++ b/miniprogram/pages/mine/index.js @@ -87,10 +87,11 @@ Page({ const options = { filePath: avatarUrl, }; - console.log(avatarUrl) + app.mpserverless.file.uploadFile(options).then(res => { + console.log(res) this.setData({ - avataavatarUrl_editrUrl: res.fileUrl + avatarUrl_edit: res.fileUrl }) }); }, @@ -203,7 +204,7 @@ Page({ return { title: '可能是东半球最好用的人情记账工具', path: "pages/start/index", - imageUrl: '/static/img/share.jpg' + imageUrl: '/static/img/share2.jpg' } } }) \ No newline at end of file diff --git a/miniprogram/pages/question/index.wxml b/miniprogram/pages/question/index.wxml index 7a1ae25d..967d6013 100644 --- a/miniprogram/pages/question/index.wxml +++ b/miniprogram/pages/question/index.wxml @@ -4,14 +4,14 @@ Q：这个软件收费吗？ - A：本项目是个人开源项目，不会收取任何费用。 + A：永远不会收取任何费用。 Q：作者是一个人完成所有开发工作吗？ - A：目前是的，如果你熟悉JS、mongodb、微信小程序欢迎PR。同时也欢迎设计、产品参与项目。 + A：目前是的，如果你熟悉JS、mongodb、微信小程序欢迎参与项目开发。即使你不是开发者，也可以参与GitHub需求讨论，发表你的想法。 @@ -39,21 +39,21 @@ Q：有很多其他同类的产品，为什么选择我？ - A：作者尝试过很多记录人情往来的产品，都难以令自己满意，有的界面简陋，有的操作逻辑反人类，有的已经停止服务，因此决定自己动手。你的痛点，礼记已阅已历；礼记的惊喜，你且慢慢享受。 + A：礼记全部代码完全开源，开源项目的优势在于可以吸引更多开发者和用户的参与，从而不断地进行改进和优化。此外，开源软件也有较高的安全性，因为更多的人参与开发和审查代码，可以及早发现和解决潜在的漏洞和风险。这是其他任何同类产品不具备的。 Q：我手机上界面显示不正确或者有bug？ - A：肝能力有限，目前只在iphone xs上做了完整测试，建议遇到bug先更新微信版本，如果问题还存在可以再意见反馈中填写你遇到的问题，感谢。 + A：肝能力有限，目前只在iphone xs上做了完整测试，建议遇到bug先更新微信版本，如果问题还存在可以在意见反馈中填写你遇到的问题，感谢。 Q：软件后续开发计划？是否会变的商业化广告乱飞，功能臃肿？ - A：先说结论，不会。最多后期会增加一个开屏广告，关于以后功能演变，你可以在意见反馈中提出你的想法，或参与github中issues讨论。 + A：先说结论，不会。最多后期会增加一个开屏广告，关于以后功能演变，你可以在意见反馈中提出你的想法，或参与GitHub中issues讨论。 diff --git a/miniprogram/pages/start/index.js b/miniprogram/pages/start/index.js index c365b3a5..aaa1843a 100644 --- a/miniprogram/pages/start/index.js +++ b/miniprogram/pages/start/index.js @@ -13,12 +13,12 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad(options) { }, + onLoad(options) {}, /** * 生命周期函数--监听页面初次渲染完成 */ - onReady() { }, + onReady() {}, /** * 初始化用户数据 */ @@ -45,7 +45,7 @@ Page({ async onShow() { app.needRefreshTotal = true - if (!app.userInfo) { + if (!app.userInfo || !app.userDataScope) { await this.initUserInfo() await this.initUserDataScope() } @@ -62,20 +62,20 @@ Page({ /** * 生命周期函数--监听页面隐藏 */ - onHide() { }, + onHide() {}, /** * 生命周期函数--监听页面卸载 */ - onUnload() { }, + onUnload() {}, /** * 页面相关事件处理函数--监听用户下拉动作 */ - onPullDownRefresh() { }, + onPullDownRefresh() {}, /** * 页面上拉触底事件的处理函数 */ - onReachBottom() { }, + onReachBottom() {}, }) \ No newline at end of file diff --git a/project.config.json b/miniprogram/project.config.json similarity index 89% rename from project.config.json rename to miniprogram/project.config.json index 21491114..3eeb9ac9 100644 --- a/project.config.json +++ b/miniprogram/project.config.json @@ -1,8 +1,6 @@ { "appid": "wx200dacbd79781fa0", "compileType": "miniprogram", - "miniprogramRoot": "miniprogram/", - "srcMiniprogramRoot": "miniprogram/", "packOptions": { "ignore": [], "include": [] diff --git a/miniprogram/project.private.config.json b/miniprogram/project.private.config.json new file mode 100644 index 00000000..f572b60d --- /dev/null +++ b/miniprogram/project.private.config.json @@ -0,0 +1,8 @@ +{ + "setting": { + "compileHotReLoad": true + }, + "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", + "projectname": "li-ji-weapp", + "libVersion": "2.30.2" +} \ No newline at end of file diff --git a/miniprogram/utils/tools.wxs b/miniprogram/utils/tools.wxs new file mode 100644 index 00000000..18ed7ff3 --- /dev/null +++ b/miniprogram/utils/tools.wxs @@ -0,0 +1,14 @@ +module.exports = { + bookColor: function (str) { + if (!str) { + return 'red' + } + + var words = ["悼", "哀", "丧", "殇", '奠', "祭", "死", '葬', "追悼", "白事", "节哀", "哀悼", "追思", "缅怀", "悼念", "吊唁", "逝世", "辞世", "归西", "仙逝", "别世", "过世", "去世", "寿终", "长眠"] + var hasMourningWords = words.some(function (word) { + return str.indexOf(word) !== -1 + }) + + return hasMourningWords ? 'grey' : 'red' + }, +}; \ No newline at end of file