谢杰标 3 years ago
parent
commit
ad77607b17

+ 15 - 5
src/components/common/CollectionBox.vue

@@ -1,7 +1,9 @@
 <template>
-  <div class="col" :class="showT ? 'tuck' : 'cancel'" @click="collect">
-    <div v-if="showT"><img src="@/assets/col.png" alt="" />收藏</div>
-    <div v-else><img src="@/assets/cancelcol.png" alt="" />取消收藏</div>
+  <div class="col-box">
+    <div class="col" :class="showT ? 'tuck' : 'cancel'" @click="collect">
+      <div v-if="showT"><img src="@/assets/col.png" alt="" />收藏</div>
+      <div v-else><img src="@/assets/cancelcol.png" alt="" />取消收藏</div>
+    </div>
   </div>
 </template>
 
@@ -42,7 +44,7 @@ export default {
           .deleteCollectQuestion(this.param.collectQuestionId)
           .then((res) => {
             this.$message.success("取消收藏成功");
-            this.$emit("sumit"); 
+            this.$emit("sumit");
           });
       }
     },
@@ -51,12 +53,20 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.col-box {
+  width: 970px;
+  position: absolute;
+  bottom: 0;
+  padding: 12px 0;
+  border-top: 1px solid #eeeeee;
+}
 .col {
+  width: 100%;
   display: flex;
   justify-content: center;
   margin-left: 32px;
-  margin-top: 12px;
   border-radius: 4px;
+
   cursor: pointer;
   div {
     height: 30px;

+ 4 - 89
src/pages/bank-exam/index.vue

@@ -137,21 +137,6 @@
                           ></div>
                         </div>
                       </div>
-                      <div class="question__btns">
-                        <div
-                          class="collect"
-                          @click="
-                            collect(collectList[questionIndex], questionIndex)
-                          "
-                        >
-                          <template v-if="!collectList[questionIndex]"
-                            ><i class="el-icon-star-off"></i>收藏本题
-                          </template>
-                          <template v-if="collectList[questionIndex]"
-                            ><i class="el-icon-star-on"></i>已收藏</template
-                          >
-                        </div>
-                      </div>
                     </div>
 
                     <div
@@ -257,19 +242,6 @@
                         >
                           确认答案
                         </div>
-                        <div
-                          class="collect"
-                          @click="
-                            collect(collectList[questionIndex], questionIndex)
-                          "
-                        >
-                          <template v-if="!collectList[questionIndex]"
-                            ><i class="el-icon-star-off"></i>收藏本题</template
-                          >
-                          <template v-if="collectList[questionIndex]"
-                            ><i class="el-icon-star-on"></i>已收藏</template
-                          >
-                        </div>
                       </div>
                     </div>
 
@@ -365,21 +337,6 @@
                           ></div>
                         </div>
                       </div>
-                      <div class="question__btns">
-                        <div
-                          class="collect"
-                          @click="
-                            collect(collectList[questionIndex], questionIndex)
-                          "
-                        >
-                          <template v-if="!collectList[questionIndex]"
-                            ><i class="el-icon-star-off"></i>收藏本题</template
-                          >
-                          <template v-if="collectList[questionIndex]"
-                            ><i class="el-icon-star-on"></i>已收藏</template
-                          >
-                        </div>
-                      </div>
                     </div>
 
                     <div
@@ -939,21 +896,6 @@
                           </el-tab-pane>
                         </el-tabs>
                       </div>
-                      <div class="question__btns">
-                        <div
-                          class="collect"
-                          @click="
-                            collect(collectList[questionIndex], questionIndex)
-                          "
-                        >
-                          <template v-if="!collectList[questionIndex]"
-                            ><i class="el-icon-star-off"></i>收藏本题</template
-                          >
-                          <template v-if="collectList[questionIndex]"
-                            ><i class="el-icon-star-on"></i>已收藏</template
-                          >
-                        </div>
-                      </div>
                     </div>
 
                     <div
@@ -1053,19 +995,6 @@
                         >
                           确认答案
                         </div>
-                        <div
-                          class="collect"
-                          @click="
-                            collect(collectList[questionIndex], questionIndex)
-                          "
-                        >
-                          <template v-if="!collectList[questionIndex]"
-                            ><i class="el-icon-star-off"></i>收藏本题</template
-                          >
-                          <template v-if="collectList[questionIndex]"
-                            ><i class="el-icon-star-on"></i>已收藏</template
-                          >
-                        </div>
                       </div>
                     </div>
                   </template>
@@ -2776,7 +2705,9 @@ export default {
     param() {
       return {
         examId: this.examId,
-        questionId: this.questionList[this.current].questionId,
+        questionId: this.questionList[this.current]
+          ? this.questionList[this.current].questionId
+          : undefined,
         goodsId: this.goodsId,
         orderGoodsId: this.orderGoodsId,
         collectQuestionId: this.collectList[this.current]
@@ -2807,6 +2738,7 @@ export default {
           margin-bottom: 20px;
           border: 1px solid #eee;
           .left-box {
+            position: relative;
             float: left;
             width: 970px;
             min-height: 630px;
@@ -3067,23 +2999,6 @@ export default {
                     line-height: 32px;
                     font-size: 16px;
                   }
-
-                  .collect {
-                    width: 100px;
-                    cursor: pointer;
-                    position: absolute;
-                    right: 0;
-                    top: 5px;
-                    font-size: 12px;
-                    font-family: Microsoft YaHei;
-                    font-weight: 400;
-                    color: #3f8dfd;
-                    line-height: 24px;
-
-                    i {
-                      font-size: 20px;
-                    }
-                  }
                 }
               }
             }

+ 7 - 38
src/pages/subject/collect-bank.vue

@@ -890,21 +890,6 @@
                       </div>
                     </div>
                   </template>
-                  <div class="question__btns">
-                    <div
-                      class="collect"
-                      @click="
-                        collect(collectList[questionIndex], questionIndex)
-                      "
-                    >
-                      <template v-if="!collectList[current]"
-                        ><i class="el-icon-star-off"></i>收藏本题
-                      </template>
-                      <template v-else
-                        ><i class="el-icon-star-on"></i>已收藏</template
-                      >
-                    </div>
-                  </div>
                 </div>
                 <Collection-box
                   @sumit="() => {}"
@@ -1756,6 +1741,7 @@ export default {
 .course-exam {
   .section {
     overflow: hidden;
+    position: relative;
     &__header {
       height: 20px;
       margin-top: 20px;
@@ -1769,12 +1755,12 @@ export default {
         &__body {
           margin-bottom: 20px;
           border: 1px solid #eee;
+          display: flex;
           .left-box {
-            float: left;
+            position: relative;
             width: 970px;
             min-height: 630px;
             border: 1px solid #eee;
-
             &__header {
               height: 40px;
               padding-left: 12px;
@@ -1799,8 +1785,8 @@ export default {
             }
 
             &__body {
-              border-bottom: 1px solid #eee;
-
+              // border-bottom: 1px solid #eee;
+              // padding-bottom: 10px;
               .question {
                 padding: 12px 0 0 12px;
                 display: flex;
@@ -2031,22 +2017,6 @@ export default {
                     color: #fff;
                     font-size: 16px;
                   }
-
-                  .collect {
-                    width: 100px;
-                    cursor: pointer;
-                    position: absolute;
-                    right: 0;
-                    top: 5px;
-                    font-size: 12px;
-                    font-family: Microsoft YaHei;
-                    font-weight: 400;
-                    color: #3f8dfd;
-                    line-height: 24px;
-                    i {
-                      font-size: 20px;
-                    }
-                  }
                 }
               }
             }
@@ -2072,10 +2042,9 @@ export default {
           }
 
           .right-box {
-            float: right;
+            // float: right;
             width: 299px;
             border-right: 1px solid #eee;
-
             &__header {
               height: 40px;
               line-height: 40px;
@@ -2095,7 +2064,7 @@ export default {
 
             &__body {
               height: 510px;
-              border-bottom: 1px solid #eee;
+              // border-bottom: 1px solid #eee;
 
               .card {
                 &__note {