|
@@ -396,6 +396,7 @@
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</u-popup>
|
|
</u-popup>
|
|
|
|
|
+
|
|
|
<!-- 观众列表弹窗 -->
|
|
<!-- 观众列表弹窗 -->
|
|
|
<u-popup :show="showadd" @close="close" @open="openViews" round="20rpx" bgColor="#ffffff" zIndex="10077">
|
|
<u-popup :show="showadd" @close="close" @open="openViews" round="20rpx" bgColor="#ffffff" zIndex="10077">
|
|
|
<view class="view-box">
|
|
<view class="view-box">
|
|
@@ -562,6 +563,7 @@
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
|
|
+
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</template>
|
|
</template>
|
|
@@ -665,9 +667,7 @@ export default {
|
|
|
|
|
|
|
|
templateId: 'fxYJu817lxHNKXl0hJypb-y-lLm8CNmGbcwpQmasCVg',
|
|
templateId: 'fxYJu817lxHNKXl0hJypb-y-lLm8CNmGbcwpQmasCVg',
|
|
|
isAgreement: false,
|
|
isAgreement: false,
|
|
|
-
|
|
|
|
|
- wsNewUrl: 'wss://api.fhhx.runtzh.com/ws/app/webSocket',
|
|
|
|
|
- // wsNewUrl: 'ws://192.168.10.166:7114/ws/app/webSocket',
|
|
|
|
|
|
|
+
|
|
|
qrFrom: null,
|
|
qrFrom: null,
|
|
|
scene: '',
|
|
scene: '',
|
|
|
|
|
|
|
@@ -2743,14 +2743,12 @@ export default {
|
|
|
const now = new Date();
|
|
const now = new Date();
|
|
|
this.timestamp = now.getTime();
|
|
this.timestamp = now.getTime();
|
|
|
},
|
|
},
|
|
|
-
|
|
|
|
|
openCart() {
|
|
openCart() {
|
|
|
this.queryCollect();
|
|
this.queryCollect();
|
|
|
},
|
|
},
|
|
|
close() {
|
|
close() {
|
|
|
this.showadd = false;
|
|
this.showadd = false;
|
|
|
},
|
|
},
|
|
|
-
|
|
|
|
|
// 关闭小黄车
|
|
// 关闭小黄车
|
|
|
closeShop() {
|
|
closeShop() {
|
|
|
this.shopping = false;
|
|
this.shopping = false;
|
|
@@ -2767,7 +2765,7 @@ export default {
|
|
|
console.warn('WebSocket 任务不存在或未打开,无需关闭');
|
|
console.warn('WebSocket 任务不存在或未打开,无需关闭');
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
console.log(`WebSocket连接关闭 - ${isManual ? '手动' : '自动'}`);
|
|
console.log(`WebSocket连接关闭 - ${isManual ? '手动' : '自动'}`);
|
|
|
this.isManualClose = isManual;
|
|
this.isManualClose = isManual;
|
|
|
|
|
|
|
@@ -2879,7 +2877,8 @@ export default {
|
|
|
const signature = CryptoJS.HmacSHA256(`${this.liveId}${this.userData.userId}${this.userType}${this.timestamp}`, this.timestamp.toString()).toString(CryptoJS.enc.Hex);
|
|
const signature = CryptoJS.HmacSHA256(`${this.liveId}${this.userData.userId}${this.userType}${this.timestamp}`, this.timestamp.toString()).toString(CryptoJS.enc.Hex);
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
|
- const baseWsUrl = 'wss://api.fhhx.runtzh.com/ws/app/webSocket';
|
|
|
|
|
|
|
+ const baseWsUrl = 'wss://im.fhhx.runtzh.com/ws/app/webSocket';
|
|
|
|
|
+ //const baseWsUrl = 'wss://api.fhhx.runtzh.com/ws/app/webSocket';
|
|
|
// const baseWsUrl = 'ws://192.168.10.166:7114/ws/app/webSocket';
|
|
// const baseWsUrl = 'ws://192.168.10.166:7114/ws/app/webSocket';
|
|
|
let wsUrl = `${baseWsUrl}?userId=${this.userData.userId}&liveId=${this.liveId}&userType=${this.userType}×tamp=${this.timestamp}&signature=${signature}`;
|
|
let wsUrl = `${baseWsUrl}?userId=${this.userData.userId}&liveId=${this.liveId}&userType=${this.userType}×tamp=${this.timestamp}&signature=${signature}`;
|
|
|
if (this.qrFrom) {
|
|
if (this.qrFrom) {
|
|
@@ -2959,7 +2958,6 @@ export default {
|
|
|
this.isSocketOpen = false;
|
|
this.isSocketOpen = false;
|
|
|
this.isConnecting = false;
|
|
this.isConnecting = false;
|
|
|
this.stopHeartBeat(); // 清除心跳定时器
|
|
this.stopHeartBeat(); // 清除心跳定时器
|
|
|
-
|
|
|
|
|
// 根据关闭原因决定是否重连
|
|
// 根据关闭原因决定是否重连
|
|
|
if (!this.isManualClose) {
|
|
if (!this.isManualClose) {
|
|
|
if (res.code === 1000) {
|
|
if (res.code === 1000) {
|
|
@@ -3102,7 +3100,6 @@ export default {
|
|
|
}
|
|
}
|
|
|
// 清除已有定时器(无论状态是否为1,先清掉旧的)
|
|
// 清除已有定时器(无论状态是否为1,先清掉旧的)
|
|
|
clearTimeout(this.lotteryTimer);
|
|
clearTimeout(this.lotteryTimer);
|
|
|
-
|
|
|
|
|
if (this.isShowLottery) {
|
|
if (this.isShowLottery) {
|
|
|
this.lotteryTimer = setInterval(() => {
|
|
this.lotteryTimer = setInterval(() => {
|
|
|
this.countdown = this.handleTime(this.lotteryInfo.updateTime, this.lotteryInfo.duration);
|
|
this.countdown = this.handleTime(this.lotteryInfo.updateTime, this.lotteryInfo.duration);
|
|
@@ -3292,7 +3289,8 @@ export default {
|
|
|
console.error('发送消息异常:', err);
|
|
console.error('发送消息异常:', err);
|
|
|
if (retries > 0) {
|
|
if (retries > 0) {
|
|
|
setTimeout(() => this.sendMsg(retries - 1), 500);
|
|
setTimeout(() => this.sendMsg(retries - 1), 500);
|
|
|
- } else {
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ else {
|
|
|
uni.showToast({
|
|
uni.showToast({
|
|
|
title: '发送失败,请稍后再试',
|
|
title: '发送失败,请稍后再试',
|
|
|
icon: 'none'
|
|
icon: 'none'
|
|
@@ -3301,8 +3299,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
|
|
};
|
|
};
|
|
@@ -4345,4 +4342,5 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
</style>
|
|
</style>
|