Merge remote-tracking branch 'origin/master'

nnzwminiapp/pages/myCenter/myCenter.js

@@ -247,6 +247,11 @@ Page({
             url: '/pages/login/login',
         })
     },
+    toNnzzd(){
+        wx.navigateTo({
+            url: '/pages/nnzzd/nnzzd',
+        })
+    },
     getUserInfo() {
         // this.setData({
         // 	nickName: wx.getStorageSync('nickName'),

nnzwminiapp/pages/myCenter/myCenter.wxml

@@ -99,6 +99,16 @@
                     <image src="../images/arrow.png" alt=""></image>
                 </view>
             </view>
+			<view class="list-item" bindtap="toNnzzd" >
+                <view class="left">
+                    <image src="../images/l-rwzx.png" alt=""></image>
+                    <text>南岸早知道</text>
+                </view>
+                <view class="arrow">
+                    <image src="../images/arrow.png" alt=""></image>
+                </view>
+            </view>
+
             <!-- <view class="line"></view>
 			<view class="list-item">
 				<view class="left">

nnzwminiapp/pages/nnzzd/nnzzd-item.wxml

@@ -1,10 +1,16 @@
 <view>
     <scroll-view class="item-he" scroll-y>
-        <view class="item-main" wx:for="{{5}}">
+        <view class="item-main" wx:for="{{eventDataList}}" wx:key="index">
             <view class="item-right">
-                <view class="item-title" style="background-image: url('{{imgUrl}}nnzzditemtitle.png');">新闻标题</view>
+                <view class="item-title" style="background-image: url('{{imgUrl}}nnzzditemtitle.png');">{{item.eventTitle}}</view>
                 <view class="item-c">
-                    <view class="item-context">拉卡机了咖啡机垃圾分类卡机了咖啡机阿里斯顿积分栏</view>
+                    <view class="item-context">
+                        <view class="itemitme" wx:for="{{item.templateContent}}" wx:for-index="dateIndex" wx:for-item="dateItem">
+                            <view class="key">{{dateItem.label}}</view>
+                            <text  class="value">{{dateItem.value}}</text>
+                        </view>
+                        
+                    </view>
                 </view>
             </view>
         </view>

nnzwminiapp/pages/nnzzd/nnzzd.js

@@ -24,9 +24,14 @@ Page({
         url: '/event/page?page=1&limit=9999',
         method: 'GET'
     }).then(res => {
-        this.setData({
-            eventDataList: res.data
-        })
+      let a = []
+        res.data.forEach(element => {
+          element.templateContent =  JSON.parse(element.templateContent)
+          a.push(element)
+       }); 
+      this.setData({
+            eventDataList: a
+      })
     })
     request({
         url: '/subscribe/getSubscribeNumber',

nnzwminiapp/pages/nnzzd/nnzzd.wxss

@@ -128,7 +128,7 @@
 }
 .item-right{
     width: 90%;
-    min-height: 334rpx;
+    /* min-height: 334rpx; */
     margin: 0 auto 40rpx;
     
 }
@@ -141,7 +141,20 @@
 }
 .item-context{
     width: 93%;
+    min-height: 334rpx;
     margin: 0 auto;
     color: #666666;
+}
+.itemitme{
+    width: 100%;
+}
 
+.key{
+    width: 30%;
+    float: left;
+}
+
+.value{
+    width: 70%;
+    float: left;
 }