Merge branch 'chronic-master' of…

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master

 Conflicts:
	src/doctor/Doctor.vue

src/doctor/followUp/search/Search.vue

@@ -11,7 +11,9 @@
                     clearable
                     @clear="idCardClear"
                     ref="idCardField"/>
+                <van-uploader :max-size="5 * 1024 * 1024" :after-read="afterRead" max-count="1">
                         <doc-icon type="doc-camera" class="shrink-0 mr-3" style="color: #575B66"/>
+                </van-uploader>
             </div>
             <span class="text-16 shrink-0 text-primary" @click="search">
                 搜索
@@ -183,6 +185,11 @@ export default {
         clearHistory() {
             setLocalStorage(this.historyKey, [])
             this.history = []
+        },
+        // 证件上传后
+        afterRead(file) {
+            console.log(file)
+            showNotify({ type: 'primary', message: '文件上传' })
         }
     }
 }

src/doctor/resident/Visit.vue

@@ -208,7 +208,7 @@ export default {
         delBtn(item) {
             showConfirmDialog({
                 title: '提示',
-                message: '确认删除该随访记录吗？确认后将无法查看该随访信息'
+                message: '确认删除该随访记录吗？\n确认后将无法查看该随访信息'
             }).then(() => {
                 // on confirm
                 // console.log(item.id)