Merge branch 'jingjie' into 'develop'

Jingjie



See merge request !12

src/assets/less/style2.less

@@ -216,3 +216,23 @@
     }
     }
   }
   }
 }
 }
+.detail{
+  .page-content{
+    .title-content{
+      .pos(r);
+      p{
+        font-size: 0.32rem;
+        color: #252525;
+      }
+      span{
+        font-size: 0.22rem;
+        color: #727272;
+      }
+      &:after{.line.xb;}
+    }
+    .detail-content{
+      font-size: 0.28rem;
+      color: #727272;
+    }
+  }
+}

src/components/Notice/detail.vue

 <template>
 <template>
-  <div class="">
-    {{msg}}
+  <div class="page detail">
+    <div class="page-header" flex="main:justify cross:center">
+      <div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div>
+      <div class="title">公告详情</div>
+    </div>
+    <div class="page-content">
+      <div class="title-content pt20 pb20 pl30 pr30">
+        <p>{{notice.title}}</p>
+        <span>{{notice.time}}</span>
+      </div>
+      <div class="detail-content pt20 pb20 pl30 pr30">
+        {{notice.detail}}
+      </div>
+    </div>
   </div>
   </div>
+
 </template>
 </template>
 <script>
 <script>
 export default {
 export default {
   name: 'noticeShow',
   name: 'noticeShow',
   data() {
   data() {
     return {
     return {
-      msg: '通知详情'
+      notice:{
+        id: 0,
+        time: '2017-11-05 11:33',
+        title:'矿池关于比特币现金版本升级及更名的通知',
+        status: 'unread',
+        detail: '日前，Bitcoin ABC发布了比特币现金BCH(原BCC)包含有算法难度调整（DAA）的0.16.0版本。该版本中将原BC'
+      }
     }
     }
   },
   },
   mounted() {
   mounted() {
 
 
   },
   },
   methods: {
   methods: {
-    
+    goBack() {
+      this.$router.go(-1);
+    },
   }
   }
 }
 }
 
 

src/components/Notice/index.vue

@@ -8,7 +8,7 @@
       <div class="notice-content">
       <div class="notice-content">
         <div class="notice-notice" flex="dir:left box:first" @click="goNoticeList">
         <div class="notice-notice" flex="dir:left box:first" @click="goNoticeList">
           <span class="iconfont icon-xiaoxigonggao">
           <span class="iconfont icon-xiaoxigonggao">
-                <b class="notice-badge">{{notice.num}}</b>
+            <b class="notice-badge">{{notice.num}}</b>
           </span>
           </span>
           <div class="notice-right"  flex="dir:top main:justify">
           <div class="notice-right"  flex="dir:top main:justify">
             <div flex="dir:left box:mean cross:center">
             <div flex="dir:left box:mean cross:center">
@@ -39,7 +39,6 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <!--<button @click="goNoticeList">跳转到通知列表</button>-->
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>

src/components/Notice/list.vue

@@ -2,12 +2,12 @@
   <div class="page list">
   <div class="page list">
     <div class="page-header" flex="main:justify cross:center">
     <div class="page-header" flex="main:justify cross:center">
       <div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div>
       <div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div>
-      <div class="title">通知列表</div>
+      <div class="title">公告列表</div>
       <div class="btn-mark" @click="markAllList">全标已读</div>
       <div class="btn-mark" @click="markAllList">全标已读</div>
     </div>
     </div>
     <div class="page-content">
     <div class="page-content">
       <ul class="list-content">
       <ul class="list-content">
-        <li  v-for="(notice,index) in noticeList" :key="notice.id" class="list-item p30" :class="notice.status=='unread'?'unread':'read'" @click="goNoticeShow(index) ">
+        <li  v-for="(notice,index) in noticeList" :key="notice.id" class="list-item pt20 pb20 pl30 pr30" :class="notice.status=='unread'?'unread':'read'" @click="goNoticeShow(index) ">
           <p>{{notice.title}}</p>
           <p>{{notice.title}}</p>
           <span>{{notice.time}}</span>
           <span>{{notice.time}}</span>
         </li>
         </li>
@@ -31,13 +31,12 @@ export default {
         id: 1,
         id: 1,
         time: '2017-11-04 11:33',
         time: '2017-11-04 11:33',
         title:'矿池关于比特币现金版本升级及更名的通知',
         title:'矿池关于比特币现金版本升级及更名的通知',
-        status: 'read'
+        status: 'unread'
       },{
       },{
         id: 2,
         id: 2,
         time: '2017-11-04 11:33',
         time: '2017-11-04 11:33',
         title:'矿池关于比特币现金版本升级及更名的通知',
         title:'矿池关于比特币现金版本升级及更名的通知',
-        status: 'read',
-        isRead: false
+        status: 'read'
       }],
       }],
     }
     }
   },
   },
@@ -49,11 +48,13 @@ export default {
       this.$router.go(-1);
       this.$router.go(-1);
     },
     },
     goNoticeShow(index) {
     goNoticeShow(index) {
-      this.noticeList[index].status='read';
-      // this.$router.push('/NoticeShow');
+      // this.noticeList[index].status='read';
+      this.$router.push('/NoticeShow');
     },
     },
     markAllList() {
     markAllList() {
-
+      this.noticeList.forEach((notice)=>{
+        notice.status = 'read';
+      })
     }
     }
   }
   }
 }
 }