From 13c656d9b56a2a3a14214a03a6da8b2851d47510 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Mon, 9 Sep 2024 17:08:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6master=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/baseUrl.js                             |  4 +--
 pages/course/courseDetail.vue                 | 12 ++++-----
 pages/miniClass/addHomeWork.vue               |  6 ++---
 pages/miniClass/classInfo.vue                 | 26 +++++++++++--------
 pages/miniClass/classInfoMan.vue              |  4 +--
 pages/miniClass/classInfoWork.vue             |  4 +--
 .../components/sutdent_score_list.vue         |  8 +++++-
 pages/miniClass/taskListForWaitOpen.vue       |  1 +
 8 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/config/baseUrl.js b/config/baseUrl.js
index 4814761..e1f047e 100644
--- a/config/baseUrl.js
+++ b/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/";
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index 44456d2..774824a 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -101,7 +101,7 @@
 			</view>
 			<view class="containerBg2">
 				<!-- 目录 -->
-				<view :class="['coursePart','flexbox', userMsg.vip != 0 ? 'vipBgColor':'']"
+				<view :class="['coursePart','flexbox', (userMsg.vip == 1 || userMsg.vip == 2) ? 'vipBgColor':'']"
 					v-if="librayList.length > 1">
 					<view :class="['item','flexbox',curId == item.id? 'active': '' ]"
 						v-for="(item, index) in librayList" :key="index" @click="clicklib(item,index)">
@@ -111,11 +111,11 @@
 				</view>
 				<!-- end -->
 				<template v-if="librayList[curIndex]">
-					<view :class="['endBox',userMsg.vip != 0 ? 'vipBgColor':'']"
+					<view :class="['endBox',(userMsg.vip == 1 || userMsg.vip == 2) ? 'vipBgColor':'']"
 						v-if="librayList[curIndex].isBuy == 1 || userMsg.vip != 0">
 						<!-- 已经可以观看的情况 -->
 						<view class="box">
-							<view class="flexbox" v-if="userMsg.vip != 0">	
+							<view class="flexbox" v-if="userMsg.vip == 1 || userMsg.vip == 2">	
 									<!-- vip到期时间 -->
 								<text>VIP畅学权益有效期截止到：{{userMsg.userVip.endTime}} </text>
 								<!-- <uni-tag type="warning" text="去学习"></uni-tag> -->
@@ -152,9 +152,9 @@
 				</template>
 
 				<view class="shiting_content">
-					<view :class="['chapter_content',userMsg.vip != 0 ? 'vipchapter_content' : '']"
+					<view :class="['chapter_content', (userMsg.vip == 1 || userMsg.vip == 2) ? 'vipchapter_content' : '']"
 						v-if="chapterList.length > 0">
-						<view class="vipSee" v-if="userMsg && userMsg.vip != 0">
+						<view class="vipSee" v-if="userMsg && (userMsg.vip == 1 || userMsg.vip == 2)">
 							<text>VIP畅学权益生效中</text>
 						</view>
 						<view @click="gotoDetail(item, index)" class="item" v-for="(item, index) in chapterList"
@@ -733,7 +733,7 @@
 					_myurl = '/pages/course/chapterDetailAndorid'
 				// }
 				if (this.librayList[this.curIndex].isBuy == 1 || v.isAudition == 1 ||
-					this.vip.type != "0") {
+					this.vip.type != "1" || this.vip.type != "2") {
 					let noRecored = false
 					v.isAudition == 1 && this.userMsg.vip == 0 && this.librayList[this.curIndex].isBuy == 0 ?
 						noRecored = true : ''
diff --git a/pages/miniClass/addHomeWork.vue b/pages/miniClass/addHomeWork.vue
index 283abad..5efc25b 100644
--- a/pages/miniClass/addHomeWork.vue
+++ b/pages/miniClass/addHomeWork.vue
@@ -134,10 +134,10 @@ import $http from '@/config/requestConfig.js';
 			if(e.sort != 'undefined' && e.sort){
 				this.form.sort = e.sort 
 			}	
-			if(e.type = 2){
+			if(e.type == 2){
 				this.form.display = '0'
 			}
-			this.pageType = e.type
+			// this.pageType = e.type
 			this.form.classId = e.classId
 			this.form.type = e.type
 			if(e.type){
@@ -159,7 +159,7 @@ import $http from '@/config/requestConfig.js';
 			}else if(e.type == 1){
 				this.pageType = '医案'
 			}else if( e.type == 2){
-				this.pageType = '心得'
+				this.pageType = '心得222'
 			}else{
 				this.pageType = '作业'
 			}
diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue
index 7132d21..2a2762f 100644
--- a/pages/miniClass/classInfo.vue
+++ b/pages/miniClass/classInfo.vue
@@ -39,8 +39,9 @@
 						class="mainTxt">{{students.length}}/{{thisClass.number}}人</text></view>
 				<view><text class="ciyao">管理成员</text><text class="mainTxt" @click="seeManager">点击查看</text></view>
 			</view>
+			<!-- v-if="thisClass.state == '2'" -->
 			<view class="pingfenBox testBox"
-				v-if="thisClass.state == '2'">
+				>
 				<view class="scoreTitle">
 					<view class="titles flex_box">
 						<text>总成绩</text>
@@ -48,18 +49,18 @@
 							@click="showTestTips = true"></uni-icons> -->
 					</view>
 				</view>
-				<view class="optionsBox" v-if="thisClass.state == '3'">					
+				<!-- v-if="thisClass.state == '3'" -->
+				<view class="optionsBox" >					
 					<!-- v-show="thisClass.state == '2'" -->
 					<view class="chengji">
-						<view>恭喜您获得<text class="greenScore">A证</text>， <text
+						<view style="margin-top: 20rpx;">总成绩：<text class="scoreNumber greenScore">{{performanceScore.userScore}}</text>分 <text
+								class="c999">（{{performanceScore.examScore}}分考试分+{{performanceScore.usualScore}}分平时表现分）</text></view>
+						<view>恭喜您获得<text class="greenScore">A证</text>，<text
 								class="small_btn border_radius_10 zhengshu">查看证书</text></view>
 						<view style="margin-top: 20rpx; text-align: center;">很遗憾，您的成绩未达标</view>
 						<view class="" style="margin-top: 20rpx; text-align: center;">
 							<text class="small_btn chongxiu border_radius_10">加入新班级重修</text>
 						</view>
-						<!-- <view style="margin-top: 20rpx;">总成绩为：<text class="scoreNumber greenScore">90</text>分 <text
-								class="c999">（50考试分+40平时表现分）</text></view> -->
-			
 					</view>
 				</view>
 			</view>
@@ -385,7 +386,7 @@
 					<template v-if="admins.scorer.length > 0">
 						<view class="arryItemSub" v-for="(item,index) in admins.scorer" :key="index">
 							<template v-if="item.user != null">
-								<text>{{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname+' ' : '匿名用户 '}}</text>
+								<text>{{item.user.nickname != null && item.user.nickname != '' ? item.user.nickname+'，' : '匿名用户，'}}</text>
 								<!-- <text>({{item.user.tel}}),</text> -->
 							</template>
 						</view>
@@ -932,7 +933,8 @@
 						url: "common/class/getUserScore",
 						method: "POST",
 						data: {
-							"classId": this.classId
+							"classId": this.classId,
+							"userId": this.userInfo.id
 						},
 						header: { //默认 无 说明：请求头
 							'Content-Type': 'application/json'
@@ -1067,10 +1069,10 @@
 					"page": this.pPage,
 					"classId": this.thisClass.id,
 					"type": this.tijiaoTitleId + '', //类型 0班内任务1医案2心得
-					"myExperience": this.myExperience, //0全部心得1我的心得
+					"myExperience": this.tijiaoTitleId != 2 ? "0" : "1", //0全部心得1我的心得 this.myExperience
 					"title": ""
 				}
-				console.log('data', data);
+				console.log('data任务/心得', data);
 				$http.request({
 						url: "common/class/getClassTaskListStudent",
 						method: "POST",
@@ -1102,9 +1104,11 @@
 							this.loadFlag = false;
 							console.log('res', res);
 							uni.hideLoading()
+						}else{
+							console.log('数据获取失败.......', res);
 						}
 					}).catch(e => {
-						console.log(e, '数据报错')
+						console.log( '数据报错', e)
 						uni.hideLoading()
 						this.loadFlag = false;
 						uni.showToast({
diff --git a/pages/miniClass/classInfoMan.vue b/pages/miniClass/classInfoMan.vue
index 9668031..13dc1f8 100644
--- a/pages/miniClass/classInfoMan.vue
+++ b/pages/miniClass/classInfoMan.vue
@@ -383,9 +383,9 @@
 				<view class="item">
 					<text><b>电话：</b>{{thisStudent.student.tel}}</text>
 				</view>
-				<!-- <view class="item">
+				<view class="item">
 					<b>课程购买情况：</b><br />{{thisStudent.buyState}}
-				</view> -->				
+				</view>				
 			</view>
 		</u-popup>
 		<u-popup key="3" v-if="showStudentScoreBlank" :show="showStudentScoreBlank" :round="10" @close="closePup" ref="">
diff --git a/pages/miniClass/classInfoWork.vue b/pages/miniClass/classInfoWork.vue
index 15d945d..895db52 100644
--- a/pages/miniClass/classInfoWork.vue
+++ b/pages/miniClass/classInfoWork.vue
@@ -227,9 +227,9 @@
 				<view class="item">
 					<text><b>电话：</b>{{thisStudent.student.tel}}</text>
 				</view>
-				<!-- <view class="item">
+				<view class="item">
 					<b>课程购买情况：</b><br />{{thisStudent.buyState}}
-				</view> -->
+				</view>
 				<view class="scoreBox flex_box flex_between border_radius_10 ">
 					<view class="">
 						<view class="ciyao">
diff --git a/pages/miniClass/components/sutdent_score_list.vue b/pages/miniClass/components/sutdent_score_list.vue
index e1d87dd..d98fe4f 100644
--- a/pages/miniClass/components/sutdent_score_list.vue
+++ b/pages/miniClass/components/sutdent_score_list.vue
@@ -85,7 +85,13 @@
 											考试成绩
 										</view>
 										<text class="score">{{item.examScore}}分</text>
-									</view>																				
+									</view>
+									<view v-if="thisClass.state == '2'">
+										<view class="ciyao">
+											总分
+										</view>
+										<text class="score">{{item.userScore}}分</text>
+									</view>
 								</template>
 							</template>
 							<!--   -->
diff --git a/pages/miniClass/taskListForWaitOpen.vue b/pages/miniClass/taskListForWaitOpen.vue
index 716ce5d..9d30664 100644
--- a/pages/miniClass/taskListForWaitOpen.vue
+++ b/pages/miniClass/taskListForWaitOpen.vue
@@ -213,6 +213,7 @@
 				})
 			},
 			addTask(item){
+				// console.log('type',this.pageType);
 				var _sort = undefined
 				item ? _sort = item.sort : undefined
 				uni.navigateTo({