Merge branch 'dev' into x_bf_1

src/pages/course-detail/index copy.vue

@@ -4325,10 +4325,10 @@ export default {
       // } else {
       const canvas = document.createElement("canvas");
       canvas.width = 400;
-      canvas.height = 300;
+      canvas.height = 400;
       const context = canvas.getContext("2d");
       const video = document.getElementById("video");
-      context.drawImage(video, 0, 0, 400, 300);
+      context.drawImage(video, 0, 0, 400, 400);
       this.faceUrl = canvas.toDataURL("image/png");
       this.isTaking = false;
       // }
@@ -7274,7 +7274,8 @@ export default {
         float: right;
         width: 400px;
         height: 400px;
-
+        position: relative;
+        overflow: hidden;
         video {
           width: 100%;
           height: 100%;

src/pages/course-detail/index.vue

@@ -4912,10 +4912,10 @@ export default {
       // } else {
       const canvas = document.createElement("canvas");
       canvas.width = 400;
-      canvas.height = 300;
+      canvas.height = 400;
       const context = canvas.getContext("2d");
       const video = document.getElementById("video");
-      context.drawImage(video, 0, 0, 400, 300);
+      context.drawImage(video, 0, 0, 400, 400);
       this.faceUrl = canvas.toDataURL("image/png");
       this.isTaking = false;
       // }
@@ -8298,7 +8298,8 @@ export default {
         float: right;
         width: 400px;
         height: 400px;
-
+        position: relative;
+        overflow: hidden;
         video {
           width: 100%;
           height: 100%;

src/pages/course-exam/index.vue

@@ -1703,10 +1703,10 @@ export default {
       // } else {
       const canvas = document.createElement("canvas");
       canvas.width = 400;
-      canvas.height = 300;
+      canvas.height = 400;
       const context = canvas.getContext("2d");
       const video = document.getElementById("video");
-      context.drawImage(video, 0, 0, 400, 300);
+      context.drawImage(video, 0, 0, 400, 400);
       this.faceUrl = canvas.toDataURL("image/png");
       this.isTaking = false;
       // }

src/pages/home/index.vue

@@ -6,6 +6,7 @@
           <div class="text-list" v-if="!userInfo">
             <a @click="go('/login', { state: 1 })">登录</a>
             <a @click="go('/login', { state: 2 })">注册</a>
+            
           </div>
 
           <div class="icon-list" v-else>
@@ -59,6 +60,7 @@
                 <el-dropdown-item command="1">我的课程</el-dropdown-item>
                 <el-dropdown-item command="2">我的题库</el-dropdown-item>
                 <el-dropdown-item command="3">个人中心</el-dropdown-item>
+                <!-- <el-dropdown-item command="5">跳小程序</el-dropdown-item> -->
                 <el-dropdown-item command="4">退出登录</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -1146,7 +1148,9 @@ export default {
         case "4":
           this.$tools.exit();
           break;
-
+        case '5':
+          console.log('------command:', command)
+          break
         default:
           break;
       }

src/pages/live-detail/index.vue

@@ -4417,10 +4417,10 @@ export default {
       // } else {
       const canvas = document.createElement("canvas");
       canvas.width = 400;
-      canvas.height = 300;
+      canvas.height = 400;
       const context = canvas.getContext("2d");
       const video = document.getElementById("video");
-      context.drawImage(video, 0, 0, 400, 300);
+      context.drawImage(video, 0, 0, 400, 400);
       this.faceUrl = canvas.toDataURL("image/png");
       this.isTaking = false;
       // }
@@ -7463,7 +7463,8 @@ export default {
         float: right;
         width: 400px;
         height: 400px;
-
+        position: relative;
+        overflow: hidden;
         video {
           width: 100%;
           height: 100%;

src/pages/person-center/bank-record/index.vue

@@ -85,8 +85,8 @@
                         @click="
                           go('/bank-exam-explain/' + record.goodsId, {
                             examId: record.examId,
-                            chapterId: record.chapterExamId,
-                            moduleId: record.moduleExamId,
+                            chapterId: record.courseType == 2 ? record.chapterId : record.chapterExamId,
+                            moduleId: record.courseType == 2 ? record.moduleId: record.moduleExamId,
                             orderGoodsId: record.orderGoodsId,
                           })
                         "

src/pages/person-center/bank-record/record-list/index.vue

@@ -35,7 +35,7 @@
                           orderGoodsId: record.orderGoodsId,
                         })
                       "
-                      v-if="record.status == 0 && record.historyExamJson"
+                      v-if="courseType !=  2 && record.status == 0 && record.historyExamJson"
                       >继续答题</el-button
                     >
 
@@ -52,8 +52,8 @@
                         @click="
                           go('/bank-exam-explain/' + record.goodsId, {
                             examId: record.examId,
-                            chapterId: record.chapterExamId,
-                            moduleId: record.moduleExamId,
+                            chapterId: courseType == 2 ? record.chapterId : record.chapterExamId,
+                            moduleId: courseType == 2 ? record.moduleId : record.moduleExamId,
                             orderGoodsId: record.orderGoodsId,
                           })
                         "