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

src/router/index.js

@@ -118,6 +118,7 @@ var _constant_router_map = [
     path: "/contact",
     component: () => import("@/scrm_pages/contact/contact")
   },
+  
   {
     path: "/",
     component: () => import("@/scrm_pages/microHome/microHome")
@@ -174,10 +175,24 @@ var _constant_router_map = [
     component: () => import("@/scrm_pages/activitylist/activitylistdetail")
   },
 
-  //联系我们
+  // //联系我们
+  // {
+  //   path: "/contactus",
+  //   component: () => import("@/scrm_pages/contactus/contactus")
+  // },
+
+  {
+    path: "/card",
+    component: () => import("@/scrm_pages/card/card")
+  },
+
+  {
+    path:"/custom",
+    component: () =>import("@/scrm_pages/custom/custom")
+  },
   {
-    path: "/contactus",
-    component: () => import("@/scrm_pages/contactus/contactus")
+    path:"/contactus",
+    component: () => import("@/scrm_pages/contact/contactus")
   },
 
   {

src/scrm_pages/activity/activity.vue

@@ -51,19 +51,18 @@ export default {
     staffCreateTime(time) {
       return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
     },
-    // singleActivitInfo(id, orgid) {
-    //   this.$router.push({
-    //     path: "/activityDetail",
-    //     query: {
-    //       id: id,
-    //       orgid,
-    //       orgid
-    //     }
-    //   });
-    // }
-    singleActivitInfo(id){
-      window.location.href = "http://wx.kuyicloud.com/weixin/activity/"+id;
+    singleActivitInfo(id, orgid) {
+      this.$router.push({
+        path: "/activityDetail",
+        query: {
+          id: id,
+          orgid: orgid
+        }
+      });
     }
+    // singleActivitInfo(id){
+    //   window.location.href = "http://wx.kuyicloud.com/weixin/activity/"+id;
+    // }
   },
   created() {
     const id = this.$route.query.id;

src/scrm_pages/activityDetail/activityDetail.vue

@@ -1,183 +1,92 @@
 <template>
-  <div>
-    <div class="banner">
-      <img :src="activitys.poster_photo" style="width:100%;height:100%" alt />
-    </div>
-    <div class="headline">
-      <div class="top">{{activitys.title}}</div>
-      <!-- <div class="bottom">
-        <p class="browse">
-          <i class="iconfont">&#xe629;</i>
-          <span>浏览400次</span>
-        </p>
-      </div>-->
-    </div>
-    <div class="detail">
-      <p class="row">
-        <i class="iconfont">&#xe614;</i>
-        <span>{{staffCreateTime(activitys.start_time)}}</span>
-      </p>
-      <p class="row">
-        <i class="iconfont">&#xe668;</i>
-        <span>{{activitys.address}}</span>
-      </p>
-      <p class="row">
-        <i class="iconfont">&#xe61f;</i>
-        <span>{{activitys.join_num}} / {{activitys.limit_num}}</span>
-      </p>
-      <p class="row">
-        <i class="iconfont">&#xe6a9;</i>
-        <span>{{activitys.phone_number}}</span>
-      </p>
-    </div>
-    <div class="introduce">
-      <div class="common_title">
-        <div class="one"></div>
-        <div class="dynamicTxt">报名须知</div>
+  <div class="page_home">
+    <div class="swiper-slide">
+      <div style="widht:100%;height:100%">
+         <iframe  :src = this.url width="100%" height="100%" marginwidth="0" frameborder="no" scrolling="no"></iframe>
       </div>
-      <div class="introduceDetail">{{activitys.sign_up_notice}}</div>
     </div>
-    <!-- <div class="apply">我要报名</div> -->
   </div>
 </template>
- <script>
-import { uParseTime } from "@/utils/tools";
-import { singleActivitInfo } from "@/api/micro/micro";
+
+<script>
+import { getDefalutNavigationData,} from "@/api/micro/micro";
 export default {
   data() {
     return {
-      activitys: []
+      url:"",
+      navigationdata: [],
     };
   },
   methods: {
-    staffCreateTime(time) {
-      console.log("time是多少", time);
-      return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
-    },
-    singleActivitInfo(id, orgid) {
-      singleActivitInfo(id, orgid).then(response => {
+     getDefalutNavigationData(orgid) {
+      getDefalutNavigationData(orgid).then(response => {
         if (response.data.state == 1) {
-          var activitys = response.data.data.activity;
-          this.activitys = activitys;
-          console.log("activitys", activitys);
+          var navigation = response.data.data.navigation;
+          console.log("navigation是什么", navigation);
+          this.navigationdata = navigation;
         }
       });
-    }
+    },
   },
-  created() {
+   created(){
     const id = this.$route.query.id;
+    console.log("id是什么",id)
+     this.url = "http://wx.kuyicloud.com/weixin/activity/"+id;
     const orgid = this.$route.query.orgid;
-    console.log("id是多少", id);
-    console.log("orgid是多少", orgid);
-    this.singleActivitInfo(id, orgid);
-  }
-};
+    console.log("我的世界", orgid);
+   
+    this.getDefalutNavigationData(orgid);
+  },
+ };
 </script>
 
 <style lang="scss" scoped>
-.banner {
-  width: 100%;
-  height: 13.75rem;
-  img {
-    width: 100%;
-    height: 100%;
+@import "../../assets/styles/mixin.scss";
+
+.page_home {
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  > div:first-child {
+    flex: 1;
+    overflow: auto;
   }
-}
-.headline {
-  position: relative;
-  width: 20.875rem;
-  height: 5rem;
-  margin-top: -1.25rem;
-  left: 1.25rem;
-  z-index: 99;
-  background: rgba(255, 255, 255, 1);
-  box-shadow: 0px 6px 20px 0px rgba(0, 0, 0, 0.05);
-  border-radius: 10px;
-  padding: 1.0625rem 0.625rem 0 0.875rem;
-  box-sizing: border-box;
-  .top {
-    font-size: 1.0625rem;
-    font-weight: 600;
-    color: rgba(7, 18, 40, 1);
-    line-height: 1.5rem;
+  > div:first-child::-webkit-scrollbar {
+    width: 0;
   }
+  // border:solid 1px red;
 }
-.browse {
-  color: rgba(182, 186, 193, 1);
-  margin-top: 0.5rem;
-  span {
-    font-size: 0.75rem;
-    font-weight: 400;
-  }
+// .bugone{
+//   border: solid 1px red;
+// }
+
+
+.tabs {
+  @include border-top;
+  width: 100%;
+  height: 3.125rem;
+  box-sizing: border-box;
 }
-.detail {
-  margin-left: 1.25rem;
-  margin-top: 1.25rem;
-  .row {
-    margin: 0.625rem 0;
-    i {
-      color: #b6bac1;
+.tabList {
+  display: flex;
+  justify-content: space-around;
+  height: 100%;
+  .tabOne {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    img {
+      // margin-top: 0.5rem;
+      width: 1.875rem;
+      height: 1.875rem;
     }
     span {
-      font-size: 0.875rem;
-      font-weight: 600;
-      color: rgba(7, 18, 40, 1);
-      margin-left: 0.625rem;
+      font-size: 0.75rem;
+      color: #999;
+      // line-height: 1.3125rem;
     }
   }
 }
-.introduce {
-  margin-left: 1.25rem;
-  margin-top: 1.5rem;
-}
-
-.common_title {
-  width: 20.9375rem;
-  height: 1.125rem;
-  line-height: 1.125rem;
-  font-size: 1.125rem;
-  font-weight: 800;
-  color: rgba(7, 18, 40, 1);
-}
-
-.one {
-  margin-top: 0.125rem;
-  margin-right: 0.625rem;
-  float: left;
-  width: 0.125rem;
-  height: 0.875rem;
-  background: linear-gradient(
-    0deg,
-    rgba(114, 182, 253, 1),
-    rgba(52, 119, 254, 1)
-  );
-  box-shadow: 0px 3px 12px 0px rgba(60, 127, 254, 0.2);
-  border-radius: 3px;
-}
-.introduceDetail {
-  width: 19.875rem;
-  height: 5.75rem;
-  font-size: 1rem;
-  color: rgba(155, 155, 155, 1);
-  line-height: 1.5rem;
-  margin-top: 1.125rem;
-  padding-left: 0.375rem;
-  box-sizing: border-box;
-}
-.apply {
-  width: 100%;
-  height: 2.625rem;
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  text-align: center;
-  line-height: 2.625rem;
-  color: rgba(255, 255, 255, 1);
-  font-size: 1.125rem;
-  background: linear-gradient(
-    90deg,
-    rgba(114, 182, 253, 1),
-    rgba(52, 119, 254, 1)
-  );
-}
 </style>

src/scrm_pages/card/card.vue

@@ -0,0 +1,103 @@
+<template>
+  <div class="page_home">
+    <div class="swiper-slide">
+      <div style="widht:100%;height:100%">
+         <iframe  :src = this.cardUrl width="100%" height="100%" marginwidth="0" frameborder="no" scrolling="no"></iframe>
+      </div>
+    </div>
+    <!-- tab切换 -->
+    <!-- <div class="tabs">
+      <ul class="tabList">
+        <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>
+      </ul>
+    </div> -->
+  </div>
+</template>
+
+<script>
+import { getDefalutNavigationData,} from "@/api/micro/micro";
+export default {
+  data() {
+    return {
+      url:"",
+      cardUrl:"http://wx.kuyicloud.com/weixin/membershipagree/"+this.url,
+      navigationdata: [],
+    };
+  },
+  methods: {
+     getDefalutNavigationData(orgid) {
+      getDefalutNavigationData(orgid).then(response => {
+        if (response.data.state == 1) {
+          var navigation = response.data.data.navigation;
+          console.log("navigation是什么", navigation);
+          this.navigationdata = navigation;
+        }
+      });
+    },
+  },
+   created(){
+    const orgid = this.$route.query.orgid;
+    this.url = orgid;
+    console.log("我的世界", orgid);
+    this.getDefalutNavigationData(orgid);
+  },
+ };
+</script>
+
+<style lang="scss" scoped>
+@import "../../assets/styles/mixin.scss";
+
+.page_home {
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  > div:first-child {
+    flex: 1;
+    overflow: auto;
+  }
+  > div:first-child::-webkit-scrollbar {
+    width: 0;
+  }
+  // border:solid 1px red;
+}
+// .bugone{
+//   border: solid 1px red;
+// }
+
+
+.tabs {
+  @include border-top;
+  width: 100%;
+  height: 3.125rem;
+  box-sizing: border-box;
+}
+.tabList {
+  display: flex;
+  justify-content: space-around;
+  height: 100%;
+  .tabOne {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    img {
+      // margin-top: 0.5rem;
+      width: 1.875rem;
+      height: 1.875rem;
+    }
+    span {
+      font-size: 0.75rem;
+      color: #999;
+      // line-height: 1.3125rem;
+    }
+  }
+}
+</style>

src/scrm_pages/contact/contact.vue

@@ -101,7 +101,7 @@ export default {
   overflow: hidden;
   height: 100%;
   > div:nth-of-type(2) {
-    min-height: 6.875rem;
+    min-height: 5.125rem;
   }
   .focusImg {
     width: 23.4375rem;

src/scrm_pages/contact/contactus.vue

@@ -0,0 +1,266 @@
+<template>
+  <div class="page_home">
+         <!-- <iframe  :src = this.customUrl width="100%" height="100%" marginwidth="0" frameborder="no" scrolling="no"></iframe> -->
+      <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">
+            <div class="swiper-slide" v-for="it in item.Conrotation" :key="it.id">
+              <img class="imgtwo" :src="it.images" />
+            </div>
+          </div>
+          <!-- 如果需要分页器 -->
+          <div class="swiper-pagination"></div>
+        </div>
+      </div>
+      <!-- <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 == 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">
+        <p class="title">{{item.title}}:</p>
+        <p class="msg">{{item.Worktime.worktime}}</p>
+      </div>
+      <div class="row one" v-if="item.mode_type == 5">
+        <p class="title">{{item.title}}:</p>
+        <p class="msg">{{item.Rideway.ride_way}}</p>
+      </div>
+    </div>
+
+
+    <!-- tab切换 -->
+    <div class="tabs">
+      <ul class="tabList">
+        <li
+          class="tabOne"
+          v-for="item in this.navigationdata"
+          :key="item.id"
+          @click="CallPhone(item.linktype,item.navaddress,item.user_org_id)">
+          <img :src="item.nonavimages" alt />
+          <span>{{item.navtitle}}</span>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+import Swiper from "swiper";
+import Vue from "vue";
+import { Swipe, SwipeItem} from "mint-ui";
+import "mint-ui/lib/style.css";
+import { getDefalutNavigationData,getOrderModel, getAllConnecWay } from "@/api/micro/micro";
+export default {
+  data() {
+    return {
+      navigationdata: [],
+       ordmodel: [],
+      Connectways: [],
+    };
+  },
+  methods: {
+     getDefalutNavigationData(orgid) {
+      getDefalutNavigationData(orgid).then(response => {
+        if (response.data.state == 1) {
+          var navigation = response.data.data.navigation;
+          for (let index = 0; index < navigation.length; index++) {
+              navigation[1].nonavimages = "https://images.shengws.com/2124_o_1571990749565.png";
+
+          }
+          console.log("navigation是什么", navigation);
+          this.navigationdata = navigation;
+        }
+      });
+    },
+      initSwiper() {
+      var mySwiper1 = new Swiper(".swiper-container", {
+        loop: true, // 循环模式选项
+        pagination: {
+          el: ".swiper-pagination"
+        },
+        // autoplay: {
+        //   disableOnInteraction: false
+        // }
+        autoplay: true
+      });
+    },
+    getOrderModel(orgid) {
+      getOrderModel(orgid).then(response => {
+        if (response.data.state == 1) {
+          var ordmodel = response.data.data.ordmodel;
+          console.log("ordmodel是什么", ordmodel);
+          this.ordmodel = response.data.data.ordmodel;
+        }
+      });
+    },
+    getAllConnecWay(orgid) {
+      getAllConnecWay(orgid).then(response => {
+        if (response.data.state == 1) {
+          var connect = response.data.data.connect;
+          this.Connectways = connect;
+        }
+      });
+    },
+      CallPhone(linktype, address,orgid) {
+      console.log("orgid是什么啊",orgid)
+      console.log("linktype",linktype)
+      if(linktype == "1"){
+          this.$router.push({
+              path:"/microHome",
+              query:{
+                  orgid:orgid,
+              }
+          })
+     }
+      if (linktype == "2") {
+        // window.location.href = address;
+        this.$router.push({
+          path: "/contactus",
+          query: {
+            orgid: orgid
+          }
+         });
+      }
+      if (linktype == "3") {
+        window.location.href = "tel://" + address + "";
+      }
+      if (linktype == "4") {
+        // window.location.href = address;
+        this.$router.push({
+          path:"/custom",
+          query:{
+            orgid:orgid
+          }
+        })
+      }
+    },
+  },
+   created(){
+    const orgid = this.$route.query.orgid;
+       console.log("我的", orgid);
+     this.url = orgid;
+    this.getDefalutNavigationData(orgid);
+     this.getOrderModel(orgid);
+     this.getAllConnecWay(orgid);
+    this.initSwiper();
+  },
+updated() {
+    this.initSwiper();
+  }
+ };
+</script>
+
+<style lang="scss" scoped>
+@import "../../assets/styles/mixin.scss";
+
+.page_home {
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  > div:first-child {
+    flex: 1;
+    overflow: auto;
+  }
+  > div:first-child::-webkit-scrollbar {
+    width: 0;
+  }
+  // border:solid 1px red;
+}
+// .bugone{
+//   border: solid 1px red;
+// }
+
+
+.tabs {
+  @include border-top;
+  width: 100%;
+  height: 3.125rem;
+  box-sizing: border-box;
+}
+.tabList {
+  display: flex;
+  justify-content: space-around;
+  height: 100%;
+  .tabOne {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    img {
+      // margin-top: 0.5rem;
+      width: 1.875rem;
+      height: 1.875rem;
+    }
+    span {
+      font-size: 0.75rem;
+      color: #999;
+      // line-height: 1.3125rem;
+    }
+  }
+}
+
+.page_home {
+  overflow: hidden;
+  height: 100%;
+  > div:nth-of-type(2) {
+    min-height: 5.125rem;
+  }
+  .focusImg {
+    width: 23.4375rem;
+    height: 11.5625rem;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+    .swiper-container {
+      height: 100%;
+    }
+  }
+
+  .space {
+    margin: 0 1.25rem;
+  }
+  .row {
+    font-size: 1rem;
+    font-weight: 600;
+    color: rgba(7, 18, 40, 1);
+    line-height: 2.375rem;
+    min-height: 2.375rem;
+    width: 21.125rem;
+    margin: 0 1.25rem;
+    // border: 1px solid #000;
+
+    .title {
+      float: left;
+      width: 5rem;
+    }
+    .msg {
+      float: left;
+      width: 16rem;
+      line-height: 2.375rem;
+      min-height: 2.375rem;
+      word-wrap: break-word;
+      word-break: break-all;
+      // overflow-x: hidden;
+    }
+  }
+  .one {
+    min-height: 2.375rem;
+    // line-height: 3rem;
+  }
+  .detail {
+    width: 21.125rem;
+    margin: 1.1875rem 1.25rem 0 1.25rem;
+  }
+}
+</style>
+

src/scrm_pages/custom/custom.vue

@@ -0,0 +1,141 @@
+<template>
+  <div class="page_home">
+    <div class="swiper-slide">
+      <div style="widht:100%;height:100%">
+         <iframe  :src = this.customUrl width="100%" height="100%" marginwidth="0" frameborder="no" scrolling="no"></iframe>
+      </div>
+    </div>
+    <!-- tab切换 -->
+    <div class="tabs">
+      <ul class="tabList">
+        <li
+          class="tabOne"
+          v-for="item in this.navigationdata"
+          :key="item.id"
+          @click="CallPhone(item.linktype,item.navaddress,item.user_org_id)">
+          <img :src="item.nonavimages" alt />
+          <span>{{item.navtitle}}</span>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getDefalutNavigationData,} from "@/api/micro/micro";
+export default {
+  data() {
+    return {
+      navigationdata: [],
+      url:"",
+      customUrl:"http://wx.kuyicloud.com/weixin/im/"+this.url,
+    };
+  },
+  methods: {
+     getDefalutNavigationData(orgid) {
+      getDefalutNavigationData(orgid).then(response => {
+        if (response.data.state == 1) {
+          var navigation = response.data.data.navigation;
+          for (let index = 0; index < navigation.length; index++) {
+              navigation[3].nonavimages = "https://images.shengws.com/2101_o_1571990903053.png";
+              
+          }
+          console.log("navigation是什么", navigation);
+          this.navigationdata = navigation;
+        }
+      });
+    },
+
+     CallPhone(linktype, address,orgid) {
+      console.log("orgid是什么啊",orgid)
+      console.log("linktype",linktype)
+      if(linktype == "1"){
+          this.$router.push({
+              path:"/microHome",
+              query:{
+                  orgid:orgid,
+              }
+          })
+     }
+      if (linktype == "2") {
+        // window.location.href = address;
+        this.$router.push({
+          path: "/contactus",
+          query: {
+            orgid: orgid
+          }
+         });
+      }
+      if (linktype == "3") {
+        window.location.href = "tel://" + address + "";
+      }
+      if (linktype == "4") {
+        // window.location.href = address;
+        this.$router.push({
+          path:"/custom",
+          query:{
+            orgid:orgid
+          }
+        })
+      }
+    },
+  },
+   created(){
+    const orgid = this.$route.query.orgid;
+    this.url = orgid;
+    console.log("我的世界", orgid);
+    this.getDefalutNavigationData(orgid);
+  },
+ };
+</script>
+
+<style lang="scss" scoped>
+@import "../../assets/styles/mixin.scss";
+
+.page_home {
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  > div:first-child {
+    flex: 1;
+    overflow: auto;
+  }
+  > div:first-child::-webkit-scrollbar {
+    width: 0;
+  }
+  // border:solid 1px red;
+}
+// .bugone{
+//   border: solid 1px red;
+// }
+
+
+.tabs {
+  @include border-top;
+  width: 100%;
+  height: 3.125rem;
+  box-sizing: border-box;
+}
+.tabList {
+  display: flex;
+  justify-content: space-around;
+  height: 100%;
+  .tabOne {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    img {
+      // margin-top: 0.5rem;
+      width: 1.875rem;
+      height: 1.875rem;
+    }
+    span {
+      font-size: 0.75rem;
+      color: #999;
+      // line-height: 1.3125rem;
+    }
+  }
+}
+</style>

src/scrm_pages/microHome/microHome.vue

@@ -194,9 +194,9 @@
           class="tabOne"
           v-for="item in this.navigationdata"
           :key="item.id"
-          @click="CallPhone(item.linktype,item.navaddress)"
+          @click="CallPhone(item.linktype,item.navaddress,item.user_org_id)"
         >
-          <img :src="item.navimages" alt />
+          <img :src="item.nonavimages" alt />
           <span>{{item.navtitle}}</span>
         </li>
       </ul>
@@ -318,6 +318,10 @@ export default {
       getDefalutNavigationData(orgid).then(response => {
         if (response.data.state == 1) {
           var navigation = response.data.data.navigation;
+          for (let index = 0; index < navigation.length; index++) {
+            navigation[0].nonavimages = "https://images.shengws.com/2089_o_1571990714383.png";
+            
+          }
           console.log("navigation是什么", navigation);
           this.navigationdata = navigation;
         }
@@ -327,31 +331,54 @@ export default {
       console.log("orgid", orgid);
       //  debugger
       if (title == "加入会员") {
-        window.location.href =
-          "http://wx.kuyicloud.com/weixin/membershipagree/" + orgid;
+        // window.location.href =
+        //   "http://wx.kuyicloud.com/weixin/membershipagree/" + orgid;
+        this.$router.push({
+          path:"/card",
+          query: {
+            orgid: orgid,
+          }
+        })
       } else if (title == "联系我们") {
         this.$router.push({
           path: "/contact",
           query: {
             orgid: orgid
           }
-        });
-      } else if (title == "咨询客服") {
-        window.location.href = "http://wx.kuyicloud.com/weixin/im/" + orgid;
-      } else {
+         });
+      }else if(title =="咨询客服"){
+        //  window.location.href = "http://wx.kuyicloud.com/weixin/im/"+orgid;
+        this.$router.push({
+          path:"/custom",
+          query: {
+            orgid:orgid
+          }
+        })
+      }else {
         window.location.href = address;
       }
     },
 
-    CallPhone(linktype, address) {
+    CallPhone(linktype, address,orgid) {
       if (linktype == "2") {
-        window.location.href = address;
+        this.$router.push({
+          path:"/contactus",
+          query:{
+            orgid:orgid,
+          }
+        })
       }
       if (linktype == "3") {
         window.location.href = "tel://" + address + "";
       }
       if (linktype == "4") {
-        window.location.href = address;
+        // window.location.href = address;
+        this.$router.push({
+          path:"custom",
+          query:{
+            orgid:orgid,
+          }
+        })
       }
     },
     getData(orgid) {
@@ -366,11 +393,11 @@ export default {
   created() {
     const orgid = this.$route.query.orgid;
     console.log("机构id是什么", orgid);
-    // this.getHospitaldata(orgid);
+    this.getHospitaldata(orgid);
     this.getArticlelist(orgid);
     this.getActivities(orgid);
     this.getDefalutNavigationData(orgid);
-    this.getData(orgid);
+    // this.getData(orgid);
   },
   mounted() {
     this.initSwiper();
@@ -575,7 +602,7 @@ export default {
     padding: 1.125rem 1.3125rem 1.3125rem 1.3125rem;
     overflow: hidden;
     text-overflow: ellipsis;
-    border: 1px solid #000;
+    // border: 1px solid #000;
   }
   .commonImg {
     width: 18.4375rem;
@@ -590,7 +617,7 @@ export default {
     color: rgba(60, 60, 60, 1);
     line-height: 1.375rem;
     overflow: hidden;
-    border: solid 1px red;
+    // border: solid 1px red;
     display: -webkit-box;
     -webkit-line-clamp: 8;
     -webkit-box-orient: vertical;