|
|
@@ -33,7 +33,7 @@
|
|
|
<view>{{liveViewData && liveViewData.like||0}}</view>
|
|
|
</view>
|
|
|
<view class="side-item">
|
|
|
- <button open-type="share" class="button">
|
|
|
+ <button open-type="share" class="button button-reset">
|
|
|
<image class="image" src="/static/images/weixin.png" mode="widthFix" />
|
|
|
</button>
|
|
|
<view>分享</view>
|
|
|
@@ -658,7 +658,7 @@
|
|
|
if (options.companyId && options.companyUserId) {
|
|
|
this.qrFrom = `&companyId=${options.companyId}&companyUserId=${options.companyUserId}`;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// 初始化直播间列表
|
|
|
this.$nextTick(() => {
|
|
|
if (this.liveId) {
|
|
|
@@ -681,7 +681,7 @@
|
|
|
}, 1000)
|
|
|
},
|
|
|
async onShow() {
|
|
|
- if (this.liveId&& !this.talklist) {
|
|
|
+ if (this.liveId && !this.talklist) {
|
|
|
await this.getLiveMsg(this.liveItem);
|
|
|
}
|
|
|
if (!this.liveViewData) {
|
|
|
@@ -1887,7 +1887,7 @@
|
|
|
return;
|
|
|
}
|
|
|
this.liveItem = Object.assign({}, this.liveItem, res.data);
|
|
|
- this.talklist = Array.isArray((res.data || {}).talklist) ? res.data.talklist : [];
|
|
|
+ // this.talklist = Array.isArray((res.data || {}).talklist) ? res.data.talklist : [];
|
|
|
this.startTimeTimer(this.liveItem);
|
|
|
// 清除旧定时器（如预告倒计时）
|
|
|
if (this.liveStartTimer) {
|
|
|
@@ -2633,23 +2633,6 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /* button自带样式清除 */
|
|
|
- button::after {
|
|
|
- border: none !important;
|
|
|
- padding: 0 !important;
|
|
|
- margin: 0 !important;
|
|
|
- }
|
|
|
-
|
|
|
- button {
|
|
|
- background-color: transparent !important;
|
|
|
- padding: 0 !important;
|
|
|
- line-height: inherit !important;
|
|
|
- margin: 0 !important;
|
|
|
- width: auto !important;
|
|
|
- font-weight: 500 !important;
|
|
|
- border-radius: none !important;
|
|
|
- }
|
|
|
-
|
|
|
.welcome-message {
|
|
|
position: fixed;
|
|
|
width: 100%;
|
|
|
@@ -2754,6 +2737,23 @@
|
|
|
margin-bottom: 32rpx;
|
|
|
text-align: center;
|
|
|
|
|
|
+ // 将 button 选择器改为类选择器
|
|
|
+ .button-reset::after {
|
|
|
+ border: none !important;
|
|
|
+ padding: 0 !important;
|
|
|
+ margin: 0 !important;
|
|
|
+ }
|
|
|
+
|
|
|
+ .button-reset {
|
|
|
+ background-color: transparent !important;
|
|
|
+ padding: 0 !important;
|
|
|
+ line-height: inherit !important;
|
|
|
+ margin: 0 !important;
|
|
|
+ width: auto !important;
|
|
|
+ font-weight: 500 !important;
|
|
|
+ border-radius: none !important;
|
|
|
+ }
|
|
|
+
|
|
|
.image {
|
|
|
width: 72rpx;
|
|
|
height: 72rpx;
|
|
|
@@ -2951,9 +2951,6 @@
|
|
|
align-items: center;
|
|
|
font-size: 28rpx;
|
|
|
margin: 10rpx 0;
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
.txt {
|
|
|
font-weight: 600;
|
|
|
}
|
|
|
@@ -3149,10 +3146,8 @@
|
|
|
border-radius: 16rpx 16rpx 0 0;
|
|
|
overflow: hidden;
|
|
|
}
|
|
|
-
|
|
|
.item {
|
|
|
padding: 4rpx;
|
|
|
-
|
|
|
.price {
|
|
|
font-size: 30rpx;
|
|
|
|
|
|
@@ -3161,7 +3156,6 @@
|
|
|
font-weight: 600;
|
|
|
margin-right: 10rpx;
|
|
|
}
|
|
|
-
|
|
|
.del {
|
|
|
color: #828282;
|
|
|
font-weight: 500;
|
|
|
@@ -3169,13 +3163,11 @@
|
|
|
text-decoration: line-through
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
.title {
|
|
|
font-weight: 500;
|
|
|
font-size: 30rpx;
|
|
|
margin: 10rpx 0 12rpx;
|
|
|
}
|
|
|
-
|
|
|
.button {
|
|
|
background: linear-gradient(270deg, #ff4702 0%, #fe6304 100%);
|
|
|
color: #fff;
|
|
|
@@ -3195,11 +3187,9 @@
|
|
|
z-index: 5;
|
|
|
border-radius: 20rpx;
|
|
|
width: 320rpx;
|
|
|
-
|
|
|
.coupon-block {
|
|
|
width: 100%;
|
|
|
position: relative;
|
|
|
-
|
|
|
.item {
|
|
|
width: 100%;
|
|
|
position: absolute;
|
|
|
@@ -3208,13 +3198,11 @@
|
|
|
flex-direction: column;
|
|
|
align-items: center;
|
|
|
color: #fff;
|
|
|
-
|
|
|
.title {
|
|
|
font-weight: 500;
|
|
|
font-size: 30rpx;
|
|
|
margin: 16rpx 0 12rpx;
|
|
|
}
|
|
|
-
|
|
|
.price {
|
|
|
font-size: 40rpx;
|
|
|
|
|
|
@@ -3223,13 +3211,11 @@
|
|
|
font-weight: 600;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
.txt {
|
|
|
font-weight: 500;
|
|
|
font-size: 30rpx;
|
|
|
margin: 5rpx 0;
|
|
|
}
|
|
|
-
|
|
|
.button {
|
|
|
background: linear-gradient(270deg, #fffce1 0%, #ffeaaf 100%);
|
|
|
color: #ff0004;
|
|
|
@@ -3256,7 +3242,6 @@
|
|
|
width: 100%;
|
|
|
z-index: 6;
|
|
|
}
|
|
|
-
|
|
|
.close {
|
|
|
position: absolute;
|
|
|
right: 10rpx;
|
|
|
@@ -3274,7 +3259,6 @@
|
|
|
justify-content: center;
|
|
|
align-items: center;
|
|
|
transition: transform 0.2s ease;
|
|
|
-
|
|
|
}
|
|
|
|
|
|
.list {
|
|
|
@@ -3285,16 +3269,12 @@
|
|
|
|
|
|
@keyframes xxxawdawd {
|
|
|
from {
|
|
|
- margin-top: 0rpx;
|
|
|
opacity: 0;
|
|
|
}
|
|
|
-
|
|
|
to {
|
|
|
- // margin-top: 20rpx;
|
|
|
opacity: 1;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
.shop-prompt {
|
|
|
position: absolute;
|
|
|
bottom: 750rpx;
|
|
|
@@ -3324,7 +3304,6 @@
|
|
|
overflow-y: auto;
|
|
|
padding: 0 40rpx;
|
|
|
}
|
|
|
-
|
|
|
.bottom {
|
|
|
padding: 20rpx 40rpx;
|
|
|
position: absolute;
|
|
|
@@ -3338,14 +3317,12 @@
|
|
|
// 抽奖
|
|
|
.prize-box {
|
|
|
position: relative;
|
|
|
-
|
|
|
.nav-img {
|
|
|
width: 311rpx;
|
|
|
position: absolute;
|
|
|
top: -122rpx;
|
|
|
left: 50%;
|
|
|
transform: translateX(-50%);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
.bg-img {
|
|
|
@@ -3361,7 +3338,6 @@
|
|
|
position: relative;
|
|
|
z-index: 2;
|
|
|
padding: 24rpx 0 68rpx;
|
|
|
-
|
|
|
.white-item {
|
|
|
width: 40rpx;
|
|
|
height: 40rpx;
|
|
|
@@ -3392,7 +3368,6 @@
|
|
|
background: rgba(255, 255, 255, 0.5);
|
|
|
border-radius: 4rpx 4rpx 4rpx 4rpx;
|
|
|
}
|
|
|
-
|
|
|
.selected {
|
|
|
background: #FFEB66;
|
|
|
}
|
|
|
@@ -3410,7 +3385,6 @@
|
|
|
font-size: 36rpx;
|
|
|
color: #F4410B;
|
|
|
text-align: center;
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -3473,7 +3447,6 @@
|
|
|
overflow: hidden;
|
|
|
position: relative;
|
|
|
margin-right: 24rpx;
|
|
|
-
|
|
|
.img {
|
|
|
width: 100%;
|
|
|
height: 100%;
|
|
|
@@ -3492,24 +3465,19 @@
|
|
|
color: #FFFFFF;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
.goods-right {
|
|
|
flex: 1;
|
|
|
-
|
|
|
.goods-title {
|
|
|
font-weight: 500;
|
|
|
font-size: 30rpx;
|
|
|
color: #000000;
|
|
|
margin-bottom: 10rpx;
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
.goods-details {
|
|
|
font-size: 24rpx;
|
|
|
color: #999999;
|
|
|
margin: 10rpx 0 20rpx;
|
|
|
}
|
|
|
-
|
|
|
.goods-people {
|
|
|
font-size: 22rpx;
|
|
|
color: #E69A22;
|
