See999 5 år sedan
förälder
incheckning
0e2c6b0b86

+ 6 - 1
src/scrm_pages/activity/activity.vue Visa fil

@@ -17,7 +17,6 @@
17 17
               <p>
18 18
                 {{staffCreateTime(it.start_time)}}开始
19 19
                 <br />
20
-                <!-- {{it.address}} -->
21 20
               </p>
22 21
             </div>
23 22
             <div class="people">
@@ -26,6 +25,7 @@
26 25
           </div>
27 26
         </div>
28 27
       </div>
28
+     
29 29
     </div>
30 30
   </div>
31 31
 </template>
@@ -77,6 +77,11 @@ export default {
77 77
 .page_activity {
78 78
   overflow: hidden;
79 79
   height: 100%;
80
+  padding-bottom: 1.25rem;
81
+  overflow-y: auto;
82
+  &::-webkit-scrollbar {
83
+    width: 0;
84
+  }
80 85
 }
81 86
 .contentOne {
82 87
   margin: auto;

+ 4 - 0
src/scrm_pages/doctorIntroduction/doctorIntroduction.vue Visa fil

@@ -106,6 +106,10 @@ export default {
106 106
 .page_doctorIntroduction {
107 107
   overflow: hidden;
108 108
   height: 100%;
109
+  overflow-y: auto;
110
+  &::-webkit-scrollbar {
111
+    width: 0;
112
+  }
109 113
 }
110 114
 .contentOne {
111 115
   margin: auto;

+ 4 - 0
src/scrm_pages/medicalTeam/medicalTeam.vue Visa fil

@@ -79,6 +79,10 @@ export default {
79 79
 .page_medicalTeam {
80 80
   overflow: hidden;
81 81
   height: 100%;
82
+  overflow-y: auto;
83
+  &::-webkit-scrollbar {
84
+    width: 0;
85
+  }
82 86
 }
83 87
 .header {
84 88
   height: 1.25rem;

+ 1 - 0
src/scrm_pages/microHome/microHome.vue Visa fil

@@ -309,6 +309,7 @@ export default {
309 309
       });
310 310
     },
311 311
     articlemore(id, orgid) {
312
+      console.log("orgid", orgid);
312 313
       this.$router.push({
313 314
         path: "/news",
314 315
         query: {

+ 5 - 0
src/scrm_pages/news/news.vue Visa fil

@@ -54,6 +54,11 @@ export default {
54 54
 .page_news {
55 55
   overflow: hidden;
56 56
   height: 100%;
57
+  padding-bottom: 1.25rem;
58
+  overflow-y: auto;
59
+  &::-webkit-scrollbar {
60
+    width: 0;
61
+  }
57 62
 }
58 63
 .content {
59 64
   padding: 1;

+ 58 - 44
src/scrm_pages/newsDetail/newsDetail.vue Visa fil

@@ -1,56 +1,70 @@
1 1
 <template>
2
-  <div>
3
-    <div class="newsTitle"> {{articles.title}}</div>
2
+  <div class="page_newsDetail">
3
+    <div class="newsTitle">{{articles.title}}</div>
4 4
     <div class="msg" v-html="articles.content" v-show="articleshow"></div>
5
-     <div class="video" v-show="videoshow">            
6
-          <video id="example_video_1" class="video-js vjs-default-skin"
7
-                 controls preload="auto" width="640" height="300"
8
-                 poster="http://video-js.zencoder.com/oceans-clip.png"
9
-                 data-setup='{"example_option":true}' ref="video">
10
-               <source :src="articles.video_url" type='video/mp4' />
11
-        </video>            
12
-        </div>
5
+    <div class="video" v-show="videoshow">
6
+      <video
7
+        id="example_video_1"
8
+        class="video-js vjs-default-skin"
9
+        controls
10
+        preload="auto"
11
+        width="640"
12
+        height="300"
13
+        poster="http://video-js.zencoder.com/oceans-clip.png"
14
+        data-setup="{"example_option":true}"
15
+        ref="video"
16
+      >
17
+        <source :src="articles.video_url" type="video/mp4" />
18
+      </video>
19
+    </div>
13 20
   </div>
14 21
 </template>
15 22
   <script>
16
-      import { singleArticleInfo } from "@/api/micro/micro"
17
-     export default{
18
-       data(){
19
-         return{
20
-            articles:[],
21
-            videoshow:false,
22
-            articleshow:true,
23
-         }
24
-       },
25
-       methods:{
26
-         singleArticleInfo(id,orgid){
27
-             singleArticleInfo(id,orgid).then(response=>{
28
-                 if(response.data.state == 1){
29
-                   var articles =  response.data.data.articles;
30
-                   console.log("articles是什么",articles)
31
-                   this.articles = articles;
32
-                   if(articles.video_url != ""){
33
-                     this.articleshow = false;
34
-                      this.videoshow = true;
35
-                      this.$refs.video.src = articles.video_url;  
36
-                   }
37
-                        
38
-                } 
39
-             })
23
+import { singleArticleInfo } from "@/api/micro/micro";
24
+export default {
25
+  data() {
26
+    return {
27
+      articles: [],
28
+      videoshow: false,
29
+      articleshow: true
30
+    };
31
+  },
32
+  methods: {
33
+    singleArticleInfo(id, orgid) {
34
+      singleArticleInfo(id, orgid).then(response => {
35
+        if (response.data.state == 1) {
36
+          var articles = response.data.data.articles;
37
+          console.log("articles是什么", articles);
38
+          this.articles = articles;
39
+          if (articles.video_url != "") {
40
+            this.articleshow = false;
41
+            this.videoshow = true;
42
+            this.$refs.video.src = articles.video_url;
40 43
           }
41
-       },
42
-       created(){
43
-           const id = this.$route.query.id;
44
-           const orgid = this.$route.query.orgid;
45
-           console.log("id是多少",id)
46
-           console.log("orgid是多少",orgid)
47
-           this.singleArticleInfo(id,orgid)  
48
-       },
49
-     }
50
-  </script>
44
+        }
45
+      });
46
+    }
47
+  },
48
+  created() {
49
+    const id = this.$route.query.id;
50
+    const orgid = this.$route.query.orgid;
51
+    console.log("id是多少", id);
52
+    console.log("orgid是多少", orgid);
53
+    this.singleArticleInfo(id, orgid);
54
+  }
55
+};
56
+</script>
51 57
 
52 58
 
53 59
 <style lang="scss" scoped>
60
+.page_newsDetail {
61
+  overflow: hidden;
62
+  height: 100%;
63
+  overflow-y: auto;
64
+  &::-webkit-scrollbar {
65
+    width: 0;
66
+  }
67
+}
54 68
 .newsTitle {
55 69
   width: 19.9375rem;
56 70
   height: 3.75rem;