diff --git a/packageA/pages/liveStream/liveStream.json b/packageA/pages/liveStream/liveStream.json
index b111cb3..e54bca5 100644
--- a/packageA/pages/liveStream/liveStream.json
+++ b/packageA/pages/liveStream/liveStream.json
@@ -1,5 +1,6 @@
{
"usingComponents": {
"subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
- }
+ },
+ "navigationBarTitleText": "直播"
}
\ No newline at end of file
diff --git a/packageA/pages/liveStream/liveStream.wxss b/packageA/pages/liveStream/liveStream.wxss
index ab33fc0..af00582 100644
--- a/packageA/pages/liveStream/liveStream.wxss
+++ b/packageA/pages/liveStream/liveStream.wxss
@@ -63,7 +63,7 @@
width: 172rpx;
height: 56rpx;
line-height: 56rpx;
- background-color: #000;
+ background-color: #f23030;
color: #fff;
font-size: 28rpx;
text-align: center;
@@ -75,7 +75,7 @@ subscribe {
width: 172rpx !important;
height: 56rpx !important;
line-height: 56rpx !important;
- background-color: #000 !important;
+ background-color: #f23030 !important;
font-size: 28rpx !important;
position: relative;
border-radius: 0 !important;
@@ -87,7 +87,7 @@ subscribe {
left: 0;
width: 172rpx;
height: 56rpx;
- background-color: #000;
+ background-color: #f23030;
color: #fff;
}
.subscribe--live-player-hasSubscribe {
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.json b/packageA/pages/liveStreamDetails/liveStreamDetails.json
index cbe9a20..6fc87c7 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.json
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.json
@@ -1,5 +1,6 @@
{
"usingComponents": {
"subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
- }
+ },
+ "navigationBarTitleText": "直播详情"
}
\ No newline at end of file
diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.wxss b/packageA/pages/liveStreamDetails/liveStreamDetails.wxss
index d54cbec..55f26ca 100644
--- a/packageA/pages/liveStreamDetails/liveStreamDetails.wxss
+++ b/packageA/pages/liveStreamDetails/liveStreamDetails.wxss
@@ -14,6 +14,7 @@
.cover-img {
width: 100%;
height: 100%;
+ background-color: #eee;
}
.cover-desc {
position: absolute;
@@ -78,7 +79,7 @@
}
.item-desc-container {
padding-left: 46rpx;
- font-size: 24rpx;
+ font-size: 26rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
@@ -123,9 +124,9 @@
}
.btn {
color: #fff;
- background-color: #000;
+ background-color: #f23030;
font-size: 36rpx;
- line-height: 120rpx;
+ line-height: 92rpx;
text-align: center;
/* width: 618rpx;
height: 92rpx; */
@@ -139,16 +140,16 @@
left: 0;
width: 100%;
height: auto;
- background-color: #000;
+ background-color: #f23030;
color: #fff;
}
.subscribe--live-player-subscribe__btn {
width: 100% !important;
height: auto !important;
font-size: 36rpx !important;
- line-height: 120rpx !important;
+ /* line-height: 120rpx !important; */
border-radius: 0 !important;
- background-color: #000 !important;
+ background-color: #f23030 !important;
}
.subscribe--live-player-hasSubscribe {
background-color: #666 !important;
@@ -217,12 +218,12 @@
.playbill.active ~ .mask {
display: block;
}
-
.playbill-pic {
+ display: block;
width: 478rpx;
height: 737rpx;
border-width: 31rpx 20rpx 51rpx;
- border-color: black;
+ border-color: #f23030;
border-style: solid;
margin: 0 auto 26rpx;
}
@@ -231,10 +232,11 @@
width: 560rpx;
height: 100rpx;
line-height: 100rpx;
- background-color: black;
+ background-color: #f23030;
color: #fff;
font-size: 36rpx;
text-align: center;
+ margin: 0 auto;
}
.playbill-save image {
width: 44rpx;
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 05050b3..ff806b1 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -239,7 +239,7 @@ Page({
}
}
} else {
- getApp().my_warnning("系统繁忙,请稍后再试", 0, th);
+ getApp().my_warnning(res.data.msg, 0, th);
return false;
}
}
@@ -293,7 +293,7 @@ Page({
isStart:isStart,
})
} else {
- getApp().my_warnning("系统繁忙,请稍后再试", 0, _this2);
+ getApp().my_warnning(res.data.msg, 0, _this2);
return false;
}
}
@@ -337,7 +337,6 @@ Page({
},
"put"
-
)
},
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index de8a720..92065b4 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -100,29 +100,39 @@
-
-
+
+
+
+
+
+
+
+