From 026a0f4725b359d6f2e499e3207c35077071a6aa Mon Sep 17 00:00:00 2001
From: Elegenthus <996886231@qq.com>
Date: Wed, 10 May 2017 16:07:30 +0800
Subject: [PATCH] modify commentPage

---
 src/components/main/item.vue             |  4 ++--
 src/components/profile/changeMessage.vue | 28 ++++++++++++------------
 src/components/profile/exitPage.vue      |  2 +-
 src/components/second/comment.vue        | 16 ++++----------
 src/components/second/info.vue           |  3 ++-
 src/components/second/second.vue         | 13 ++++++++---
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/components/main/item.vue b/src/components/main/item.vue
index 236cc42..c250d2c 100644
--- a/src/components/main/item.vue
+++ b/src/components/main/item.vue
@@ -11,7 +11,7 @@
         <div :class = "$style.views_img" v-show ="item.kind != 1">
           <svg viewBox="0 0 200 200" :class="$style.view_img"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#view"></use></svg>
         </div>
-        <div :class = "$style.tag">#{{item.tag}}#</div> 
+        <div :class = "$style.tag" v-show = "item.tag">#{{item.tag}}#</div> 
       </div>
     </div>
 </template>
@@ -116,7 +116,7 @@ import Map from '../../common/keymap.js'
   composes: space from 'sass-loader!../../scss/utility.scss';
 }
 .author{
-  width: 30%;
+  width: 50%;
   padding-left: 15px;
   float: left;
   composes: common; 
diff --git a/src/components/profile/changeMessage.vue b/src/components/profile/changeMessage.vue
index 5b2da2c..647d823 100644
--- a/src/components/profile/changeMessage.vue
+++ b/src/components/profile/changeMessage.vue
@@ -66,19 +66,19 @@ export default {
             submitChange() {
                 if (!this.editChange) return
                 let promise1 = Fetch.FetchData('/api/v1.0/profile/' + this.profile.user_id + '/edit/', 'PUT', {
-                        name: this.newName ? this.newName : this.profile.name,
-                        introduction: this.newIntroduction ? this.newIntroduction : this.profile.introduction,
-                        weibo: this.newWeibo ? this.newWeibo : this.profile.weibo,
-                        img_url: this.pic_url ? this.pic_url : this.profile.weibo.img_url
-                    }).then(value => {
-                        this.profile = value
-                        this.$parent.profile = value
-                        this.$parent.changeMessage = false
-                        this.editChange = false
-                        this.newName = ""
-                        this.newIntroduction = ""
-                        this.newWeibo = ""
-                    })
+                    name: this.newName ? this.newName : this.profile.name,
+                    introduction: this.newIntroduction ? this.newIntroduction : this.profile.introduction,
+                    weibo: this.newWeibo ? this.newWeibo : this.profile.weibo,
+                    img_url: this.pic_url ? this.pic_url : this.profile.weibo.img_url
+                }).then(value => {
+                    this.profile = value
+                    this.$parent.profile = value
+                    this.$parent.changeMessage = false
+                    this.editChange = false
+                    this.newName = ""
+                    this.newIntroduction = ""
+                    this.newWeibo = ""
+                })
             },
             getName(e) {
                 this.changedImg = URL.createObjectURL(e.target.files[0])
@@ -100,7 +100,7 @@ export default {
         }
 }
 </script>
-<style lang ="sass" module>
+<style lang="sass" module>
 @import '../../scss/color.scss';
 .suggestPage {
     position: absolute;
diff --git a/src/components/profile/exitPage.vue b/src/components/profile/exitPage.vue
index acc126e..da8d3c9 100644
--- a/src/components/profile/exitPage.vue
+++ b/src/components/profile/exitPage.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-show="returnIt" :class="$style.suggestMask">
+    <div :class="$style.suggestMask">
         <div :class="$style.returnCard" >
             <div v-show = "flag">退出登录后，将不能发表评论和收藏内容。确认退出？</div>
             <div :class="$style.returnButton" v-on:click="exit" v-show = "flag">退出</div>
diff --git a/src/components/second/comment.vue b/src/components/second/comment.vue
index 6e21092..e9e45e7 100644
--- a/src/components/second/comment.vue
+++ b/src/components/second/comment.vue
@@ -95,9 +95,6 @@ export default {
             "sharePage":SharePage,
             "modal":Modal
         },
-        mounted(){
-            console.log(this.articleInfo,"sf")
-        },
         computed: {
             BoxWidth: function () {
                 return {
@@ -164,16 +161,19 @@ export default {
             closeComment: function () {
                 if (this.showComment) {
                     this.showComment = false
+                    this.$parent.showComment = false
                     this.message = ""
                 }
             },
             activeComment: function (e) {
+                console.log("this.$parent",this.$parent)
                 if (!this.showComment) {
                     FETCH.FetchData(this.url, "GET")
                         .then(res => {
                             this.obj = res
                         })
                     this.showComment = true
+                    this.$parent.showComment = true
                 }
             },
             ClickChangeColor: function () {
@@ -235,15 +235,6 @@ export default {
     width: 100%;
 }
 
-.mask {
-    position: fixed;
-    width: 100%;
-    background-color: rgba(229, 233, 233, 0.85);
-    z-index: $Zindex2;
-    bottom: 50px;
-    top: 0;
-}
-
 .comment {
     border-top: solid 1px $grey_l;
     padding: 15px;
@@ -351,6 +342,7 @@ export default {
 
 .commentPage {
     position: absolute;
+    overflow: auto;
     top: 0;
     min-height:100%;
     background-color: $white;
diff --git a/src/components/second/info.vue b/src/components/second/info.vue
index 7232889..5f96cc1 100644
--- a/src/components/second/info.vue
+++ b/src/components/second/info.vue
@@ -102,7 +102,7 @@ export default {
     position: absolute;
     width: 50px;
     left: 20%;
-    top: 75px;
+    top: 20%;
 }
 
 .audio {
@@ -124,6 +124,7 @@ export default {
 }
 
 .musicBox {
+    position: relative;
     composes: space from 'sass-loader!../../scss/utility.scss';
 }
 
diff --git a/src/components/second/second.vue b/src/components/second/second.vue
index d614fd7..6d40e3f 100644
--- a/src/components/second/second.vue
+++ b/src/components/second/second.vue
@@ -1,13 +1,13 @@
 <template>
-    <div id="xxx">
+    <div id="xxx" :style = "stopScroll">
         <articleInfo ref="articleInfo"></articleInfo>
         <light ref = "light"></light>
-        <articleComments ref="articleComments"></articleComments>
         <ad></ad>
         <div :class="$style.recommend" v-show="list.length">
             <div :class="$style.title" v-on:click="closeComment">相关推荐</div>
             <item :item="item" v-for="item in list"></item>
         </div>
+        <articleComments ref="articleComments"></articleComments>
         <div :class="$style.occupy"></div>
     </div>
 </template>
@@ -30,6 +30,12 @@ export default {
             return {
                 transform: 'translateX(' + this.x + 'px)'
             }
+        },
+        stopScroll: function () {
+            return{
+                overflow: this.showComment ? 'hidden':'auto',
+                height:this.showComment?'90%':''
+            }
         }
     },
     data() {
@@ -37,7 +43,8 @@ export default {
             closeCom: false,
             x: 0,
             foo: 0,
-            list: []
+            list: [],
+            showComment:false
         }
     },
     mounted() {