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

src/api/micro/micro.js

 import { link } from 'fs';
 
 export function getHospitaldata(orgid,params){
-    console.log("orgid",orgid)
+    console.log("params是什么",params)
     return request({
-        url:"/api/site/getdata?orgid="+orgid,
+        url:"/api/site/getdatabyorgid?orgid="+orgid,
         method:"Get",
         params:params,
     })
          Get:"Get",
          params:params,
      })
-}
+}

src/scrm_pages/activity/activity.vue

               </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>

src/scrm_pages/microHome/microHome.vue

 
         <!-- 魔方导航 -->
         <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>
               </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 />
             </div>
           </div>
           <div class="commonBox">
-            <!-- <div class="commonImg">
-            <img src="static\images\img2.png" alt />
-          </div>
-          <div class="commonMessage">
-            深圳市南山区人民医院（深圳市第六人民医院），坐落于深圳经济特区西部南头半岛中心区，是深圳市第四家三级甲等医院暨南山区区域医疗中心。深圳市第四家三级甲等医院
-            深圳市南山区人民医院（深圳市第六人民医院），坐落于深圳经济特区西部南头半岛中心区，是深圳市第四家三级甲等医院暨南山区区域医疗中心。深圳市第四家三级甲等医院...
-          </div>
-            </div>-->
+
             <div class="commonMessage" v-html="item.Hospitals.introduction"></div>
           </div>
         </div>
               </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 />
               </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 />
     <!-- 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>
   getHospitaldata,
   getArticlelist,
   getActivities,
-  getDefalutNavigationData
+  getDefalutNavigationData,
 } from "@/api/micro/micro";
+import { link } from 'fs';
 export default {
   data() {
     return {
           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() {

src/scrm_pages/news/news.vue

         <div class="img">
           <img :src="it.imgs" style="width:100%;height:100%" alt />
         </div>
-        <div class="detail">
+        <div class="detail" @click="singleArticleInfo(it.id,it.user_org_id)">
           <p class="detailTitle">{{it.title}}</p>
           <p class="detailMessage"></p>
         </div>
   </div>
 </template>
   <script>
+<<<<<<< .mine
+     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;
+               }
+            })  
+          },
+           singleArticleInfo(id,orgid){
+            this.$router.push({
+                path:"/newsDetail",
+                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)
+=======
 import { articlemore } from "@/api/micro/micro";
 export default {
   data() {
           var articlelist = response.data.data.articlelists;
           console.log("文章列表数据", articlelist);
           this.articlelist = response.data.data.articlelists;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
         }
       });
     },

src/scrm_pages/newsDetail/newsDetail.vue

 <template>
   <div>
-    <div class="newsTitle">山东潍坊，高考还剩最后一门，女孩却被同学杀死了湾半岛，与香港隔海相望，西依珠江口，背靠大南山,拥有得天独厚的地理位置</div>
-    <div
-      class="msg"
-    >蛇口位于深圳湾半岛，与香港隔海相望，西依珠江口，背靠大南山,拥有得天独厚的地理位置；作为改革开放的前沿阵地，经过数十年的发展，如今已成为一个融合居住与旅游、本土与国际、富饶与休闲的国际化城区，区域内集中了鲸山别墅九期、双玺花园、兰溪谷等一系列高尚住宅，聚集着一大批具有高品质生活、高消费能力的优质人群，同时也吸引了来自70多个国家和地区，占深圳市60%以上的外籍人士聚居于此，拥有“</div>
+    <div class="newsTitle"> {{articles.title}}</div>
+    <div class="msg" v-html="articles.content" v-show="articleshow"></div>
+     <div class="video" v-show="videoshow">            
+          <video id="example_video_1" class="video-js vjs-default-skin"
+                 controls preload="auto" width="640" height="300"
+                 poster="http://video-js.zencoder.com/oceans-clip.png"
+                 data-setup='{"example_option":true}' ref="video">
+               <source :src="articles.video_url" type='video/mp4' />
+        </video>            
+        </div>
   </div>
 </template>
-
+  <script>
+      import { singleArticleInfo } from "@/api/micro/micro"
+     export default{
+       data(){
+         return{
+            articles:[],
+            videoshow:false,
+            articleshow:true,
+         }
+       },
+       methods:{
+         singleArticleInfo(id,orgid){
+             singleArticleInfo(id,orgid).then(response=>{
+                 if(response.data.state == 1){
+                   var articles =  response.data.data.articles;
+                   console.log("articles是什么",articles)
+                   this.articles = articles;
+                   if(articles.video_url != ""){
+                     this.articleshow = false;
+                      this.videoshow = true;
+                      this.$refs.video.src = articles.video_url;  
+                   }
+                        
+                } 
+             })
+          }
+       },
+       created(){
+           const id = this.$route.query.id;
+           const orgid = this.$route.query.orgid;
+           console.log("id是多少",id)
+           console.log("orgid是多少",orgid)
+           this.singleArticleInfo(id,orgid)  
+       },
+     }
+  </script>
 
 
 <style lang="scss" scoped>

src/scrm_pages/site/index.vue

               </div>
             </el-col>
             <el-col :span="12">
-                 
+                
             </el-col>
           </el-row>
       </div>
     width: 100px;
     height: 100px;
   }
+
+  
 }
 </style>