提交

config/baseUrl.js

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

main.js

@@ -17,7 +17,7 @@ import {
 Vue.prototype.$getHours = nowHour
 
 // 地址
-// Vue.prototype.$baseUrl = "http://192.168.110.100:9100/pb/"
+//Vue.prototype.$baseUrl = "http://192.168.110.100:9100/pb/"
 Vue.prototype.$baseUrl = "https://api.nuttyreading.com/"
 // 安卓安卓包下载地址
 // Vue.prototype.$apkUrl = "https://www.nuttyreading.com/nuttyreading.apk"    // 本地地址

manifest.json

@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "2.0.11",
-    "versionCode" : 2011,
+    "versionName" : "2.0.13",
+    "versionCode" : 2013,
     "app-plus" : {
         "nvueCompiler" : "uni-app",
         "compatible" : {

pages/component/commonComponents/video/index.vue

@@ -158,6 +158,7 @@
 				this.$emit('unlockChangeVideo')
 			},
 			hideNextVideo() {
+				console.log(11111111111111)
 				this.showCountDown = false
 				this.playEndBlank = false
 				this.$emit('hideNextVideo')

pages/course/chapterDetailAndorid.vue

@@ -78,7 +78,7 @@
 									<view class="score" v-if="myAnswer.scoreSuccess == 0 && myAnswer.scoreInfo != ''">
 										<text>正在评分</text>
 									</view>
-									<view class="score" v-if="myAnswer.scoreSuccess != 0">
+									<view class="score" v-if="myAnswer.scoreSuccess > 2">
 										<text>{{myAnswer.score}}分</text>
 									</view>
 								</view>								

pages/miniClass/classInfo.vue

@@ -324,7 +324,7 @@
 													<!-- <view class="score" v-if="item.scoreSuccess > 0 && item.scoreSuccess ">
 														正在评分
 													</view> -->
-													<view class="score" v-if="item.scoreSuccess >= 1">
+													<view class="score" v-if="item.scoreSuccess >= 3">
 														分数：{{item.score}}
 													</view>
 												</view>
@@ -335,8 +335,8 @@
 											<template v-if="roleCode.includes('0') && isHave && tijiaoTitleId != 2">
 												<template  v-if="item.reply && item.otherInfo != null">
 													<text v-if="item.otherInfo[0].scoreSuccess == 0">等待评分</text>
-													<text class="pIng" v-if="item.otherInfo[0].scoreSuccess < 2 && item.otherInfo[0].scoreSuccess > 0">正在评分</text>
-													<view class="" v-if="item.otherInfo[0].scoreSuccess >=2">
+													<text class="pIng" v-if="item.otherInfo[0].scoreSuccess < 3 && item.otherInfo[0].scoreSuccess > 0">正在评分</text>
+													<view class="" v-if="item.otherInfo[0].scoreSuccess >2">
 														<text class="score" >{{item.otherInfo[0].score}} 分</text>
 														<!-- <text style="color: #999; padding-left: 10rpx; font-size: 26rpx;">分</text> -->
 													</view>
@@ -382,13 +382,13 @@
 											<template v-else>
 												<!-- <text  class=""
 													style="padding-left: 10rpx; color: #55aaff; font-size: 26rpx;">已作答</text> -->
-												<text style="padding-left: 10rpx; color: #55aa7f; font-size: 26rpx;" v-if="item.reply.scoreSuccess <= 0 && thisClass.state != '2'">
+												<text style="padding-left: 10rpx; color: #55aa7f; font-size: 26rpx;" v-if="item.reply.scoreSuccess <= 2 && thisClass.state != '2'">
 													等待评分
 												</text>
-												<text style="padding-left: 10rpx; color: #999; font-size: 26rpx;" v-if="item.reply.scoreSuccess <= 0 && thisClass.state == '2'">
+												<text style="padding-left: 10rpx; color: #999; font-size: 26rpx;" v-if="item.reply.scoreSuccess <= 2 && thisClass.state == '2'">
 													已结班无法评分
 												</text>
-												<view class="" style="margin-left: 5rpx;"  v-if="item.reply.scoreSuccess > 0">
+												<view class="" style="margin-left: 5rpx;"  v-if="item.reply.scoreSuccess > 2">
 													<text class="score">{{item.reply.score}}</text><text style="color: #999;">分</text>
 												</view>
 											</template>

pages/miniClass/classInfoMan.vue

@@ -704,6 +704,7 @@ export default {
         fontWeight: "bold",
         color: "#258feb",
       },
+	  classStatus: false,  //点击结班改变按钮状态
     };
   },
   onLoad(e) {
@@ -1096,6 +1097,10 @@ export default {
     },
     // 改变班级状态
     changeClassStatu(statusCode) {
+		if(this.classStatus){
+			return
+		}
+		this.classStatus = true;
 		debounce(async () => {
 			let that = this;
 			that.opClass(statusCode);
@@ -1180,6 +1185,7 @@ export default {
               title: "操作成功",
               icon: "success",
             });
+			
             setTimeout(() => {
               this.getClassInfo();
               if (statusCode == "2") {
@@ -1196,9 +1202,11 @@ export default {
         })
         .catch((e) => {
           uni.hideLoading();
+		  //恢复按钮状态
+		  this.classStatus = false;
           console.log(e, "数据报错");
           uni.showToast({
-            title: res.errMsg,
+            title: e.errMsg,
             icon: "none",
             duration: 3000,
           });
@@ -1363,7 +1371,7 @@ export default {
             this.thisClass.homeWorkNumber = 0;
             if (res.result.classModel.days > 0) {
               this.thisClass.homeWorkNumber = Math.ceil(
-                (res.result.classModel.days - res.result.classModel.examDays) /
+                (res.result.classModel.days) /
                   7
               );
             }

pages/miniClass/taskDetail.vue

@@ -62,10 +62,10 @@
 									<text @click="editOrAdd(item)">修改</text>	
 								</view>
 								<template v-if="item.scoreInfo != '' && listDisplay == '1'">
-									<view class="score" v-show="item.scoreSuccess >= 2">
+									<view class="score" v-show="item.scoreSuccess > 2">
 										分数：{{item.score}}
 									</view>
-									<view class="score" v-show="item.scoreSuccess < 2 && (classState == '1' || classState == '3')">
+									<view class="score" v-show="item.scoreSuccess < 3 && (classState == '1' || classState == '3')">
 										正在评分
 									</view>									
 								</template>

pages/peanut/home.vue

@@ -488,7 +488,7 @@
     </view>
     <!-- 应对华为审核，去掉app跳转 -->
     <view class="appJump">
-      <view class="soulspace item flexbox" @click="appjumpfun('soulspace')" v-if="$platform != 'ios'">
+      <view class="soulspace item flexbox" @click="appjumpfun('soulspace')">
         <view class="img">
           <image src="@/static/xlkj.png"></image>
         </view>