微网站

src/App.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="app">
+  <div id="app" class="app">
     <router-view v-if="isRouterAlive"></router-view>
   </div>
 </template>
@@ -27,3 +27,10 @@
     }
   }
 </script>
+
+
+<style lang="scss" scoped>
+.app{
+  -webkit-overflow-scrolling: touch;
+}
+</style>

src/api/micro/micro.js

@@ -199,4 +199,13 @@ export function getEnviromentImages(id,orgid){
      Get:"Get",
      params:params
    })
+}
+
+export function GetAllDoctors(orgid,params){
+   return request({
+     url:"/api/site/getalldoctors?orgid="+orgid,
+     Get:"Get",
+     params:params,
+
+   })
 }

src/scrm_pages/Enviroments/enviromentsdetail.vue

@@ -1,49 +1,38 @@
 <template>
-    <div>
-       <div class="swiper-container imgSwiper">
-              <div class="swiper-wrapper">
-                <div class="swiper-slide carousel">
-                  <img class="img" src="static/images/a.jpg" />
-                </div>
-                <div class="swiper-slide carousel">
-                  <img class="img" src="static/images/a.jpg" />
-                </div>
-             </div>
-        </div>
+    <div class="page_enviromentsdetail">
+      <div class="imgList" v-for="it in this.EnImages" :key="it.id">
+       <img class="img" :src="it.enviroimages"  :preview="it.id"/>  
+      </div>
     </div>
 </template>
 
 <script>
     import Swiper from "swiper";
-   import {getEnviromentImages } from "@/api/micro/micro";
+   import { getEnviromentImages } from "@/api/micro/micro";
     export default {
         name: "enviromentsdetail",
         data(){
             return{
-
+               EnImages:[],
             }
         },
-        created(){
-          const id =  this.$route.query.id;
-          const orgid = this.$route.query.orgid;
-          console.log("id是多少",id)
-          console.log("orgid是多少",orgid)
-          getEnviromentImages(id,orgid);
-        },
-        methods:{
-         initSwiper() {
+   
+        methods: {
+         getEnviromentImages(id,orgid){
+            getEnviromentImages(id,orgid).then(response=>{
+               if(response.data.state == 1){
+                 var enviro =  response.data.data.enviro;
+                 console.log("enviro是什么",enviro)
+                 this.EnImages = enviro;
+               }
+            })
+         },
+
+        initSwiper() {
            var mySwiper2 = new Swiper(".imgSwiper", {
            slidesPerView: 2,
           });
          },
-         getEnviromentImages(id,orgid){
-            getEnviromentImages(id,orgid).then(response=>{
-                 if(response.data.state == 1){
-                   var enviro =  response.data.data.enviro;
-                   console.log("enviro是什么",enviro)
-                 }
-            })
-         }
         },
       mounted() {
         this.initSwiper();
@@ -52,24 +41,44 @@
      updated() {
        this.initSwiper();
        this.$previewRefresh();
-      }
+      },
+     created(){
+          const id =  this.$route.query.id;
+          const orgid = this.$route.query.orgid;
+          this.getEnviromentImages(id,orgid);
+       },
     }
 </script>
 
 <style lang="scss">
-  .carousel {
+  // .carousel {
+  //   width: 100%;
+  //   height: 200px;
+  //   float: left;
+  //   padding-right: 1rem;
+  //   .img{
+  //       width: 100%;
+  //       height: 100%;
+  //       float: left;
+  //   }
+  // }
+ 
+//  .swiper-wrapper{
+//      width:50%;
+//  }
+.page_enviromentsdetail{
+ height: 100%;
+  .imgList{
     width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around
+  }
+  .img{
+    width: 48%;
     height: 200px;
-    float: left;
-    padding-right: 1rem;
-    .img{
-        width: 100%;
-        height: 100%;
-        float: left;
-    }
+    margin-bottom: 20px;
+    
   }
- 
- .swiper-wrapper{
-     width:50%;
- }
+}
 </style>

src/scrm_pages/contact/contact.vue

@@ -102,9 +102,9 @@ export default {
 .page_contact {
   overflow: hidden;
   height: 100%;
-  > div:nth-of-type(2) {
-    min-height: 5.125rem;
-  }
+  // > div:nth-of-type(2) {
+  //   min-height: 5.125rem;
+  // }
   .focusImg {
     width: 23.4375rem;
     height: 11.5625rem;

src/scrm_pages/contact/contactus.vue

@@ -1,14 +1,9 @@
 <template>
   <div class="page_home">
-<<<<<<< .mine
     <!-- <iframe  :src = this.customUrl width="100%" height="100%" marginwidth="0" frameborder="no" scrolling="no"></iframe> -->
     <div>
-      <div v-for="item in this.ordmodel" :key="item.id">
-=======
-
-      <div v-for="item in this.ordmodel" :key="item.id" class="modeone"> 
-
->>>>>>> .theirs
+    <div v-for="item in this.ordmodel" :key="item.id" >
+  
         <div class="focusImg" v-if="item.mode_type == 1">
           <div class="swiper-container">
             <div class="swiper-wrapper">
@@ -19,29 +14,11 @@
             <!-- 如果需要分页器 -->
             <div class="swiper-pagination"></div>
           </div>
-<<<<<<< .mine
 
-
-=======
-  
           <!-- <div class="swiper-pagination"></div> -->
->>>>>>> .theirs
         </div>
-<<<<<<< .mine
-        <!-- <div class="detail"> -->
-        <div class="row one detail" v-if="item.mode_type == 2">
-          <p class="title">{{item.title}}:</p>
-          <p class="msg">{{item.Hosaddress.address}}</p>
-
-
-
-
-
-
+     
 
-=======
-      </div>
-      
       <div class="row" v-if="item.mode_type == 2">
         <p class="title">{{item.title}}:</p>
         <p class="msg">{{item.Hosaddress.address}}</p>
@@ -51,47 +28,22 @@
           <p class="title">{{it.title}}:</p>
           <p class="msg">{{it.content}}</p>
           <br />
->>>>>>> .theirs
-        </div>
-        <div class="row" v-if="item.mode_type == 3">
-          <div v-for="it in Connectways" :key="it.id">
-            <p class="title">{{it.title}}:</p>
-            <p class="msg">{{it.content}}</p>
-            <br />
-          </div>
         </div>
-        <div class="row" v-if="item.mode_type == 4">
+      </div>
+       <div class="row" v-if="item.mode_type == 4">
           <p class="title">{{item.title}}:</p>
           <p class="msg">{{item.Worktime.worktime}}</p>
         </div>
-        <div class="row one" v-if="item.mode_type == 5">
+        <div class="row" v-if="item.mode_type == 5">
           <p class="title">{{item.title}}:</p>
           <p class="msg">{{item.Rideway.ride_way}}</p>
         </div>
-      </div>
-<<<<<<< .mine
-
-
-
-
-
-
-
-
-=======
-      <div class="row" v-if="item.mode_type == 4">
-        <p class="title">{{item.title}}:</p>
-        <p class="msg">{{item.Worktime.worktime}}</p>
-      </div>
-      <div class="row" v-if="item.mode_type == 5">
-        <p class="title">{{item.title}}:</p>
-        <p class="msg">{{item.Rideway.ride_way}}</p>
-      </div>
->>>>>>> .theirs
     </div>
 
     <!-- tab切换 -->
-    <div class="tabs">
+    
+  </div>
+  <div class="tabs">
       <ul class="tabList">
         <li
           class="tabOne"
@@ -131,13 +83,7 @@ export default {
         if (response.data.state == 1) {
           var navigation = response.data.data.navigation;
           for (let index = 0; index < navigation.length; index++) {
-<<<<<<< .mine
-            navigation[1].nonavimages =
-              "https://images.shengws.com/2124_o_1571990749565.png";
-=======
-              navigation[3].nonavimages = "https://images.shengws.com/2124_o_1571990749565.png";
-
->>>>>>> .theirs
+            navigation[3].nonavimages = "https://images.shengws.com/2124_o_1571990749565.png";
           }
           console.log("navigation是什么", navigation);
           this.navigationdata = navigation;
@@ -196,17 +142,15 @@ export default {
       if (linktype == "3") {
         window.location.href = "tel://" + address + "";
       }
-<<<<<<< .mine
-      if (linktype == "4") {
-        // window.location.href = address;
-        this.$router.push({
-          path: "/custom",
-          query: {
-            orgid: orgid
-          }
-        });
-      }
-=======
+      // if (linktype == "4") {
+      //   // window.location.href = address;
+      //   this.$router.push({
+      //     path: "/custom",
+      //     query: {
+      //       orgid: orgid
+      //     }
+      //   });
+      // }
       // if (linktype == "4") {
       //   // window.location.href = address;
       //   this.$router.push({
@@ -216,7 +160,6 @@ export default {
       //     }
       //   })
       // }
->>>>>>> .theirs
     }
   },
   created() {
@@ -236,49 +179,25 @@ export default {
 
 <style lang="scss" scoped>
 @import "../../assets/styles/mixin.scss";
-<<<<<<< .mine
-
-.page_home {
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  overflow-y: auto;
-  > div:first-child {
-    flex: 1;
-    overflow: auto;
-  }
-  > div:first-child::-webkit-scrollbar {
-    width: 0;
-  }
-  // border:solid 1px red;
-}
+// .page_home {
+//   overflow: hidden;
+//   display: flex;
+//   flex-direction: column;
+//   height: 100%;
+//   overflow-y: auto;
+//   > div:first-child {
+//     flex: 1;
+//     overflow: auto;
+//   }
+//   > div:first-child::-webkit-scrollbar {
+//     width: 0;
+//   }
+//   // border:solid 1px red;
+// }
 // .bugone{
 //   border: solid 1px red;
 // }
 
-=======
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
 .tabs {
   @include border-top;
   width: 100%;
@@ -310,30 +229,22 @@ export default {
 .page_home {
   overflow: hidden;
   height: 100%;
-<<<<<<< .mine
   // > div:nth-of-type(2) {
   //   min-height: 5.125rem;
   // }
 
-
-
-
-
-
-=======
-  display:flex;
+  display: flex;
   flex-direction: column;
-  >div:first-child{
+  > div:first-child {
     flex: 1;
     overflow: auto;
   }
-  > div:nth-of-type(2) {
-    min-height: 3.0rem;
-  }
->>>>>>> .theirs
+  // > div:nth-of-type(2) {
+  //   min-height: 3rem;
+  // }
   > div:nth-of-type(3) {
     min-height: 3.125rem;
-  } 
+  }
   > div:nth-of-type(4) {
     min-height: 2.9rem;
   }
@@ -376,16 +287,15 @@ export default {
     }
   }
   .one {
-    min-height: 1.0rem;
+    min-height: 1rem;
     // line-height: 3rem;
   }
   .detail {
     width: 21.125rem;
     margin: 1.1875rem 1.25rem 0 1.25rem;
-
   }
 }
-.modeone{
+.modeone {
   min-height: 210px;
   // border:solid 1px red;
 }

src/scrm_pages/contactus/contactus.vue

@@ -1,5 +1,4 @@
 <template>
-<<<<<<< .mine
   <div class="page_contactus">
     <!-- 联系我们页面 -->
     <div class="scroll" style="padding:15px 4%;">
@@ -12,7 +11,6 @@
           </mt-swipe>
         </div>
 
-=======
     <div>
           <!-- 联系我们页面 -->
          <div class="scroll"  style="padding:15px 4%;">
@@ -25,7 +23,6 @@
                              </mt-swipe-item>
                         </mt-swipe>
                      </div>
->>>>>>> .theirs
 
         <div v-if="item.mode_type == 2" class="oldmodetwo">
           <div>

src/scrm_pages/doctorIntroduction/doctorIntroduction.vue

@@ -6,8 +6,8 @@
           <img :src="doctors.dochead" style="width:100%;height:100%" alt />
         </div>
         <div class="detail">
-          <p class="detailTitle">{{doctors.doc_name}}</p>
-          <p class="detailMessage">{{doctors.doc_postion}}</p>
+          <p class="detailTitle">{{doctors.name}}</p>
+          <p class="detailMessage">{{doctors.user_title}}</p>
         </div>
       </div>
       <!-- <div class="good">
@@ -22,7 +22,7 @@
           <div class="one"></div>
           <div class="dynamicTxt">医生简介</div>
         </div>
-        <div class="goodtxt" v-html="doctors.docintroduction"></div>
+        <div class="goodtxt" v-html="doctors.content"></div>
       </div>
     </div>
   </div>
@@ -41,62 +41,51 @@ export default {
       singleDoctorInfo(id, orgid).then(response => {
         if (response.data.state == 1) {
           var editdoctor = response.data.data.editdoctor;
-          if (editdoctor.doc_postion == 1) {
-            editdoctor.doc_postion = "医士";
+          console.log("editdoctor是什么",editdoctor)
+          if (editdoctor.user_title == 1) {
+            editdoctor.user_title = "医士";
           }
-          if (editdoctor.doc_postion == 2) {
-            editdoctor.doc_postion = "医师";
+          if (editdoctor.user_title == 2) {
+            editdoctor.user_title = "医师";
           }
-          if (editdoctor.doc_postion == 3) {
-            editdoctor.doc_postion = "住院医师";
+          if (editdoctor.user_title == 3) {
+            editdoctor.user_title = "住院医师";
           }
-          if (editdoctor.doc_postion == 4) {
-            editdoctor.doc_postion = "主治医师";
+          if (editdoctor.user_title == 4) {
+            editdoctor.user_title = "主治医师";
           }
-          if (editdoctor.doc_postion == 5) {
-            editdoctor.doc_postion = "副主任医师";
+          if (editdoctor.user_title == 5) {
+            editdoctor.user_title = "副主任医师";
           }
-          if (editdoctor.doc_postion == 6) {
-            editdoctor.doc_postion = "主任医师";
+          if (editdoctor.user_title == 6) {
+            editdoctor.user_title = "主任医师";
           }
-          if (editdoctor.doc_postion == 7) {
-            editdoctor.doc_postion = "护士";
+          if (editdoctor.user_title == 7) {
+            editdoctor.user_title = "护士";
           }
-          if (editdoctor.doc_postion == 8) {
-            editdoctor.doc_postion = "护师";
+          if (editdoctor.user_title == 8) {
+            editdoctor.user_title = "护师";
           }
-          if (editdoctor.doc_postion == 9) {
-            editdoctor.doc_postion = "主管护师";
+          if (editdoctor.user_title == 9) {
+            editdoctor.user_title = "主管护师";
           }
-          if (editdoctor.doc_postion == 10) {
-            editdoctor.doc_postion = "副主任护师";
+          if (editdoctor.user_title == 10) {
+            editdoctor.user_title = "副主任护师";
           }
-          if (editdoctor.doc_postion == 11) {
-            editdoctor.doc_postion = "主任护师";
+          if (editdoctor.user_title == 11) {
+            editdoctor.user_title = "主任护师";
           }
 
           console.log("editdoctor", editdoctor);
           this.doctors = editdoctor;
         }
       });
-
-      //      { index: 1, name: '医士' },
-      // { index: 2, name: '医师' },
-      // { index: 3, name: '住院医师' },
-      // { index: 4, name: '主治医师' },
-      // { index: 5, name: '副主任医师' },
-      // { index: 6, name: '主任医师' },
-      // { index: 7, name: '护士' },
-      // { index: 8, name: '护师' },
-      // { index: 9, name: '主管护师' },
-      // { index: 10, name: '副主任护师' },
-      // { index: 11, name: '主任护师' },
     }
   },
   created() {
     const id = this.$route.query.id;
     const orgid = this.$route.query.orgid;
-    console.log("id是多少", id);
+    console.log("医生id是多少", id);
     console.log("orgid是多少", orgid);
     this.singleDoctorInfo(id, orgid);
   }

src/scrm_pages/medicalTeam/medicalTeam.vue

@@ -18,11 +18,11 @@
         <div class="img">
           <img :src="item.dochead" style="width:100%;height:100%" alt />
         </div>
-        <div class="detail" v-if="item.docintroduction !=''">
-          <p class="detailTitle">{{item.doc_name}}</p>
-          <p class="detailMessage" v-html="item.docintroduction"></p>
+        <div class="detail" v-if="item.content !=''">
+          <p class="detailTitle">{{item.name}}</p>
+          <p class="detailMessage" v-html="item.content"></p>
         </div>
-        <div class="detail" v-else-if="item.docintroduction == ''">
+        <div class="detail" v-else-if="item.content ==''">
           <div class="noImg">
             <img src="../../../static/images/none2.png" alt />
           </div>
@@ -32,29 +32,29 @@
   </div>
 </template>
   <script>
-import { docmore } from "@/api/micro/micro";
+import { docmore,GetAllDoctors} from "@/api/micro/micro";
 export default {
   data() {
     return {
-      editdocfrom: []
+      editdocfrom: [],
     };
   },
   methods: {
-    docmore(id, orgid) {
-      docmore(id, orgid).then(response => {
-        if (response.data.state == 1) {
-          var editdoctor = response.data.data.editdoctor;
-          if (this.editdocfrom.doc_postion == 1) {
-            this.editdocfrom.doc_postion = "";
-          }
-          console.log("编辑医生返回数据", editdoctor);
-          this.editdocfrom = editdoctor;
-          if (this.editdocfrom.doc_postion == 1) {
-            return "医生";
-          }
-        }
-      });
-    },
+    // docmore(id, orgid) {
+    //   docmore(id, orgid).then(response => {
+    //     if (response.data.state == 1) {
+    //       var editdoctor = response.data.data.editdoctor;
+    //       if (this.editdocfrom.doc_postion == 1) {
+    //         this.editdocfrom.doc_postion = "";
+    //       }
+    //       console.log("编辑医生返回数据", editdoctor);
+    //       this.editdocfrom = editdoctor;
+    //       if (this.editdocfrom.doc_postion == 1) {
+    //         return "医生";
+    //       }
+    //     }
+    //   });
+    // },
 
     singleDoctorInfo(id, orgid) {
       this.$router.push({
@@ -64,6 +64,17 @@ export default {
           orgid: orgid
         }
       });
+    },
+    GetAllDoctors(orgid){
+       GetAllDoctors(orgid).then(response=>{
+         if(response.data.state == 1){
+           console.log("hhehhhehehehe")
+           var info =  response.data.data.info;
+            this.editdocfrom = info;
+           console.log("info是多少",info)
+
+         }
+       })
     }
   },
   created() {
@@ -71,7 +82,8 @@ export default {
     const orgid = this.$route.query.orgid;
     console.log("id是多少", id);
     console.log("orgid是多少", orgid);
-    this.docmore(id, orgid);
+    // this.docmore(id, orgid);
+    this.GetAllDoctors(orgid)
   }
 };
 </script>

src/scrm_pages/microHome/microHome.vue

@@ -78,7 +78,7 @@
           </div>
           <div class="commonBox">
             <div class="commonMessage" v-html="item.Hospitals.introduction" v-if="item.Hospitals.introduction!=''"></div>
-            <div class="noImg" v-else-if="item.Hospitals.introcution == ''">
+            <div class="noImg" v-else-if="item.Hospitals.introduction == ''">
               <img src="../../../static/images/none2.png" alt />
             </div>
           </div>
@@ -101,7 +101,7 @@
             <img src="static\images\img2.png" alt />
             </div>-->
             <div class="commonMessage" v-html="item.Offices.introduction" v-if="item.Offices.introduction != ''"></div>
-            <div class="noImg" v-else-if="item.Offices.introduction">
+            <div class="noImg" v-else-if="item.Offices.introduction == ''">
               <img src="../../../static/images/none2.png" alt />
             </div>
           </div>
@@ -386,7 +386,8 @@ export default {
 
       if (linktype == "2") {
         this.$router.push({
-          path: "/contactus",
+          // path: "/contactus",
+          path:"/custom",
           query: {
             orgid: orgid
           }
@@ -398,7 +399,7 @@ export default {
       if (linktype == "4") {
         // window.location.href = address;
         this.$router.push({
-          path:"/custom",
+          path:"/contactus",
           query:{
             orgid:orgid,
           }