Squashed commit of the following:

commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date:   Wed Jul 24 13:57:02 2019 +0800

    名字统一

commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date:   Wed Jul 24 13:33:37 2019 +0800

    Merge branch 'dev' into byll

commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date:   Wed Jul 24 13:23:25 2019 +0800

    241

commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 23 17:08:16 2019 +0800

    数据处理

commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 23 15:47:37 2019 +0800

    Merge branch 'dev' into byll

    # Conflicts:
    #	config/index.js
    #	src/common/MultiLineInput.vue
    #	src/components/Symptom.vue
    #	src/components/TabPage.vue
    #	src/store.js
    #	src/utils/tools.js

commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 23 15:24:38 2019 +0800

    数字键盘弹起输入问题解决

commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 23 10:27:55 2019 +0800

    类型修改

commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 23 10:20:19 2019 +0800

    type类型改变

commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date:   Mon Jul 22 15:49:52 2019 +0800

    Merge branch 'dev' into byll

commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date:   Mon Jul 22 15:39:22 2019 +0800

    模块配置

commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date:   Thu Jul 18 16:39:19 2019 +0800

    Merge branch 'dev' into byll

commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date:   Thu Jul 18 16:38:09 2019 +0800

    图片上传数据结构修改

src/components/DetailBox.vue

@@ -99,10 +99,12 @@
       color: #7C828E;
       i{
         position: absolute;
-        top:0.35rem;
+        top:0.64rem;
         left:0;
         font-size: .22rem;
         width:100%;
+        height: .33rem;
+        line-height: .33rem;
         display: inline-block;
         text-align: center;
       }

src/components/DiagTreat.vue

@@ -36,7 +36,7 @@
             @updata="updataData($event,it.id)"/>
     </div>
     <div class="result" v-if="checkText.length>0">
-      <p class="title">治疗情况</p>
+      <p class="title">{{datas.name}}</p>
       <!-- <p v-for="(v,i) in checkText">{{v.text}}</p> -->
       <p>{{getText()}}</p>
     </div>

src/components/Others.vue

@@ -42,7 +42,7 @@
         </template> -->
     </div>
     <div class="result" v-if="checkText.length>0">
-      <p class="title">其他病史</p>
+      <p class="title">{{datas.name}}</p>
       <p>{{getText()}}</p>
     </div>
     <div class="foot" v-if="modluesLen==3&&!nextName||modluesLen==2">

src/components/Preview.vue

@@ -17,13 +17,15 @@
     </div>
     <div class="personMsg">
       <ul class="previewParts">
-        <li v-if="symptom.choose.length>0">
+        <!-- <li v-if="symptom.choose.length>0"> -->
+        <li>
           <h4><i :style="{'background': '#FF9A9A'}"></i> 主诉：</h4>
           <p>
             <span v-for="(item,idx) in symptom.choose" :key="item.name+idx">{{item.name+(idx == symptom.choose.length-1?'':'、')}}</span>
           </p>
         </li>
-        <li v-if="diagnose.text.length>0||symptom.choose.length>0">
+        <!-- <li v-if="diagnose.text.length>0||symptom.choose.length>0"> -->
+        <li>
           <h4><i :style="{'background': '#3D69D9'}"></i> 现病史：</h4>
           <p>
             <span v-for="(item,idx) in symptom.text" :key="item.text+idx">{{item.text+(idx == symptom.choose.length-1?'。':';')}}</span>
@@ -32,13 +34,13 @@
             <span v-for="(item,idx) in diagnose.text" :key="item.text+idx">{{item.text+(idx == diagnose.text.length-1?'。':';')}}</span>
           </p>
         </li>
-        <li v-if="others.text.length>0">
+        <li v-if="showLis[moduleCP['other']]==1">
           <h4><i></i> 其他史：</h4>
           <p>
             <span v-for="(item,idx) in others.text" :key="item.text+idx">{{item.text+(idx == others.text.length-1?'。':';')}}</span>
           </p>
         </li>
-        <li v-if="addContent.txt">
+        <li v-if="showLis[moduleCP['suplement']]==1">
           <h4><i></i> 补充内容：</h4>
           <p>{{addContent.txt}}</p>
         </li>
@@ -72,8 +74,9 @@
 import api from '@utils/api.js';
 import Submit from '../common/Submit';
 import Loading from '../common/Loading';
+import {moduleCP} from '@utils/tools.js'
 export default {
-  props: ['preName'],
+  props: ['preName','showLis'],
   data() {
     const { pathInfo, originDatas } = this.$store.state;
     let symptomDate = this.$store.state.symptom;
@@ -91,7 +94,8 @@ export default {
       showType: 'fail',
       imgList:[],
       show:false,//提交等待的动画loading
-      tmpNum:0
+      tmpNum:0,
+      moduleCP:moduleCP
     }
   },
   methods: {

src/components/Symptom.vue

@@ -34,7 +34,7 @@
       class="result"
       v-if="checkText.length>0"
     >
-      <p class="title">症状情况</p>
+      <p class="title">{{nameStr}}</p>
       <p v-for="(value,index) in checkText">{{value.text}}</p>
     </div>
     <div v-if="modluesLen>1"
@@ -82,7 +82,7 @@ import Search from './Search.vue';
 import {moduleCP} from '@utils/tools'
 export default {
   name: 'Symptom',
-  props:['modluesLen'],
+  props:['modluesLen','nameStr'],
   data() {
     let { datas, pathInfo } = this.$store.state;
     const { choose, text } = this.$store.state.symptom;

src/components/TabPage.vue

@@ -18,6 +18,7 @@
         <Symptom
           v-if="flag==moduleCP['symp']&&item.type==moduleCP['symp']&&moduleShow"
           @next="toNext"
+          :nameStr="item.name"
           :modluesLen="modluesLen"
         />
       
@@ -52,6 +53,7 @@
       </template>
       <Preview v-show="!moduleShow" 
         :preName="getPreviewName()"
+        :showLis="type"
         @back="beBack" 
       />
     </div>

src/utils/tools.js

@@ -16,7 +16,7 @@ const deepClone = (arr) =>{
   }
   return newArr;
 }
-// 带输入框选项
+
 const getExpStr = (str) =>{
   let result = {}
   if(str.match(/\${number_(.*})/)){//数字输入框