微官网

src/scrm_pages/activity/activity.vue

@@ -17,7 +17,6 @@
               <p>
                 {{staffCreateTime(it.start_time)}}开始
                 <br />
-                <!-- {{it.address}} -->
               </p>
             </div>
             <div class="people">
@@ -31,6 +30,7 @@
             </div>
         </div>
       </div>
+     
     </div>
   </div>
 </template>
@@ -82,6 +82,11 @@ export default {
 .page_activity {
   overflow: hidden;
   height: 100%;
+  padding-bottom: 1.25rem;
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    width: 0;
+  }
 }
 .contentOne {
   margin: auto;

src/scrm_pages/doctorIntroduction/doctorIntroduction.vue

@@ -106,6 +106,10 @@ export default {
 .page_doctorIntroduction {
   overflow: hidden;
   height: 100%;
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    width: 0;
+  }
 }
 .contentOne {
   margin: auto;

src/scrm_pages/medicalTeam/medicalTeam.vue

@@ -79,6 +79,10 @@ export default {
 .page_medicalTeam {
   overflow: hidden;
   height: 100%;
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    width: 0;
+  }
 }
 .header {
   height: 1.25rem;

src/scrm_pages/microHome/microHome.vue

@@ -311,6 +311,7 @@ export default {
       });
     },
     articlemore(id, orgid) {
+      console.log("orgid", orgid);
       this.$router.push({
         path: "/news",
         query: {
@@ -389,15 +390,9 @@ export default {
       if (linktype == "4") {
         // window.location.href = address;
         this.$router.push({
-<<<<<<< .mine
           path:"/custom",
           query:{
             orgid:orgid,
-=======
-          path: "custom",
-          query: {
-            orgid: orgid
->>>>>>> .theirs
           }
         });
       }

src/scrm_pages/news/news.vue

@@ -59,6 +59,11 @@ export default {
 .page_news {
   overflow: hidden;
   height: 100%;
+  padding-bottom: 1.25rem;
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    width: 0;
+  }
 }
 .content {
   padding: 1;

src/scrm_pages/newsDetail/newsDetail.vue

@@ -1,7 +1,8 @@
 <template>
-  <div>
-    <div class="newsTitle"> {{articles.title}}</div>
+  <div class="page_newsDetail">
+    <div class="newsTitle">{{articles.title}}</div>
     <div class="msg" v-html="articles.content" v-show="articleshow"></div>
+<<<<<<< .mine
      <div class="video" v-show="videoshow">            
           <video id="example_video_1" class="video-js vjs-default-skin"
                  controls preload="auto" width="100%" height="100%"
@@ -10,47 +11,78 @@
                <source :src="articles.video_url" type='video/mp4' />
         </video>            
         </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>
+>>>>>>> .theirs
   </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;  
-                   }
-                        
-                } 
-             })
+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>
+        }
+      });
+    }
+  },
+  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>
+.page_newsDetail {
+  overflow: hidden;
+  height: 100%;
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    width: 0;
+  }
+}
 .newsTitle {
   width: 19.9375rem;
   height: 3.75rem;