Merge branch 'master' of http://1.14.104.71:10880/liujiaxin/baiyuchengpin

pages/user/index.vue

@@ -180,12 +180,12 @@
 							</view> -->
 
 							<!-- 测试用下面的 -->
-							<!-- <view class="item no-marin-bottom align-top" @click="navgetTo('/pages_course/livingList')">
+							<view class="item no-marin-bottom align-top" @click="navgetTo('/pages_course/livingList')">
 								<image
 									src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/integral.png"
 									mode=""></image>
 								<text class="text">直播</text>
-							</view> -->
+							</view>
 
 							<view class="item no-marin-bottom" @click="toManager()">
 								<image

pages_course/living.vue

@@ -110,15 +110,15 @@
 						</video>
 
 						<!-- 全屏返回按钮 - 只在全屏状态下显示 -->
-						<!-- <view v-if="isFullscreen" class="fullscreen-exit-btn" @click="exitFullscreen">
+						<view v-if="isFullscreen" class="fullscreen-exit-btn" @click="exitFullscreen">
 							<image src="/static/images/half_screen.png" class="exit-fullscreen-icon" />
 							<text class="exit-text">退出全屏</text>
-						</view> -->
+						</view>
 						<!-- 全屏按钮 - 只在非全屏状态下显示 -->
-						<!-- <view v-if="showCustomControls && liveItem.showType==1 && !isFullscreen" class="custom-controls"
+						<view v-if="showCustomControls && liveItem.showType==1 && !isFullscreen" class="custom-controls"
 							@click="toggleFullscreen">
 							<image src="/static/images/full_screen.png" class="control-icon" />
-						</view> -->
+						</view>
 
 						<!-- 投诉按钮 -->
 						<view v-if="liveItem.showType==2" class="complaint-box"

pages_shopping/live/paymentOrder.vue

@@ -268,13 +268,13 @@
 							this.toPayConfirmReward()
 						} else {
 							if (this.payType == 1) {
-								console.log("这个order", this.order)
+								// console.log("这个order", this.order)
 								const {
 									itemJson,
 									...newOrder
 								} = this.order;
 								this.newOrder = newOrder;
-								console.log("这个newOrder", this.newOrder)
+								
 								this.weixinPayOrder()
 							} else {
 								uni.showToast({