Merge branch 'master' of http://223.93.170.82:10080/zhouna/preliminary into his/shaoyifu

# Conflicts:
#	config/index.js
#	src/components/Preview.vue
#	src/utils/tools.js

build/webpack.dev.conf.js

@@ -34,7 +34,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     compress: true,
     // host: HOST || config.dev.host,
     // host: '192.168.3.6',
-    host: '192.168.3.106',
+    host: '127.0.0.1',
     port: PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay

src/components/Symptom.vue

@@ -60,7 +60,7 @@
       class="footer"
       @click="toNext"
     >
-      <div class="nextBtn" :class="{'nofoot':chooseSymp.length==0}">预览并提交病历</div>    
+      <div class="nextBtn" :class="{'nofoot':chooseSymp.length==0}">预览并提交病历</div>
     </div>
     <Toast
       :message="delText"
@@ -157,7 +157,7 @@ export default {
         }else{
           this.getSympList();
           this.quesText = "请问您这次哪里最不舒服？";
-        } 
+        }
       },
       deep:true
     }
@@ -175,7 +175,7 @@ export default {
         this.$refs.showHide.style.height = '3rem'
         this.slideTxt = '展开'
       }
-    },  
+    },
     touchend(item,flg) {//症状点开详情
       clearTimeout(this.timer);
       this.end = this.$store.state.scroll
@@ -285,6 +285,7 @@ export default {
               let signNum = 1;//第一个打标的，保存为伴随
               for(let i = 0;i < mapping.length;i++){
                 let tmpMap = mapping[i]
+                tmpMap.slide = 1
                 if(tmpMap.flag == 3 && signNum == 1){
                   ++signNum
                   for(let j = 0;j < tmpMap.questionDetailList.length;j++){
@@ -302,10 +303,12 @@ export default {
               }
               this.$store.commit('setSearchShow', false);
               this.chooseSymp.push(item);
-            } else { 
+            } else {
               this.$store.commit('setSearchShow', false);
               this.chooseSymp.push(item);
             }
+            result.data.questionMapping = mapping
+            this.labelDetail = result.data;
             const sympText = this.getSympText();
             this.getPush(sympText);
           }
@@ -315,7 +318,7 @@ export default {
             this.getPush(sympText);
           }
         })
-      } else {//没有questionId或id 
+      } else {//没有questionId或id
         if(this.chooseSymp.length == 0){
           item.idx = 1
         }
@@ -429,7 +432,7 @@ export default {
       const read = this.$store.state.symptom.datas;
       const data = read[(item.questionId||item.id)] || origin[(item.questionId||item.id)];
       if (data&&data.questionMapping && data.questionMapping.length > 0) {
-        this.$store.commit('setDetail',{detail:data,ppId:null,moduleType:moduleCP['symp'],sign:1,idx:i})       
+        this.$store.commit('setDetail',{detail:data,ppId:null,moduleType:moduleCP['symp'],sign:1,idx:i})
       }
     },
   },