合并代码修复

components/bigScreen/bigScreen.vue

@@ -51,11 +51,9 @@
                           scode: res.data.scode,
                           patientName: res.data.patientName,
                           sickRoom: res.data.sickRoom ?
-                            res.data.sickRoom.dept :
-                            "-",
+                            res.data.sickRoom.dept : "-",
                           checkDept: res.data.checkDept ?
-                            res.data.checkDept.dept :
-                            "-",
+                            res.data.checkDept.dept : "-",
                           bedNum: res.data.bedNum,
                         };
                         uni.navigateTo({
@@ -114,25 +112,6 @@
                   icon: "none",
                   title: '请求失败',
                 });
-<<<<<<< HEAD
-            } else {
-              uni.hideLoading();
-              uni.showToast({
-                icon: "none",
-                title: '请求失败',
-              });
-            }
-          })
-      }).catch(err=>{
-        // this.SMFlag = true;
-      });
-    },
-  },
-  onShow(){
-    // this.SMFlag = true;
-  }
-};
-=======
               }
             })
         }).catch(err => {
@@ -144,7 +123,6 @@
       this.SMFlag = true;
     }
   };
->>>>>>> lmm
 </script>
 
 <style lang="less">