liujiaxin 3 днів тому
батько
коміт
bd2642e4f9

+ 4 - 4
common/request.js

@@ -10,15 +10,15 @@ export default class Request {
 		// let path = 'https://test.userapp.store.cdwjyyh.com';
 		// let path = 'https://user.test.ylrztop.com/api';
 
-		// let path = 'https://userapp.klbycp.com/store'; //百域承品
-		// let path2 = 'https://userapp.klbycp.com'; //百域承品
+		let path = 'https://userapp.klbycp.com/store'; //百域承品
+		let path2 = 'https://userapp.klbycp.com'; //百域承品
 
 
 		// let path = 'http://j26df4a4.natappfree.cc/store'; //百域承品 夏伟
 		// let path2 = 'http://j26df4a4.natappfree.cc'; //百域承品 夏伟
 
-		let path = 'http://d499966b.natappfree.cc/store'; //本地
-		let path2 = 'http://d499966b.natappfree.cc'; //本地
+		// let path = 'http://d499966b.natappfree.cc/store'; //本地
+		// let path2 = 'http://d499966b.natappfree.cc'; //本地
 
 
 		let type = 0

+ 2 - 1
pages/shopping/productDetails.vue

@@ -86,7 +86,8 @@
 			</view>
 		</view>
 		<!-- 底部按钮 -->
-		<view class="btn-foot" v-if="userinfo.isShow==1&&isuser==false">
+		<!-- v-if="userinfo.isShow==1&&isuser==false" -->
+		<view class="btn-foot" >
 			<view class="menu-box">
 				<view class="item" @click="goHome">
 					<image src="https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com/shop/images/back_home.png"

+ 3 - 3
pages_course/living.vue

@@ -171,7 +171,7 @@
 				<!-- &&liveItem.completionPointsEnabled -->
 				<view class="progress-countdown end" :class="liveItem.showType==2?' progress-vertical':''"
 					:style="{ 'display':isFocus?'none':''}"
-					v-if="countdownPercentage!=100&&liveItem.completionPointsEnabled&&!receiveStatus&&liveItem.status==2&&!hasReceived">
+					v-if="countdownPercentage!=100&&!receiveStatus&&liveItem.status==2&&!hasReceived">
 					<image class="title" src="/static/images/points_title.png"></image>
 					<view class="progress-bar-bg">
 						<view class="progress-bar-fill" :style="{ width: countdownPercentage + '%' }"></view>
@@ -1889,7 +1889,7 @@
 				}
 				// remainingTime = 剩余需要观看的时间
 				// 已观看时间 = 总目标时间 - 剩余时间
-				const watchedTime = this.videoDuration - this.pointsRemainingTime;
+				// const watchedTime = this.videoDuration - this.pointsRemainingTime;
 
 				// 5. 确保数值有效
 				if (watchedTime <= 0) {
@@ -1897,7 +1897,7 @@
 				}
 
 				// 6. 计算百分比(已观看时间 / 目标时间)
-				const percentage = (watchedTime / this.videoDuration) * 100;
+				const percentage = (this.watchedTime / this.videoDuration) * 100;
 
 				// 7. 限制在 0-100 范围内
 				return Math.min(100, Math.max(0, percentage));

+ 2 - 1
pages_user/user/integralLogsList.vue

@@ -5,7 +5,8 @@
 			<view class="item" v-for="(item) in dataList">
 				<view class="left">
 					<text class="title"  >
-						{{utils.getDictLabel2Name(typeOptions,item.logType)}}
+						完课积分领取记录
+						<!-- {{utils.getDictLabel2Name(typeOptions,item.logType)}} -->
 					</text>
 					<view class="time">{{item.createTime}}</view>
 				</view>