提交

config/baseUrl.js

@@ -2,13 +2,13 @@ let baseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	//baseUrl = "https://api.nuttyreading.com/"; //线上正式
+	baseUrl = "https://api.nuttyreading.com/"; //线上正式
-	baseUrl = "http://192.168.110.100:9200/pb/"; //张川川
+	// baseUrl = "http://192.168.110.100:9200/pb/"; //张川川
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境11
-	//baseUrl = "https://api.nuttyreading.com/";
+	baseUrl = "https://api.nuttyreading.com/";
 	//baseUrl = "https://testapi.nuttyreading.com/"; //线上正式
-	baseUrl = "http://192.168.110.100:9200/pb/"; //张川川
+	// baseUrl = "http://192.168.110.100:9200/pb/"; //张川川
 }
 const courtConfig = {
 	//微信公众号APPID1

config/requestConfig.js

@@ -40,7 +40,7 @@ let $http = new request({
 		'Content-Type': 'application/x-www-form-urlencoded',
 		// 'project_token': base.projectToken, //项目token（可删除）
 	},
-	timeout: '15000' // 15秒
+	timeout: '20000' // 15秒
 
 });
 // 添加获取七牛云token的方法

pages/miniClass/MonitorClassList.vue

@@ -72,7 +72,9 @@
 									<view class="jianjie">
 										目标学员人数：{{item.number}} 人<br/>
 										<text v-if="item.startTime&&item.studyEndTime">学习日期：{{(item.startTime).split('T')[0]}}至{{(item.studyEndTime).substring(0, 10)}}<br/></text>
+										
 										<text v-if="item.examStartTime&&item.examEndTime">考试周日期：{{item.examStartTime.substring(0, 10)}}至{{(item.examEndTime).substring(0, 10)}}</text>
+									
 									</view>
 									<view class="jianjie">
 										班内职务：{{item.roleName}}
@@ -111,7 +113,9 @@
 									<view class="jianjie">
 										目标学员人数：{{item.number}} 人<br/>
 										<text v-if="item.startTime&&item.studyEndTime">学习日期：{{(item.startTime).split('T')[0]}}至{{(item.studyEndTime).substring(0, 10)}}<br/></text>
+										
 										<text v-if="item.examStartTime&&item.examEndTime">考试周日期：{{item.examStartTime.substring(0, 10)}}至{{(item.examEndTime).substring(0, 10)}}</text>
+							
 									</view>
 									<view class="jianjie">
 										班内职务：{{item.roleName}}
@@ -620,12 +624,12 @@
 
 			@include mshadow(10px, 1) .imgcontainer {
 				display: block;
-				width: 90rpx;
+				width: 240rpx;
 				margin-right: 20rpx;
 				// background-size: cover;
 				// background-position: center;
 				height: 200rpx;
-				flex-grow: 1;
+				// flex-grow: 1;
 				// @include ptop_bottm(10px);
 				overflow: hidden;
 
@@ -752,4 +756,7 @@
 			}
 		}
 	}
+	.buyItems{
+		width: calc(100% - 240rpx);
+	}
 </style>

pages/miniClass/classInfo.vue

@@ -245,7 +245,7 @@
 								</view>
 							</view>
 						</view>
-						<sutdent-score-list :students="students" :classModel="classModel" :tabId="tabId"
+						<sutdent-score-list :students="students" :classModel="classModel" :tabId="tabId" :pageSorce="options.isMyClass?'myClass':''"
 							:thisClass="thisClass" @chooseStudent="chooseStudent"
 							v-if="(thisClass.state == '3' || thisClass.state == '2') && students.length > 0"></sutdent-score-list>
 					</template>
@@ -530,6 +530,7 @@
 	export default {
 		data() {
 			return {
+				options:{},
 				currentStudyNumber:0,
 				courseActiveStyle:{
 					background:'#fff',
@@ -689,7 +690,9 @@
 			this.scrollTop = e.scrollTop;
 		},
 		onLoad(e) {
+		this.options=e
 			uni.hideTabBar();
+
 			// #ifdef APP-PLUS
 			plus.screen.lockOrientation("portrait-primary")
 			// #endif

pages/miniClass/classInfoMan.vue

@@ -28,10 +28,16 @@
           <view class="welComeText">
             <text>【 班内职务：{{ getRoleName }} 】</text>
           </view>
-		  <span v-if="examStartTime&&examEndTime" style=" font-size: 26rpx; color: #999; font-weight: normal; display: block; padding:20rpx 0; line-height: 34rpx;">
+		   <!-- v-if="examStartTime&&examEndTime&&examStartTime!=''&&examEndTime!=''" -->
+		  
+		  <span v-if="thisClass.startTime&&thisClass.studyEndTime" style=" font-size: 26rpx; color: #999; font-weight: normal; display: block; padding:20rpx 0; line-height: 34rpx;">
 		  	学习日期：{{thisClass.startTime.substring(0,10)}} 至 {{thisClass.studyEndTime.substring(0,10)}}<br/>
+		  	
+		  </span>
+		  <span v-if="examStartTime&&examEndTime" style=" font-size: 26rpx; color: #999; font-weight: normal; display: block; padding:0 0 20rpx; line-height: 34rpx;">
+		  	
 		  	考试周日期：{{examStartTime.substring(0,10)}} 至 {{examEndTime.substring(0,10)}}
-		  	<b style="font-size: 26rpx;line-height: 34rpx;color: red; font-weight: normal; display: block;">距离考试周开始还有：{{examEndDays}}天</b>
+		  	<b style="font-size: 26rpx;line-height: 34rpx;color: red; font-weight: normal; display: block;" v-if="examEndDays!=undefined">距离考试周开始还有：{{examEndDays}}天</b>
 		  	<b style="font-size: 26rpx;line-height: 34rpx;color: red; font-weight: normal; display: block;">(注：考试周开始后无法提交答案)</b>
 		  </span>
         </view>
@@ -1333,6 +1339,7 @@ export default {
             //默认 无 说明：请求头
             "Content-Type": "application/json",
           },
+		  
         })
         .then(async (res) => {
           console.log("res--------", this.classId, res);

pages/miniClass/components/sutdent_score_list.vue

@@ -39,11 +39,12 @@
 									v-if="item.user.nickname != null && item.user.nickname != ''">
 									{{item.user.nickname}}
 									<template>
-										<text>（{{item.user.tel}}）</text>
+										<text v-if="pageSorce!='myClass'">（{{item.user.tel}}）</text>
 									</template>
 								</view>
 								<text class="txt555" v-else>
 									匿名用户
+									
 								</text>										
 								<!-- <text @click.stop="outClass(item.student.id)" class="outBtn"
 									v-if="thisClass.state != '2' && thisClass.state != '3'">踢出班级</text> -->
@@ -85,7 +86,10 @@
 							</template>
 							<!--   -->
 							<template v-if="classModel.isExam == 1 && item.classExamUsers.length > 0 && thisClass.state == '2'" >
-								<view v-if="item.userScore >= 60 && item.userScore < 70"
+					
+					<view :class="isShowA(item, index)"></view>
+							<!-- <view v-html="isShowA(item,index)"></view> -->
+								<!-- <view v-if="item.userScore >= 60 && item.userScore < 70"
 								:class="['PM_font','zhengshu','Bzheng']"
 								 ></view>
 								<view  v-else-if="item.userScore >= 70"
@@ -93,7 +97,7 @@
 								 ></view>
 								 <view  v-else
 								 :class="['PM_font','zhengshu','bujige']"
-								  ></view>
+								  ></view> -->
 							</template>							
 							</view>
 						</view>
@@ -106,7 +110,7 @@
 
 <script>
 	export default {
-		props:['students','tabId','thisClass','classModel'],
+		props:['students','tabId','thisClass','classModel','pageSorce'],
 		data(){
 			return{
 				
@@ -116,6 +120,31 @@
 			console.log('进来了吗？beforeUpdate-----------');
 		}	,
 		methods:{
+			isShowA(item,index){
+				var max;
+				var str=''
+				if (this.thisClass.title.includes("精英")) {
+				  max=Math.ceil(this.students.length * 0.2);
+				} else {
+					 max=Math.ceil(this.students.length * 0.1);
+				 
+				}
+				
+				 if (item.userScore >= 70) {
+				      if (index + 1 <= max) {
+				        str = "PM_fon zhengshu Azheng";
+				      } else {
+				        str = "PM_fon zhengshu Bzheng";
+				      }
+				    } else if (item.userScore >= 60 && item.userScore < 70) {
+				      str = "PM_fon zhengshu Bzheng";
+				    } else {
+				      str = "PM_fon zhengshu bujige";
+				    }
+				console.log(str)
+				
+				return str
+			},
 			clickStudent(item) {
 				// console.log('item', item);		
 				this.$emit('chooseStudent',item)

pages/miniClass/myClassList.vue

@@ -406,7 +406,7 @@
 			onPageJump(url, id, have) {
 				// console.log('进来了',url,id);				
 				uni.navigateTo({
-					url: `${url}?id=${id}`
+					url: `${url}?id=${id}&isMyClass=1`
 				});
 			},
 
@@ -492,13 +492,13 @@
 
 			@include mshadow(10px, 1) .imgcontainer {
 				display: block;
-				width: 90rpx;
+				width: 240rpx;
 				flex-shrink: 0;
 				margin-right: 20rpx;
 				// background-size: cover;
 				// background-position: center;
 				height: 200rpx;
-				flex-grow: 1;
+				// flex-grow: 1;
 				// @include ptop_bottm(10px);
 				overflow: hidden;
 
@@ -626,4 +626,7 @@
 			}
 		}
 	}
+	.buyItems{
+		width: calc(100% - 240rpx);
+	}
 </style>