Merge branch 'beta' into HK

src/components/easy2/studyStudent.vue

@@ -109,7 +109,7 @@
             <div class="returnBtn" @click="nextOrpreSteps(0)">上一步</div>
             <div class="returnBtn" @click="nextOrpreSteps(1)">下一步</div>
             <div class="returnBtn" @click="refreshCourse">刷新</div>
-            <div class="returnBtn" @click="setPz" v-if="tType == 1">评课</div>
+            <div class="returnBtn" @click="setPz" v-if="tType == 1">评论</div>
             <!-- <div class="returnBtn" @click="allScrell">全屏</div> -->
             <!-- <div class="returnBtn" @click="startRecording" v-if="!videoStart && (tType == 1 || tType == 4)">
               开始录制

src/components/easy3/studyStudent.vue

@@ -109,7 +109,7 @@
             <div class="returnBtn" @click="nextOrpreSteps(0)">上一步</div>
             <div class="returnBtn" @click="nextOrpreSteps(1)">下一步</div>
             <div class="returnBtn" @click="refreshCourse">刷新</div>
-            <div class="returnBtn" @click="setPz" v-if="tType == 1">评课</div>
+            <div class="returnBtn" @click="setPz" v-if="tType == 1">评论</div>
             <!-- <div class="returnBtn" @click="allScrell">全屏</div> -->
             <!-- <div class="returnBtn" @click="startRecording" v-if="!videoStart && (tType == 1 || tType == 4)">
               开始录制