Dev 0.8.0 "Suzumiya Haruhi no Yūutsu"版本更新 (#12)

- 添加秒记功能 - 优化首页隐藏金额功能体验：现在可以持久化隐藏 - 修复记一笔页面使用模板时顶部tab栏显示错误问题 - 添加饮品和水果蔬菜icon
ztkuaikuai · Dec 17, 2023 · e8ff9b1 · e8ff9b1
1 parent 62e5d17
commit e8ff9b1
Show file tree

Hide file tree

Showing 25 changed files with 783 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
 # 更新说明
+## 0.8.0(2023.12.17) "Suzumiya Haruhi no Yūutsu"
+- 添加秒记功能
+- 优化首页隐藏金额功能体验：现在可以持久化隐藏
+- 修复记一笔页面使用模板时顶部tab栏显示错误问题
+- 添加饮品和水果蔬菜icon
+
 ## 0.7.8(2023.11.18)
 - 添加再记功能
 - 优化首页和账单页加载速度
@@ -21,6 +27,32 @@
 - 捉到一些小虫子
 
 # 更新日志
+## 12.17(0.8.0)
+- feat: 添加秒记功能！
+- fix: 修复记一笔页面使用模板时顶部tab栏显示错误问题
+
+
+## 12.16
+- feat: 初步添加秒记功能
+- style: 更换秒记图标
+- perf: 优化隐藏金额功能体验
+
+
+## 12.13
+- style: 秒记管理页静态完成
+- feat: 添加mj-bill-one-temlplate组件
+
+
+## 12.4
+- style: 记一笔页面取消底部安全栏
+- style: 添加一个icon：水果蔬菜
+
+
+## 11.21(0.7.81)
+- style: 添加两个icon：饮品和秒记管理
+- fix: 修复编辑账单未获取账单信息的bug
+
+
 ## 11.18
 - feat: 新增再记功能
 - perf: 优化记账体验：资产如果有资产名，则优先显示资产名

diff --git a/README.md b/README.md
@@ -1,19 +1,24 @@
 # 妙记——开发中
 
 ## 项目需求跟踪记录
+> 欢迎提交Issues
+
+[产品有不足或Bug？点我提出需求](https://siu9p6v1zlb.feishu.cn/share/base/form/shrcnNwskrIIk1t1IkOMgG4gisd)
 [点我跳转妙记项目需求跟踪记录文档](https://siu9p6v1zlb.feishu.cn/sheets/PkB9sXr2RhzY7KttdQ3cjwjXnyj?from=from_copylink)
 
-## 接下来的规划
+## 0.8.0(2023.12.17) "Suzumiya Haruhi no Yūutsu"
 - 添加秒记功能
+- 优化首页隐藏金额功能体验：现在可以持久化隐藏
+- 修复记一笔页面使用模板时顶部tab栏显示错误问题
+- 添加饮品和水果蔬菜icon
+
+## 接下来的规划
 - 添加筛选功能
 - 添加定时记账功能
 - 添加预算设置功能
 - 添加主题配色功能
 
 ##放在更久的版本更新规划
-- 添加定时记账功能
-- 添加预算设置
-- 自定义配色
 - 添加二级分类
 - 添加多账本
 - 更多图表（日历图、面积图）

diff --git a/components/mj-asset-card/mj-asset-card.vue b/components/mj-asset-card/mj-asset-card.vue
@@ -239,6 +239,10 @@
 			color: $mj-text-color-grey;
 			margin-top: 20px;
 		}
+		
+		.money {
+			font-weight: bold;
+		}
 
 	}
 </style>
diff --git a/components/mj-bill-one-template/mj-bill-one-template.vue b/components/mj-bill-one-template/mj-bill-one-template.vue
@@ -0,0 +1,77 @@
+<template>
+	<view class="one-bill-template">
+		<template v-if="oneTemplate">
+			<view class="left">
+				<mj-icon-with-background :type="oneTemplate.billStyle.icon" size="48rpx" customPrefix="miaoji"></mj-icon-with-background>
+				<view class="info">
+					<view>{{oneTemplate.billStyle.title}}</view>
+					<view class="minor" v-if="oneTemplate.bill_notes"><u--text :lines="1" :text="oneTemplate.bill_notes" color="rgba(0,0,0, 0.6)" size="24rpx"></u--text></view>
+				</view>
+			</view>
+			<view class="right" v-if="oneTemplate.bill_type !== 2">
+				<u--text mode="price" :text="oneTemplate.bill_amount" :color="oneTemplate.bill_type === 0 ? '#dd524d' : '#219a6d'" size="32rpx" bold></u--text>
+				<view class="minor">{{oneTemplate.asset_id[0].asset_name || oneTemplate.assetStyle.title}}</view>
+			</view>
+			<view class="right" v-else>
+				<u--text mode="price" :text="oneTemplate.transfer_amount / 100" color="#212121" size="32rpx" bold></u--text>
+				<view class="minor">{{oneTemplate.asset_id[0].asset_name || oneTemplate.assetStyle.title}}</view>
+			</view>
+		</template>
+		<template v-else>
+			<view class="left">
+				<mj-icon-with-background></mj-icon-with-background>
+				<view class="info">
+					<view>未绑定模板</view>
+					<view class="minor" v-if="true"><u--text :lines="1" :text="fromType ? '点我绑定模板' : '快去点击修改按钮绑定模板吧!'" color="rgba(0,0,0, 0.6)" size="24rpx"></u--text></view>
+				</view>
+			</view>
+		</template>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"mj-bill-one-template",
+		props: ['oneTemplate','fromType'],
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+.one-bill-template {
+	display: flex;
+	justify-content: space-between;
+	color: $mj-text-color;
+	
+	font-size: 32rpx;
+	padding: 8rpx 0;
+
+	.left {
+		display: flex;
+		justify-content: right;
+		align-items: center;
+
+		.info {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			padding-left: 24rpx;
+		}
+	}
+	.right {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: flex-end;
+		padding-right: 20rpx;
+	}
+	.minor {
+		color: $mj-text-color-grey;
+		font-size: 24rpx;
+	}
+}
+</style>
diff --git a/components/mj-bill-template/mj-bill-template.vue b/components/mj-bill-template/mj-bill-template.vue
@@ -107,7 +107,7 @@
 			// 点击每个模板卡片触发
 			clickTemp(temp) {
 				// 只有在模板管理页面才能查看模板详情
-				console.log('temp123',temp);
+				console.log('mj-bill-template:点击每个模板卡片触发',temp);
 				if(this.pageType === 'temp') {
 					this.templateDetails = {}
 					this.templateDetails = temp

diff --git a/components/mj-card/mj-card.vue b/components/mj-card/mj-card.vue
@@ -1,9 +1,13 @@
 <template>
 	<view class="card">
-		<uni-section :title="title" type="line" :titleFontSize="titleFontSize" titleColor="#212121" white="true"></uni-section>
-		<view class="slot">
+		<uni-section :title="title" type="line" :titleFontSize="titleFontSize" titleColor="#212121" white="true" :sub-title="subTitle">
+			<template v-slot:right>
+				<slot name="right"></slot>
+			</template>
+		</uni-section>
+		<template>
 			<slot></slot>
-		</view>
+		</template>
 	</view>
 </template>
 
@@ -22,6 +26,10 @@
 			titleFontSize: {
 				type: String,
 				default: '32rpx'
+			},
+			subTitle: {
+				type: String,
+				default: ''
 			}
 		}
 	}

diff --git a/pages.json b/pages.json
@@ -92,6 +92,14 @@
                     "enablePullDownRefresh": false
                 }
 
+                },
+                {
+                	"path" : "seconds/seconds",
+                	"style" : 
+                	{
+                		"navigationBarTitleText" : "秒记管理",
+                		"enablePullDownRefresh" : false
+                	}
                 }
             ]
 		}, {

diff --git a/pages/index/index.vue b/pages/index/index.vue
@@ -89,7 +89,7 @@
 	export default {
 		data() {
 			return {
-				isEyeShow: true,
+				isEyeShow: uni.getStorageSync('isEyeShow'),
 				isIndexShow: 0,  // 0 展示首页  1 展示资产页
 				bottomBtnText: '点我记账',
 				userAssets: [],
@@ -144,6 +144,7 @@
 		methods: {
 			clickEye() {
 				this.isEyeShow = !this.isEyeShow
+				uni.setStorageSync('isEyeShow', this.isEyeShow)
 			},
 			toMyAssets() {
 				uni.navigateTo({

diff --git a/pages/my/my.vue b/pages/my/my.vue
@@ -22,8 +22,8 @@
 		</uni-card>
 		<!-- 修改了uni-section的样式，背景色和装饰line颜色改变,padding -->
 		<view class="options">
-			<!-- 常用功能 -->
-			<uni-section class="section" title="常用功能" type="line" titleFontSize="32rpx"
+			<!-- 功能 -->
+			<uni-section class="section" title="功能" type="line" titleFontSize="32rpx"
 				titleColor="#212121"></uni-section>
 			<!-- grid组件 -->
 			<u-grid :border="false" @click="clickOption" col="4">
@@ -60,7 +60,7 @@
 							关于妙记
 						</view>
 						<view class="about-tag">
-							<u-tag text="v0.7.8" size="mini" @click="clickAbout"></u-tag>
+							<u-tag text="v0.8.0" size="mini" @click="clickAbout"></u-tag>
 						</view>
 					</view>
 					<uni-icons slot="icon" type="info" size="36rpx"></uni-icons>
@@ -105,6 +105,11 @@
 						title: '模板管理',
 						customPrefix: "miaoji"
 					},
+					{
+						icon: 'mj-second',
+						title: '秒记管理',
+						customPrefix: "miaoji"
+					},
 					{
 						icon: 'mj-reloadtime',
 						title: '定时记账',
@@ -164,6 +169,11 @@
 							url:"/pagesMy/bill-template/bill-template"
 						})
 						break
+					case 2:
+						uni.navigateTo({
+							url:"/pagesMy/seconds/seconds"
+						})
+						break
 					default:
 						uni.showToast({
 							title:"正在开发中~",
@@ -187,7 +197,7 @@
 			},
 			clickAuthor() {
 				uni.showModal({
-					content: "微信：ztkuaikuai",
+					content: "微信：kuaikuaitz",
 					cancelColor: "rgba(0,0,0,0.6)",
 					confirmColor:"#9fcba7",
 					showCancel:false
@@ -207,9 +217,6 @@
 					url: "/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate"
 				})
 			},
-			
-			
-			
 			// 页面挂载时获取数据  1 如果有缓存，获取缓存进行渲染  2 若无缓存，获取db数据，并赋值  3 获取用户使用天数 4 存入缓存
 			async getUserInfo() {
 				try {
@@ -299,7 +306,7 @@
 				align-items: center;
 
 				.main {
-					margin-left: 12rpx;
+					margin-left: 24rpx;
 					margin-top: 8rpx;
 					display: flex;
 					flex-direction: column;