Merge remote-tracking branch 'origin/test'

src/common/Toast.vue

@@ -76,6 +76,7 @@ import $ from 'jquery';
         height: .9rem;
         line-height: .9rem;
         border-top: 1px solid #colors[line];
+        // font-weight: bold;
         span{
           display: inline-block;
           width: 50%;
@@ -88,7 +89,7 @@ import $ from 'jquery';
           color: #FF6167;
         }
         .canc{
-          color: #colors[btn];
+          color: #333333;
         }
       }
     }

src/components/Preview.vue

@@ -10,7 +10,7 @@
               <td><span>挂号科室：</span>{{pathInfo.selfDeptName}}</td>
             </tr>
             <tr v-if="pathInfo.recordId">
-              <td><span>门诊号：</span>{{pathInfo.recordId}}</td>
+              <td><span>排队号：</span>{{pathInfo.recordId}}</td>
             </tr>
             <tr v-if="pathInfo.doctorName">
               <td><span>预约医生：</span>{{pathInfo.doctorName}}</td>

src/components/Symptom.vue

@@ -215,6 +215,7 @@ export default {
       clearTimeout(this.timer);
       this.end = this.$store.state.scroll
       if(JSON.stringify(this.start) != JSON.stringify(this.end)){
+        this.startNum = 0
         return
       }
       let endTime = +new Date();
@@ -246,10 +247,12 @@ export default {
             that.message.title = "";
             that.message.text = "暂无资料";
           }
+          this.startNum = 0
         },600)
     },
     closeTip(){
       this.showExp = false,
+      this.startNum = 0
       this.message.title = '';
       this.message.text = '';
     },