生字组件后面为连词的判断有边框

src/views/book/courseware/preview/components/character/CharacterPreview.vue

@@ -95,7 +95,10 @@
                       indexs != 0
                         ? 'NoborderRadius'
                         : '',
-                      !item.is_margin && item.content_list.length > 1 && indexs != item.content_list.length - 1
+                      !item.is_margin &&
+                      item.content_list.length > 1 &&
+                      indexs != item.content_list.length - 1 &&
+                      item.content_list[indexs + 1].type !== 'lian'
                         ? 'NoborderRight'
                         : '',
                     ]"
@@ -125,7 +128,10 @@
                       indexs != 0
                         ? 'NoborderRadius'
                         : '',
-                      !item.is_margin && item.content_list.length > 1 && indexs != item.content_list.length - 1
+                      !item.is_margin &&
+                      item.content_list.length > 1 &&
+                      indexs != item.content_list.length - 1 &&
+                      item.content_list[indexs + 1].type !== 'lian'
                         ? 'NoborderRight'
                         : '',
                     ]"

src/views/book/courseware/preview/components/newWord_template/NewWordTemplatePreview.vue

@@ -149,7 +149,11 @@
                     item.content_list.length > 1 && indexs != item.content_list.length - 1 && indexs != 0
                       ? 'NoborderRadius'
                       : '',
-                    item.content_list.length > 1 && indexs != item.content_list.length - 1 ? 'NoborderRight' : '',
+                    item.content_list.length > 1 &&
+                    indexs != item.content_list.length - 1 &&
+                    item.content_list[indexs + 1].type !== 'lian'
+                      ? 'NoborderRight'
+                      : '',
                   ]"
                   bg-type="tian"
                   :style="{
@@ -352,7 +356,11 @@
                       item.content_list.length > 1 && indexs != item.content_list.length - 1 && indexs != 0
                         ? 'NoborderRadius'
                         : '',
-                      item.content_list.length > 1 && indexs != item.content_list.length - 1 ? 'NoborderRight' : '',
+                      item.content_list.length > 1 &&
+                      indexs != item.content_list.length - 1 &&
+                      item.content_list[indexs + 1].type !== 'lian'
+                        ? 'NoborderRight'
+                        : '',
                     ]"
                     :style="{
                       borderColor:

src/views/book/courseware/preview/components/newWord_template/components/Strockplayredline.vue

@@ -185,7 +185,7 @@ export default {
     position: absolute;
     top: -2px;
     right: -2px;
-    z-index: 1;
+    z-index: 2;
 
     // @include font_color("sub_color");
     display: flex;

src/views/login/index.vue

@@ -13,7 +13,8 @@
           <el-input v-model="form.password" type="password" show-password />
         </el-form-item>
         <el-form-item prop="verification_code_image_text" class="verification-code" label="验证码">
-          <el-input v-model="form.verification_code_image_text" @keyup.enter.native="signIn" />
+          <!-- @keyup.enter.native="signIn" -->
+          <el-input v-model="form.verification_code_image_text" />
           <el-image
             v-if="image_content_base64.length > 0"
             :src="`data:image/jpg;base64,${image_content_base64}`"