Home Explore Help
Register Sign In
xmg123
/
micro_vue
Watch 0
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

微网站

xiaoming_global 4 years ago
parent
c1ded1a75f
commit
17181204c9
9 changed files with 180 additions and 246 deletions
Unified View Show Diff Stats
  1. 8 1
      src/App.vue
  2. 9 0
      src/api/micro/micro.js
  3. 52 43
      src/scrm_pages/Enviroments/enviromentsdetail.vue
  4. 3 3
      src/scrm_pages/contact/contact.vue
  5. 42 132
      src/scrm_pages/contact/contactus.vue
  6. 0 3
      src/scrm_pages/contactus/contactus.vue
  7. 27 38
      src/scrm_pages/doctorIntroduction/doctorIntroduction.vue
  8. 34 22
      src/scrm_pages/medicalTeam/medicalTeam.vue
  9. 5 4
      src/scrm_pages/microHome/microHome.vue

+ 8 - 1
src/App.vue View File

1 
 <template>
 1 
 <template>
2 
-  <div id="app">
2 
+  <div id="app" class="app">
3 
     <router-view v-if="isRouterAlive"></router-view>
 3 
     <router-view v-if="isRouterAlive"></router-view>
4 
   </div>
 4 
   </div>
5 
 </template>
 5 
 </template>
27 
     }
 27 
     }
28 
   }
 28 
   }
29 
 </script>
 29 
 </script>
30 
+
31 
+
32 
+<style lang="scss" scoped>
33 
+.app{
34 
+  -webkit-overflow-scrolling: touch;
35 
+}
36 
+</style>

+ 9 - 0
src/api/micro/micro.js View File

199 
      Get:"Get",
 199 
      Get:"Get",
200 
      params:params
 200 
      params:params
201 
    })
 201 
    })
202 
+}
203 
+
204 
+export function GetAllDoctors(orgid,params){
205 
+   return request({
206 
+     url:"/api/site/getalldoctors?orgid="+orgid,
207 
+     Get:"Get",
208 
+     params:params,
209 
+
210 
+   })
202 
 }
 211 
 }

+ 52 - 43
src/scrm_pages/Enviroments/enviromentsdetail.vue View File

1 
 <template>
 1 
 <template>
2 
-    <div>
3 
-       <div class="swiper-container imgSwiper">
4 
-              <div class="swiper-wrapper">
5 
-                <div class="swiper-slide carousel">
6 
-                  <img class="img" src="static/images/a.jpg" />
7 
-                </div>
8 
-                <div class="swiper-slide carousel">
9 
-                  <img class="img" src="static/images/a.jpg" />
10 
-                </div>
11 
-             </div>
12 
-        </div>
2 
+    <div class="page_enviromentsdetail">
3 
+      <div class="imgList" v-for="it in this.EnImages" :key="it.id">
4 
+       <img class="img" :src="it.enviroimages"  :preview="it.id"/>
5 
+      </div>
13 
     </div>
 6 
     </div>
14 
 </template>
 7 
 </template>
15
8
16 
 <script>
 9 
 <script>
17 
     import Swiper from "swiper";
 10 
     import Swiper from "swiper";
18 
-   import {getEnviromentImages } from "@/api/micro/micro";
11 
+   import { getEnviromentImages } from "@/api/micro/micro";
19 
     export default {
 12 
     export default {
20 
         name: "enviromentsdetail",
 13 
         name: "enviromentsdetail",
21 
         data(){
 14 
         data(){
22 
             return{
 15 
             return{
23 
-
16 
+               EnImages:[],
24 
             }
 17 
             }
25 
         },
 18 
         },
26 
-        created(){
27 
-          const id =  this.$route.query.id;
28 
-          const orgid = this.$route.query.orgid;
29 
-          console.log("id是多少",id)
30 
-          console.log("orgid是多少",orgid)
31 
-          getEnviromentImages(id,orgid);
32 
-        },
33 
-        methods:{
34 
-         initSwiper() {
19 
+
20 
+        methods: {
21 
+         getEnviromentImages(id,orgid){
22 
+            getEnviromentImages(id,orgid).then(response=>{
23 
+               if(response.data.state == 1){
24 
+                 var enviro =  response.data.data.enviro;
25 
+                 console.log("enviro是什么",enviro)
26 
+                 this.EnImages = enviro;
27 
+               }
28 
+            })
29 
+         },
30 
+
31 
+        initSwiper() {
35 
            var mySwiper2 = new Swiper(".imgSwiper", {
 32 
            var mySwiper2 = new Swiper(".imgSwiper", {
36 
            slidesPerView: 2,
 33 
            slidesPerView: 2,
37 
           });
 34 
           });
38 
          },
 35 
          },
39 
-         getEnviromentImages(id,orgid){
40 
-            getEnviromentImages(id,orgid).then(response=>{
41 
-                 if(response.data.state == 1){
42 
-                   var enviro =  response.data.data.enviro;
43 
-                   console.log("enviro是什么",enviro)
44 
-                 }
45 
-            })
46 
-         }
47 
         },
 36 
         },
48 
       mounted() {
 37 
       mounted() {
49 
         this.initSwiper();
 38 
         this.initSwiper();
52 
      updated() {
 41 
      updated() {
53 
        this.initSwiper();
 42 
        this.initSwiper();
54 
        this.$previewRefresh();
 43 
        this.$previewRefresh();
55 
-      }
44 
+      },
45 
+     created(){
46 
+          const id =  this.$route.query.id;
47 
+          const orgid = this.$route.query.orgid;
48 
+          this.getEnviromentImages(id,orgid);
49 
+       },
56 
     }
 50 
     }
57 
 </script>
 51 
 </script>
58
52
59 
 <style lang="scss">
 53 
 <style lang="scss">
60 
-  .carousel {
54 
+  // .carousel {
55 
+  //   width: 100%;
56 
+  //   height: 200px;
57 
+  //   float: left;
58 
+  //   padding-right: 1rem;
59 
+  //   .img{
60 
+  //       width: 100%;
61 
+  //       height: 100%;
62 
+  //       float: left;
63 
+  //   }
64 
+  // }
65 
+
66 
+//  .swiper-wrapper{
67 
+//      width:50%;
68 
+//  }
69 
+.page_enviromentsdetail{
70 
+ height: 100%;
71 
+  .imgList{
61 
     width: 100%;
 72 
     width: 100%;
73 
+    display: flex;
74 
+    flex-wrap: wrap;
75 
+    justify-content: space-around
76 
+  }
77 
+  .img{
78 
+    width: 48%;
62 
     height: 200px;
 79 
     height: 200px;
63 
-    float: left;
64 
-    padding-right: 1rem;
65 
-    .img{
66 
-        width: 100%;
67 
-        height: 100%;
68 
-        float: left;
69 
-    }
80 
+    margin-bottom: 20px;
81 
+
70 
   }
 82 
   }
71 
-
72 
- .swiper-wrapper{
73 
-     width:50%;
74 
- }
83 
+}
75 
 </style>
 84 
 </style>

+ 3 - 3
src/scrm_pages/contact/contact.vue View File

102 
 .page_contact {
 102 
 .page_contact {
103 
   overflow: hidden;
 103 
   overflow: hidden;
104 
   height: 100%;
 104 
   height: 100%;
105 
-  > div:nth-of-type(2) {
106 
-    min-height: 5.125rem;
107 
-  }
105 
+  // > div:nth-of-type(2) {
106 
+  //   min-height: 5.125rem;
107 
+  // }
108 
   .focusImg {
 108 
   .focusImg {
109 
     width: 23.4375rem;
 109 
     width: 23.4375rem;
110 
     height: 11.5625rem;
 110 
     height: 11.5625rem;

+ 42 - 132
src/scrm_pages/contact/contactus.vue View File

1 
 <template>
 1 
 <template>
2 
   <div class="page_home">
 2 
   <div class="page_home">
3 
-<<<<<<< .mine
4 
     <!-- <iframe  :src = this.customUrl width="100%" height="100%" marginwidth="0" frameborder="no" scrolling="no"></iframe> -->
 3 
     <!-- <iframe  :src = this.customUrl width="100%" height="100%" marginwidth="0" frameborder="no" scrolling="no"></iframe> -->
5 
     <div>
 4 
     <div>
6 
-      <div v-for="item in this.ordmodel" :key="item.id">
7 
-=======
8 
-
9 
-      <div v-for="item in this.ordmodel" :key="item.id" class="modeone">
10 
-
11 
->>>>>>> .theirs
5 
+    <div v-for="item in this.ordmodel" :key="item.id" >
6 
+
12 
         <div class="focusImg" v-if="item.mode_type == 1">
 7 
         <div class="focusImg" v-if="item.mode_type == 1">
13 
           <div class="swiper-container">
 8 
           <div class="swiper-container">
14 
             <div class="swiper-wrapper">
 9 
             <div class="swiper-wrapper">
19 
             <!-- 如果需要分页器 -->
 14 
             <!-- 如果需要分页器 -->
20 
             <div class="swiper-pagination"></div>
 15 
             <div class="swiper-pagination"></div>
21 
           </div>
 16 
           </div>
22 
-<<<<<<< .mine
23
17
24 
-
25 
-=======
26 
-
27 
           <!-- <div class="swiper-pagination"></div> -->
 18 
           <!-- <div class="swiper-pagination"></div> -->
28 
->>>>>>> .theirs
29 
         </div>
 19 
         </div>
30 
-<<<<<<< .mine
31 
-        <!-- <div class="detail"> -->
32 
-        <div class="row one detail" v-if="item.mode_type == 2">
33 
-          <p class="title">{{item.title}}:</p>
34 
-          <p class="msg">{{item.Hosaddress.address}}</p>
35 
-
36 
-
37 
-
38 
-
39 
-
40 
-
20 
+
41
21
42 
-=======
43 
-      </div>
44 
-
45 
       <div class="row" v-if="item.mode_type == 2">
 22 
       <div class="row" v-if="item.mode_type == 2">
46 
         <p class="title">{{item.title}}:</p>
 23 
         <p class="title">{{item.title}}:</p>
47 
         <p class="msg">{{item.Hosaddress.address}}</p>
 24 
         <p class="msg">{{item.Hosaddress.address}}</p>
51 
           <p class="title">{{it.title}}:</p>
 28 
           <p class="title">{{it.title}}:</p>
52 
           <p class="msg">{{it.content}}</p>
 29 
           <p class="msg">{{it.content}}</p>
53 
           <br />
 30 
           <br />
54 
->>>>>>> .theirs
55 
-        </div>
56 
-        <div class="row" v-if="item.mode_type == 3">
57 
-          <div v-for="it in Connectways" :key="it.id">
58 
-            <p class="title">{{it.title}}:</p>
59 
-            <p class="msg">{{it.content}}</p>
60 
-            <br />
61 
-          </div>
62 
         </div>
 31 
         </div>
63 
-        <div class="row" v-if="item.mode_type == 4">
32 
+      </div>
33 
+       <div class="row" v-if="item.mode_type == 4">
64 
           <p class="title">{{item.title}}:</p>
 34 
           <p class="title">{{item.title}}:</p>
65 
           <p class="msg">{{item.Worktime.worktime}}</p>
 35 
           <p class="msg">{{item.Worktime.worktime}}</p>
66 
         </div>
 36 
         </div>
67 
-        <div class="row one" v-if="item.mode_type == 5">
37 
+        <div class="row" v-if="item.mode_type == 5">
68 
           <p class="title">{{item.title}}:</p>
 38 
           <p class="title">{{item.title}}:</p>
69 
           <p class="msg">{{item.Rideway.ride_way}}</p>
 39 
           <p class="msg">{{item.Rideway.ride_way}}</p>
70 
         </div>
 40 
         </div>
71 
-      </div>
72 
-<<<<<<< .mine
73 
-
74 
-
75 
-
76 
-
77 
-
78 
-
79 
-
80 
-
81 
-=======
82 
-      <div class="row" v-if="item.mode_type == 4">
83 
-        <p class="title">{{item.title}}:</p>
84 
-        <p class="msg">{{item.Worktime.worktime}}</p>
85 
-      </div>
86 
-      <div class="row" v-if="item.mode_type == 5">
87 
-        <p class="title">{{item.title}}:</p>
88 
-        <p class="msg">{{item.Rideway.ride_way}}</p>
89 
-      </div>
90 
->>>>>>> .theirs
91 
     </div>
 41 
     </div>
92
42
93 
     <!-- tab切换 -->
 43 
     <!-- tab切换 -->
94 
-    <div class="tabs">
44 
+
45 
+  </div>
46 
+  <div class="tabs">
95 
       <ul class="tabList">
 47 
       <ul class="tabList">
96 
         <li
 48 
         <li
97 
           class="tabOne"
 49 
           class="tabOne"
131 
         if (response.data.state == 1) {
 83 
         if (response.data.state == 1) {
132 
           var navigation = response.data.data.navigation;
 84 
           var navigation = response.data.data.navigation;
133 
           for (let index = 0; index < navigation.length; index++) {
 85 
           for (let index = 0; index < navigation.length; index++) {
134 
-<<<<<<< .mine
135 
-            navigation[1].nonavimages =
136 
-              "https://images.shengws.com/2124_o_1571990749565.png";
137 
-=======
138 
-              navigation[3].nonavimages = "https://images.shengws.com/2124_o_1571990749565.png";
139 
-
140 
->>>>>>> .theirs
86 
+            navigation[3].nonavimages = "https://images.shengws.com/2124_o_1571990749565.png";
141 
           }
 87 
           }
142 
           console.log("navigation是什么", navigation);
 88 
           console.log("navigation是什么", navigation);
143 
           this.navigationdata = navigation;
 89 
           this.navigationdata = navigation;
196 
       if (linktype == "3") {
 142 
       if (linktype == "3") {
197 
         window.location.href = "tel://" + address + "";
 143 
         window.location.href = "tel://" + address + "";
198 
       }
 144 
       }
199 
-<<<<<<< .mine
200 
-      if (linktype == "4") {
201 
-        // window.location.href = address;
202 
-        this.$router.push({
203 
-          path: "/custom",
204 
-          query: {
205 
-            orgid: orgid
206 
-          }
207 
-        });
208 
-      }
209 
-=======
145 
+      // if (linktype == "4") {
146 
+      //   // window.location.href = address;
147 
+      //   this.$router.push({
148 
+      //     path: "/custom",
149 
+      //     query: {
150 
+      //       orgid: orgid
151 
+      //     }
152 
+      //   });
153 
+      // }
210 
       // if (linktype == "4") {
 154 
       // if (linktype == "4") {
211 
       //   // window.location.href = address;
 155 
       //   // window.location.href = address;
212 
       //   this.$router.push({
 156 
       //   this.$router.push({
216 
       //     }
 160 
       //     }
217 
       //   })
 161 
       //   })
218 
       // }
 162 
       // }
219 
->>>>>>> .theirs
220 
     }
 163 
     }
221 
   },
 164 
   },
222 
   created() {
 165 
   created() {
236
179
237 
 <style lang="scss" scoped>
 180 
 <style lang="scss" scoped>
238 
 @import "../../assets/styles/mixin.scss";
 181 
 @import "../../assets/styles/mixin.scss";
239 
-<<<<<<< .mine
240 
-
241 
-.page_home {
242 
-  overflow: hidden;
243 
-  display: flex;
244 
-  flex-direction: column;
245 
-  height: 100%;
246 
-  overflow-y: auto;
247 
-  > div:first-child {
248 
-    flex: 1;
249 
-    overflow: auto;
250 
-  }
251 
-  > div:first-child::-webkit-scrollbar {
252 
-    width: 0;
253 
-  }
254 
-  // border:solid 1px red;
255 
-}
182 
+// .page_home {
183 
+//   overflow: hidden;
184 
+//   display: flex;
185 
+//   flex-direction: column;
186 
+//   height: 100%;
187 
+//   overflow-y: auto;
188 
+//   > div:first-child {
189 
+//     flex: 1;
190 
+//     overflow: auto;
191 
+//   }
192 
+//   > div:first-child::-webkit-scrollbar {
193 
+//     width: 0;
194 
+//   }
195 
+//   // border:solid 1px red;
196 
+// }
256 
 // .bugone{
 197 
 // .bugone{
257 
 //   border: solid 1px red;
 198 
 //   border: solid 1px red;
258 
 // }
 199 
 // }
259
200
260 
-=======
261 
-
262 
-
263 
-
264 
-
265 
-
266 
-
267 
-
268 
-
269 
-
270 
-
271 
-
272 
-
273 
-
274 
-
275 
-
276 
-
277 
-
278 
-
279 
-
280 
-
281 
->>>>>>> .theirs
282 
 .tabs {
 201 
 .tabs {
283 
   @include border-top;
 202 
   @include border-top;
284 
   width: 100%;
 203 
   width: 100%;
310 
 .page_home {
 229 
 .page_home {
311 
   overflow: hidden;
 230 
   overflow: hidden;
312 
   height: 100%;
 231 
   height: 100%;
313 
-<<<<<<< .mine
314 
   // > div:nth-of-type(2) {
 232 
   // > div:nth-of-type(2) {
315 
   //   min-height: 5.125rem;
 233 
   //   min-height: 5.125rem;
316 
   // }
 234 
   // }
317
235
318 
-
319 
-
320 
-
321 
-
322 
-
323 
-=======
324 
-  display:flex;
236 
+  display: flex;
325 
   flex-direction: column;
 237 
   flex-direction: column;
326 
-  >div:first-child{
238 
+  > div:first-child {
327 
     flex: 1;
 239 
     flex: 1;
328 
     overflow: auto;
 240 
     overflow: auto;
329 
   }
 241 
   }
330 
-  > div:nth-of-type(2) {
331 
-    min-height: 3.0rem;
332 
-  }
333 
->>>>>>> .theirs
242 
+  // > div:nth-of-type(2) {
243 
+  //   min-height: 3rem;
244 
+  // }
334 
   > div:nth-of-type(3) {
 245 
   > div:nth-of-type(3) {
335 
     min-height: 3.125rem;
 246 
     min-height: 3.125rem;
336 
-  }
247 
+  }
337 
   > div:nth-of-type(4) {
 248 
   > div:nth-of-type(4) {
338 
     min-height: 2.9rem;
 249 
     min-height: 2.9rem;
339 
   }
 250 
   }
376 
     }
 287 
     }
377 
   }
 288 
   }
378 
   .one {
 289 
   .one {
379 
-    min-height: 1.0rem;
290 
+    min-height: 1rem;
380 
     // line-height: 3rem;
 291 
     // line-height: 3rem;
381 
   }
 292 
   }
382 
   .detail {
 293 
   .detail {
383 
     width: 21.125rem;
 294 
     width: 21.125rem;
384 
     margin: 1.1875rem 1.25rem 0 1.25rem;
 295 
     margin: 1.1875rem 1.25rem 0 1.25rem;
385 
-
386 
   }
 296 
   }
387 
 }
 297 
 }
388 
-.modeone{
298 
+.modeone {
389 
   min-height: 210px;
 299 
   min-height: 210px;
390 
   // border:solid 1px red;
 300 
   // border:solid 1px red;
391 
 }
 301 
 }

+ 0 - 3
src/scrm_pages/contactus/contactus.vue View File

1 
 <template>
 1 
 <template>
2 
-<<<<<<< .mine
3 
   <div class="page_contactus">
 2 
   <div class="page_contactus">
4 
     <!-- 联系我们页面 -->
 3 
     <!-- 联系我们页面 -->
5 
     <div class="scroll" style="padding:15px 4%;">
 4 
     <div class="scroll" style="padding:15px 4%;">
12 
           </mt-swipe>
 11 
           </mt-swipe>
13 
         </div>
 12 
         </div>
14
13
15 
-=======
16 
     <div>
 14 
     <div>
17 
           <!-- 联系我们页面 -->
 15 
           <!-- 联系我们页面 -->
18 
          <div class="scroll"  style="padding:15px 4%;">
 16 
          <div class="scroll"  style="padding:15px 4%;">
25 
                              </mt-swipe-item>
 23 
                              </mt-swipe-item>
26 
                         </mt-swipe>
 24 
                         </mt-swipe>
27 
                      </div>
 25 
                      </div>
28 
->>>>>>> .theirs
29
26
30 
         <div v-if="item.mode_type == 2" class="oldmodetwo">
 27 
         <div v-if="item.mode_type == 2" class="oldmodetwo">
31 
           <div>
 28 
           <div>

+ 27 - 38
src/scrm_pages/doctorIntroduction/doctorIntroduction.vue View File

6 
           <img :src="doctors.dochead" style="width:100%;height:100%" alt />
 6 
           <img :src="doctors.dochead" style="width:100%;height:100%" alt />
7 
         </div>
 7 
         </div>
8 
         <div class="detail">
 8 
         <div class="detail">
9 
-          <p class="detailTitle">{{doctors.doc_name}}</p>
10 
-          <p class="detailMessage">{{doctors.doc_postion}}</p>
9 
+          <p class="detailTitle">{{doctors.name}}</p>
10 
+          <p class="detailMessage">{{doctors.user_title}}</p>
11 
         </div>
 11 
         </div>
12 
       </div>
 12 
       </div>
13 
       <!-- <div class="good">
 13 
       <!-- <div class="good">
22 
           <div class="one"></div>
 22 
           <div class="one"></div>
23 
           <div class="dynamicTxt">医生简介</div>
 23 
           <div class="dynamicTxt">医生简介</div>
24 
         </div>
 24 
         </div>
25 
-        <div class="goodtxt" v-html="doctors.docintroduction"></div>
25 
+        <div class="goodtxt" v-html="doctors.content"></div>
26 
       </div>
 26 
       </div>
27 
     </div>
 27 
     </div>
28 
   </div>
 28 
   </div>
41 
       singleDoctorInfo(id, orgid).then(response => {
 41 
       singleDoctorInfo(id, orgid).then(response => {
42 
         if (response.data.state == 1) {
 42 
         if (response.data.state == 1) {
43 
           var editdoctor = response.data.data.editdoctor;
 43 
           var editdoctor = response.data.data.editdoctor;
44 
-          if (editdoctor.doc_postion == 1) {
45 
-            editdoctor.doc_postion = "医士";
44 
+          console.log("editdoctor是什么",editdoctor)
45 
+          if (editdoctor.user_title == 1) {
46 
+            editdoctor.user_title = "医士";
46 
           }
 47 
           }
47 
-          if (editdoctor.doc_postion == 2) {
48 
-            editdoctor.doc_postion = "医师";
48 
+          if (editdoctor.user_title == 2) {
49 
+            editdoctor.user_title = "医师";
49 
           }
 50 
           }
50 
-          if (editdoctor.doc_postion == 3) {
51 
-            editdoctor.doc_postion = "住院医师";
51 
+          if (editdoctor.user_title == 3) {
52 
+            editdoctor.user_title = "住院医师";
52 
           }
 53 
           }
53 
-          if (editdoctor.doc_postion == 4) {
54 
-            editdoctor.doc_postion = "主治医师";
54 
+          if (editdoctor.user_title == 4) {
55 
+            editdoctor.user_title = "主治医师";
55 
           }
 56 
           }
56 
-          if (editdoctor.doc_postion == 5) {
57 
-            editdoctor.doc_postion = "副主任医师";
57 
+          if (editdoctor.user_title == 5) {
58 
+            editdoctor.user_title = "副主任医师";
58 
           }
 59 
           }
59 
-          if (editdoctor.doc_postion == 6) {
60 
-            editdoctor.doc_postion = "主任医师";
60 
+          if (editdoctor.user_title == 6) {
61 
+            editdoctor.user_title = "主任医师";
61 
           }
 62 
           }
62 
-          if (editdoctor.doc_postion == 7) {
63 
-            editdoctor.doc_postion = "护士";
63 
+          if (editdoctor.user_title == 7) {
64 
+            editdoctor.user_title = "护士";
64 
           }
 65 
           }
65 
-          if (editdoctor.doc_postion == 8) {
66 
-            editdoctor.doc_postion = "护师";
66 
+          if (editdoctor.user_title == 8) {
67 
+            editdoctor.user_title = "护师";
67 
           }
 68 
           }
68 
-          if (editdoctor.doc_postion == 9) {
69 
-            editdoctor.doc_postion = "主管护师";
69 
+          if (editdoctor.user_title == 9) {
70 
+            editdoctor.user_title = "主管护师";
70 
           }
 71 
           }
71 
-          if (editdoctor.doc_postion == 10) {
72 
-            editdoctor.doc_postion = "副主任护师";
72 
+          if (editdoctor.user_title == 10) {
73 
+            editdoctor.user_title = "副主任护师";
73 
           }
 74 
           }
74 
-          if (editdoctor.doc_postion == 11) {
75 
-            editdoctor.doc_postion = "主任护师";
75 
+          if (editdoctor.user_title == 11) {
76 
+            editdoctor.user_title = "主任护师";
76 
           }
 77 
           }
77
78
78 
           console.log("editdoctor", editdoctor);
 79 
           console.log("editdoctor", editdoctor);
79 
           this.doctors = editdoctor;
 80 
           this.doctors = editdoctor;
80 
         }
 81 
         }
81 
       });
 82 
       });
82 
-
83 
-      //      { index: 1, name: '医士' },
84 
-      // { index: 2, name: '医师' },
85 
-      // { index: 3, name: '住院医师' },
86 
-      // { index: 4, name: '主治医师' },
87 
-      // { index: 5, name: '副主任医师' },
88 
-      // { index: 6, name: '主任医师' },
89 
-      // { index: 7, name: '护士' },
90 
-      // { index: 8, name: '护师' },
91 
-      // { index: 9, name: '主管护师' },
92 
-      // { index: 10, name: '副主任护师' },
93 
-      // { index: 11, name: '主任护师' },
94 
     }
 83 
     }
95 
   },
 84 
   },
96 
   created() {
 85 
   created() {
97 
     const id = this.$route.query.id;
 86 
     const id = this.$route.query.id;
98 
     const orgid = this.$route.query.orgid;
 87 
     const orgid = this.$route.query.orgid;
99 
-    console.log("id是多少", id);
88 
+    console.log("医生id是多少", id);
100 
     console.log("orgid是多少", orgid);
 89 
     console.log("orgid是多少", orgid);
101 
     this.singleDoctorInfo(id, orgid);
 90 
     this.singleDoctorInfo(id, orgid);
102 
   }
 91 
   }

+ 34 - 22
src/scrm_pages/medicalTeam/medicalTeam.vue View File

18 
         <div class="img">
 18 
         <div class="img">
19 
           <img :src="item.dochead" style="width:100%;height:100%" alt />
 19 
           <img :src="item.dochead" style="width:100%;height:100%" alt />
20 
         </div>
 20 
         </div>
21 
-        <div class="detail" v-if="item.docintroduction !=''">
22 
-          <p class="detailTitle">{{item.doc_name}}</p>
23 
-          <p class="detailMessage" v-html="item.docintroduction"></p>
21 
+        <div class="detail" v-if="item.content !=''">
22 
+          <p class="detailTitle">{{item.name}}</p>
23 
+          <p class="detailMessage" v-html="item.content"></p>
24 
         </div>
 24 
         </div>
25 
-        <div class="detail" v-else-if="item.docintroduction == ''">
25 
+        <div class="detail" v-else-if="item.content ==''">
26 
           <div class="noImg">
 26 
           <div class="noImg">
27 
             <img src="../../../static/images/none2.png" alt />
 27 
             <img src="../../../static/images/none2.png" alt />
28 
           </div>
 28 
           </div>
32 
   </div>
 32 
   </div>
33 
 </template>
 33 
 </template>
34 
   <script>
 34 
   <script>
35 
-import { docmore } from "@/api/micro/micro";
35 
+import { docmore,GetAllDoctors} from "@/api/micro/micro";
36 
 export default {
 36 
 export default {
37 
   data() {
 37 
   data() {
38 
     return {
 38 
     return {
39 
-      editdocfrom: []
39 
+      editdocfrom: [],
40 
     };
 40 
     };
41 
   },
 41 
   },
42 
   methods: {
 42 
   methods: {
43 
-    docmore(id, orgid) {
44 
-      docmore(id, orgid).then(response => {
45 
-        if (response.data.state == 1) {
46 
-          var editdoctor = response.data.data.editdoctor;
47 
-          if (this.editdocfrom.doc_postion == 1) {
48 
-            this.editdocfrom.doc_postion = "";
49 
-          }
50 
-          console.log("编辑医生返回数据", editdoctor);
51 
-          this.editdocfrom = editdoctor;
52 
-          if (this.editdocfrom.doc_postion == 1) {
53 
-            return "医生";
54 
-          }
55 
-        }
56 
-      });
57 
-    },
43 
+    // docmore(id, orgid) {
44 
+    //   docmore(id, orgid).then(response => {
45 
+    //     if (response.data.state == 1) {
46 
+    //       var editdoctor = response.data.data.editdoctor;
47 
+    //       if (this.editdocfrom.doc_postion == 1) {
48 
+    //         this.editdocfrom.doc_postion = "";
49 
+    //       }
50 
+    //       console.log("编辑医生返回数据", editdoctor);
51 
+    //       this.editdocfrom = editdoctor;
52 
+    //       if (this.editdocfrom.doc_postion == 1) {
53 
+    //         return "医生";
54 
+    //       }
55 
+    //     }
56 
+    //   });
57 
+    // },
58
58
59 
     singleDoctorInfo(id, orgid) {
 59 
     singleDoctorInfo(id, orgid) {
60 
       this.$router.push({
 60 
       this.$router.push({
64 
           orgid: orgid
 64 
           orgid: orgid
65 
         }
 65 
         }
66 
       });
 66 
       });
67 
+    },
68 
+    GetAllDoctors(orgid){
69 
+       GetAllDoctors(orgid).then(response=>{
70 
+         if(response.data.state == 1){
71 
+           console.log("hhehhhehehehe")
72 
+           var info =  response.data.data.info;
73 
+            this.editdocfrom = info;
74 
+           console.log("info是多少",info)
75 
+
76 
+         }
77 
+       })
67 
     }
 78 
     }
68 
   },
 79 
   },
69 
   created() {
 80 
   created() {
71 
     const orgid = this.$route.query.orgid;
 82 
     const orgid = this.$route.query.orgid;
72 
     console.log("id是多少", id);
 83 
     console.log("id是多少", id);
73 
     console.log("orgid是多少", orgid);
 84 
     console.log("orgid是多少", orgid);
74 
-    this.docmore(id, orgid);
85 
+    // this.docmore(id, orgid);
86 
+    this.GetAllDoctors(orgid)
75 
   }
 87 
   }
76 
 };
 88 
 };
77 
 </script>
 89 
 </script>

+ 5 - 4
src/scrm_pages/microHome/microHome.vue View File

78 
           </div>
 78 
           </div>
79 
           <div class="commonBox">
 79 
           <div class="commonBox">
80 
             <div class="commonMessage" v-html="item.Hospitals.introduction" v-if="item.Hospitals.introduction!=''"></div>
 80 
             <div class="commonMessage" v-html="item.Hospitals.introduction" v-if="item.Hospitals.introduction!=''"></div>
81 
-            <div class="noImg" v-else-if="item.Hospitals.introcution == ''">
81 
+            <div class="noImg" v-else-if="item.Hospitals.introduction == ''">
82 
               <img src="../../../static/images/none2.png" alt />
 82 
               <img src="../../../static/images/none2.png" alt />
83 
             </div>
 83 
             </div>
84 
           </div>
 84 
           </div>
101 
             <img src="static\images\img2.png" alt />
 101 
             <img src="static\images\img2.png" alt />
102 
             </div>-->
 102 
             </div>-->
103 
             <div class="commonMessage" v-html="item.Offices.introduction" v-if="item.Offices.introduction != ''"></div>
 103 
             <div class="commonMessage" v-html="item.Offices.introduction" v-if="item.Offices.introduction != ''"></div>
104 
-            <div class="noImg" v-else-if="item.Offices.introduction">
104 
+            <div class="noImg" v-else-if="item.Offices.introduction == ''">
105 
               <img src="../../../static/images/none2.png" alt />
 105 
               <img src="../../../static/images/none2.png" alt />
106 
             </div>
 106 
             </div>
107 
           </div>
 107 
           </div>
386
386
387 
       if (linktype == "2") {
 387 
       if (linktype == "2") {
388 
         this.$router.push({
 388 
         this.$router.push({
389 
-          path: "/contactus",
389 
+          // path: "/contactus",
390 
+          path:"/custom",
390 
           query: {
 391 
           query: {
391 
             orgid: orgid
 392 
             orgid: orgid
392 
           }
 393 
           }
398 
       if (linktype == "4") {
 399 
       if (linktype == "4") {
399 
         // window.location.href = address;
 400 
         // window.location.href = address;
400 
         this.$router.push({
 401 
         this.$router.push({
401 
-          path:"/custom",
402 
+          path:"/contactus",
402 
           query:{
 403 
           query:{
403 
             orgid:orgid,
 404 
             orgid:orgid,
404 
           }
 405 
           }