diff --git a/src/pages.json b/src/pages.json
index 4c5beba..51a24c8 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -104,6 +104,12 @@
}
},
{
+ "path": "pages/collection/list/list",
+ "style": {
+ "navigationBarTitleText": "收款记录"
+ }
+ },
+ {
"path": "pages/collection/detail/detail",
"style": {
"navigationBarTitleText": "收款明细"
diff --git a/src/pages/collection/list/list.vue b/src/pages/collection/list/list.vue
new file mode 100644
index 0000000..dfa6577
--- /dev/null
+++ b/src/pages/collection/list/list.vue
@@ -0,0 +1,172 @@
+
+
+
+ 收款日期
+
+
+
+
+
+
+
+
+
+
+
+
+ 品牌收入汇总
+
+
+
+
+
+ ¥10800.00
+
+ 日总收入
+
+
+ 收款100笔(¥10000.00)
+ 退款2笔(¥200.00)
+
+
+ 收款100笔(¥10000.00)
+ 退款2笔(¥200.00)
+
+
+ 收款100笔(¥200.00)
+ 退款2笔(¥200.00)
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 917757a..5d2bf04 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -79,7 +79,7 @@
const tabList = [
{
id: 0,
- name: '营业额',
+ name: '收入统计',
path: '/pages/turnover/turnover',
serverKey: 1001 // 后端对应权限编号
},
diff --git a/src/pages/turnover/turnover.vue b/src/pages/turnover/turnover.vue
index c7fc3c1..81c7268 100644
--- a/src/pages/turnover/turnover.vue
+++ b/src/pages/turnover/turnover.vue
@@ -1,8 +1,8 @@
- 品牌
- 门店
+ 品牌统计
+ 门店统计
@@ -26,9 +26,13 @@
{{pageInfo.duration || '-'}}
- 总营业额
+ 总收入
¥{{pageInfo.total || '0'}}
+
+ 线上 ¥0.00
+ 线下 ¥200.00
+
@@ -49,24 +53,31 @@
- 实际收入
+ 总收入
¥{{pageInfo.calc.total || 0}}
+
+
+ 线上 ¥1000.00
+
- 收款笔数 {{pageInfo.calc.in_count || 0}}
+ 收款笔数 ( {{pageInfo.calc.in_count || 0}} )
- 退款笔数 {{pageInfo.calc.out_count || 0}}
+ 退款笔数 ( {{pageInfo.calc.out_count || 0}} )
+
+ 线上 ¥1000.00
+
- 收款金额 ¥{{pageInfo.calc.in_total || '0.00'}}
+ 收款金额 ( ¥{{pageInfo.calc.in_total || '0.00'}} )
- 退款金额 ¥{{pageInfo.calc.out_total || '0.00'}}
+ 退款金额 ( ¥{{pageInfo.calc.out_total || '0.00'}} )
@@ -264,7 +275,7 @@ export default {
@include centerFlex(center);
>view{
margin: 0 70upx;
- width: 176upx;
+ width: 228upx;
height: 72upx;
line-height: 72upx;
text-align: center;
@@ -314,33 +325,52 @@ export default {
}
.tts-money{
padding-top: 48upx;
- padding-bottom: 70upx;
+
>view{
+ margin-bottom: 34upx;
text-align: center;
padding: 0 24upx;
@include textHide(1);
&:first-child{
+ margin-bottom: 22upx;
line-height: 34upx;
font-size: 24upx;
color: #9c9c9f;
}
&:nth-child(2){
- margin-bottom: 30upx;
+ margin-bottom: 12upx;
line-height: 40upx;
font-size: 28upx;
color: #9c9c9f;
}
&:nth-child(3){
line-height: 90upx;
- font-size: 76upx;
+ font-size: 64upx;
color: #1a1a1a;
- font-weight: bold;
+ font-weight: 600;
>text{
font-size: 52upx;
}
}
}
}
+ .tts-preview{
+ padding-bottom: 70upx;
+ @include centerFlex(space-between);
+ >view{
+ width: 50%;
+ padding: 0 24upx;
+ line-height: 40upx;
+ text-align: center;
+ font-size: 28upx;
+ font-weight: 500;
+ color: #1a1a1a;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+
+ }
+ }
}
.tc-info-section{
.tis-tab{
@@ -427,6 +457,12 @@ export default {
>view{
max-width: 50%;
flex-shrink: 0;
+ .td-first{
+ margin-bottom: 24upx;
+ color: #1A1A1A;
+ font-weight: 500;
+ font-size: 28upx;
+ }
&:first-child{
margin-right: 24upx;
}
@@ -434,16 +470,17 @@ export default {
margin-left: 24upx;
}
>view{
- margin-bottom: 24upx;
- font-weight: 500;
- font-size: 32upx;
- color: #1a1a1a;
+ font-size: 24upx;
+ color: #9C9C9F;
@include textHide(1);
>text{
- margin-right: 10upx;
- font-weight: 400;
- font-size: 28upx;
- color: #9C9C9F;
+
+ }
+ .orange{
+ color: #F6843E;
+ }
+ .margin{
+ margin-right: 12upx;
}
}
}