1109

app.js

@@ -2,19 +2,35 @@
 var restAjax = require('utils/restAjax.js');
 var dialog = require('utils/dialog.js');
 App({
-  loginUrl: 'https://www.wgink.ink/usercenter',
-  usercenterUrl: 'https://www.wgink.ink/usercenter',
-  newsUrl: 'https://www.wgink.ink/news',
-  newsContentUrl: 'https://www.wgink.ink',
-  libraryUrl: 'https://www.wgink.ink/library',
-  venueUrl: 'https://www.wgink.ink/venuebooking',
-  activityUrl: 'https://www.wgink.ink/culturalactivity',
-  volunteerUrl: 'https://www.wgink.ink/volunteer',
-  activityUrl: 'https://www.wgink.ink/culturalactivity',
-  volunteerUrl: 'https://www.wgink.ink/volunteer',
-  liveUrl: 'https://www.wgink.ink/live',
-  liveRecordUrl: 'https://www.wgink.ink',
-  socialUrl: 'https://www.wgink.ink/social',
+  // loginUrl: 'https://www.xzszwhy.cn/usercenter',
+  // usercenterUrl: 'https://www.xzszwhy.cn/usercenter',
+  // newsUrl: 'https://www.xzszwhy.cn/news',
+  // newsContentUrl: 'https://www.xzszwhy.cn',
+  // libraryUrl: 'https://www.xzszwhy.cn/library',
+  // venueUrl: 'https://www.xzszwhy.cn/venuebooking',
+  // activityUrl: 'https://www.xzszwhy.cn/culturalactivity',
+  // volunteerUrl: 'https://www.xzszwhy.cn/volunteer',
+  // activityUrl: 'https://www.xzszwhy.cn/culturalactivity',
+  // volunteerUrl: 'https://www.xzszwhy.cn/volunteer',
+  // liveUrl: 'https://www.xzszwhy.cn/live',
+  // liveRecordUrl: 'https://www.xzszwhy.cn.ink',
+  // socialUrl: 'https://www.xzszwhy.cn/social',
+  // settingUrl: 'https://www.xzszwhy.cn/miniapp',
+
+  loginUrl: 'http://219.159.20.131:8081/usercenter',
+  usercenterUrl: 'http://219.159.20.131:8081/usercenter',
+  newsUrl: 'http://219.159.20.131:8081/news',
+  newsContentUrl: 'http://219.159.20.131:8081',
+  libraryUrl: 'http://219.159.20.131:8081/library',
+  venueUrl: 'http://219.159.20.131:8081/venuebooking',
+  activityUrl: 'http://219.159.20.131:8081/culturalactivity',
+  volunteerUrl: 'http://219.159.20.131:8081/volunteer',
+  activityUrl: 'http://219.159.20.131:8081/culturalactivity',
+  volunteerUrl: 'http://219.159.20.131:8081/volunteer',
+  liveUrl: 'http://219.159.20.131:8081/live',
+  liveRecordUrl: 'https://www.xzszwhy.cn.ink',
+  socialUrl: 'http://219.159.20.131:8081/social',
+  settingUrl: 'http://219.159.20.131:8081/miniapp',
   restAjax: restAjax,
   dialog: dialog,
   onLaunch: function () {

app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/newsPage/newsPage",
     "pages/travel/travel",
     "pages/resource/resource",
     "pages/template/template",
@@ -9,7 +10,6 @@
     "pages/order/order",
     "pages/venue/venue",
     "pages/center/center",
-    "pages/myFriendCircle/myFriendCircle",
     "pages/friendCircle/friendCircle",
     "pages/orderDetail/orderDetail",
     "pages/broadcastList/broadcastList",
@@ -33,13 +33,17 @@
     "pages/activityDetail/activityDetail",
     "pages/activity/activity",
     "pages/newsDetail/newsDetail",
-    "pages/newsList/newsList"
+    "pages/newsList/newsList",
+    "pages/myActivity/myActivity",
+    "pages/myVolunteerTeam/myVolunteerTeam",
+    "pages/myVolunteerActivity/myVolunteerActivity",
+    "pages/serviceActivityDetail/serviceActivityDetail"
   ],
   "window": {
     "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#9F1512",
+    "navigationBarBackgroundColor": "#ffffff",
     "navigationBarTitleText": "日喀则市数字文化云",
-    "navigationBarTextStyle": "white"
+    "navigationBarTextStyle": "black"
   },
   "tabBar": {
     "color": "#BBBBBB",

app.wxss

@@ -1,10 +0,0 @@
-/**app.wxss**/
-.container {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  padding: 200rpx 0;
-  box-sizing: border-box;
-} 

pages/activity/activity.js

@@ -16,7 +16,7 @@ Page({
   },
   getAreaList: function () {
     var self = this;
-    app.restAjax.get(app.restAjax.path(app.usercenterUrl + '/app/dataarea/listareabyparentidrelease/640675', []),
+    app.restAjax.get(app.restAjax.path(app.usercenterUrl + '/app/dataarea/listareabyparentidrelease/110889', []),
       self.data.pages, null, function (code, data) {
         if (code == '200') {
           self.setData({

pages/activity/activity.wxml

@@ -6,18 +6,21 @@
   <view class="activity-box" bindtap="goDetail" data-id="{{item.activityLibraryId}}" wx:for="{{dataList}}" wx:key="index">
     <view class="activity-img">
       <image src="{{item.activityImage}}"></image>
-    </view>
-    <view class="activity-info">
-      <view class="title">
-        <view class="activity-title">{{item.activityTitle}}</view>
-        <view class="sign" wx:if="{{item.activityState == '3'}}">报名中</view>
+      <view class="sign" wx:if="{{item.activityState == '3'}}">报名中</view>
         <view class="sign" wx:if="{{item.activityState == '4'}}">报名人数已满</view>
         <view class="sign" wx:if="{{item.activityState == '5'}}">停止报名</view>
         <view class="sign" wx:if="{{item.activityState == '6'}}">进行中</view>
         <view class="sign" wx:if="{{item.activityState == '7'}}">直接进入</view>
         <view class="sign" wx:if="{{item.activityState == '99'}}">已结束</view>
+    </view>
+    <view class="activity-info">
+      <view class="title">
+        <view class="activity-title">{{item.activityTitle}}</view>
+      </view>
+      <view class="date">
+        <image src="../../images/time-g.png"></image>
+        {{item.activityStartTime}}至{{item.activityEndTime}}
       </view>
-      <view class="date">{{item.activityStartTime}}至{{item.activityEndTime}}</view>
     </view>
   </view>
 </view>

pages/activity/activity.wxss

@@ -4,7 +4,7 @@
 }
 .activity-box{
   margin-bottom: 20rpx;
-  box-shadow:0px 0px 17rpx 0px rgba(0,0,0,0.1);
+  box-shadow: 0px 2px 8px 0px rgba(35, 24, 21, 0.1);
   border-radius: 10rpx;
   overflow: hidden;
 }
@@ -47,26 +47,36 @@
   justify-content: space-between;
 }
 .activity-title{
-  width: 70%;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   font-size: 32rpx;
   color: #242424;
   line-height: 40rpx;
+  font-weight: bold;
 }
 .sign{
-  background: rgba(159,21,18,.1);
-  color: #9F1512;
-  border-radius: 10rpx;
-  padding: 0 20rpx;
+  position: absolute;
+  top:0;
+  right: 0;
+  background: linear-gradient(90deg, rgba(21, 113, 250, 0.97), rgba(21, 183, 250, 0.97));
+  color: #fff;
+  border-top-left-radius: 0;
+  border-top-right-radius: 10rpx;
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 0;
+  padding: 5rpx 20rpx;
   line-height: 40rpx;
   font-size: 28rpx;
 }
 .date{
   margin-top: 10rpx;
   font-size: 24rpx;
-  color: #242424;
+  color: #999;
+}
+.date image{
+  width: 20rpx;
+  height: 20rpx;
 }
 .area{
   position: fixed;
@@ -76,6 +86,8 @@
   height: 80rpx;
   white-space: nowrap;
   overflow-x: auto;
+  background: #FFF;
+  z-index: 100;
 }
 .area-box{
   display: inline-block;
@@ -85,5 +97,5 @@
   font-size: 30rpx;
 }
 .area-box.active{
-  color: #9F1512;
+  color: #125CE1;
 }

pages/activityDetail/activityDetail.wxml

@@ -7,19 +7,17 @@
 </view>
 <view class="activity-detail">
   <view class="activity-title">{{dataMap.activityTitle}}</view>
+  <view class="activity-date"> 
+    {{dataMap.activityStartTime}}至{{dataMap.activityEndTime}}
+  </view>
   <view class="activity-info">
     <view class="activity-text">
-      <image src="../../images/people.png"></image>
+      <image src="../../images/people-b.png" class="people"></image>
       <text>活动人数：</text>
       {{dataMap.activityUserNum }}
     </view>
     <view class="activity-text">
-      <image src="../../images/time.png"></image>
-      <text>活动时间：</text>
-      {{dataMap.activityStartTime}}至{{dataMap.activityEndTime}}
-    </view>
-    <view class="activity-text">
-      <image src="../../images/people.png"></image>
+      <image src="../../images/position-b.png" class="position"></image>
       <text>活动地址：</text>
       {{dataMap.activityAddress }}
     </view>

pages/activityDetail/activityDetail.wxss

@@ -6,20 +6,27 @@ swiper {
   height: 100%;
 }
 .activity-detail{
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 430rpx;
+  padding: 0 30rpx;
+  box-sizing: border-box;
+  position: relative;
+  width: 710rpx;
+  margin: -50rpx auto 20rpx;
   background: #fff;
   border-radius:30rpx 30rpx 0px 0px;
   overflow: hidden;
   padding-bottom: 120rpx;
+  box-shadow: 0px 2px 8px 0px rgba(35, 24, 21, 0.1);
 }
-.activity-title, .activity-info{
-  padding: 30rpx;
+.activity-title{
+  padding: 30rpx 0;
   font-size: 32rpx;
-  color: #242424;
-  border-bottom: 5px solid #FBFBFB;
+  color: #122939;
+  font-weight: bold;
+}
+.activity-info{
+  padding: 30rpx 0;
+  font-size: 32rpx;
+  color: #122939;
 }
 .activity-text{
   line-height: 35rpx;
@@ -29,19 +36,19 @@ swiper {
 .activity-text:last-child{
   margin-bottom: 0;
 }
-.activity-info image{
-  width: 35rpx;
-  height: 35rpx;
+.people{
+  width: 24rpx;
+  height: 20rpx;
+  margin-right: 10rpx;
+}
+.position{
+  width: 20rpx;
+  height: 24rpx;
   margin-right: 10rpx;
-  vertical-align: middle;
-  margin-top: -5rpx;
 }
 .activity-text text{
   color: #BBBBBB;
 }
-.activity-container{
-  padding: 30rpx;
-}
 .part{
   margin-bottom: 30rpx;
 }
@@ -49,11 +56,10 @@ swiper {
   margin-bottom: 0;
 }
 .part-title{
-  border-left: 3px solid #9F1512;
-  color: #242424;
-  padding-left: 10rpx;
-  font-size: 30rpx;
+  color: #122939;
+  font-size: 32rpx;
   margin-bottom: 10rpx;
+  font-weight: bold;
 }
 .part-content{
   font-size: 28rpx;
@@ -88,4 +94,8 @@ swiper {
   align-items: center;
   font-size: 30rpx;
   color: #fff;
+}
+.activity-date{
+  font-size: 28rpx;
+  color: #999;
 }

pages/activityDialog/activityDialog.wxml

@@ -1,8 +1,8 @@
 <view class="dialog">
-  <view class="dialog-box" wx:if="{{dataList < 1}}">
+  <view class="dialog-box" wx:if="{{dataList.length < 1}}">
     暂无评论
   </view>
-  <view class="dialog-box" wx:for="{{dataList}}">
+  <view class="dialog-box" wx:for="{{dataList}}" wx:key="index">
     <view class="avatar">
       <image wx:if="{{item.photo}}" src="{{item.photo}}"></image>
       <image wx:else src="../../images/avatar.png"></image>
@@ -10,7 +10,7 @@
     <view class="user-info">
       <view class="name">{{item.volunteerName}}</view>
       <view class="content">{{item.content}}</view>
-      <view class="content" wx:if="{{item.photos}}">
+      <view class="content {{item.photo.length > 1 ? 'images': ''}}" wx:if="{{item.photos}}">
         <image wx:for="{{item.photos}}" wx:for-item="subItem" src="{{subItem}}"></image>
       </view>
       <view class="content" wx:if="{{item.videos}}">

pages/activityDialog/activityDialog.wxss

@@ -1,31 +1,35 @@
 .dialog{
-  padding: 30rpx;
+  padding: 20rpx;
 }
 .dialog-box{
   margin-bottom: 15rpx;
   display: flex;
   justify-content: space-between;
+  padding: 30rpx;
+  background-color: #fff;
 }
 .avatar{
-  width: 15%;
+  width: 50rpx;
 }
 .avatar image{
   width: 100%;
-  height: 90rpx;
+  height: 50rpx;
+  border-radius: 50%;
 }
 .user-info{
-  width: 83%;
+  width: 570rpx;
   border-bottom: 1px solid #DEDEDE;
   padding-bottom: 10rpx;
 }
 .name{
   font-size: 34rpx;
-  color: #949494;
-  margin: 15rpx 0;
+  color: #333;
+  font-weight: bold;
 }
 .content{
   font-size: 30rpx;
-  color: #000;
+  color: #333;
+  line-height: 40rpx;
   margin-bottom: 15rpx;
 }
 .public-time{
@@ -39,4 +43,12 @@
 .delete, .delete image{
   width: 40rpx;
   height: 40rpx;
+}
+.images{
+  display: flex;
+  justify-content: space-between;
+}
+.images image{
+  width: 32%;
+  height: 140rpx;
 }

pages/broadcastList/broadcastList.js

@@ -13,7 +13,8 @@ Page({
     page: 1,
     rows: 20,
     liveRecordList: [],
-    videoPath: ''
+    videoPath: '',
+    curTime: ''
   },
   getLivePlanRecordList: function () {
     var self = this
@@ -50,8 +51,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    var time = new Date().getTime()
     this.setData({
-      livePlanId: options.livePlanId
+      livePlanId: options.livePlanId,
+      curTime: time
     })
     this.getLivePlanRecordList();
   },

pages/broadcastList/broadcastList.wxml

@@ -4,4 +4,4 @@
 <view class="select-list">
   <view class="select-video {{item.recordFilePath == videoPath ? 'active': ''}}" wx:for="{{liveRecordList}}" data-url="{{item.recordFilePath}}" bindtap="playVideo">{{index+1}}.{{item.recordFileName}}</view>
 </view> -->
-<web-view src="{{liveRecordContentUrl}}/flv/index.html?livePlanId={{livePlanId}}&liveUrl={{liveUrl}}&liveRecordUrl={{liveRecordUrl}}" wx:if="{{livePlanId}}"></web-view>
+<web-view src="{{liveRecordContentUrl}}/flv/index.html?livePlanId={{livePlanId}}&liveUrl={{liveUrl}}&liveRecordUrl={{liveRecordUrl}}&{{curTime}}" wx:if="{{livePlanId}}"></web-view>

pages/center/center.wxml

@@ -1,29 +1,30 @@
-<view class="top-img">
-	<image src="../../images/center-bg.png"></image>
-</view>
 <view class="page-container">
 	<view class="person">
 		<view class="user-avatar" bindtap="changeAvatar" wx:if="{{userInfo.avatar}}">
 			<image src="{{usercenterUrl}}{{sourcePath}}{{userInfo.avatar}}"></image>
 		</view>
 		<view class="user-name">{{userInfo.name}}</view>
-		<button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" class="getphone" wx:if="{{randomName}}">绑定手机号</button>
-		<view class="tips" wx:if="{{randomName}}">绑定手机号后，账号信息即可与APP共享</view>
+		<view class="bind-box">
+			<button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber" class="getphone" wx:if="{{randomName}}">绑定手机号</button>
+			<view class="tips" wx:if="{{randomName}}">绑定手机号后，账号信息即可与APP共享</view>
+		</view>
+		<image src="../../images/center-img.png" class="person-bg"></image>
 	</view>
 	<view class="main">
-		<view class="main-title">常用功能</view>
 		<view class="main-container">
-			<view class="main-box" bindtap="toMyOrder">
-				<image src="../../images/my-sign.png"></image>
+			<view class="main-box order" bindtap="toMyOrder">
+				<image src="../../images/center-order.png"></image>
 				<view class="title">我的预订</view>
+				<view class="check">查看</view>
 			</view>
 			<!-- <view class="main-box" bindtap="toMyFirend">
 				<image src="../../images/friend.png"></image>
 				<view class="title">我的发布</view>
 			</view> -->
-			<view class="main-box" bindtap="toMyJoinActivity">
-				<image src="../../images/my-sign.png"></image>
+			<view class="main-box activity" bindtap="toMyJoinActivity">
+				<image src="../../images/center-activity.png"></image>
 				<view class="title">我的活动</view>
+				<view class="check">查看</view>
 			</view>
 			<!-- <view class="main-box">
         <image src="../../images/my-comment.png"></image>
@@ -33,13 +34,15 @@
         <image src="../../images/my-collect.png"></image>
         <view class="title">我的收藏</view>
       </view> -->
-			<view class="main-box" bindtap="toMyTeam">
-				<image src="../../images/share.png"></image>
+			<view class="main-box team" bindtap="toMyTeam">
+				<image src="../../images/center-team.png"></image>
 				<view class="title">我的志愿团队</view>
+				<view class="check">查看</view>
 			</view>
-			<view class="main-box" bindtap="toMyVolunteerActivity">
-				<image src="../../images/team.png"></image>
+			<view class="main-box team-activity" bindtap="toMyVolunteerActivity">
+				<image src="../../images/center-team-activity.png"></image>
 				<view class="title">我的志愿活动</view>
+				<view class="check">查看</view>
 			</view>
 			<!-- <view class="main-box">
 				<image src="../../images/share.png"></image>

pages/center/center.wxss

@@ -1,19 +1,28 @@
-.top-img, .top-img image{
-  width: 100%;
-  height: 450rpx
+page{
+  background: #fafafa;
 }
 .page-container{
-  position: absolute;
-  top: 420rpx;
-  left: 0;
-  right: 0;
   border-radius:31rpx 31rpx 0px 0px;
-  background: #fff;
 }
 .person{
-  padding: 50rpx 30rpx 30rpx;
+  height: 450rpx;
+  box-sizing: border-box;
+  padding: 60rpx 0 80rpx 55rpx;
   position: relative;
-  border-bottom: 3px solid #FBFBFB;
+}
+.bind-box{
+  position: absolute;
+  width: 380rpx;
+  top: 100rpx;
+  left: 60rpx;
+  z-index: 100;
+}
+.person-bg{
+  position: absolute;
+  top: 20rpx;
+  right: 50rpx;
+  width: 200rpx;
+  z-index: 0;
 }
 .user-avatar{
   width: 180rpx;
@@ -31,39 +40,45 @@
   height: 100%;
 }
 .user-name{
-  font-size: 32rpx;
-  text-align: center;
-  color: #242424;
+  font-size: 38rpx;
+  color: #122939;
+}
+.getphone{
+  display: block;
+  margin-top: 60rpx;
+  margin-left: 0 !important;
+  margin-right: 0 !important;
+  background: #0956E0;
+  box-shadow: 0px 2px 8px 0px rgba(35, 24, 21, 0.2);
+  border-radius: 8rpx;
+  color: #fff;
 }
 .main{
-  padding: 30rpx;
-}
-.main-title{
-  border-left: 3px solid #9F1512;
-  padding-left: 10rpx;
-  font-size: 32rpx;
-  color: #242424;
-  margin-bottom: 20rpx;
+  width: 710rpx;
+  margin: 50rpx auto 0;
+  padding: 40rpx;
+  background-color: #fff;
+  box-sizing: border-box;
+  box-shadow: 0px 2px 8px 0px rgba(35, 24, 21, 0.1);
+  border-radius: 30rpx;
 }
 .main-container{
   display: flex;
   flex-wrap: wrap;
+  justify-content: space-between;
 }
 .main-box{
-  width: 25%;
+  width: 300rpx;
+  height: 260rpx;
   flex-shrink: 0;
-  text-align: center;
-  padding: 0 15rpx;
+  padding: 20rpx 30rpx;
   box-sizing: border-box;
-  margin-bottom: 15rpx;
-}
-.main-box image{
-  width: 65rpx;
-  height: 65rpx;
+  margin-bottom: 30rpx;
+  border-radius: 10rpx;
 }
 .title{
   font-size: 30rpx;
-  color: #242424;
+  color: #122939;
 }
 .set-phone{
   position: fixed;
@@ -146,8 +161,9 @@
 }
 .tips{
   font-size: 30rpx;
-  text-align: center;
   margin-top: 15rpx;
+  color: #0956E0;
+  margin-top: 25rpx;
 }
 .loading{
   position: fixed;
@@ -164,4 +180,49 @@
   transform: translate(-50%,-50%);
   width: 150rpx;
   height: 150rpx;
+}
+.order{
+  background-color: #FFF7EC;
+}
+.order image{
+  width: 45rpx;
+  height: 40rpx;
+  margin-bottom: 50rpx;
+}
+.activity{
+  background-color: #FBEFEF;
+}
+.activity image{
+  width: 41rpx;
+  height: 44rpx;
+  margin-bottom: 46rpx;
+}
+.team{
+  background-color: #EDF4FE;
+  margin-bottom: 0;
+}
+.team image{
+  width: 44rpx;
+  height: 33rpx;
+  margin-bottom: 57rpx;
+}
+.team-activity{
+  background-color: #E6E9FE;
+  margin-bottom: 0;
+}
+.team-activity image{
+  width: 44rpx;
+  height: 38rpx;
+  margin-bottom: 52rpx;
+}
+.check{
+  width: 110rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  font-size: 26rpx;
+  color: #999;
+  text-align: center;
+  margin-top: 20rpx;
+  background: #FFFFFF;
+  border-radius: 25rpx;
 }

pages/cultureDetail/cultureDetail.wxml

@@ -1,57 +1,71 @@
 <view class="culture-swiper">
-  <swiper indicator-dots="{{swiper.indicatorDots}}" autoplay="{{swiper.autoplay}}" current="{{swiper.current}}">
+  <swiper indicator-dots="{{swiper.indicatorDots}}" autoplay="{{swiper.autoplay}}" current="{{swiper.current}}" indicator-dots="{{true}}" indicator-color="rgba(18,92,225,.6)" indicator-active-color="rgba(18,92,225,1)">
     <swiper-item class="swiper-item" wx:for="{{swiper.imgUrl}}" wx:key="swiper">
       <image src="{{item}}" class="swiper-img"></image>
     </swiper-item>
   </swiper>
-  <view class="prev" bindtap="prevImg">
+  <!-- <view class="prev" bindtap="prevImg">
     <image src="../../images/prev.png"></image>
   </view>
   <view class="next" bindtap="nextImg">
     <image src="../../images/next.png"></image>
-  </view>
+  </view> -->
 </view>
 <view class="culture">
   <view class="culture-title">{{library.libraryTitle}}</view>
   <view class="culture-info">
     <view class="row">
       <view class="info">
+        <image src="../../images/row-icon-1.png"></image>
         <text>项目编号：</text>
         {{library.libraryNumber}}
       </view>
-      <view class="info">
-        <text>数据来源：</text>
-        {{library.librarySource}}
-      </view>
     </view>
     <view class="row">
       <view class="info">
+        <image src="../../images/row-icon-2.png"></image>
         <text>公布时间：</text>
         {{library.libraryOpenDateValue}}
       </view>
-      <view class="info">
-        <text>非遗级别：</text>
-        {{library.libraryLevel}}级
-      </view>
     </view>
     <view class="row">
       <view class="info">
+        <image src="../../images/row-icon-3.png"></image>
         <text>所属地区：</text>
         {{library.libraryArea}}
       </view>
-      <view class="info">
-        <text>类　　型：</text>
-        {{library.libraryTypeValue}}
-      </view>
     </view>
     <view class="row">
       <view class="info">
+        <image src="../../images/row-icon-4.png"></image>
         <text>申报地区或单位：</text>
         {{library.libraryAddress}}
       </view>
     </view>
     <view class="row">
       <view class="info">
+        <image src="../../images/row-icon-5.png"></image>
+        <text>数据来源：</text>
+        {{library.librarySource}}
+      </view>
+    </view>
+    <view class="row">
+      <view class="info">
+        <image src="../../images/row-icon-6.png"></image>
+        <text>非遗级别：</text>
+        {{library.libraryLevel}}级
+      </view>
+    </view>
+    <view class="row">
+      <view class="info">
+        <image src="../../images/row-icon-7.png"></image>
+        <text>类　　型：</text>
+        {{library.libraryTypeValue}}
+      </view>
+    </view>
+    <view class="row">
+      <view class="info">
+        <image src="../../images/row-icon-8.png"></image>
         <text>保护单位：</text>
         {{library.libraryAuthor}}
       </view>
@@ -66,7 +80,21 @@
   <view class="part">
     <view class="part-title">相关传承人</view>
     <view class="library-person" wx:for="{{libraryPersonList}}" wx:for-item="item" wx:for-index="index" wx:key="libraryPersonList">
-      <view class="row">
+      <view class="person-info">
+        <view class="person-number">{{item.libraryPersonNumber}}</view>
+        <view class="person-name">{{item.libraryPersonName}}</view>
+        <image src="../../images/man.png" class="man" wx:if="{{item.libraryPersonSex == 1}}"></image>
+        <image src="../../images/woman.png" class="woman" wx:else></image>
+      </view>
+      <view class="person-info" style="margin-top: 20rpx">
+        <view class="person-birth">
+          <text>民族：</text>{{item.libraryPersonNationDictionaryName}}
+        </view>
+        <view class="person-birth">
+          <text>出生日期：</text>{{item.libraryPersonBirthday}}
+        </view>
+      </view>
+      <!-- <view class="row">
         <view class="info">
           <text>编　　号：</text>
           {{item.libraryPersonNumber}}
@@ -91,7 +119,7 @@
           <text>民　　族：</text>
           {{item.libraryPersonNationDictionaryName}}
         </view>
-      </view>
+      </view> -->
     </view>
   </view>
 </view>

pages/cultureDetail/cultureDetail.wxss

@@ -1,9 +1,16 @@
 .culture-swiper, swiper, .swiper-img{
   width: 100%;
-  height: 500rpx;
+  height: 480rpx;
+}
+.swiper-img{
+  height: 440rpx;
+  border-radius: 40rpx;
 }
 .culture-swiper{
-  position: fixed;
+  padding: 20rpx;
+  border-radius: 40rpx;
+  overflow: hidden;
+  box-sizing: border-box;
 }
 .prev{
   width: 60rpx;
@@ -38,22 +45,17 @@
   align-items: center;
 }
 .culture{
-  position: absolute;
-  top: 450rpx;
-  left: 0;
-  right: 0;
   border-radius:31rpx 31rpx 0px 0px;
   background: #fff;
 }
 .culture-title{
-  padding: 30rpx;
-  border-bottom: 3px solid #FBFBFB;
+  padding: 20rpx;
   font-size: 34rpx;
-  color: #242424;
+  color: #122939;
+  font-weight: bold;
 }
 .culture-info{
-  padding: 20rpx 30rpx;
-  border-bottom: 3px solid #FBFBFB;
+  padding: 0 30rpx 20rpx;
 }
 .row{
   display: flex;
@@ -68,18 +70,22 @@
   padding-right: 10rpx;
   line-height: 50rpx;
 }
+.info image{
+  width: 22rpx;
+  height: 22rpx;
+  margin-right: 10rpx;
+}
 .info text{
-  color: #BBBBBB;
+  color: #999;
 }
 .part{
-  padding: 30rpx;
-  border-bottom: 3px solid #FBFBFB;
+  padding: 20rpx;
 }
 .part-title{
   font-size: 32rpx;
-  border-left: 3px solid #9F1512;
-  padding-left: 10rpx;
   margin-bottom: 20rpx;
+  color: #122939;
+  font-weight: bold;
 }
 .part-content{
   font-size: 26rpx;
@@ -109,8 +115,53 @@
   color: #fff;
 }
 .library-person {
-  border-bottom: 1px solid #FBFBFB;
+  background: #FFFFFF;
+  box-shadow: 0px 2px 8px 0px rgba(35, 24, 21, 0.1);
+  border-radius: 12rpx;
+  margin-bottom: 20rpx;
+  padding-bottom: 20rpx;
 }
 .library-person:last-child {
   border-bottom: none;
+}
+.person-info{
+  display: flex;
+}
+.person-info image.man{
+  width: 20rpx;
+  height: 20rpx;
+  margin-top: 15rpx;
+}
+.person-info image.woman{
+  width: 16rpx;
+  height: 24rpx;
+  margin-top: 13rpx;
+}
+.person-number{
+  width: 130rpx;
+  height: 50rpx;
+  text-align: center;
+  line-height: 50rpx;
+  color: #fff;
+  font-size: 26rpx;
+  background: linear-gradient(90deg, rgba(21, 113, 250, 0.97), rgba(21, 183, 250, 0.97));
+  border-top-left-radius: 12rpx;
+  border-bottom-right-radius: 28rpx;
+  margin-right: 20rpx;
+}
+.person-name{
+  line-height: 50rpx;
+  font-size: 28rpx;
+  color: #122939;
+  font-weight: bold;
+  margin-right: 20rpx;
+}
+.person-birth{
+  flex: 1;
+  font-size: 26rpx;
+  padding: 0 15rpx;
+  color: #333;
+}
+.person-birth text{
+  color: #999;
 }

pages/heritage/heritage.wxml

@@ -1,6 +1,6 @@
 <view class="top-select">
   <view class="select-box active">
-    <image src="../../images/select-tab.png"></image>
+    <image src="../../images/database.png"></image>
     <view class="select-title">非物质文化遗产数据库</view>
   </view>
   <!--
@@ -14,7 +14,7 @@
     <view class="select-title">文化分享</view>
   </view> -->
   <view class="select-box" bindtap="goCultureMap">
-    <image src="../../images/select-tab.png"></image>
+    <image src="../../images/culture-map.png"></image>
     <view class="select-title">文化地图</view>
   </view>
 </view>
@@ -28,6 +28,8 @@
         <view class="activity-title">{{item.libraryTitle}}</view>
       </view>
       <view class="date">{{item.libraryApplyTime}}</view>
+      <view class="level">非遗级别：{{item.libraryLevel}}级</view>
+      <view class="area">所属地区：{{item.libraryArea}}</view>
     </view>
   </view>
 </view>

pages/heritage/heritage.wxss

@@ -38,13 +38,16 @@
 }
 .activity-box{
   margin-bottom: 20rpx;
-  box-shadow:0px 0px 17rpx 0px rgba(0,0,0,0.1);
-  border-radius: 10rpx;
-  overflow: hidden;
+  display: flex;
+  justify-content: space-between;
 }
 .activity-img{
-  height: 320rpx;
+  width: 230rpx;
+  height: 280rpx;
   position: relative;
+  box-shadow: 0px 4rpx 8rpx 0px rgba(35, 24, 21, 0.26);
+  border-radius: 14rpx;
+  overflow: hidden;
 }
 .activity-img image{
   width: 100%;
@@ -58,6 +61,7 @@
   color: #fff;
 }
 .activity-info{
+  width: 430rpx;
   padding: 10rpx;
 }
 .title{
@@ -70,8 +74,9 @@
   overflow: hidden;
   text-overflow: ellipsis;
   font-size: 32rpx;
-  color: #242424;
+  color: #122939;
   line-height: 40rpx;
+  font-weight: bold;
 }
 .sign{
   background: rgba(159,21,18,.1);
@@ -83,5 +88,19 @@
 .date{
   margin-top: 10rpx;
   font-size: 28rpx;
-  color: #242424;
+  color: #999;
+}
+.level{
+  padding: 5rpx 10rpx;
+  background-color: #ABC8FD;
+  color: #fff;
+  border-radius: 6rpx;
+  width: 220rpx;
+  box-sizing: border-box;
+  margin-top: 10rpx;
+}
+.area{
+  margin-top: 10rpx;
+  font-size: 28rpx;
+  color: #999;
 }

pages/index/index.js

@@ -4,6 +4,8 @@ Page({
    * 页面的初始数据
    */
   data: {
+    showLive: false,
+    navList: [],
     randomName: true,
     showPhone: true,
     gotCode: false,
@@ -32,6 +34,42 @@ Page({
     usercenterUrl: app.usercenterUrl,
     isConfirm: false
   },
+  getSetting: function () {
+    var self = this
+    var num = Math.random()
+    app.restAjax.get(app.restAjax.path('{settingUrl}/nav-setting.json?v=' + num, [app.settingUrl]), {}, null, function(code, data) {
+      self.setData({
+        // navList: data.nav,
+        showLive: data.showLive
+      })
+    }, function(code, data) {
+      app.dialog.msg(data.msg);
+    });
+  },
+  goNav: function (e) {
+    var id = e.currentTarget.dataset.id
+    if (id == 'c131dd1d-83c6-46c0-b535-76dc089f2637') {
+      wx.switchTab({
+        url: '../heritage/heritage',
+      })
+      return
+    }
+    // if (id == '1a140370-3e61-41d8-a2ef-72f600902460') {
+    //   wx.navigateTo({
+    //     url: '../travel/travel',
+    //   })
+    //   return
+    // }
+    if (id == '1ab9fcab-4d7e-4305-9d57-abe71cfd539a') {
+      wx.switchTab({
+        url: '../activity/activity',
+      })
+      return
+    }
+    wx.navigateTo({
+      url: '../newsPage/newsPage?id=' + id,
+    })
+  },
   doLogin: function () {
     var self = this;
     wx.login({
@@ -106,7 +144,7 @@ Page({
   doGetNewsList: function() {
     var self = this;
     app.restAjax.get(app.restAjax.path('{newsUrl}/app/newscontent/listpagenewscontentrelease', [self.data.news.newsUrl]), {
-      newsDirectoriesParentId: 'f497904b-7727-4832-891c-604c36ae4167',
+      newsDirectoriesId: '1e494b7f-d0e4-4baa-acfe-57268247e0e4',
       page: 1,
       rows: 5
     }, null, function(code, data) {
@@ -131,9 +169,15 @@ Page({
     });
   },
   goNewsDetail: function (event) {
-    wx.navigateTo({
-      url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
-    })
+    if (event.currentTarget.dataset.type == '6') {
+      wx.navigateTo({
+        url: '../newsDetail/newsDetail?content='+ event.currentTarget.dataset.content,
+      })
+    } else {
+      wx.navigateTo({
+        url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
+      })
+    }
   },
   goNewsList: function(event) {
     wx.navigateTo({
@@ -215,17 +259,36 @@ Page({
       url: '../resource/resource',
     })
   },
+  getNav: function () {
+    var self = this
+    app.restAjax.get(app.restAjax.path('{usercenterUrl}/app/newsdirectories/listnewsdirectoriesrelease', ['http://219.159.20.131:8081/news']), {
+      directoriesParentId: '213f660a-1660-48da-b244-56de7cf5c27e'
+    }, {
+      headers: {
+        token: self.data.token
+      }
+    }, function (code, data) {
+      console.log(data)
+      self.setData({
+        navList: data
+      })
+    }, function (code, data) {
+      app.dialog.msg(data.msg);
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
     var self = this;
+    self.getNav();
     self.doLogin();
     self.doGetBanner();
     self.doGetNewsList();
     self.doGetLiveList();
     self.doGetVenueList();
     self.doGetActivityList();
+    self.getSetting()
   },
 
   /**

pages/index/index.wxml

@@ -1,167 +1,140 @@
-<view class="swiper-box">
-  <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" >
-    <swiper-item class="swiper-item" wx:for="{{news.bannerList}}" bindtap="goNewsDetail"  data-template-record-url="{{item.templateRecordUrl}}" wx:for-index="idx" wx:for-item="item" wx:key="bannerList">
-      <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" class="swiper-img" wx:key="swiperImg"></image>
-    </swiper-item>
-  </swiper>
-</view>
-<view class="tab">
-  <view class="tab-box" bindtap="goNewsList" data-type="2">
-    <image src="../../images/tab6.png"></image>
-    <view class="tab-title">展览展示</view>
+<view class="container">
+  <view class="swiper-box">
+    <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" >
+      <swiper-item class="swiper-item" wx:for="{{news.bannerList}}" bindtap="goNewsDetail"  data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:for-index="idx" wx:for-item="item" wx:key="bannerList">
+        <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" class="swiper-img" wx:key="swiperImg"></image>
+      </swiper-item>
+    </swiper>
   </view>
-  <view class="tab-box" bindtap="goNewsList" data-type="1">
-    <image src="../../images/tab7.png"></image>
-    <view class="tab-title">文化动态</view>
-  </view>
-  <view class="tab-box" bindtap="goVolunteer">
-    <image src="../../images/tab1.png"></image>
-    <view class="tab-title">志愿者服务</view>
-  </view>
-  <view class="tab-box" bindtap="goActivity">
-    <image src="../../images/tab2.png"></image>
-    <view class="tab-title">精彩活动</view>
-  </view>
-  <view class="tab-box" bindtap="goVenue">
-    <image src="../../images/tab3.png"></image>
-    <view class="tab-title">场馆导航</view>
-  </view>
-  <view class="tab-box" bindtap="goHeritage">
-    <image src="../../images/tab4.png"></image>
-    <view class="tab-title">非遗文化</view>
-  </view>
-  <view class="tab-box" bindtap="goBroadcast">
-    <image src="../../images/tab5.png"></image>
-    <view class="tab-title">直播点播</view>
-  </view>
-  <view class="tab-box" bindtap="goTrain">
-    <image src="../../images/tab5.png"></image>
-    <view class="tab-title">在线培训</view>
-  </view>
-  <view class="tab-box" bindtap="goTravel">
-    <image src="../../images/tab6.png"></image>
-    <view class="tab-title">文化旅游</view>
-  </view>
-  <view class="tab-box" bindtap="goResource">
-    <image src="../../images/tab4.png"></image>
-    <view class="tab-title">数图资源</view>
-  </view>
-</view>
-<view class="recommend">
-  <view class="public-title">
-    <view class="title-text">
-      <image src="../../images/selected-l.png" class="selected-l"></image>
-      精彩推荐
-      <image src="../../images/selected-r.png" class="selected-r"></image>
+  <view class="tab">
+    <view class="tab-box" data-id="{{item.newsDirectoriesId}}" wx:for="{{navList}}" bindtap="goNav" wx:key="index">
+      <image src="{{news.newsUrl + '/route/file/downloadfile/true/' + item.directoriesPhoto}}"></image>
+      <view class="tab-title">{{item.directoriesName}}</view>
     </view>
   </view>
-  <view class="recommend-container">
-    <view class="recommend-box" wx:for="{{venue.venueList}}" bindtap="goVenueDetail" data-venues-info-Id="{{item.venuesInfoId}}" wx:for-index="index" wx:for-item="item" wx:key="venueList">
-      <image src="{{venue.venueUrl}}/route/file/downloadfile/true/{{item.venuePanoramaArray[0]}}"></image>
-    </view>
-    <view class="recommend-box" wx:for="{{activity.activityList}}" bindtap="goActivityDetail" data-activity-library-id="{{item.activityLibraryId}}" wx:for-index="index" wx:for-item="item" wx:key="activityList">
-      <image src="{{activity.activityUrl}}/route/file/downloadfile/true/{{item.activityImageArray[0]}}"></image>
-    </view>
-  </view>
-</view>
-<view class="news">
-  <view class="public-title">
-    <view class="title-text">
-      <image src="../../images/selected-l.png" class="selected-l"></image>
-      文化动态
-      <image src="../../images/selected-r.png" class="selected-r"></image>
-    </view>
-  </view>
-  <view wx:for="{{news.newsList}}" wx:for-index="idx" wx:for-item="item" wx:key="newsList">
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_1'}}">
-      <view class="news-title">{{item.newsContentTitle}}</view>
-      <view class="news-small-pic">
-        <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
-      </view>
-      <view class="news-info">
-        <text>来源：{{item.newsContentResource}}</text>
-        <text>{{item.newsContentPublishTime}}</text>
+  <view class="recommend">
+    <view class="public-title">
+      <view class="title-text">
+        精彩推荐
       </view>
     </view>
-    <view class="news-box transverse-news" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_2'}}">
-      <view class="news-row-img">
-        <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
+    <view class="recommend-container">
+      <view class="recommend-box" wx:for="{{venue.venueList}}" bindtap="goVenueDetail" data-venues-info-Id="{{item.venuesInfoId}}" wx:for-index="index" wx:for-item="item" wx:key="venueList">
+        <image src="{{venue.venueUrl}}/route/file/downloadfile/true/{{item.venuePanoramaArray[0]}}"></image>
+        <view class="recommend-info">
+          <view class="recommend-title">{{item.venueName}}</view>
+          <view class="recomment-text">
+            <image src="../../images/phone-g.png"></image>
+            {{item.venueTelephone}}
+          </view>
+          <view class="recomment-text time">
+            <image src="../../images/time-g.png"></image>
+            {{item.businessHours}}
+          </view>
+        </view>
       </view>
-      <view class="news-row-info">
+      <!-- <view class="recommend-box" wx:for="{{activity.activityList}}" bindtap="goActivityDetail" data-activity-library-id="{{item.activityLibraryId}}" wx:for-index="index" wx:for-item="item" wx:key="activityList">
+        <image src="{{activity.activityUrl}}/route/file/downloadfile/true/{{item.activityImageArray[0]}}"></image>
+      </view> -->
+    </view>
+  </view>
+  <view class="news">
+    <view class="public-title">
+      <view class="title-text">
+        政务信息
+      </view>
+    </view>
+    <view wx:for="{{news.newsList}}" wx:for-index="idx" wx:for-item="item" wx:key="newsList">
+      <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" wx:if="{{item.typesettingCode == 'key_1'}}">
+        <view class="news-title">{{item.newsContentTitle}}</view>
+        <view class="news-small-pic">
+          <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
+        </view>
+        <view class="news-info">
+          <text>来源：{{item.newsContentResource}}</text>
+          <text>{{item.newsContentPublishTime}}</text>
+        </view>
+      </view>
+      <view class="news-box transverse-news img-text img-left" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_2'}}">
+        <view class="news-row-img">
+          <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
+        </view>
+        <view class="news-row-info">
+          <view class="news-title">{{item.newsContentTitle}}</view>
+          <view class="news-info">
+            <text>来源：{{item.newsContentResource}}</text>
+            <text>{{item.newsContentPublishTime}}</text>
+          </view>
+        </view>
+      </view>
+      <view class="news-box transverse-news" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_3'}}">
+        <view class="news-row-info">
+          <view class="news-title">{{item.newsContentTitle}}</view>
+          <view class="news-info">
+            <text>来源：{{item.newsContentResource}}</text>
+            <text>{{item.newsContentPublishTime}}</text>
+          </view>
+        </view>
+        <view class="news-row-img">
+          <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
+        </view>
+      </view>
+      <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_4'}}">
+        <view class="news-title">{{item.newsContentTitle}}</view>
+        <view class="news-big-pic">
+          <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
+        </view>
+        <view class="news-info">
+          <text>来源：{{item.newsContentResource}}</text>
+          <text>{{item.newsContentPublishTime}}</text>
+        </view>
+      </view>
+      <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_5'}}">
         <view class="news-title">{{item.newsContentTitle}}</view>
         <view class="news-info">
           <text>来源：{{item.newsContentResource}}</text>
           <text>{{item.newsContentPublishTime}}</text>
         </view>
       </view>
-    </view>
-    <view class="news-box transverse-news" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_3'}}">
-      <view class="news-row-info">
+      <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_6'}}">
         <view class="news-title">{{item.newsContentTitle}}</view>
+        <view class="news-big-pic">
+          <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
+          <image src="../../images/play.png" class="play-btn"></image>
+        </view>
         <view class="news-info">
           <text>来源：{{item.newsContentResource}}</text>
           <text>{{item.newsContentPublishTime}}</text>
         </view>
       </view>
-      <view class="news-row-img">
-        <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
-      </view>
-    </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_4'}}">
-      <view class="news-title">{{item.newsContentTitle}}</view>
-      <view class="news-big-pic">
-        <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
-      </view>
-      <view class="news-info">
-        <text>来源：{{item.newsContentResource}}</text>
-        <text>{{item.newsContentPublishTime}}</text>
-      </view>
-    </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_5'}}">
-      <view class="news-title">{{item.newsContentTitle}}</view>
-      <view class="news-info">
-        <text>来源：{{item.newsContentResource}}</text>
-        <text>{{item.newsContentPublishTime}}</text>
-      </view>
-    </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_6'}}">
-      <view class="news-title">{{item.newsContentTitle}}</view>
-      <view class="news-big-pic">
-        <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
-        <image src="../../images/play.png" class="play-btn"></image>
-      </view>
-      <view class="news-info">
-        <text>来源：{{item.newsContentResource}}</text>
-        <text>{{item.newsContentPublishTime}}</text>
-      </view>
-    </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_7'}}">
-      <view class="news-title">{{item.newsContentTitle}}</view>
-      <view class="news-info voice-box">
-        <text>来源：{{item.newsContentResource}}</text>
-        <text>{{item.newsContentPublishTime}}</text>
-        <image src="../../images/play.png"></image>
+      <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_7'}}">
+        <view class="news-title">{{item.newsContentTitle}}</view>
+        <view class="news-info voice-box">
+          <text>来源：{{item.newsContentResource}}</text>
+          <text>{{item.newsContentPublishTime}}</text>
+          <image src="../../images/play.png"></image>
+        </view>
       </view>
     </view>
   </view>
-</view>
-<view class="broadcast">
-  <view class="public-title">
-    <view class="title-text">
-      <image src="../../images/selected-l.png" class="selected-l"></image>
-      直播专区
-      <image src="../../images/selected-r.png" class="selected-r"></image>
+  <!-- <view class="broadcast" wx:if="{{showLive}}">
+    <view class="public-title">
+      <view class="title-text">
+        直播专区
+      </view>
     </view>
-  </view>
-  <view class="broadcast-container">
-    <view class="broadcast-box" bindtap="goBroadcastDetail" data-live-plan-id="{{item.livePlanId}}"  wx:for="{{live.liveList}}" wx:for-index="index" wx:for-item="item" wx:key="liveList">
-      <image src="{{live.liveUrl}}/route/file/downloadfile/true/{{item.livePlanPhoto}}"></image>
-      <view class="broadcast-text">{{item.livePlanName}}</view>
-      <view class="broadcast-status">直播中</view> 
-      <view class="broadcast-status" wx:if="{{item.liveStatus == 0}}">已结束</view> 
-      <view class="broadcast-status" wx:elif="{{item.liveStatus == 1}}">未开始</view> 
-      <view class="broadcast-status" wx:elif="{{item.liveStatus == 2}}">直播中</view> 
-      <view class="broadcast-status" wx:else>错误</view> 
+    <view class="broadcast-container">
+      <view class="broadcast-box" bindtap="goBroadcastDetail" data-live-plan-id="{{item.livePlanId}}"  wx:for="{{live.liveList}}" wx:for-index="index" wx:for-item="item" wx:key="liveList">
+        <view class="broadcast-img">
+          <image src="{{live.liveUrl}}/route/file/downloadfile/true/{{item.livePlanPhoto}}"></image>
+          <view class="broadcast-status">直播中</view> 
+          <view class="broadcast-status" wx:if="{{item.liveStatus == 0}}">已结束</view> 
+          <view class="broadcast-status" wx:elif="{{item.liveStatus == 1}}">未开始</view> 
+          <view class="broadcast-status" wx:elif="{{item.liveStatus == 2}}">直播中</view> 
+          <view class="broadcast-status" wx:else>错误</view> 
+        </view>
+        <view class="broadcast-text">{{item.livePlanName}}</view>
+      </view>
     </view>
-  </view>
+  </view> -->
 </view>

pages/index/index.wxss

@@ -1,6 +1,7 @@
 .swiper-box, .swiper-img, swiper{
   width: 100%;
   height: 330rpx;
+  border-radius: 20rpx;
 }
 .tab{
   padding: 30rpx;
@@ -8,6 +9,8 @@
   border-bottom: 5px solid #FBFBFB;
   flex-wrap: nowrap;
   overflow-x: scroll;
+  background-color: #fff;
+  margin-top: 30rpx;
 }
 .tab-box{
   flex-shrink: 0;
@@ -15,13 +18,14 @@
   width: 25%;
 }
 .tab-box image{
-  width: 65rpx;
-  height: 65rpx;
+  width: 60rpx;
+  height: 60rpx;
 }
 .tab-title{
   font-size: 28rpx;
 }
 .recommend{
+  margin-top: 30rpx;
   padding: 30rpx;
   border-bottom: 5px solid #FBFBFB;
 }
@@ -32,27 +36,25 @@
 }
 .recommend-box{
   flex-shrink: 0;
-  width: 220rpx;
-  height: 130rpx;
+  width: 270rpx;
+  height: 270rpx;
   border-radius: 10rpx;
   overflow: hidden;
   position: relative;
   margin-right: 30rpx;
+  box-shadow: 0px 2px 8px 0px rgba(35, 24, 21, 0.1);
+  background-color: #fff;
 }
 .recommend-box image{
   width: 100%;
-  height: 100%;
-}
-.public-title{
-  text-align: center;
+  height: 130rpx;
 }
 .title-text{
   display: inline-block;
   font-size: 32rpx;
-  color: #9F1512;
-  padding: 0 20rpx 0;
-  position: relative;
+  color: #122939;
   margin-bottom: 15rpx;
+  font-weight: bold;
 }
 .title-text image{
   position: absolute;
@@ -67,7 +69,7 @@
   right: 0;
 }
 .news{
-  padding: 30rpx;
+  padding: 30rpx 0;
   border-bottom: 5px solid #FBFBFB;
 }
 .news-box{
@@ -75,6 +77,7 @@
   border-bottom: 1px solid #EBEBEB;
   display: flex;
   flex-direction: column;
+  background-color: #fff;
 }
 .news-title{
   color: #242424;
@@ -127,35 +130,31 @@
 .broadcast-box{
   flex-shrink: 0;
   width: 49%;
-  border-radius: 10rpx;
-  overflow: hidden;
-  height: 185rpx;
   margin-bottom: 15rpx;
+}
+.broadcast-img{
+  height: 185rpx;
   position: relative;
 }
 .broadcast-box image{
   width: 100%;
   height: 100%;
+  border-radius: 10rpx;
 }
 .broadcast-text{
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
   padding: 5rpx 10rpx;
-  font-size: 26rpx;
-  background: rgba(0,0,0,0.6);
-  color: #fff;
+  font-size: 28rpx;
+  color: #122939;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 .broadcast-status{
   position: absolute;
-  top: 10rpx;
-  right: 10rpx;
+  bottom: 10rpx;
+  left: 10rpx;
   padding: 5rpx;
-  background: #9F1512;
+  background: linear-gradient(90deg, rgba(9, 86, 224, 0.97), rgba(65, 127, 237, 0.97));
   color: #fff;
   font-size: 26rpx;
   border-radius: 10rpx;
@@ -260,4 +259,67 @@
   transform: translate(-50%, -50%);
   width: 80rpx;
   height: 80rpx;
+}
+.container{
+  padding: 20rpx;
+  background-color: #fafafa;
+}
+.recommend-info{
+  padding: 5rpx 15rpx 15rpx;
+}
+.recommend-title{
+  font-size: 28rpx;
+  color: #122939;
+  font-weight: bold;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.recomment-text{
+  font-size: 24rpx;
+  color: #999;
+  margin-top: 10rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.recomment-text image{
+  width: 16rpx;
+  height: 20rpx;
+}
+.recomment-text.time image{
+  width: 20rpx;
+  height: 20rpx;
+  vertical-align: top;
+  margin-top:6rpx;
+  display: inline-block;
+}
+.img-text{
+  height: 180rpx;
+  padding: 30rpx;
+  position: relative;
+  background-color: #fff;
+  margin-top: 50rpx;
+  border-bottom: none;
+  box-shadow: 0px 2px 8px 0px rgba(35, 24, 21, 0.1);
+  border-radius: 10rpx;
+}
+.img-text .news-row-info{
+  width: 60%;
+  position: absolute;
+  top: 30rpx;
+  right: 30rpx;
+}
+.img-text  .news-row-img{
+  position: absolute;
+  left: 30rpx;
+  bottom: 30rpx;
+}
+.img-text  .news-row-img{
+  height: 230rpx;
+}
+.img-text  .news-row-img image{
+  width: 100%;
+  height:230rpx;
+  border-radius: 10rpx;
 }

pages/myActivity/myActivity.wxml

@@ -1,6 +1,6 @@
 <view class="team">
   <view class="team-box" bindtap="toTeamDetail"
-     wx:for="{{dataMap}}">
+     wx:for="{{dataMap}}" wx:key="index">
     <view class="name-join">
       <view class="name">{{item.activityTitle}}</view>
     </view>

pages/myFriendCircle/myFriendCircle.js

@@ -1,116 +0,0 @@
-// pages/friendCircle/friendCircle.js
-var app = getApp();
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    usercenterUrl: app.usercenterUrl,
-    socialUrl: app.socialUrl,
-    momentsList: [],
-    currentPage: 1,
-    rows: 20
-  },
-  doGetMomentsList: function(page) {
-    var self = this;
-    app.dialog.loading('正在加载');
-    app.restAjax.get(app.restAjax.path('{socialUrl}/app/moments/listpagemomentsofpublicrelease', [self.data.socialUrl]), {
-      page: page,
-      rows: self.data.rows
-    }, null, function(code, data) {
-      if(data.rows.length == 0) {
-        app.dialog.msg('暂无数据');
-        return;
-      }
-      for(var i = 0, item; item = data.rows[i++];) {
-        if(item.type === 'photo') {
-          var photos = item.photos.split(',');
-          var photoArray = [];
-          for(var j = 0, jItem; jItem = photos[j++];) {
-            if(jItem.length != 0) {
-              photoArray.push(jItem);
-            }
-          }
-          item.photoArray = photoArray;
-        }
-      }
-      var momentsArray;
-      if(page <= 1) {
-        momentsArray = data.rows;
-      } else {
-        momentsArray = self.data.news.newsList;
-        momentsArray = momentsArray.concat(data.rows);
-      }
-      self.setData({
-        currentPage: page,
-        momentsList: momentsArray
-      })
-    }, function(code, data) {
-      app.dialog.msg(data.msg);
-    }, function() {
-      wx.stopPullDownRefresh();
-      wx.hideLoading();
-    });
-  },
-  newFriendCircle: function () {
-    wx.navigateTo({
-      url: '../newFriendCircle/newFriendCircle',
-    })
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.doGetMomentsList(1);
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-    this.doGetMomentsList(1);
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-    this.doGetMomentsList(this.data.currentPage + 1);
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
-})

pages/myFriendCircle/myFriendCircle.wxml

@@ -1,54 +0,0 @@
-<view class="friend-circle" wx:for="{{momentsList}}" wx:for-item="item" wx:for-index="index" wx:key="momentsList">
-  <view class="friend-circle-box" wx:if="{{item.type === 'text'}}">
-    <view class="avatar">
-      <image src="{{usercenterUrl}}/app/user/downloadavatar/{{item.creator}}"></image>
-    </view>
-    <view class="content">
-      <view class="name">{{item.creatorName}}</view>
-      <view class="text">{{item.content}}</view>
-      <view class="date">{{item.gmtCreate}}</view>
-    </view>
-  </view>
-  <view class="friend-circle-box" wx:if="{{item.type === 'photo' && item.photoArray.length === 1}}">
-    <view class="avatar">
-      <image src="{{usercenterUrl}}/app/user/downloadavatar/{{item.creator}}"></image>
-    </view>
-    <view class="content">
-      <view class="name">{{item.creatorName}}</view>
-      <view class="text">{{item.content}}</view>
-      <view class="photo-one">
-        <image src="{{socialUrl}}/route/file/downloadfile/true/{{item.photoArray[0]}}"></image>
-      </view>
-      <view class="date">{{item.gmtCreate}}</view>
-    </view>
-  </view>
-  <view class="friend-circle-box" wx:if="{{item.type === 'photo' && item.photoArray.length > 1}}">
-    <view class="avatar">
-      <image src="{{usercenterUrl}}/app/user/downloadavatar/{{item.creator}}"></image>
-    </view>
-    <view class="content">
-      <view class="name">{{item.creatorName}}</view>
-      <view class="text">{{item.content}}</view>
-      <view class="photo-more">
-        <image src="{{socialUrl}}/route/file/downloadfile/true/{{photo}}" wx:for="{{item.photoArray}}" wx:for-item="photo" wx:for-index="photoIndex" wx:key="photoArray"></image>
-      </view>
-      <view class="date">{{item.gmtCreate}}</view>
-    </view>
-  </view>
-  <view class="friend-circle-box" wx:if="{{item.type === 'video'}}">
-    <view class="avatar">
-      <image src="{{usercenterUrl}}/app/user/downloadavatar/{{item.creator}}"></image>
-    </view>
-    <view class="content">
-      <view class="name">{{item.creatorName}}</view>
-      <view class="text">{{item.content}}</view>
-      <view class="video">
-        <video src="{{socialUrl}}/route/file/downloadfile/true/{{item.video}}"></video>
-      </view>
-      <view class="date">{{item.gmtCreate}}</view>
-    </view>
-  </view>
-</view>
-<view class="new-friend-circle">
-  <view class="box new" bindtap="newFriendCircle">发布</view>
-</view>

pages/myFriendCircle/myFriendCircle.wxss

@@ -1,68 +0,0 @@
-.friend-circle{
-  padding: 15rpx 30rpx;
-  border-bottom: 1px solid #DEDEDE;
-}
-.friend-circle:last-child {
-  border-bottom: none;
-}
-.friend-circle-box{
-  display: flex;
-  justify-content: space-between;
-  padding-bottom: 10rpx;
-}
-
-.avatar{
-  width: 8%;
-}
-.avatar image{
-  width: 100%;
-  height: 50rpx;
-  border-radius: 50rpx;
-}
-.content{
-  width: 90%;
-}
-.name{
-  font-size: 30rpx;
-  color: #949494;
-}
-.text{
-  font-size: 32rpx;
-  color: #000;
-  margin: 10rpx 0;
-}
-.date{
-  font-size: 28rpx;
-  color: #949494;
-}
-.photo-one image{
-  width: 100%;
-}
-.photo-more image{
-  width: 32%;
-  height: 150rpx;
-  margin-right: 2%;
-  margin-bottom: 10rpx;
-}
-.photo-more image:nth-child(3n){
-  margin-right: 0;
-}
-.video video{
-  width: 100%;
-}
-.new-friend-circle{
-  position: fixed;
-  right: 30rpx;
-  bottom: 30rpx;
-}
-.box{
-  width: 100rpx;
-  height: 100rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: #9F1512;
-  color: #fff;
-  font-size: 32rpx;
-  border-radius: 50%;
-}

pages/myVolunteerActivity/myVolunteerActivity.wxml

@@ -1,18 +1,25 @@
 <view class="top-tab">
   <view class="tab-box {{type==1?'active':''}}" data-type="1" bindtap="changeTab">
-    <image src="../../images/selected-l.png" class="selected-l"></image>
     我发起
-    <image src="../../images/selected-r.png" class="selected-r"></image>
   </view>
   <view class="tab-box {{type==2?'active':''}}" data-type="2" bindtap="changeTab">
-    <image src="../../images/selected-l.png" class="selected-l"></image>
     我参加
-    <image src="../../images/selected-r.png" class="selected-r"></image>
   </view>
 </view>
 <view class="volunteer-activity">
   <view class="activity">
-    <view class="activity-box" bindtap="goDetail" data-id="{{item.volunteerServiceId}}" wx:for="{{dataMap}}">
+    <view class="activity-box">
+      <view class="activity-img">
+        <image src="../../images/big-news.png"></image>
+      </view>
+      <view class="activity-info">
+        <view class="title">
+          <view class="activity-title">许世友传奇人生视频讲座</view>
+        </view>
+        <view class="date">2020-07-15至2020-07-29</view>
+      </view>
+    </view>
+    <view class="activity-box" bindtap="goDetail" data-id="{{item.volunteerServiceId}}" wx:for="{{dataMap}}" wx:key="index">
       <view class="activity-img">
         <image src="{{item.photo}}"></image>
       </view>

pages/myVolunteerActivity/myVolunteerActivity.wxss

@@ -4,9 +4,8 @@
   left: 0;
   right: 0;
   display: flex;
-  box-shadow:0 0 17rpx 0 rgba(0,0,0,0.1);
-  border-radius:0 0 31rpx 31rpx;
   background: #fff;
+  border-bottom: 1px solid #EEE;
 }
 .tab-box{
   display: flex;
@@ -19,7 +18,7 @@
   color: #242424;
 }
 .tab-box.active{
-  color: #9F1512;
+  color: #125CE1;
 }
 .tab-box image{
   position: absolute;
@@ -89,12 +88,11 @@
   align-items: center;
   font-size: 30rpx;
   color: #fff;
-  background: #9F1512;
-  border-radius: 10rpx;
+  background: linear-gradient(90deg, rgba(21, 113, 250, 0.97), rgba(21, 183, 250, 0.97));
+  border-radius: 36rpx;
 }
 .volunteer-activity{
   margin-top: 90rpx;
-  padding: 0 30rpx;
   margin-bottom: 105rpx;
 }
 .activity{
@@ -126,12 +124,12 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  font-size: 30rpx;
-  color: #242424;
-  line-height: 40rpx;
+  font-size: 32rpx;
+  color: #122939;
+  font-weight: bold;
 }
 .date{
   margin-top: 10rpx;
-  font-size: 22rpx;
-  color: #242424;
+  font-size: 28rpx;
+  color: #999; 
 }

pages/myVolunteerTeam/myVolunteerTeam.wxml

@@ -1,7 +1,12 @@
 <view class="team">
-  <view class="team-box" bindtap="toTeamDetail" data-teamid="{{item.teamId}}" wx:for="{{otherTeamMap}}">
+  <view class="team-box" bindtap="toTeamDetail" data-teamid="{{item.teamId}}" wx:for="{{otherTeamMap}}" wx:key="index">
+    <view class="team-img">
+      <image src="../../images/avatar.png"></image>
+    </view>
     <view class="name-join">
       <view class="name">{{item.teamName}}</view>
+      <view class="slogan">团队口号：{{item.teamWatchword}}</view>
+      <view class="area">所属区域：{{item.teamCityDictionaryName}} {{item.teamCountyDictionaryName}} {{item.teamAreaDictionaryName}}</view>
       <view class="join" wx:if="{{item.checkStatus == '' && type == 1}}" data-teamid="{{item.teamId}}" bindtap="joinOrOutTeam">申请加入</view>
       <view class="join" wx:if="{{item.checkStatus == '' && type == 2}}" data-teamid="{{item.teamId}}" bindtap="joinOrOutTeam">退出</view>
       <view class="join" wx:if="{{item.checkStatus != '' && item.checkStatus == '0'}}">待审核</view>
@@ -9,7 +14,5 @@
       <view class="join" wx:if="{{item.checkStatus != '' && item.checkStatus == '2'}}">审核驳回</view>
       <view class="join" wx:if="{{item.checkStatus != '' && item.checkStatus == '3'}}">已退出 </view>
     </view>
-    <view class="slogan">团队口号：{{item.teamWatchword}}</view>
-    <view class="area">所属区域：{{item.teamCityDictionaryName}} {{item.teamCountyDictionaryName}} {{item.teamAreaDictionaryName}}</view>
   </view>
 </view>

pages/myVolunteerTeam/myVolunteerTeam.wxss

@@ -1,3 +1,6 @@
+page{
+  background-color: #fafafa;
+}
 .top-tab{
   position: fixed;
   top: 0;
@@ -39,37 +42,59 @@
   right: 100rpx;
 }
 .team{
-  padding: 0 30rpx;
+  padding: 0 20rpx;
 }
 .team-box{
-  padding: 20rpx 0;
-  border-bottom: 1px solid #EBEBEB;
-}
-.name-join{
+  padding: 30rpx 20rpx;
+  margin-top: 20rpx;
+  background: #FFFFFF;
+  box-shadow: 0px 2px 8px 0px rgba(35, 24, 21, 0.1);
+  border-radius: 20rpx;
   display: flex;
   justify-content: space-between;
-  height: 40rpx;
+}
+.team-img{
+  width: 150rpx;
+  height: 150rpx;
+  border-radius: 50%;
+  overflow: hidden;
+  flex-shrink: 0;
+}
+.team-img image{
+  width: 100%;
+  height: 100%;
+}
+.name-join{
+  flex-shrink: 0;
+  width: 470rpx;
   line-height: 40rpx;
   font-size: 32rpx;
   color: #242424;
 }
 .name{
-  width: 70%;
+  font-size: 34rpx;
+  color: #122939;
+  font-weight: bold;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 .join{
+  display: inline-block;
   padding: 0 10rpx;
-  background: rgba(159,21,18,.1);
-  color: #9F1512;
+  background: linear-gradient(90deg, rgba(21, 113, 250, 0.97), rgba(21, 183, 250, 0.97));
+  color: #fff;
   font-size: 28rpx;
   border-radius: 10rpx;
+  margin-top: 10rpx;
 }
 .slogan, .area{
-  color: #949494;
-  font-size: 26rpx;
-  margin-top: 10rpx;
+  color: #999;
+  font-size: 28rpx;
+  /* margin-top: 10rpx; */
+}
+.area{
+  color: #4D4D4D;
 }
 .new-team{
   position: fixed;

pages/newTeam/newTeam.wxml

@@ -4,8 +4,8 @@
     <view class="row-text avatar" bindtap="uploadPhoto" wx:if="{{photo}}">
       <image src="{{photo}}" class="row-img"></image>
     </view>
-    <view class="row-text" wx:else bindtap="uploadPhoto">
-      点击上传
+    <view class="row-text no-avatar" wx:else bindtap="uploadPhoto">
+      <image src="../../images/upload-team-avatar.png" class="upload"></image>
     </view>
   </view>
   <view class="row">
@@ -27,7 +27,7 @@
     </view>
   </view>
   <view class="row">
-    <view class="row-title">市：</view>
+    <view class="row-title">城市：</view>
     <view class="row-text">
       <picker bindchange="cityChange" value="{{teamCityIndex}}" range="{{teamCityArray}}">
         <view class="picker">
@@ -67,7 +67,7 @@
   <view class="agree">
     <checkbox-group bindchange="changeAgree">
       <label>
-        <checkbox value="{{isAgree}}" checked="{{isAgree}}" color="#9F1512" class="agree-checkbox"/>我已阅读并同意<text class="agreement" style="color: red;" data-type="team" bindtap="userAgree">《团队注册服务协议》</text>
+        <checkbox value="{{isAgree}}" checked="{{isAgree}}" color="#9F1512" class="agree-checkbox"/>我已阅读并同意<text class="agreement" style="color: #0956E0;" data-type="team" bindtap="userAgree">《团队注册服务协议》</text>
       </label>
     </checkbox-group>
   </view>

pages/newTeam/newTeam.wxss

@@ -5,6 +5,7 @@
   display: flex;
   justify-content: space-between;
   height: 90rpx;
+  border-bottom: 1px solid #EBEBEB;
 }
 .row-title{
   line-height: 90rpx;
@@ -16,9 +17,7 @@
 }
 .row-text{
   width: 75%;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #EBEBEB;
+  text-align: right;
 }
 .row-text input{
   width: 100%;
@@ -58,9 +57,9 @@ laebl{
   transform: scale(0.8,0.8);
 }
 .create-btn{
-  background: #9F1512;
+  background: linear-gradient(90deg, rgba(21, 113, 250, 0.97), rgba(21, 183, 250, 0.97));
+  border-radius: 36rpx;
   height: 80rpx;
-  border-radius: 10rpx;
   color: #fff;
   font-size: 32rpx;
   display: flex;
@@ -78,11 +77,21 @@ label{
 }
 .avatar{
   height: 150rpx;
+  box-sizing: border-box;
 }
 .avatar image{
   width: 150rpx;
-  height: 150rpx;
+  height: 130rpx;
+  margin-top: 10rpx;
+
 }
 .avatar-row{
   height: 150rpx;
+}
+.upload{
+  width: 100rpx;
+  height: 120rpx;
+}
+.avatar-row .no-avatar{
+  padding-top: 20rpx;
 }

pages/newVolunteerActivity/newVolunteerActivity.wxml

@@ -88,10 +88,10 @@
     <view class="row-title">宣传图片：</view>
     <view class="row-text" bindtap="uploadPhoto" wx:if="{{photo}}">
       <image wx:if="{{photo}}" src="{{photo}}" class="row-img"></image>
+      
     </view>
     <view class="row-text" bindtap="uploadPhoto" wx:else>
-      点击上传
-      <image src="" class="row-img"></image>
+      <image src="../../images/upload-xc.png" class="upload"></image>
     </view>
   </view>
 </view>

pages/newVolunteerActivity/newVolunteerActivity.wxss

@@ -6,18 +6,17 @@
   display: flex;
   justify-content: space-between;
   height: 90rpx;
+  border-bottom: 1px solid #EBEBEB;
 }
 .row-title{
   line-height: 90rpx;
-  color: #242424;
+  color: #808080;
   font-size: 32rpx;
   width: 24%;
 }
 .row-text{
   width: 75%;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid #EBEBEB;
+  text-align: right;
 }
 .row-text input{
   width: 100%;
@@ -32,6 +31,7 @@ picker{
   height: 230rpx;
 }
 .intro textarea{
+  width: 100%;
   padding: 26rpx 0;
   box-sizing: border-box;
   font-size: 32rpx;
@@ -46,9 +46,9 @@ picker{
   box-shadow:0 0 17rpx 0 rgba(0,0,0,0.1);
 }
 .create-btn{
-  background: #9F1512;
+  background: linear-gradient(90deg, rgba(21, 113, 250, 0.97), rgba(21, 183, 250, 0.97));
+  border-radius: 36rpx;
   height: 80rpx;
-  border-radius: 10rpx;
   color: #fff;
   font-size: 32rpx;
   display: flex;
@@ -59,10 +59,7 @@ picker{
   height: auto;
 }
 .img-row .row-text{
-  padding-top: 20rpx;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
+  padding: 30rpx 0;
 }
 .row-img{
   width: 240rpx;
@@ -72,4 +69,11 @@ picker{
 }
 .row-img:nth-child(even){
   margin-right: 0;
+}
+radio-group{
+  line-height: 90rpx;
+}
+.upload{
+  width: 110rpx;
+  height: 95rpx;
 }

pages/newsDetail/newsDetail.js

@@ -7,16 +7,25 @@ Page({
    */
   data: {
     newsContentUrl: app.newsContentUrl,
-    templateRecordUrl: null
+    templateRecordUrl: null,
+    content: '',
+    pageUrl: ''
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.setData({
-      templateRecordUrl: options.templateRecordUrl
-    })
+    if (options.content) {
+      this.setData({
+        pageUrl: options.content
+      })
+    } else {
+      this.setData({
+        pageUrl: this.data.newsContentUrl + '/' + options.templateRecordUrl
+      })
+    }
+    
   },
 
   /**

pages/newsDetail/newsDetail.wxml

@@ -1,4 +1,13 @@
-<web-view src="{{newsContentUrl}}/{{templateRecordUrl}}" wx:if="{{templateRecordUrl}}"></web-view>
+<web-view src="{{pageUrl}}" class="web-view"></web-view>
+
+
+
+
+
+
+
+
+
 <!-- <view class="news-title">
   <view class="title">银保监会印发《关于加快推进意外险改革的意见》</view>
   <view class="news-info">

pages/newsDetail/newsDetail.wxss

@@ -1,6 +1,10 @@
 /* page{
   background: #d2e0f6;
 } */
+.web-view{
+  width: 100%;
+  height: 100%;
+}
 .news-title{
   padding: 20rpx 30rpx;
 }

pages/newsList/newsList.js

@@ -32,7 +32,6 @@ Page({
   },
   doClickDictionaries: function(event) {
     var self = this;
-    console.log(event.currentTarget.dataset.newsDirectoriesId)
     self.setData({
       currentNewsDictionariesId: event.currentTarget.dataset.newsDirectoriesId
     });
@@ -48,7 +47,6 @@ Page({
   doGetNewsList: function(page, lv) {
     var self = this;
     app.dialog.loading('正在加载');
-    console.log(self.data.currentNewsDictionariesId)
     var info = {
       newsDirectoriesParentId: self.data.directoriesParentId,
       newsDirectoriesId: self.data.currentNewsDictionariesId ? self.data.currentNewsDictionariesId : '',
@@ -71,7 +69,6 @@ Page({
         currentPage: page,
         'news.newsList': newsArray
       })
-      console.log(self.data.news.newsList)
       if(data.rows.length == 0) {
         app.dialog.msg('暂无数据');
         return;
@@ -84,9 +81,15 @@ Page({
     });
   },
   goNewsDetail: function (event) {
-    wx.navigateTo({
-      url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
-    })
+    if (event.currentTarget.dataset.type == '6') {
+      wx.navigateTo({
+        url: '../newsDetail/newsDetail?content='+ event.currentTarget.dataset.content,
+      })
+    } else {
+      wx.navigateTo({
+        url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
+      })
+    }
   },
   getAreaList: function () {
     var self = this;

pages/newsList/newsList.wxml

@@ -1,32 +1,24 @@
 <view class="top-tab">
   <view class="type">
     <view class="tab-box {{!currentNewsDictionariesId ? 'active' : ''}}" bindtap="doClearCurrentNewsDictionariesId">
-      <image src="../../images/selected-l.png" class="selected-l"></image>
       全部
-      <image src="../../images/selected-r.png" class="selected-r"></image>
     </view>
     <view class="tab-box {{ item.newsDirectoriesId == currentNewsDictionariesId ? 'active' : ''}}" wx:for="{{news.newsDictionaries}}" wx:for-index="index" wx:for-item="item" wx:key="newsDictionaries" bindtap="doClickDictionaries" data-news-directories-id="{{item.newsDirectoriesId}}">
-      <image src="../../images/selected-l.png" class="selected-l"></image>
       {{item.directoriesName}}
-      <image src="../../images/selected-r.png" class="selected-r"></image>
     </view>
   </view>
 </view>
 <view class="area">
     <view class="area-box {{'' == areaId?'active': ''}}" bindtap="loadAll">
-      <image src="../../images/selected-l.png" class="selected-l"></image>
       全部
-      <image src="../../images/selected-r.png" class="selected-r"></image>
     </view>
     <view class="area-box {{item.areaId == areaId?'active': ''}}" wx:for="{{areaList}}" wx:key="index" data-area="{{item.areaId}}" data-level="{{item.areaLevel}}" bindtap="changeArea">
-      <image src="../../images/selected-l.png" class="selected-l"></image>
       {{item.areaName}}
-      <image src="../../images/selected-r.png" class="selected-r"></image>
     </view>
   </view>
 <view class="news">
   <view wx:for="{{news.newsList}}" wx:for-index="idx" wx:for-item="item" wx:key="idx">
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_1'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_1'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-small-pic">
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
@@ -36,7 +28,7 @@
         <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
-    <view class="news-box transverse-news" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_2'}}">
+    <view class="news-box transverse-news" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_2'}}">
       <view class="news-row-img">
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
       </view>
@@ -48,7 +40,7 @@
         </view>
       </view>
     </view>
-    <view class="news-box transverse-news" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_3'}}">
+    <view class="news-box transverse-news" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_3'}}">
       <view class="news-row-info">
         <view class="news-title">{{item.newsContentTitle}}</view>
         <view class="news-info">
@@ -60,7 +52,7 @@
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
       </view>
     </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_4'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_4'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-big-pic">
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
@@ -70,14 +62,14 @@
         <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_5'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_5'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-info">
         <text>来源：{{item.newsContentResource}}</text>
         <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_6'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_6'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-big-pic">
         <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
@@ -88,7 +80,7 @@
         <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
-    <view class="news-box" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_7'}}">
+    <view class="news-box" bindtap="goNewsDetail" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}" data-template-record-url="{{item.templateRecordUrl}}" wx:if="{{item.typesettingCode == 'key_7'}}">
       <view class="news-title">{{item.newsContentTitle}}</view>
       <view class="news-info voice-box">
         <text>来源：{{item.newsContentResource}}</text>

pages/newsList/newsList.wxss

@@ -14,15 +14,28 @@
   display: inline-flex;
   justify-content: center;
   align-items: center;
-  width: 30%;
+  width: 24%;
   position: relative;
   height: 90rpx;
-  font-size: 30rpx;
+  font-size: 34rpx;
   color: #242424;
   flex-shrink: 0;
+  position: relative;
 }
 .tab-box.active{
-  color: #9F1512;
+  font-weight: bold;
+}
+.tab-box.active:after{
+  content: '';
+  display: block;
+  width: 92rpx;
+  height: 8rpx;
+  background: linear-gradient(90deg, rgba(255, 164, 40, 0.97), rgba(247, 197, 46, 0.97));
+  border-radius: 4px;
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  margin-left: -46rpx;
 }
 .tab-box image{
   position: absolute;
@@ -54,19 +67,18 @@
 }
 .area-box{
   display: inline-flex;
-  width: 30%;
+  width: 24%;
   height: 90rpx;
-  /* line-height: 90rpx;
-  text-align: center; */
   align-items: center;
   justify-content: center;
-  padding: 0 20px;
+  padding: 0 10px;
   box-sizing: border-box;
   position: relative;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  font-size: 30rpx;
+  font-size: 28rpx;
+  color: #808080;
 }
 .area-box.active{
   color: #9F1512;

pages/newsPage/newsPage.js

@@ -0,0 +1,195 @@
+// pages/newsPage/newsPage.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    newsUrl: app.newsUrl,
+    pageId: '',
+    areaList: [],
+    typeList: [],
+    newsList: [],
+    curType: '',
+    curArea: '',
+    page: {
+      page: 1,
+      rows: 10,
+      newsDirectoriesId: '',
+      county: ''
+    }
+  },
+  getAreaList: function () {
+    var self = this;
+    app.restAjax.get(app.restAjax.path(app.usercenterUrl + '/app/dataarea/listareabyparentidrelease/110889', []), {}, null, function (code, data) {
+        if (code == '200') {
+          self.setData({
+            areaList: data
+          })
+        }
+      }
+    )
+  },
+  changeArea: function (e) {
+    var item = this.data.page
+    var lv = parseInt(e.currentTarget.dataset.lv) + 1
+    lv = 'area' + lv
+    item.page = 1
+    item.county = e.currentTarget.dataset.area
+    item[lv] = e.currentTarget.dataset.area
+    this.setData({
+      page: item
+    })
+    console.log(this.data.page)
+    this.getNewsList()
+  },
+  getTypeList: function () {
+    var self = this
+    app.restAjax.get(app.restAjax.path(app.newsUrl + '/app/newsdirectories/listnewsdirectoriesrelease', []),
+      {
+        directoriesParentId: self.data.pageId
+      }, null, function (code, data) {
+        if (code == '200') {
+          self.setData({
+            typeList: data,
+            curType: data[0].newsDirectoriesId,
+            ['page.newsDirectoriesId']: data[0].newsDirectoriesId,
+          })
+          self.getNewsList()
+        }
+      }
+    )
+  },
+  changeType: function (e) {
+    var self = this
+    self.setData({
+      curType: e.currentTarget.dataset.id,
+      ['page.newsDirectoriesId']: e.currentTarget.dataset.id,
+      ['page.page']: 1
+    })
+    self.getNewsList()
+  },
+  getNewsList: function () {
+    var self = this
+    app.restAjax.get(app.restAjax.path(app.newsUrl + '/app/newscontent/listpagenewscontentrelease', []),
+      self.data.page, null, function (code, data) {
+        if (code == '200') {
+          if (self.data.page.page == 1) {
+            for (let i = 0; i < data.rows.length; i++) {
+              data.rows[i].newsContentCoverList = data.rows[i].newsContentCoverList[0].contentCoverId
+            }
+            self.setData({
+              newsList: data.rows
+            })
+          } else {
+            if (data.rows.length > 0) {
+              var arr = self.data.newsList
+              for (let i = 0; i < data.rows.length; i++) {
+                data.rows[i].newsContentCoverList = data.rows[i].newsContentCoverList[0].contentCoverId
+                arr.push(data.rows[i])
+              }
+              self.setData({
+                newsList: arr
+              })
+            } else {
+              self.setData({
+                ['page.page']: self.data.page.page - 1
+              })
+              wx.showToast({
+                title: '暂无更多',
+                icon: 'none'
+              })
+            }
+          }
+        }
+      }
+    )
+  },
+  loadAll: function () {
+    var item = {
+      page: 1,
+      rows: 10,
+      newsDirectoriesId: this.data.curType,
+      county: ''
+    }
+    this.setData({
+      page: item
+    })
+    this.getNewsList()
+  },
+  goNewsDetail: function (event) {
+    if (event.currentTarget.dataset.type == '6') {
+      wx.navigateTo({
+        url: '../newsDetail/newsDetail?content='+ event.currentTarget.dataset.content,
+      })
+    } else {
+      wx.navigateTo({
+        url: '../newsDetail/newsDetail?templateRecordUrl='+ event.currentTarget.dataset.templateRecordUrl,
+      })
+    }
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      pageId: options.id,
+    })
+    this.getAreaList()
+    this.getTypeList()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    var self = this
+    this.setData({
+      ['page.page']: self.data.page.page + 1
+    })
+    this.getNewsList()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/newsPage/newsPage.wxml

@@ -0,0 +1,13 @@
+<view class="area type">
+  <view class="area-box {{curType == item.newsDirectoriesId? 'active': ''}}" bindtap="changeType" wx:for="{{typeList}}" wx:key="index" data-id="{{item.newsDirectoriesId}}">{{item.directoriesName}}</view>
+</view>
+<view class="area">
+  <view class="area-box {{'' == page.county?'active': ''}}" bindtap="loadAll">全部</view>
+  <view class="area-box {{item.areaId == page.county?'active': ''}}" wx:for="{{areaList}}" wx:key="index" data-area="{{item.areaId}}" data-lv="{{item.areaLevel}}" bindtap="changeArea">{{item.areaName}}</view>
+</view>
+<view class="news">
+  <view class="news-box" wx:for="{{newsList}}" wx:key="index" bindtap="goNewsDetail" data-template-record-url="{{item.templateRecordUrl}}" data-type="{{item.newsContentType}}" data-content="{{item.newsContentContent}}">
+    <image src="{{newsUrl + '/route/file/downloadfile/true/' + item.newsContentCoverList}}" alt=""/>
+    <view class="news-title">{{item.newsContentTitle}}</view>
+  </view>
+</view>