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

common/request.js

@@ -83,6 +83,7 @@ export default class Request {
 				header: {
 					// 'Content-Type': 'application/x-www-form-urlencoded',
 					'Content-Type': httpContentType,
+					'appid':wx.getAccountInfoSync().miniProgram.appId,
 					'AppToken': token
 				},
 				url: `${path}${router}`,

pages_course/living.vue

@@ -256,7 +256,8 @@
 								:class="{ 'input-focused': isFocus }" @focus="inputFocus" @blur="inputBlur"
 								cursor-spacing="100" :adjust-position="false" :disabled="isEnd" />
 							<!-- v-if="isFocus&&!isIOS" -->
-							<view class="send-button" v-if="!isIOS" :class="liveItem.showType == 1 ? 'send2' : ''" @click="sendMsg()">
+							<view class="send-button" v-if="!isIOS" :class="liveItem.showType == 1 ? 'send2' : ''"
+								@click="sendMsg()">
 								发送</view>
 						</view>
 						<!--  :class="{ 'action-buttons-hidden': isFocus }" -->
@@ -315,11 +316,11 @@
 			<!-- :show="userlogo" -->
 			<u-popup :show="userlogo" mode="bottom" round='12'>
 				<view class="userlogo column">
-					<view class="bold fs36 ml20">授权你的昵称信息</view>
-					<view class=" justify-between align-center  plr20">
+					<view class="bold fs36 mt42">授权你的昵称信息</view>
+					<view class=" justify-between align-center  mt42">
 						<view class="button-container">
 							<input type="nickname" class="hidden-input"
-								placeholder-style="color:#ffffff; font-size:44rpx;" @blur="onNickNameInput"
+								placeholder-style="color:#ffffff; font-size:32rpx;" @blur="onNickNameInput"
 								placeholder="请点击授权微信昵称" @input="onNickNameInput" />
 						</view>
 					</view>
@@ -1102,20 +1103,21 @@
 			this.startTimer();
 
 			this.$nextTick(() => {
-				if (!this.userInfo || !this.userInfo.updateTime) {
+				console.log(444,this.userInfo);
+				if (!this.userInfo || !this.userInfo.nickname) {
 					console.log('用户信息不完整，显示授权弹窗');
 					this.userlogo = true;
 					return;
 				}
 
-				// 重新计算 isNow
-				const isNowCalculated = dayjs(this.userInfo.updateTime).isSame(dayjs(), 'day');
-				console.log('重新计算 isNow:', isNowCalculated);
+				// // 重新计算 isNow
+				// const isNowCalculated = dayjs(this.userInfo.updateTime).isSame(dayjs(), 'day');
+				// console.log('重新计算 isNow:', isNowCalculated);
 
-				if (!isNowCalculated) {
-					console.log('不是今天更新过，显示授权弹窗');
-					this.userlogo = true;
-				}
+				// if (!isNowCalculated) {
+				// 	console.log('不是今天更新过，显示授权弹窗');
+				// 	this.userlogo = true;
+				// }
 				setTimeout(() => {
 					this.videoContext = uni.createVideoContext(`myVideo_${this.liveId}`, this);
 					console.log('videoContext 初始化完成:', this.videoContext);
@@ -5511,8 +5513,12 @@
 			}
 
 			.userlogo {
-				padding: 60rpx 20rpx 40rpx;
-				color: #181818;
+				padding: 36rpx 40rpx;
+				color: #000000;
+
+				.mt42 {
+					margin-top: 42rpx;
+				}
 
 				.boxweixin {
 					width: 44rpx;
@@ -5528,44 +5534,43 @@
 					margin: auto;
 
 					.hidden-input {
+						width: calc(100vw - 80rpx);
 						text-align: center;
-						background-color: #00aa00;
-						padding: 40rpx 10rpx;
-						margin: 0 auto;
-						margin: 40rpx 0 20rpx;
-						font-size: 44rpx !important;
-						color: #1d1d1d !important;
+						height: 104rpx;
+						background: #07C160;
+						padding: 30rpx 0;
+						box-sizing: border-box;
+						border-radius: 12rpx;
+						font-size: 32rpx !important;
+						color: #FFFFFF !important;
 						/* 输入文字大小 */
 					}
 
 					/* 针对 placeholder 的样式 */
 					.hidden-input::placeholder {
 						font-size: 44rpx !important;
-						color: #1d1d1d !important;
+						color: #FFFFFF !important;
 					}
 
 					/* 兼容微信小程序的 placeholder 样式 */
 					.hidden-input .placeholder {
 						font-size: 44rpx !important;
-						color: #1d1d1d !important;
+						color: #FFFFFF !important;
 					}
 				}
 
 				.submitname {
-					background-color: #ffffff;
-					border: 3rpx solid #00aa00;
-					border-radius: 16rpx;
-					color: #000000;
-					width: 70%;
-					font-size: 36rpx;
-					margin: 0 auto;
+					height: 104rpx;
+					line-height: 104rpx;
+					background: #F2F2F2;
+					border-radius: 12rpx;
+					font-size: 32rpx;
+					color: #07C160;
+					margin-top: 32rpx;
 					text-align: center;
-					padding: 20rpx;
-					margin-top: 40rpx;
 				}
 			}
 
-
 			// 抽奖弹窗1
 			.lottery-popup {
 				position: relative;
@@ -6293,7 +6298,8 @@
 						margin-right: 24rpx;
 						display: flex;
 						align-items: center;
-                        color:#000;
+						color: #000;
+
 						.search-icon {
 							width: 24rpx;
 							margin-right: 16rpx;