Merge branch 'NPC-lhd'

src/components/Adult/Preview.vue

@@ -115,9 +115,9 @@
       </span>
     </div>
     <div v-if="cur" class="NNPE-Book-content-inner">
-      <div v-for="(item, index) in cur.cur_fn_data" :key="index">
-        <div
-          class="title-box"
+      <div v-for="(item, index) in cur.cur_fn_data" :key="index"
+          class="title-box">
+        <div class="title-big"
           v-if="item.number || item.z_title || item.f_title"
         >
           <b v-if="item.number">{{ item.number }}</b>
@@ -133,6 +133,10 @@
             ></h3>
           </div>
         </div>
+        <div class="title-little" :class="[item.little_title_number||item.little_title?'marginTop':'']">
+            <b v-html="item.little_title_number"></b>
+            <p v-html="item.little_title"></p>
+        </div>
         <div
           :class="['NNPE-tableList', item.is_bg ? 'NNPE-tableList-hasBg' : '']"
         >
@@ -868,11 +872,10 @@ export default {
   }
   .NNPE-Book-content-inner {
     padding: 0 40px;
-    > div {
-      padding-top: 32px;
-      .title-box {
+    > div.title-box {
+        padding-top: 32px;
+       .title-big{
         display: flex;
-        margin-bottom: 24px;
         b {
           min-width: 39px;
           height: 24px;
@@ -907,6 +910,23 @@ export default {
           padding-left: 51px;
         }
       }
+      .title-little{
+          display: flex;
+          margin-bottom: 24px;
+          &.marginTop{
+              margin-top: 24px;
+          }
+          b,p{
+            color: #000000;
+            font-size: 16px;
+            line-height: 150%;
+            font-weight: normal;
+            margin: 0;
+            white-space: pre-wrap;
+            word-break: break-word;
+            padding-right: 3px;
+          }
+      }
     }
     .NNPE-tableList {
       background: #fff;
@@ -971,8 +991,8 @@ export default {
     background: #24b99e;
   }
   .NNPE-Book-content-inner {
-    > div {
-      .title-box {
+    > div.title-box {
+      .title-big {
         b {
           background: #24b99e;
         }
@@ -1009,8 +1029,8 @@ export default {
     background: #bd8865;
   }
   .NNPE-Book-content-inner {
-    > div {
-      .title-box {
+    > div.title-box {
+      .title-big {
         b {
           background: #bd8865;
         }

src/views/adultInput.vue

@@ -144,8 +144,37 @@
               @blur="onBlur(topic, 'f_title')"
             />
           </div>
+           <div class="adult-book-input-item">
+            <span class="adult-book-lable">标题：</span>
+            <div style="width: 100%">
+              <div
+                style="
+                  display: flex;
+                  align-items: flex-start;
+                  margin-bottom: 10px;
+                "
+              >
+                <el-input
+                  style="width: 20%"
+                  v-model="topic.little_title_number"
+                  type="textarea"
+                  @input="forupdata"
+                  placeholder="请输入标题题号"
+                  @blur="onBlur(topic, 'little_title_number')"
+                />
+                <el-input
+                  style="width: 70%; margin-left: 10px"
+                  v-model="topic.little_title"
+                  type="textarea"
+                  @input="forupdata"
+                  placeholder="请输入标题内容"
+                  @blur="onBlur(topic, 'little_title')"
+                />
+              </div>
+            </div>
+          </div>
           <div class="Big-Book-top">
-            <span>标题缩进</span>
+            <span>正副标题缩进</span>
             <el-radio v-model="topic.is_textIndex" :label="true">是</el-radio>
             <el-radio v-model="topic.is_textIndex" :label="false">否</el-radio>
           </div>
@@ -1123,6 +1152,8 @@ export default {
         let arr = {
           z_title: "",
           f_title: "",
+          little_title_number:"",
+          little_title:"",
           is_bg: false, // 是否有背景色
           is_layout: false, // 是不是按背景图布局
           is_textIndex: false,