代码提交

config/dev.env.js

@@ -1,13 +1,13 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  // BASE_API:'"http://api.test1.sgjyun.com"',//'"http://localhost:9534"'
-  BASE_API:'"http://api.scrm.kuyicloud.com"',//'"http://localhost:9534"'
+  BASE_API:'"http://localhost:9535"',//'"http://api.test1.sgjyun.com"'
+  // BASE_API:'"http://api.scrm.kuyicloud.com"',//'"http://localhost:9534"'
   
-   SSO_HOST: '"https://testsso.sgjyun.com"',
-   SRCM_HOST: '"http://test1.sgjyun.com"',
-   XT_HOST: '"http://xt.test.sgjyun.com"',
-   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
-   CDM_HOST: '"http://cdm.test.sgjyun.com"',
+  //  SSO_HOST: '"https://testsso.sgjyun.com"',
+  //  SRCM_HOST: '"http://test1.sgjyun.com"',
+  //  XT_HOST: '"http://xt.test.sgjyun.com"',
+  //  MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
+  //  CDM_HOST: '"http://cdm.test.sgjyun.com"',
 }
 

config/index.js

@@ -17,10 +17,11 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    //  host: 'test1.sgjyun.com',
-     host: 'microweb.kuyicloud.com',
-    // host: 'localhost',
+    // host: 'test1.sgjyun.com',
+    // host: 'microweb.kuyicloud.com',
+    host: 'localhost',
     // host: 'jk.kuyicloud.com',
+    // port: 8091, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     // host: 'test1.sgjyun.com',
     autoOpenBrowser: true,

src/api/micro/micro.js

@@ -1,78 +1,171 @@
 import request from '@/utils/request'
+import org from '../../router/modules/org';
 
-export function getHospitaldata(params){
+export function getHospitaldata(orgid,params){
     return request({
-        url:"/api/site/getdata",
-        method:"Post",
+        url:"/api/site/getdata?orgid="+orgid,
+        method:"Get",
         params:params,
     })
  }
 
- export function getArticlelist(data){
+ export function getArticlelist(orgid,params){
     return request({
-        url:"/api/site/getarticlelist",
-        method:"Post",
-        data:data,
+        url:"/api/site/getarticlelist?orgid="+orgid,
+        method:"Get",
+        params:params,
     })
  }
 
- export function getActivities(params){
+ export function getActivities(orgid,params){
    
     return request({
-        url:"/api/site/getactivities",
-        method:"Post",
+        url:"/api/site/getactivities?orgid="+orgid,
+        method:"Get",
         params:params, 
     })
  }
 
  
-export function hispitalmore(id,data){
-    return request({
-        url:"/api/site/hispitalmore?id="+id,
-        method:"Get",
-        data:data,
-    })
-  }
+// export function hispitalmore(id,params){
+//     console.log("id是多少",id)
+//     return request({
+//         url:"/api/site/hispitalmore?id="+id,
+//         method:"Get",
+//         params:params,
+//     })
+//   }
+export function hispitalmore(id,orgid){
+    console.log("orgid是多少",orgid)
+    const params = {
+      orgid: orgid  
+  }  
+  return request({
+      url:"/api/site/getdatatwo?id="+id,
+      method:"Get",
+      params:params,
+  })
+}
 
   
-export function officemore(id,data){
+export function officemore(id,orgid){
+   const params = {
+       orgid: orgid
+   }
     return request({
-        url:"/api/site/officemore?id="+id,
+        url:"/api/site/getdatathree?id="+id,
         method:"Get",
-        data:data,
+        params:params,
     })
  }
 
 
- export function docmore(id,data){
+ export function docmore(id,orgid){
+     const params = {
+         orgid: orgid
+     }
     return request({
-       url:"/api/site/docmore?id="+id,
+       url:"/api/site/getdatafour?id="+id,
        method:"Get",
-       data:data,
+       params:params,
     })
  }
 
- export function kemore(id,data){
-    console.log('香港回归',id)
+ export function kemore(id,orgid){
+    const params = {
+       orgid: orgid
+    }  
    return request({
-       url:"/api/site/kemore?id="+id,
+       url:"/api/site/getdatafive?id="+id,
        method:'Get',
-       data:data,
+       params:params,
    })
 }
 
-export function articlemore(id,data){
+export function articlemore(id,orgid){
+    const params = {
+        orgid: orgid 
+    }
      return request({
-         url:"/api/site/articlemore?id="+id,
+         url:"/api/site/getdatasix?id="+id,
          method:"Get",
-         data:data,
+         params:params,
      })
 }
 
-export function Activitiesmore(id,data){
+export function Activitiesmore(id,orgid){
+    const params = {
+        id:id,
+        orgid: orgid, 
+    }
     return request({
-       url:"/api/site/activitiesmore?id="+id,
+       url:"/api/site/getdataseven",
+       method:"Get",
+       params:params, 
+    })
+}
+
+export function getDefalutNavigationData(orgid,params){
+    console.log("orgid",orgid)
+   return request({
+       url:"/api/site/getdefalutnavigationdata?orgid="+orgid,
        method:"Get",
-       data:data, 
+       params:params,
+   })
+}
+
+export function getOrderModel(orgid,params){
+    console.log("联系我们",orgid)
+    console.log("params",params)
+    return request({
+        url:"/api/site/getdataeight?orgid="+orgid,
+        method:"Get",
+        params:params,
     })
+}
+
+export function getAllConnecWay(orgid,params){
+    return request({
+        url:"/api/site/getdatanight?orgid="+orgid,
+        method:"Get",
+        params:params,
+    })
+}
+
+export function singleActivitInfo(id,orgid){
+    const params = {
+        id:id,
+        orgid:orgid,
+    }
+   return request({
+       url:"/api/site/singleactivitinfo",
+       method:"Get",
+       params:params,
+   })
+}
+
+export function singleArticleInfo(id,orgid){
+   const params = {
+       id:id,
+       orgid:orgid,
+   }
+   return request({
+       url:"/api/site/singlearticleinfo",
+       Get:"Get",
+       params:params,
+   })
+}
+
+export function singleDoctorInfo(id,orgid){
+    console.log(id,orgid)
+   const params = {
+       id:id,
+       orgid:orgid,
+   }
+
+   return request({
+       url:"/api/site/singledoctorinfo",
+       Get:"Get",
+       params:params,
+   })
 }

src/api/site/site.js

@@ -410,14 +410,19 @@ export function  SaveOfficeEnvironment(id,data){
      })
 }
 
-export function hispitalmore(id,data){
+export function hispitalmore(id,orgid){
+    console.log("orgid是多少",orgid)
+  const params = {
+      orgid: orgid  
+  }  
   return request({
       url:"/api/site/hispitalmore?id="+id,
       method:"Get",
-      data:data,
+      params:params,
   })
 }
 
+
 export function officemore(id,data){
    return request({
        url:"/api/site/officemore?id="+id,

src/router/index.js

@@ -55,13 +55,28 @@ var _constant_router_map = [{
   component: () => import('@/views/errorPage/401'),
   hidden: true
 },
+// {
+//   path: '',
+//   component: ()=>import('@/scrm_pages/qrcode/qrcode'),
+//   redirect: '/qrcode',
+//   children: [{
+//     path: '/qrcode',
+//     component: () => import('@/scrm_pages/qrcode/qrcode'),
+//     name: 'qrcode',
+//     meta: {
+//       title: 'qrcode',
+//       icon: 'dashboard',
+//       noCache: true
+//     }
+//   }]
+// },
 {
   path: '',
-  component: ()=>import('@/scrm_pages/qrcode/qrcode'),
+  component: ()=>import('@/scrm_pages/micro/micro'),
   redirect: '/qrcode',
   children: [{
     path: '/qrcode',
-    component: () => import('@/scrm_pages/qrcode/qrcode'),
+    component: () => import('@/scrm_pages/micro/micro'),
     name: 'qrcode',
     meta: {
       title: 'qrcode',

src/scrm_pages/qrcode/qrcode.vue

@@ -8,8 +8,8 @@
                    <!-- 轮播图 -->
                    <div class="modeone" v-if="item.mode_type == 1" v-show="show">
                      <mt-swipe :auto="2000" class="swipertwo">
-                         <mt-swipe-item v-for="it in item.images" :key="it.id">
-                            <img :src="it" style="width:100%;height:230px" >
+                          <mt-swipe-item v-for="it in item.PatientEditpiclink" :key="it.id">
+                             <img :src="it.images" style="width:100%;height:230px">
                           </mt-swipe-item>
                      </mt-swipe>       
                    </div>
@@ -17,10 +17,10 @@
                    <div class="modetwo" v-if="item.mode_type == 2" v-show="show">
                       <img src="static\images\u.png" style="width:5px;height:20px;">
                         <div class="kefont"><span >{{item.title}}</span></div>   
-                        <div class="more" @click="hispitalmore(item.id)">查看更多</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">
-                         <span v-html="item.Hospitals.introduction" id="content"></span>
+                         <span v-html="item.Hospitals.introduction" id="content" ></span>
                        </div>
                     </div> 
 
@@ -28,7 +28,7 @@
                     <div v-if="item.mode_type == 3" class="modethree" v-show="show">
                        <img src="static\images\u.png" style="width:5px;height:20px;">
                        <div class="kefont"><span >{{item.title}}</span></div>   
-                       <div class="more" @click="officemore(item.id)">查看更多</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">
                           <span  v-html="item.Offices.introduction" id="ycontent"></span>
@@ -39,7 +39,7 @@
                      <div v-if="item.mode_type == 4" class="modefour" v-show="show">
                        <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)">查看更多</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">
@@ -57,13 +57,13 @@
                        <div v-if="item.mode_type == 5" class="modefive" v-show="show">
                             <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)">查看更多</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="wrappertwo" >
-                                    <div class="swiper-slide"  v-for="it in item.Enviroimages" :key="it.id">
-                                      <img :src="it.enviroimages" style="width:150px;height:140px;border-radius:5px;"/>
+                                    <div class="swiper-slide"  v-for="itms in item.Enviroimages" :key="itms.id">
+                                      <img :src="itms.enviroimages" style="width:150px;height:140px;border-radius:5px"/>
                                      </div>
                                 </div>
                               </div>
@@ -120,7 +120,7 @@
                                   </div>                                                                                              
                               </div>     
                     </div>
-                 <div class="mtwo" v-show="showtwo"></div>          
+                 <div class="mtwo" v-show="showtwo"></div>                       
              </div>
               <!--医院介绍详情 -->
               <div class="hosdetail" v-show="showone" v-html="hospitalform.introduction" id="target"></div>
@@ -184,7 +184,6 @@
                     </div>
                  </div>
              </div>
-
           </div>
        </div>
     </div>
@@ -207,12 +206,10 @@
         </div>
        </div>
    </div> 
-  
 </template>
 
 <script>
- import {getHospitaldata,getArticlelist,getActivities,hispitalmore,officemore,docmore,kemore,articlemore,Activitiesmore} from '@/api/micro/micro' 
-//import { getHospitaldata, } from '@/api/micro/micro'
+import {getHospitaldata,getArticlelist,getActivities,hispitalmore,officemore,docmore,kemore,articlemore,Activitiesmore} from '@/api/micro/micro'  
 import Swiper from "swiper";
 import Vue from 'vue';
 import { Swipe, SwipeItem } from 'mint-ui';
@@ -254,31 +251,17 @@ export default {
     }
   },
   methods: {
-       getHospitaldata(){
-           getHospitaldata().then(response=>{
-                if(response.data.state == 1){
-                  var str = [];
-                  var images = [];
-                  var macimages = [];
-                  var mactitle = [];
-                 
+       getHospitaldata(orgid){
+           getHospitaldata(orgid).then(response=>{
+                if(response.data.state == 1){            
                  this.patientModels = response.data.data.patientModels;
                  console.log("数据是什么",this.patientModels)
-                 for (let index = 0; index < this.patientModels.length; index++) {   
-                   if(this.patientModels[index].Rotation.rotation_images!=""){   
-                     var strimages =  this.patientModels[index].Rotation.rotation_images;
-                     var strimagess =  strimages.split(',')
-                     str = strimagess;
-                     console.log("strimages",strimages)
-                     this.patientModels[index]["images"] = str;
-                   }                                                          
-                }   
                 }
            })
          },
 
-        getArticlelist(){
-          getArticlelist(this.Articlelist).then(response=>{
+        getArticlelist(orgid){
+          getArticlelist(orgid,this.Articlelist).then(response=>{
            if(response.data.state ==1){
             var articlelist =  response.data.data.articlelists;
              this.Articlelist =  response.data.data.articlelists;
@@ -287,8 +270,8 @@ export default {
         })
        },  
 
-       getActivities(){
-        getActivities(this.Activitieslist).then(response=>{
+       getActivities(orgid){
+        getActivities(orgid,this.Activitieslist).then(response=>{
         if(response.data.state ==1){
          var activity =   response.data.data.activity;
          this.Activitieslist = response.data.data.activity;
@@ -299,10 +282,11 @@ export default {
       },
 
 
-      hispitalmore(id){
-        hispitalmore(id).then(response=>{
+      hispitalmore(id,orgid){
+        hispitalmore(id,orgid).then(response=>{
            if(response.data.state ==1){
               var hospital =  response.data.data.hospital;
+              console.log("hospital",hospital)
               this.hospitalform =  response.data.data.hospital;
               this.show = false;
               this.showtwo = false;
@@ -313,13 +297,13 @@ export default {
               this.showfour = false;
               this.showfive =false;
               this.showsix = false;
-              this.showseven = false;
+              this.showseven = false;              
            }
         })
       },
 
-      officemore(id){
-        officemore(id).then(response=>{
+      officemore(id,orgid){
+        officemore(id,orgid).then(response=>{
            if(response.data.state == 1){
              var offices = response.data.data.offices;
             this.officeform = response.data.data.offices; 
@@ -337,8 +321,8 @@ export default {
         })
       },
 
-      docmore(id){
-        docmore(id).then(response=>{
+      docmore(id,orgid){
+        docmore(id,orgid).then(response=>{
           if(response.data.state == 1){
             var editdoctor =  response.data.data.editdoctor;
             this.editdocfrom = editdoctor;
@@ -356,8 +340,8 @@ export default {
         })
       },
 
-      kemore(id){
-        kemore(id).then(response=>{
+      kemore(id,orgid){
+        kemore(id,orgid).then(response=>{
           if(response.data.state == 1){
              var offenvironment =  response.data.data.offenvironment;
             this.keEnvironmentImages =  offenvironment;
@@ -458,9 +442,12 @@ export default {
          document.getElementById('target').removeEventListener('scroll', this.scrollToTop)
     },
      created(){
-       this.getHospitaldata();
-       this.getArticlelist();
-       this.getActivities();
+        const orgid = this.$route.query.orgid;
+        console.log("机构id是",orgid)
+       this.getHospitaldata(orgid);
+       this.getArticlelist(orgid);
+       this.getActivities(orgid);
+       
      },
        mounted(){
       var swiper = new Swiper('.swiperone', {
@@ -567,11 +554,11 @@ export default {
    width: 100%;
    height: 860px;
    overflow-y: auto;
-   border: 1px solid white;
-  //  margin-left: 30px;
-  //  margin-top: 40px;
+  //  border: 1px solid red;
+  //  position: relative;
+  //  z-index: -1;
  }
-    .yycontent{
+  .yycontent{
      overflow: hidden;
      text-overflow: ellipsis;
      display: -webkit-box;
@@ -579,7 +566,7 @@ export default {
      -webkit-box-orient: vertical   
    }
 
-    .zzcontent{
+   .zzcontent{
      overflow: hidden;
      text-overflow: ellipsis;
      display: -webkit-box;
@@ -628,39 +615,40 @@ export default {
   position: absolute;
   font-size: 14px;
   color:black;
-  margin-left: 275px;
+  margin-left: 290px;
   margin-top: -14px;
 }
 .logo{
    position: absolute;
-   margin-left: 335px;
+   margin-left: 350px;
    margin-top: -16px;
 }
  .hoscontent{
-      height:auto!important; 
-      min-height:200px;
-      font-size: 14px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-line-clamp: 6;
-      -webkit-box-orient: vertical; 
-      margin-top: 5px;
-      margin-left: 5px;
+    height:auto!important; 
+    min-height:200px;
+    font-size: 14px;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 6;
+    -webkit-box-orient: vertical; 
+    margin-top: 5px;
+    margin-left: 5px;
+     // border: solid 1px red;
+    overflow: hidden;
   }
   
-    .xcontent{
-      height:auto!important; 
-      min-height:200px;
-      margin-top: 5px;
-      margin-left: 5px;
-      font-size: 14px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-line-clamp: 6;
-      -webkit-box-orient: vertical; 
-    }
+  .xcontent{
+    height:auto!important; 
+    min-height:200px;
+    margin-top: 5px;
+    margin-left: 5px;
+    font-size: 14px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 6;
+    -webkit-box-orient: vertical; 
+  }
 
 
  .box{
@@ -757,6 +745,7 @@ export default {
       height: 90px;
       // border:solid 1px red;
       margin-left: 5px;
+      overflow: hidden;
     }
 
     .acthead{
@@ -782,6 +771,10 @@ export default {
       margin-left: 5px;
       margin-top: 10px;
       font-size: 14px;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
     }
     .actcomments{
       width: 190px;
@@ -830,7 +823,7 @@ export default {
       // border:solid 1px red;
       margin-top: 2px;
       margin-bottom: 5px;
-      margin-left: 4px;
+      margin-left: 30px;
     }
     #macimgtwo{
       width:58px;
@@ -840,7 +833,7 @@ export default {
       // overflow:hidden;
       // border: solid 1px red;
       text-align: center;
-      margin-left: -1px;
+      margin-left: 22px;
     }
 
      .mac{
@@ -1001,7 +994,7 @@ export default {
       width: 100%;
       height: 100%;
       border:solid 1px white;
-    }
+  }
 
    .swiperimages{
      width: 100%;
@@ -1139,5 +1132,6 @@ export default {
      margin-left: 100px;
      margin-top: 70px;
    }
+
    
 </style>

src/xt_permission.js

@@ -1,63 +1,12 @@
 import router from './router'
 import store from './store'
-import NProgress from 'nprogress' // progress bar
-import 'nprogress/nprogress.css'// progress bar style
-
-NProgress.configure({ showSpinner: false })// NProgress Configuration
-
-const loginWhiteList = ['/token/verify', '/401', '/404', "/activity/preview"] // 登录验证白名单
-const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
+const loginWhiteList = ['/qrcode'] // 登录验证白名单
 
 router.beforeEach((to, from, next) => {
-  // 线上注释
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  //  return
-  // 线上注释
-
-  NProgress.start()
-  // console.log(store.getters.current_role_urls.indexOf(to.path))
-  // alert('path:' + to.path)
-  // 如果 url 带有 lt (login_token)参数，则跳转到验证 token 时等待的页面
-  if (to.query.lt != null && to.query.lt.length > 0) {
-    // alert('will go to verify token: ' + to.query.lt)
-    next({ path: '/token/verify', query: { token: to.query.lt }})
-
-    // 否则 如果没有 user 信息，则前往 sso 登录
-  } else if (store.getters.xt_user.user.id === 0) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
-      // alert('登录白名单内，跳过登录')
       next()
     } else {
-      // alert('前往登录')
-      window.location.href = process.env.BASE_API + '/login' // sso 地址
+      next({ path: '/qrcode'})
     }
 
-    // 否则 如果当前 url 不需要验证访问权限，则通过
-  } else if (permissionWhiteList.indexOf(to.path) !== -1) {
-    // alert('权限验证白名单内，直接进入')
-    next()
-
-    // 否则 如果拥有当前 url 的权限，则通过
-  // } else if (store.getters.current_role_urls.indexOf(to.path) !== -1) {
-  //   // alert('权限验证通过')
-  //   next()
-
-    // 否则 跳转401 (未经授权)
-  } else {
-    // console.log(store.getters.current_role_urls)
-    // console.log(store.getters.current_role_urls.indexOf(to.path))
-    // alert('401')
-    next()
-    // next({ path: '/404' })
-  }
-})
-
-router.afterEach(() => {
-  NProgress.done()
 })