Squashed commit of the following:

commit 43a6b426c7cc497b6677192aef48ab2b1213dcd9
Merge: 01a71b3 d33ce1e
Author: Luolei <16657115156@163.com>
Date:   Thu Jul 25 11:46:27 2019 +0800

    Merge branch 'dev' into byll

commit 01a71b36fea7ed8655afce0205750d919fa5adf4
Author: Luolei <16657115156@163.com>
Date:   Thu Jul 25 11:34:18 2019 +0800

    搜索页bug

commit 273513cafd9b926b8b4ccaacf4b22d6ee18301d0
Author: Luolei <16657115156@163.com>
Date:   Thu Jul 25 10:12:11 2019 +0800

    预览患者信息修改

commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date:   Thu Jul 25 09:40:47 2019 +0800

    添加value判断各模块显示与否

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

    图片上传数据结构修改

build/webpack.dev.conf.js

@@ -33,8 +33,8 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     contentBase: false, // since we use CopyWebpackPlugin.
     compress: true,
     // host: HOST || config.dev.host,
-    host: '192.168.3.6',
-    // host: '192.168.3.126',
+    // host: '192.168.3.6',
+    host: '192.168.3.126',
     port: PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay

src/components/PathInfo.vue

@@ -174,7 +174,7 @@
 </script>
 <style lang="less" scoped>
   .path-wrap{
-    padding-top: .7rem;
+    padding-top: .5rem;
     font-size: .28rem;
     box-sizing: border-box;
     .info{

src/components/Preview.vue

@@ -4,12 +4,14 @@
       <p class="baseMsg">{{pathInfo.patientName}}&nbsp;&nbsp;&nbsp;&nbsp;{{pathInfo.patientSex}}&nbsp;&nbsp;&nbsp;&nbsp;{{pathInfo.patientAge}}岁</p>
       <table>
         <tr>
-          <td class="fst">挂号科室：{{pathInfo.selfDeptName}}</td>
-          <td class="sec">门诊号：{{pathInfo.recordId}}</td>
+          <td colspan="2">挂号科室：{{pathInfo.selfDeptName}}</td>
         </tr>
         <tr>
-          <td class="fst">预约医生：{{pathInfo.doctorName}}</td>
-          <td class="sec">就诊时间：{{pathInfo.systemTime}}</td>
+          <td>门诊号：{{pathInfo.recordId}}</td>
+          <td>预约医生：{{pathInfo.doctorName}}</td>
+        </tr>
+        <tr>
+          <td colspan="2">就诊时间：{{pathInfo.systemTime}}</td>
         </tr>
       </table>
       <div class="line"></div>
@@ -325,12 +327,10 @@ export default {
     color: #333333;
     letter-spacing: 0;
     text-align: justify;
-    line-height: 0.44rem /* 44/100 */;
-    td.fst {
-      width: 40%;
-    }
-    td.sec {
-      width: 60%;
+    margin-top: .2rem;
+    tr {
+      padding: .2rem 0;
+      line-height: .5rem;
     }
   }
   .line {

src/components/Search.vue

@@ -47,7 +47,8 @@ export default {
   data() {
     return {
       searchVal: '',
-      searchLis: []
+      searchLis: [],
+      tmpItem:{}
     }
   },
   watch:{
@@ -64,7 +65,12 @@ export default {
   },
   methods: {
     showDetil(item) {
-      this.$emit('showDetil', item,true)
+      let flg = false;
+      if(JSON.stringify(this.tmpItem)==JSON.stringify(item)){//eg:重复点击胸痛bug
+        flg = true
+      }
+      this.tmpItem = item
+      this.$emit('showDetil',item,flg)
       // this.$emit('search', false)
     },
     search() {

src/components/Symptom.vue

@@ -148,12 +148,8 @@ export default {
 
     },
     showDetil(item,flg) {
-      if(!flg){
-        this.chooseSymp.push(item);
-      }else{
-        this.tmpItem=item
-        this.isSearch=flg
-      }
+      this.tmpItem=item
+      this.isSearch=flg||false
       this.questId = item.questionId || item.id || item.conceptId;
       const id = item.questionId || item.id; //常见症状questionId，推送id,两者均有可能没有
       //将选中的name存到store中的text
@@ -172,13 +168,21 @@ export default {
             this.$store.commit('setOrigin', { type: moduleCP['symp'], data: result.data });
             if (mapping && mapping.length > 0) {
               this.show = true;
+              if(flg){
+                return
+              }
+              this.chooseSymp.push(item);
             } else { //没有详情,推送
               const sympText = this.getSympText();
               this.getPush(sympText);
+              this.chooseSymp.push(item);
+              this.searchShow = false
+              // this.complete()
             }
           }
         })
       } else {//没有questionId或id 则直接调推送
+        this.chooseSymp.push(item);
         const sympText = this.getSympText();
         this.getPush(sympText);
         this.checkText = this.$store.state.symptom.text;
@@ -244,11 +248,7 @@ export default {
       this.delText = "是否删除该信息？<br/>（已填内容将清除）";
     },
     complete() {//明细填写完成
-      if(this.isSearch){
-        this.chooseSymp.push(this.tmpItem);
-        this.searchShow = false
-      }
-      this.isSearch = false; //重置，否则每次点开都会叠加
+      this.searchShow = false;
       this.checkText = this.$store.state.symptom.text;
       this.show = false;
       this.questId = null;