diff --git a/my/commission/index.vue b/my/commission/index.vue
index 5e9a8e5..ffdf94b 100644
--- a/my/commission/index.vue
+++ b/my/commission/index.vue
@@ -14,20 +14,30 @@
-
+
{{this.homePageDataNum.fundRange}}
-
+
+
+
+
+ {{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }}
+
+
+ 本期收益(元)
+
+
@@ -47,7 +57,7 @@
车费收益
-
+
-
+
{{item.type == 1 ?"收入":"支出"}}
- {{item.money}}元
+ -{{item.money}}元
@@ -250,7 +250,7 @@
}
if (res && res.data && res.data.userMoneyDetailsList.records.length > 0) {
//有数据时
- this.currentIncome = res.data?.income + "元";
+ this.currentIncome = res.data.income + "元";
for (let i = 0; i < res.data?.userMoneyDetailsList.records.length; i++) {
this.fundDetail.push(res.data?.userMoneyDetailsList.records[i]);
}
@@ -262,6 +262,7 @@
this.loadingStatus = "loadmore";
}
} else {
+ this.currentIncome = "0元";
//无数据时
if (!isScroll) {
//如果isScroll为null时说明不在滚动
diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index 15ec2c8..3f7c205 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -2575,7 +2575,7 @@
color: #029D88;
}
.footers-bor{
- border: 3px solid #029D88;
+ border: 1px solid #029D88;
background-color: #fff;
color: #029D88;
}
@@ -2585,14 +2585,15 @@
}
.footers-btn{
width: 204rpx;
- height: 69rpx;
+ height: 82rpx;
text-align: center;
display: flex;
justify-content: center;
align-items: center;
- border-radius: 35rpx;
+ border-radius: 80rpx;
font-weight: 400;
font-size: 29rpx;
+ margin-right: 8rpx;
}
.footers{
width: 100%;
@@ -2651,14 +2652,14 @@
}
.yiji{
width: 100%;
- height: 72rpx;
+ height: 88rpx;
background: linear-gradient(-90deg, #2EC5AC, #08A28A);
border-radius: 21rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
- padding: 0 5px;
+ padding: 0 10px;
height: 72rpx;
margin-top: 10px;
}
@@ -2676,7 +2677,7 @@
align-items: center;
}
.yingde-title{
- font-size: 25rpx;
+ font-size: 32rpx;
color: #333333;
}
.yingde{
@@ -2686,10 +2687,10 @@
align-items: center;
justify-content: space-between;
padding: 0 5px;
- height: 73rpx;
+ height: 80rpx;
background: #DCF4EF;
- border-bottom-left-radius: 24rpx;
- border-bottom-right-radius: 24rpx;
+ border-bottom-left-radius: 16rpx;
+ border-bottom-right-radius: 16rpx;
}
.mian-content-textarea{
width: 100%;
@@ -2723,7 +2724,7 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
- height: 40px;
+ height: 50px;
border-bottom: 1px solid #e5e5e5;
padding: 0px 5px;
}
@@ -2735,16 +2736,16 @@
padding: 5px;
}
.mian-view-list-text{
- font-size: 22rpx;
+ font-size: 30rpx;
color: #333333;
}
.mian-content-list-title{
- font-size: 22rpx;
- color: #555555;
+ font-size: 30rpx;
+ color: #999;
}
.mian-view-list-title{
- font-size: 22rpx;
- color: #555555;
+ font-size: 30rpx;
+ color: #999;
}
.mian-view-list:last-child{
border: 0px !important;
@@ -2756,9 +2757,9 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
- height: 40px;
+ height: 50px;
border-bottom: 1px solid #e5e5e5;
- padding: 0px 5px;
+ padding: 0px 10px;
}
.mian-view{
@@ -2768,8 +2769,7 @@
background: #fff;
border-radius: 24rpx;
padding: 10px;
- margin-top: 20px;
- }
+ }
.mina-title-bor{
width: 111rpx;
height: 16rpx;
@@ -2781,7 +2781,7 @@
}
.mina-title-text{
font-weight: bold;
- font-size: 28rpx;
+ font-size: 32rpx;
color: #333333;
}
.mina-title{
@@ -2792,7 +2792,7 @@
position: relative;
align-items: center;
justify-content: center;
- margin-top: 10px;
+ margin:40rpx 0;
}
.mian-view{
width: 100%;
@@ -2812,8 +2812,8 @@
margin: 15px 0px 20px 0px;
}
.mian-top-foot-view-img span,.mian-top-foot-view-text{
- font-size: 25rpx;
- color: #666666;
+ font-size: 29rpx;
+ color: #333;
}
.mian-top-foot-view-img image{
width: 26.39rpx;
@@ -2826,8 +2826,8 @@
align-items: center;
}
.mian-top-foot-view-title{
- font-size: 25rpx;
- color: #666666;
+ font-size: 29rpx;
+ color: #999;
}
.mian-top-foot-view{
width: 100%;
@@ -2872,7 +2872,7 @@
}
.mian-title-view{
font-weight: bold;
- font-size: 31rpx;
+ font-size: 32rpx;
color: #333333;
}
.mian-title{
@@ -2900,17 +2900,18 @@
justify-content: space-between;
border-bottom: 1px solid #E5E5E5;
padding-bottom: 15px;
- margin-bottom: 7px;
+ margin-bottom: 15px;
+ margin-top: 5px;
}
.mian-top{
width: 100%;
/* height: 331rpx; */
- padding: 10px;
+ padding: 30rpx;
background: #FFFFFF;
border-radius: 24rpx;
}
.mian{
- width: 95%;
+ width: 92%;
display: flex;
flex-direction: column;
position: absolute;
@@ -2923,13 +2924,13 @@
}
.header{
width: 100%;
- height: 228rpx;
+ height: 300rpx;
background: linear-gradient(-36deg, #11957C, #20A98F, #019C88, #029D88);
margin-top: 45px;
}
.nav-btn{
font-size: 25rpx;
- color: #019C88;
+ color: #019c88;
line-height: 63rpx;
}
.nav-title{
diff --git a/pages.json b/pages.json
index 14ffd1f..b167bf1 100644
--- a/pages.json
+++ b/pages.json
@@ -163,6 +163,21 @@
"navigationBarTitleText": "网页"
}
},
+ {
+ "path": "pages/hetong/index",
+ "style": {
+ "navigationBarTitleText": "我的合同"
+ // "app-plus": {
+ // "titleNView": false
+ // }
+ }
+ },
+ {
+ "path": "pages/xingxiangzhao/index",
+ "style": {
+ "navigationBarTitleText": "生活照"
+ }
+ },
{
"path": "pages/order/index",
diff --git a/pages/hetong/index.vue b/pages/hetong/index.vue
new file mode 100644
index 0000000..f01f2eb
--- /dev/null
+++ b/pages/hetong/index.vue
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue
index c43f6f3..da6ba9a 100644
--- a/pages/index/addClock.vue
+++ b/pages/index/addClock.vue
@@ -29,9 +29,10 @@
- 本期{{orderType=='2'?'已加钟':'已充值'}}订单
+ 本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单
+ 本期{{isSfwc=='1'?'已充值':'未充值'}}订单
- 加钟{{isSfwc}}订单数量: {{listData.length}}
+ 订单数量: {{listData.length}}
@@ -46,15 +47,15 @@