Signed-off-by: 李妹妹 <1639016684@qq.com>

pages/shopping/productDetails.vue

@@ -490,7 +490,7 @@
 			addCart(type) {
 				if (type == 'buy') {
 					const userInfoStr = uni.getStorageSync('userInfo');
-					if (!userInfoStr || !userInfoStr.maOpenId) {
+					if (!userInfoStr || !!JSON.parse(userInfoStr).maOpenId) {
 						uni.navigateTo({
 							url: '/pages/auth/login'
 						});

pages/user/index.vue

@@ -181,12 +181,12 @@
 
 
 							<!-- 测试用下面的 -->
-							<!-- <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

@@ -3,12 +3,15 @@
 		<view class="container">
 			<!-- 预告直播状态 -->
 			<view class="trailer-box" v-if="liveItem.status == 1">
-				<video v-if="liveItem.previewUrl" :id="`myVideo_${liveId}`" class="trailer-video"
-					:src="liveItem.previewUrl" :autoplay="true" :loop="false" object-fit="contain" :custom-cache="false"
-					:enable-progress-gesture="false" vslide-gesture-in-fullscreen="false" :show-center-play-btn="false"
-					:http-cache="false" @error="videoError" @loadedmetadata="onVideoMetaLoaded" @pause="onVideoPause"
-					@play="onVideoPlay" :disable-progress="true" :enable-play-gesture="true" @waiting="onVideoWaiting"
-					preload="auto" type="application/x-mpegURL" :controls="false"></video>
+				<view class="video-container2" :style="{ paddingBottom: videoRatio + '%',height:auto,width:'100%'}">
+					<video v-if="liveItem.previewUrl" :id="`myVideo_${liveId}`" class="trailer-video"
+						:src="liveItem.previewUrl" :autoplay="true" :loop="false" object-fit="fill" :custom-cache="false"
+						:enable-progress-gesture="false" vslide-gesture-in-fullscreen="false" :show-center-play-btn="false"
+						:http-cache="false" @error="videoError" @loadedmetadata="onVideoMetaLoaded" @pause="onVideoPause"
+						@play="onVideoPlay" :disable-progress="true" :enable-play-gesture="true" @waiting="onVideoWaiting"
+						preload="auto" type="application/x-mpegURL" :controls="false"></video>
+				</view>
+				
 				<image v-if="liveItem.status == 1 && !liveItem.previewUrl" class="trailer-placeholder"
 					src="https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/userapp/images/no_live.png">
 				</image>
@@ -121,8 +124,8 @@
 						</video> -->
 						<video v-if="liveItem.videoUrl && liveItem.liveType == 2 && !generating"
 							:id="`myVideo_${liveId}`" :autoplay="true" class="video-player" :src="liveItem.videoUrl"
-							:style="{transform: `scale(${scale})`, transformOrigin: 'center center', bottom:isFullscreen?'0':''}"
-							:object-fit="liveItem.showType==2?'contain':'fill'" :custom-cache="false"
+							:style="{transform:liveItem.showType!==2?`scale(${scale})`:'', transformOrigin: 'center center', bottom:isFullscreen?'0':''}"
+							:object-fit="liveItem.showType==2||isFullscreen?'contain':'fill'" :custom-cache="false"
 							:enable-progress-gesture="false" vslide-gesture-in-fullscreen="false"
 							:show-center-play-btn="false" :http-cache="false" loop @error="videoError"
 							@timeupdate="onVideoTimeUpdate" @loadedmetadata="onVideoMetaLoaded" @pause="onVideoPause"
@@ -4758,6 +4761,11 @@
 		bottom: -1px;
 		transition: all 0.3s ease;
 	}
+.video-container2 {
+		position: relative;
+		bottom: -1px;
+		transition: all 0.3s ease;
+	}
 
 	.video-player.fullscreen {
 		width: 100vh !important;
@@ -4901,7 +4909,10 @@
 
 				.trailer-video {
 					width: 100%;
-					height: 400rpx;
+					height: 100%;
+					position: absolute;
+					z-index: 1;
+					border-radius: 20rpx;
 				}
 
 				.trailer-placeholder {

pages_shopping/live/goods.vue

@@ -228,7 +228,7 @@
 			addCart(type) {
 				if (type == 'buy') {
 					const userInfoStr = uni.getStorageSync('userInfo');
-					if (!userInfoStr || !userInfoStr.maOpenId) {
+					if (!userInfoStr || !JSON.parse(userInfoStr).maOpenId) {
 						uni.navigateTo({
 							url: '/pages/auth/login'
 						});