微网站

src/api/micro/micro.js

@@ -181,4 +181,4 @@ export function GetRotationLinkAddress(linkid,orgid){
          Get:"Get",
          params:params,
      })
-}
+}

src/router/index.js

@@ -114,9 +114,13 @@ var _constant_router_map = [
     path: "/newsDetail",
     component: () => import("@/scrm_pages/newsDetail/newsDetail")
   },
+  {
+    path: "/contact",
+    component: () => import("@/scrm_pages/contact/contact")
+  },
   {
     path: "/",
-    component: () => import("@/scrm_pages/newsDetail/newsDetail")
+    component: () => import("@/scrm_pages/contact/contact")
   },
 
   // 医院介绍详情路由

src/scrm_pages/activity/activity.vue

@@ -1,7 +1,12 @@
 <template>
-  <div>
+  <div class="page_activity">
     <div class="content">
-      <div class="contentOne" v-for="it in Activitieslist" :key="it.id"  @click="singleActivitInfo(it.id,it.user_org_id)">
+      <div
+        class="contentOne"
+        v-for="it in Activitieslist"
+        :key="it.id"
+        @click="singleActivitInfo(it.id,it.user_org_id)"
+      >
         <div class="img">
           <img :src="it.poster_photo" style="width:100%;height:100%" alt />
         </div>
@@ -10,157 +15,66 @@
           <div class="detailBox">
             <div class="activityTime">
               <p>
-               {{staffCreateTime(it.start_time)}}开始<br>
+                {{staffCreateTime(it.start_time)}}开始
+                <br />
                 <!-- {{it.address}} -->
               </p>
             </div>
             <div class="people">
-              <p>100人已报名</p>
+              <p>{{it.join_num}}已报名</p>
             </div>
           </div>
         </div>
       </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
-          <div class="detailBox">
-            <div class="activityTime">
-              <p>
-                7月28日 08:30开始
-                深圳市南山区
-              </p>
-            </div>
-            <div class="people">
-              <p>100人已报名</p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <!-- <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
-          <div class="detailBox">
-            <div class="activityTime">
-              <p>
-                7月28日 08:30开始
-                深圳市南山区
-              </p>
-            </div>
-            <div class="people">
-              <p>100人已报名</p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
-          <div class="detailBox">
-            <div class="activityTime">
-              <p>
-                7月28日 08:30开始
-                深圳市南山区
-              </p>
-            </div>
-            <div class="people">
-              <p>100人已报名</p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
-          <div class="detailBox">
-            <div class="activityTime">
-              <p>
-                7月28日 08:30开始
-                深圳市南山区
-              </p>
-            </div>
-            <div class="people">
-              <p>100人已报名</p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="contentOne">
-        <div class="img">
-          <img src="static\images\img1.jpg" alt />
-        </div>
-        <div class="detail">
-          <p class="detailTitle">与孩子一起挑选采摘新机陆...</p>
-          <div class="detailBox">
-            <div class="activityTime">
-              <p>
-                7月28日 08:30开始
-                深圳市南山区
-              </p>
-            </div>
-            <div class="people">
-              <p>100人已报名</p>
-              <p>{{it.join_num}}</p>
-            </div>
-          </div>
-        </div>
-      </div>-->
     </div>
   </div>
 </template>
   <script>
-      import {getFileExtension,uParseTime} from '@/utils/tools'
-      import { Activitiesmore } from "@/api/micro/micro"
-      export default{
-        data(){
-            return{
-               Activitieslist:[],
-            }
-        },
-        methods:{
-           Activitiesmore(id,orgid){
-                Activitiesmore(id,orgid).then(response=>{
-                     if(response.data.state == 1){
-                       var activity =  response.data.data.activity;
-                       this.Activitieslist =  response.data.data.activity;                 
-                       console.log("获取活动列表",activity)
-                    }
-                })
-            },
-           staffCreateTime(time) {
-               return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
-           },
-           singleActivitInfo(id,orgid){
-                this.$router.push({
-                    path:'/activityDetail',
-                    query:{
-                     id:id,
-                     orgid,orgid,
-                   }
-                })
-            }
-        },
-        created(){
-           const id = this.$route.query.id;
-            const orgid = this.$route.query.orgid;
-            console.log("id是多少",id)
-            console.log("orgid是多少",orgid)
-            this.Activitiesmore(id,orgid)
+import { getFileExtension, uParseTime } from "@/utils/tools";
+import { Activitiesmore } from "@/api/micro/micro";
+export default {
+  data() {
+    return {
+      Activitieslist: []
+    };
+  },
+  methods: {
+    Activitiesmore(id, orgid) {
+      Activitiesmore(id, orgid).then(response => {
+        if (response.data.state == 1) {
+          var activity = response.data.data.activity;
+          this.Activitieslist = response.data.data.activity;
+          console.log("获取活动列表", activity);
         }
-      }
-  </script>
+      });
+    },
+    staffCreateTime(time) {
+      return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+    },
+    singleActivitInfo(id, orgid) {
+      this.$router.push({
+        path: "/activityDetail",
+        query: {
+          id: id,
+          orgid,
+          orgid
+        }
+      });
+    }
+  },
+  created() {
+    const id = this.$route.query.id;
+    const orgid = this.$route.query.orgid;
+    console.log("id是多少", id);
+    console.log("orgid是多少", orgid);
+    this.Activitiesmore(id, orgid);
+  }
+};
+</script>
 <style lang="scss" scoped>
+.page_activity {
+  overflow: hidden;
+}
 .contentOne {
   margin: auto;
   margin-top: 1.125rem;

src/scrm_pages/contact/contact.vue

@@ -0,0 +1,64 @@
+<template>
+  <div>
+    <div class="focusImg">
+      <img src="static/images/img2.png" alt />
+    </div>
+    <div class="detail">
+      <div class="row one">
+        <p class="title">医院地址：</p>
+        <p class="msg">深圳市南山区学苑大道1001号南山智园A4栋9楼918</p>
+      </div>
+      <div class="row">
+        <p class="title">电&ensp;&ensp;&ensp;&ensp;话：</p>
+        <p class="msg">0755-8548683</p>
+      </div>
+      <div class="row">
+        <p class="title">手机号码：</p>
+        <p class="msg">13612805443</p>
+      </div>
+      <div class="row">
+        <p class="title">工作时间：</p>
+        <p class="msg">15:00-18:00</p>
+      </div>
+      <div class="row one">
+        <p class="title">乘车方式：</p>
+        <p class="msg">乘1路或859路车至千峰路口站下车向南500米</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+
+<style lang="scss" scoped>
+.focusImg {
+  width: 23.4375rem;
+  height: 11.5625rem;
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
+.detail {
+  width: 21.125rem;
+  margin: 1.1875rem 1.25rem 0 1.25rem;
+
+  .row {
+    font-size: 1rem;
+    font-weight: 600;
+    color: rgba(7, 18, 40, 1);
+    line-height: 2.375rem;
+    height: 2.375rem;
+    .title {
+      float: left;
+    }
+    .msg {
+      float: left;
+      width: 16rem;
+    }
+  }
+  .one {
+    height: 3rem;
+    line-height: 1.5rem;
+  }
+}
+</style>

src/scrm_pages/doctorIntroduction/doctorIntroduction.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="page_doctorIntroduction">
     <div>
       <div class="contentOne">
         <div class="img">
@@ -7,7 +7,7 @@
         </div>
         <div class="detail">
           <p class="detailTitle">
-              {{doctors.doc_name}}
+            {{doctors.doc_name}}
             <span>{{doctors.doc_postion}}</span>
           </p>
           <p class="detailMessage" v-html="doctors.docintroduction"></p>
@@ -19,96 +19,96 @@
           <div class="dynamicTxt">医生擅长</div>
         </div>
         <div class="goodtxt">擅长甲状腺、胆结石</div>
-      </div> -->
+      </div>-->
       <div class="good">
         <div class="common_title">
           <div class="one"></div>
           <div class="dynamicTxt">医生简介</div>
         </div>
-        <div class="goodtxt" v-html="doctors.docintroduction">
-           
-        </div>
+        <div class="goodtxt" v-html="doctors.docintroduction"></div>
       </div>
     </div>
   </div>
 </template>
   
   <script>
-     import { singleDoctorInfo } from "@/api/micro/micro"
-     export default{
-       data(){
-          return{
-            doctors:[],
+import { singleDoctorInfo } from "@/api/micro/micro";
+export default {
+  data() {
+    return {
+      doctors: []
+    };
+  },
+  methods: {
+    singleDoctorInfo(id, orgid) {
+      singleDoctorInfo(id, orgid).then(response => {
+        if (response.data.state == 1) {
+          var editdoctor = response.data.data.editdoctor;
+          if (editdoctor.doc_postion == 1) {
+            editdoctor.doc_postion = "医士";
+          }
+          if (editdoctor.doc_postion == 2) {
+            editdoctor.doc_postion = "医师";
+          }
+          if (editdoctor.doc_postion == 3) {
+            editdoctor.doc_postion = "住院医师";
+          }
+          if (editdoctor.doc_postion == 4) {
+            editdoctor.doc_postion = "主治医师";
+          }
+          if (editdoctor.doc_postion == 5) {
+            editdoctor.doc_postion = "副主任医师";
+          }
+          if (editdoctor.doc_postion == 6) {
+            editdoctor.doc_postion = "主任医师";
+          }
+          if (editdoctor.doc_postion == 7) {
+            editdoctor.doc_postion = "护士";
+          }
+          if (editdoctor.doc_postion == 8) {
+            editdoctor.doc_postion = "护师";
+          }
+          if (editdoctor.doc_postion == 9) {
+            editdoctor.doc_postion = "主管护师";
+          }
+          if (editdoctor.doc_postion == 10) {
+            editdoctor.doc_postion = "副主任护师";
+          }
+          if (editdoctor.doc_postion == 11) {
+            editdoctor.doc_postion = "主任护师";
           }
-       },
-       methods:{
-         singleDoctorInfo(id,orgid){
-                singleDoctorInfo(id,orgid).then(response=>{
-                    if(response.data.state ==1){
-                     var editdoctor = response.data.data.editdoctor;
-                     if(editdoctor.doc_postion == 1){
-                        editdoctor.doc_postion = "医士"
-                     }
-                     if(editdoctor.doc_postion == 2){
-                        editdoctor.doc_postion = "医师"
-                     }
-                       if(editdoctor.doc_postion == 3){
-                        editdoctor.doc_postion = "住院医师"
-                     }                    
-                       if(editdoctor.doc_postion == 4){
-                        editdoctor.doc_postion = "主治医师"
-                     }
-                       if(editdoctor.doc_postion == 5){
-                        editdoctor.doc_postion = "副主任医师"
-                     }
-                       if(editdoctor.doc_postion == 6){
-                        editdoctor.doc_postion = "主任医师"
-                     }
-                       if(editdoctor.doc_postion == 7){
-                        editdoctor.doc_postion = "护士"
-                     }
-                       if(editdoctor.doc_postion == 8){
-                        editdoctor.doc_postion = "护师"
-                     }
-                       if(editdoctor.doc_postion == 9){
-                        editdoctor.doc_postion = "主管护师"
-                     }
-                      if(editdoctor.doc_postion == 10){
-                        editdoctor.doc_postion = "副主任护师"
-                     }
-                      if(editdoctor.doc_postion == 11){
-                        editdoctor.doc_postion = "主任护师"
-                     }
-                   
-                     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("orgid是多少",orgid)
-           this.singleDoctorInfo(id,orgid)
-       }
-     }
+          console.log("editdoctor", editdoctor);
+          this.doctors = editdoctor;
+        }
+      });
 
-  </script>
+      //      { 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("orgid是多少", orgid);
+    this.singleDoctorInfo(id, orgid);
+  }
+};
+</script>
 <style lang="scss" scoped>
+.page_doctorIntroduction {
+  overflow: hidden;
+}
 .contentOne {
   margin: auto;
   margin-top: 1.125rem;
@@ -154,7 +154,7 @@
       height: 30px;
       overflow: hidden;
       text-overflow: ellipsis;
-       display: -webkit-box;
+      display: -webkit-box;
       -webkit-line-clamp: 1;
       -webkit-box-orient: vertical;
       // border: solid 1px red;

src/scrm_pages/medicalTeam/medicalTeam.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="page_medicalTeam">
     <div class="header">
       <div class="line"></div>
       <div class="headerTitle">
@@ -9,8 +9,12 @@
     </div>
     <div class="msg">贴心的服务，让您的就医更轻松</div>
     <div class="content">
-
-      <div class="contentOne" v-for="item in this.editdocfrom" :key="item.id" @click="singleDoctorInfo(item.id,item.user_org_id)">
+      <div
+        class="contentOne"
+        v-for="item in this.editdocfrom"
+        :key="item.id"
+        @click="singleDoctorInfo(item.id,item.user_org_id)"
+      >
         <div class="img">
           <img :src="item.dochead" style="width:100%;height:100%" alt />
         </div>
@@ -19,57 +23,57 @@
           <p class="detailMessage" v-html="item.docintroduction"></p>
         </div>
       </div>
-
     </div>
   </div>
 </template>
   <script>
-     import { docmore } from "@/api/micro/micro"
-    export default{
-         data(){
-           return{
-              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 "医生"
-                       }
-                      
-                    }
-                 })
-            },
+import { docmore } from "@/api/micro/micro";
+export default {
+  data() {
+    return {
+      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 "医生";
+          }
+        }
+      });
+    },
 
-          singleDoctorInfo(id,orgid){
-              this.$router.push({
-                       path:'/doctorIntroduction',
-                       query:{
-                           id:id,
-                           orgid:orgid,
-                       }
-                    }
-                )
-            }
-         },
-         created(){
-           const id = this.$route.query.id;
-          const orgid = this.$route.query.orgid;
-          console.log("id是多少",id)
-          console.log("orgid是多少",orgid)
-          this.docmore(id,orgid)
-         }
+    singleDoctorInfo(id, orgid) {
+      this.$router.push({
+        path: "/doctorIntroduction",
+        query: {
+          id: id,
+          orgid: orgid
+        }
+      });
     }
-  </script>
+  },
+  created() {
+    const id = this.$route.query.id;
+    const orgid = this.$route.query.orgid;
+    console.log("id是多少", id);
+    console.log("orgid是多少", orgid);
+    this.docmore(id, orgid);
+  }
+};
+</script>
 <style lang="scss" scoped>
+.page_medicalTeam {
+  overflow: hidden;
+}
 .header {
   height: 1.25rem;
   width: 9.375rem;
@@ -143,9 +147,9 @@
       font-weight: 400;
       color: rgba(155, 155, 155, 1);
       line-height: 1.125rem;
-       overflow: hidden;
+      overflow: hidden;
       text-overflow: ellipsis;
-       display: -webkit-box;
+      display: -webkit-box;
       -webkit-line-clamp: 2;
       -webkit-box-orient: vertical;
     }

src/scrm_pages/microHome/microHome.vue

@@ -17,7 +17,7 @@
 
         <!-- 魔方导航 -->
         <div class="btnList" v-if="item.mode_type== 8">
-          <div class="btnOne" v-for="it in item.Editmargin" :key="it.id">
+          <div class="btnOne" v-for="it in item.Editmargin" :key="it.id"  @click="NavigationClick(it.marginaddress)">
             <div>
               <img :src="it.margimage" alt />
             </div>
@@ -39,7 +39,7 @@
               </p>
             </div>
           </div>
-          <div class="content">
+          <div class="content" @click="articlemore(item.id,item.user_org_id)">
             <div class="contentOne" v-for="it in Articlelist" :key="it.id">
               <div class="img">
                 <img :src="it.imgs" style="width:100%;height:100%" alt />
@@ -102,7 +102,7 @@
               </p>
             </div>
           </div>
-          <div class="content">
+          <div class="content" @click="docmore(item.id,item.user_org_id)" >
             <div class="contentOne" v-for="doc in item.Editdoctor" :key="doc.id">
               <div class="img">
                 <img :src="doc.dochead" style="width:100%;height:100%" alt />
@@ -159,7 +159,7 @@
               </p>
             </div>
           </div>
-          <div class="content">
+          <div class="content"  @click="Activitiesmore(item.id,item.user_org_id)">
             <div class="contentOne" v-for="it in Activitieslist" :key="it.id">
               <div class="img">
                 <img :src="it.poster_photo" style="widht:100%;height:100%" alt />
@@ -186,7 +186,7 @@
     <!-- tab切换 -->
     <div class="tabs">
       <ul class="tabList">
-        <li class="tabOne" v-for="item in this.navigationdata" :key="item.id">
+        <li class="tabOne" v-for="item in this.navigationdata" :key="item.id" @click="CallPhone(item.linktype,item.navaddress)">
           <img :src="item.navimages" alt />
           <span>{{item.navtitle}}</span>
         </li>
@@ -202,8 +202,9 @@ import {
   getHospitaldata,
   getArticlelist,
   getActivities,
-  getDefalutNavigationData
+  getDefalutNavigationData,
 } from "@/api/micro/micro";
+import { link } from 'fs';
 export default {
   data() {
     return {
@@ -315,6 +316,22 @@ export default {
           this.navigationdata = navigation;
         }
       });
+    },
+    NavigationClick(address){
+        window.location.href = address;
+        
+    }, 
+
+    CallPhone(linktype,address){
+       if(linktype == "2"){
+         window.location.href = address;
+       }
+       if(linktype == "3"){
+          window.location.href = 'tel://'+address+''
+       }
+       if(linktype == "4"){
+          window.location.href = address;
+       }
     }
   },
   created() {
@@ -607,11 +624,6 @@ export default {
       margin-top: 0.5rem;
       width: 1.25rem;
       height: 1.25rem;
-      background: linear-gradient(
-        0deg,
-        rgba(114, 182, 253, 1),
-        rgba(52, 119, 254, 1)
-      );
     }
     span {
       font-size: 0.75rem;

src/scrm_pages/news/news.vue

@@ -1,8 +1,7 @@
 <template>
-  <div>
+  <div class="page_news">
     <div class="content">
-
-      <div class="contentOne"  v-for="it in articlelist" :key="it.id">
+      <div class="contentOne" v-for="it in articlelist" :key="it.id">
         <div class="img">
           <img :src="it.imgs" style="width:100%;height:100%" alt />
         </div>
@@ -15,6 +14,7 @@
   </div>
 </template>
   <script>
+<<<<<<< .mine
      import { articlemore } from "@/api/micro/micro"
       export default{
         data(){
@@ -48,11 +48,70 @@
            console.log("id是多少",id)
            console.log("orgid是多少",orgid)
            this.articlemore(id,orgid)
-        }
-      }
+=======
+import { articlemore } from "@/api/micro/micro";
+export default {
+  data() {
+    return {
+      articlelist: []
+    };
+  },
+  methods: {
+    articlemore(id, orgid) {
+      articlemore(id, orgid).then(response => {
+        if (response.data.state == 1) {
+          var articlelist = response.data.data.articlelists;
+          console.log("文章列表数据", articlelist);
+          this.articlelist = response.data.data.articlelists;
+
+
+
+
+
+
+
+
+
+
+
 
-  </script>
+
+
+
+
+
+
+
+>>>>>>> .theirs
+        }
+      });
+    },
+    singleArticleInfo(id, orgid) {
+      this.$router.push({
+        path: "",
+        query: {
+          id: id,
+          orgid: orgid
+        }
+      });
+    }
+  },
+  created() {
+    const id = this.$route.query.id;
+    const orgid = this.$route.query.orgid;
+    console.log("id是多少", id);
+    console.log("orgid是多少", orgid);
+    this.articlemore(id, orgid);
+  }
+};
+</script>
 <style lang="scss" scoped>
+.page_news {
+  overflow: hidden;
+}
+.content {
+  padding: 1;
+}
 .contentOne {
   margin: auto;
   margin-top: 1.125rem;
@@ -77,13 +136,13 @@
     .detailTitle {
       margin-top: 0.5rem;
       width: 12.6875rem;
-      height: 1.0rem;
+      height: 1rem;
       font-size: 0.9375rem;
       font-weight: 600;
       color: rgba(7, 18, 40, 1);
       overflow: hidden;
       text-overflow: ellipsis;
-       display: -webkit-box;
+      display: -webkit-box;
       -webkit-line-clamp: 1;
       -webkit-box-orient: vertical;
     }

src/scrm_pages/newsDetail/newsDetail.vue

@@ -67,7 +67,7 @@
 }
 .msg {
   width: 21rem;
-  height: 12.0625rem;
+  min-height: 12.0625rem;
   font-size: 1rem;
   font-weight: 600;
   color: rgba(7, 18, 40, 1);