diff --git a/components/long-date/long-date.vue b/components/long-date/long-date.vue
index 638df6f..5653d2b 100644
--- a/components/long-date/long-date.vue
+++ b/components/long-date/long-date.vue
@@ -8,11 +8,11 @@
- {{item}}
+ {{item}}时
- {{item}}
+ {{item}}分
diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue
index 477909b..7a252ea 100644
--- a/packageA/my/orderList.vue
+++ b/packageA/my/orderList.vue
@@ -1,14 +1,20 @@
-
-
+
+
+
+
待审核
@@ -212,35 +218,35 @@
sortStyle: ["#ff557f", "#3f3f3f"],
headers: [{
status: "0",
- text: "活动审核",
+ name: "活动审核",
},
{
status: "1",
- text: "未开始",
+ name: "未开始",
},
{
status: "2",
- text: "报名中",
+ name: "报名中",
},
{
status: "3",
- text: "待开始",
+ name: "待开始",
},
{
status: "4",
- text: "进行中",
+ name: "进行中",
},
{
status: "5",
- text: "已结束",
+ name: "已结束",
},
{
status: "-1",
- text: "已取消",
+ name: "已取消",
},
{
status: "-2",
- text: "售后订单",
+ name: "售后订单",
}
],
selected: "0",
@@ -597,7 +603,9 @@
this.loadStatus = "loading";
});
},
- selectheader(status) {
+ selectheader(index) {
+ console.log(index);
+ var status=index.status;
this.selected = status;
this.page = 1;
this.hotList = [];
@@ -636,55 +644,16 @@
background: #f7f7f7;
.tabs {
- width: 750rpx;
background: #ffffff;
- display: flex;
- overflow-x: auto;
- -webkit-overflow-scrolling: touch;
font-family: PingFang SC, PingFang SC;
position: fixed;
top: 0;
- z-index: 2;
- padding-left: 60rpx;
- .s-header {
- display: flex;
- justify-content: center;
- align-items: center;
- width: 140rpx;
- height: 80rpx;
- font-weight: 400;
- font-size: 28rpx;
- color: #9e9e9e;
- line-height: 26rpx;
- flex: 0 0 auto;
- position: relative;
- }
-
- .s-header.selected {
- width: 140rpx;
- height: 80rpx;
- background: #ffffff;
- font-weight: 800;
- font-size: 32rpx;
- color: #323232;
- line-height: 28rpx;
- }
-
- .lines {
- position: absolute;
- bottom: 0;
- width: 44rpx;
- }
-
- .lines.selected {
- border-bottom: #323232 solid 8rpx;
- }
}
.shenhe {
width: 94%;
position: fixed;
- top: 80rpx;
+ top: 85rpx;
//background: #f7f7f7;
background: #f7f7f7;
z-index: 100;
diff --git a/pages/center/index.vue b/pages/center/index.vue
index 7261ffc..8308e36 100644
--- a/pages/center/index.vue
+++ b/pages/center/index.vue
@@ -291,7 +291,7 @@
-
+
@@ -308,7 +308,7 @@
-
+
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 6e34a28..f6995e4 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -1189,7 +1189,7 @@
}
.botmoney {
- margin-top: 30rpx;
+ margin-top: 22rpx;
margin-left: 30rpx;
color: #777777;
font-weight: 400;