bug修改

build/webpack.dev.conf.js

@@ -34,11 +34,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     compress: true,
     // host: HOST || config.dev.host,
     // host: '192.168.3.6',
-<<<<<<< HEAD
     host: '192.168.1.103',
-=======
-    host: '192.168.1.106',
->>>>>>> test
     port: PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay

src/components/Others.vue

@@ -98,7 +98,7 @@
         this.$emit('back');
       },
       toNext(){
-        if(this.modluesLen==2&&!this.nextName){
+        if(!this.nextName){
           this.$emit('next','preview')
         }else{
           this.$emit('next');

src/components/Preview.vue

@@ -17,7 +17,7 @@
       <div class="line"></div>
       <p>采集时间：{{pathInfo.systemTime}}</p>
     </div>
-    <div class="personMsg">
+    <div class="personMsg personMsg2">
       <ul class="previewParts">
         <!-- <li v-if="symptom.choose.length>0"> -->
         <li>
@@ -46,7 +46,7 @@
           <h4><i></i> 补充内容：</h4>
           <p>{{addContent.txt}}</p>
         </li>
-        <li v-if="JSON.stringify(diagnose.imgSrc) !='{}'">
+        <li v-if="JSON.stringify(diagnose.imgSrc) !='{}'" class="imgLis">
           <h4 class="imgTitle"><i></i> 最近一次治疗报告：</h4>
           <div v-for="(value,key,idx) in diagnose.imgSrc" class="imgView">
             <img :src="value" alt="">
@@ -274,7 +274,7 @@ export default {
   height: 1.9rem;
   float: left;
   border: 1px solid #dfe0e4;
-  margin: 0 0 0.3rem 0.3rem;
+  margin: 0 0.2rem 0.3rem 0;
   box-sizing: border-box;
   img {
     width: 100%;
@@ -294,6 +294,10 @@ export default {
       padding: .1rem .3rem;
       overflow: hidden;
     }
+    li.imgLis {
+      padding-right: 0;
+      padding-left: 0;
+    }
     h4 {
       color: #000;
       font-size: .32rem;
@@ -343,4 +347,7 @@ export default {
     height: 1px;
   }
 }
+.personMsg2 {
+  padding-right: 0;
+}
 </style>