提交

App.vue

@@ -26,7 +26,7 @@
 		onLaunch: function(e) {
 			// 检测自动更新
 			// #ifdef APP-PLUS
-			 updata();
+			 // updata();
 			// #endif
 
 			uni.getSystemInfo({

config/baseUrl.js

@@ -6,9 +6,9 @@ if (process.env.NODE_ENV === 'development') {
 	// socketUrl = "ws://localhost:6001/";
 	// baseUrl = "https://twin-ui.com/demo/";
 	// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
-	// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+	baseUrl = "https://api.nuttyreading.com/"; // 线上正式
 	// baseUrl = "http://192.168.110.110:9200/pb/"; // 磊哥
-	baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
+	// baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
 	// baseUrl = "http://59.110.212.44:9200/pb/";
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
 	// baseUrl = "http://192.168.110.110:9200/pb/";

pages/course/coursePrice.vue

@@ -21,7 +21,7 @@
 			<uni-collapse-item v-for="(item,index) in courseList" :key="index" :title="item.courseMedicine.title"
 				:thumb="item.courseMedicine.icon">
 				<view class="content" v-show="item.courseList.length > 1" style="padding:20rpx;">
-					<view :class="['courseItemleve1',userMsg.vip != 0 ? 'isVip' :'']"
+					<view :class="['courseItemleve1',(userMsg.vip != 0 && userMsg.vip != 3) ? 'isVip' :'']"
 						v-for="(item1, index1) in item.courseList" :key="index1"
 						@click="onPageJump('/pages/course/courseDetail',item1.id)">
 						<view class="vipSee" v-if="userMsg.vip != 0 && userMsg.vip != 3">
@@ -31,8 +31,9 @@
 								size="24"></u-icon><text style="font-size: 32rpx;">{{item1.title}}</text>
 						</view>
 						<template v-if="item1.courseCatalogueEntityList && item1.courseCatalogueEntityList.length > 0">
+						
 							<view class="" v-for="(item2, index2) in item1.courseCatalogueEntityList" :key="index2">								
-								<view :class="['priceItem', item2.isBuy == 1 && userMsg.vip == 0 ? 'isBuy' : '']">
+								<view :class="['priceItem', item2.isBuy == 1 && (userMsg.vip == 0 || userMsg.vip == 3) ? 'isBuy' : '']">
 									<text class="text mname" v-if="item1.courseCatalogueEntityList.length > 1"
 										style="font-weight: bold; margin-right: 10rpx;">【{{item2.title}}】</text>
 									<view class="pbox flexbox">
@@ -40,11 +41,13 @@
 										 height: 40rpx; text-align: center; line-height: 40rpx; color: #ffb861;">V</text>
 										<text class="text">半年：￥{{item2.halfFee}} 元</text><text class="text"
 											style="margin-left: 20rpx;">整年：￥{{item2.fee}} 元</text>
+											<!-- <pre>
+											{{userMsg}}-{{item2.isBuy}}
+											</pre> -->
 										<text class="buybtns" @click.stop="goBuy(item2)"
-											v-if="item2.isBuy == 0 && userMsg.vip == 0">立即购买</text>
+											v-if="item2.isBuy == 0 && (userMsg.vip == 0 || userMsg.vip == 3)">立即购买</text>
 									</view>
-									<i class="haveBuy" v-if="item2.isBuy == 1 && userMsg.vip == 0">已购买</i>
+									<i class="haveBuy" v-if="item2.isBuy == 1 && (userMsg.vip == 0 || userMsg.vip == 3)">已购买</i>
-
 								</view>
 							</view>
 						</template>

pages/miniClass/classInfoMan.vue

@@ -290,6 +290,10 @@
                           </template>
                         </text>
                         <text class="txt555" v-else> 匿名用户 </text>
+						<!-- {{item.buyState}} -->
+						<view class="" style="width: 50rpx; height: 50rpx;">
+							<image style="width: 50rpx; height: 50rpx;"  :src="item.buyState.includes('未购买') ? '../../static/icon/notbuy.png' : '../../static/icon/yesbuy.png'" mode="widthFix"></image>
+						</view>
                         <text
                           @click.stop="outClass(item.student.id)"
                           class="outBtn"

pages/miniClass/continueTest.vue

@@ -33,7 +33,7 @@
 				</view>
 				<view class="flex_box align-items_box" v-if="secondTimeDif > 0">
 					<view class="" style="font-size: 26rpx;">
-						剩余时间：
+						剩余时间:
 					</view>
 					<view class="">
 						<uni-countdown @timeup="timeup" :font-size="20" :show-day="false" 

pages/miniClass/paperBack.vue

@@ -78,6 +78,9 @@
 						</view>
 					</view>
 				</view>
+				<view class="" style="margin-top: 20rpx;">
+					<text style="color: #666; font-size: 28rpx;">开始时间：{{testPaper.startTime}} <br/> 结束时间：{{testPaper.endTime}}</text>
+				</view>
 			</view>
 		</template>
 		<u-popup key="1" :show="showPopup" :round="10" @close="hidePopup">
@@ -223,8 +226,6 @@ checkAnswer(id){
 						if (res.code == 0) {
 							// that.isHave = true	
 							var subOptions = JSON.parse(res.examPaper.subject)
-
-
 							subOptions.forEach(item => {
 								var code = 0
 								item.options.forEach(item1 => {
@@ -236,6 +237,7 @@ checkAnswer(id){
 
 							this.questionList = subOptions
 							this.testPaper = res.examPaper
+							console.log('试卷信息', this.testPaper);
 							this.answerIdsList = JSON.parse(res.examPaper.answer)
 							var newList = JSON.parse(res.examPaper.answer)
 							newList = newList.map(item => {

pages/miniClass/test.vue

@@ -32,7 +32,7 @@
 				</view>
 				<view class="flex_box align-items_box" v-if="secondTimeDif > 0">
 					<view class="">
-						剩余时间：
+						剩余时间:
 					</view>
 					<view class="">
 						<uni-countdown @timeup="timeup" :font-size="20" :show-day="false" 

pages/selfStudy/selfStudy.vue

@@ -32,7 +32,7 @@
 				</view>
 				<view class="flex_box align-items_box" v-if="secondTimeDif > 0">
 					<view class="">
-						剩余时间：
+						剩余时间:
 					</view>
 					<view class="">
 						<uni-countdown @timeup="timeup" :font-size="20" :show-day="false"