Merge branch 'master' of http://git.shengws.com/xmg123/micro_vue

src/scrm_pages/micro/micro.vue

@@ -16,22 +16,22 @@
                        </div> 
                        <!-- 医院介绍 -->
                        <div class="modetwo" v-if="item.mode_type == 2">
-                          <img src="static\images\u.png" style="width:5px;height:20px;">
+                          <img src="static\images\u.png" style="width:5px;height:25px;margin-left:10px;">
                           <div class="kefont"><span >{{item.title}}</span></div>   
-                         <div class="more" @click="hispitalmore(item.id,item.user_org_id)">查看更多</div>
-                          <div class="logo"><img src="static\images\u216.png"></div>  
-                         <div class="hoscontent">
+                         <!-- <div class="more" @click="hispitalmore(item.id,item.user_org_id)">查看更多</div> -->
+                          <!-- <div class="logo"><img src="static\images\u216.png"></div>   -->
+                         <div class="hoscontent" @click="hispitalmore(item.id,item.user_org_id)">
                            <span v-html="item.Hospitals.introduction" id="content" ></span>
                           </div>   
                            <div class="box"></div>                                                       
                        </div>                   
                     <!-- 科室介绍 -->
                     <div v-if="item.mode_type == 3" class="modethree">   
-                       <img src="static\images\u.png" style="width:5px;height:20px;">
+                       <img src="static\images\u.png" style="width:5px;height:25px;margin-left:10px;">
                        <div class="kefont"><span >{{item.title}}</span></div>   
-                       <div class="more" @click="officemore(item.id,item.user_org_id)">查看更多</div>
-                       <div class="logo"><img src="static\images\u216.png"></div>  
-                       <div class="xcontent">
+                       <!-- <div class="more" @click="officemore(item.id,item.user_org_id)">查看更多</div> -->
+                       <!-- <div class="logo"><img src="static\images\u216.png"></div>   -->
+                       <div class="xcontent" @click="officemore(item.id,item.user_org_id)">
                           <span  v-html="item.Offices.introduction" id="ycontent"></span>
                        </div>
                        <div class="box"></div>
@@ -39,10 +39,10 @@
                     
                       <!-- 名医介绍 -->
                      <div v-if="item.mode_type == 4" class="modefour">
-                       <img src="static\images\u.png" style="width:5px;height:20px;">
-                         <div class="kefont"><span >{{item.title}}</span></div> 
-                           <div class="more" @click="docmore(item.id,item.user_org_id)">查看更多</div>
-                              <div class="logo"><img src="static\images\u216.png"></div>
+                       <img src="static\images\u.png" style="width:5px;height:25px;margin-left:10px;">
+                         <div class="kefont"  @click="docmore(item.id,item.user_org_id)"><span >{{item.title}}</span></div> 
+                           <!-- <div class="more" @click="docmore(item.id,item.user_org_id)">查看更多</div> -->
+                              <!-- <div class="logo"><img src="static\images\u216.png"></div> -->
                                 <div class="docborde">
                                  <div class="docheart" v-for="doc in item.Editdoctor" :key="doc.id">
                                    <div class="docimage">
@@ -57,10 +57,10 @@
 
                         <!-- 科室环境 -->
                        <div v-if="item.mode_type == 5" class="modefive">
-                            <img src="static\images\u.png" style="width:5px;height:20px;"> 
-                            <div class="kefont"><span >{{item.title}}</span></div> 
-                            <div class="more" @click="kemore(item.id,item.user_org_id)">查看更多</div>
-                            <div class="logo"><img src="static\images\u216.png"></div>
+                            <img src="static\images\u.png" style="width:5px;height:25px;margin-left:10px;"> 
+                            <div class="kefont" @click="kemore(item.id,item.user_org_id)"><span >{{item.title}}</span></div> 
+                            <!-- <div class="more" @click="kemore(item.id,item.user_org_id)">查看更多</div> -->
+                            <!-- <div class="logo"><img src="static\images\u216.png"></div> -->
                             <div class="swiperimages">
                                <div class="swiper-container swiperthree" >
                                  <div class="swiper-wrapper" id="wrappert">
@@ -75,10 +75,10 @@
 
                      <!--文章列表 -->
                         <div v-if="item.mode_type == 6" class="modesix">
-                              <img src="static\images\u.png" style="width:5px;height:20px">
-                              <div class="kefont"><span>{{item.title}}</span></div>
-                              <div class="more" @click="articlemore(item.id,item.user_org_id)">查看更多</div>
-                              <div class="logo"><img src="static\images\u216.png"></div>
+                              <img src="static\images\u.png" style="width:5px;height:25px;margin-left:10px;">
+                              <div class="kefont" @click="articlemore(item.id,item.user_org_id)"><span>{{item.title}}</span></div>
+                              <!-- <div class="more" @click="articlemore(item.id,item.user_org_id)">查看更多</div> -->
+                              <!-- <div class="logo"><img src="static\images\u216.png"></div> -->
                               <div class="actilist" v-for="it in Articlelist" :key="it.id">
                                <div class="acthead">
                                    <img :src="it.imgs" style="width:80px;height:80px">
@@ -93,10 +93,10 @@
 
                           <!-- 活动列表 -->
                            <div v-if="item.mode_type == 7" class="modeseven">
-                             <img src="static\images\u.png" style="width:5px;height:20px;">
-                             <div class="kefont"><span>{{item.title}}</span></div>
-                             <div class="more" @click="Activitiesmore(item.id,item.user_org_id)">查看更多</div>
-                             <div class="logo"><img src="static\images\u216.png"></div>
+                             <img src="static\images\u.png" style="width:5px;height:25px;margin-left:10px;">
+                             <div class="kefont" @click="Activitiesmore(item.id,item.user_org_id)"><span>{{item.title}}</span></div>
+                             <!-- <div class="more" @click="Activitiesmore(item.id,item.user_org_id)">查看更多</div> -->
+                             <!-- <div class="logo"><img src="static\images\u216.png"></div> -->
                              <div class="actilist" v-for="it in Activitieslist" :key="it.id">
                                <div class="acthead">
                                    <img :src="it.poster_photo" style="width:80px;height:80px">
@@ -116,7 +116,7 @@
                                <div v-if="item.mode_type== 8" class="modeeight">  
                                  <div class="block" v-for="it in item.Editmargin" :key="it.id" @click="NavigationClick(it.margtitle,it.marginaddress,it.user_org_id)">
                                     <div class="macimg">
-                                      <img :src="it.margimage" style="width:100%;height:100%">
+                                      <img :src="it.margimage" >
                                     </div>
                                     <div id="macimgtwo">
                                        <!-- <span>{{it.margtitle}}</span> -->
@@ -130,11 +130,11 @@
              </div>
          </div>
      </div>
-       <div class="scroll" v-show="defalutshow">暂无数据</div>
+       <div class="scroll" v-show="defalutshow">暂无数据</div>q 
        <!-- 医院介绍详情 -->
-       <div class="scroll" v-show="hosshow" v-html="hospitalform.introduction" id="target"></div>
+       <div class="scroll" v-show="hosshow" style="padding:15px 4%;" v-html="hospitalform.introduction" id="target"></div>
        <!-- 科室介绍详情 -->
-      <div class="scroll" v-show="keshow" v-html="officeform.introduction"></div>
+      <div class="scroll" v-show="keshow" style="padding:15px 4%;"  v-html="officeform.introduction"></div>
       <!-- 名医介绍详情 -->
        <div class="scroll" v-show="docshow" id="targetthree">
            <div class="docone" v-for="item in this.editdocfrom" :key="item.id" @click="singleDoctorInfo(item.id,item.user_org_id)">
@@ -305,6 +305,7 @@
       <div class="button">
           <div class="buttonone" v-for="item in this.navigationdata" :key="item.id">
              <img :src="item.navimages" style="width:30px; height:30px" @click="callPhone(item.navtitle,item.navaddress)">
+             <span>{{item.navtitle}}</span>
           </div>
            <!-- <div class="buttonone">
              <img src="static/images/u309.png" style="width:30px; height:30px">
@@ -500,7 +501,9 @@
         if(title == "首页"){
           this.modelshow = true
           this.contactShow = false;
-          this.getHospitaldata();
+          this.keshow = false;
+          this.hosshow = false;
+          this.getHospitaldata(this.$route.query.orgid);
         }
 
         if(title == "联系我们"){  
@@ -836,20 +839,26 @@
     .button{
        position: fixed;
        width: 100%;
-       height: 40px; 
+       height: 60px; 
+       padding: 5px 4%;
        /* border: solid 1px red; */
        background-color:white;
        z-index: 999999;
        bottom: 0px;  
+       display: flex;
+       border-top:solid 1px #efefef;
     }
     .buttonone{
         /* position: absolute; */
-        width: 30px;
+        flex: 1;
         height: 30px;
+        text-align: center;
         /* border: solid 1px red; */
-        margin-top: 5px;
-        margin-left: 50px;
-        display: inline-block;
+    }
+
+    .buttonone span {
+      display: block;
+      color: #909090;
     }
 
     .buttontwo{
@@ -897,9 +906,11 @@
     }
    .kefont{
      font-size: 14px;
-     color: red;
-     margin-left: 8px;
-     margin-top: -20px;
+     color: #4d4a4a;
+     margin-left: 18px;
+     margin-top: -25px;
+     font-weight: bold;
+     line-height: 25px;
   }
 .more{
   position: absolute;
@@ -921,8 +932,7 @@
      display: -webkit-box;
     -webkit-line-clamp: 6;
     -webkit-box-orient: vertical; 
-    margin-top: 5px;
-    margin-left: 5px;
+    padding: 10px 3% 10px 3%;
     /* border: solid 1px red; */
     overflow: hidden;
   }
@@ -930,8 +940,7 @@
     .xcontent{
       height:auto!important; 
       min-height:200px;
-      margin-top: 5px;
-      margin-left: 5px;
+      padding: 10px 3% 10px 3%;
       font-size: 14px;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -1080,36 +1089,36 @@
       position: relative;
       width: 100%;
       height:100%;
+      margin-top:20px;
       /* border:solid 1px red;  */
     }
 
       .block{
-      width: 70px;
+      width: 25%;
       display: inline-block;
       /* border:solid 1px blue; */
       height: 80px;
-      margin-left:15px;
-      margin-right: 2px;
       vertical-align: top;
-      margin-top: 5px;
     }
     .macimg{
-      width: 46px;
+      width: 100%;
       height: 50px;
       /* border:solid 1px red; */
-      margin-top: 2px;
       margin-bottom: 5px;
-      margin-left: 30px;
+      text-align: center;
     }
+    .macimg img{
+      width: 50px;
+      height: 50px;
+    }
+
     #macimgtwo{
-      width:58px;
+      width:100%;
       height:18px;
       font-size:14px;
-      position:absolute;
        /* overflow:hidden; */
        /* border: solid 1px red; */
       text-align: center;
-      margin-left: 22px;
     }
 
     .showindex{