Skip to content

C
Compass
Commit 2244b90a by tangjinlin
Options

Merge branch 'znz_dev' into 'master' 

05-11

See merge request !4
parents b332bbad 17be7a3e
Showing with 503 additions and 281 deletions
src/wx/app.wxss
......@@ -39,7 +39,7 @@ live-player,
live-pusher,
open-data,
web-view {
font-family: "仿宋";
font-family:"PingFangSC-Thin";
font-size: 14px;
}
......
src/wx/components/top-navi/index.wxml
......@@ -4,9 +4,9 @@
<view bindtap='back' wx:if="{{back}}">
<image src='../../img/n1.png'></image>
</view>
<view bindtap='home' wx:if="{{home}}">
<!-- <view bindtap='home' wx:if="{{home}}">
<image src='../../img/n2.png'></image>
</view>
</view> -->
</view>
<view class='title' style="color:{{color}}">{{text}}</view>
</view>
......
src/wx/components/top-navi/index.wxss
......@@ -13,14 +13,14 @@
.capsule {
margin-left: 10px;
height: 30px;
background: rgba(255, 255, 255, 0.6);
border: 1px solid #ccc;
border-radius: 15px;
/* background: rgba(255, 255, 255, 0.6); */
/* border: 1px solid #ccc; */
/* border-radius: 15px; */
display: flex;
align-items: center;
}
.capsule > view {
width: 45px;
width: 20px;
height: 60%;
position: relative;
}
......@@ -29,8 +29,8 @@
border-left: 1px solid #ccc;
}
.capsule image {
width: 50%;
height: 100%;
width: 20px;
height: 20px;
position: absolute;
left: 50%;
top: 50%;
......
src/wx/img/c1.png
src/wx/img/c1.png

12.3 KB | W: | H:

src/wx/img/c1.png

18.6 KB | W: | H:

src/wx/img/c1.png
src/wx/img/c1.png
src/wx/img/c1.png
src/wx/img/c1.png
  • 2-up
  • Swipe
  • Onion skin
src/wx/img/c2.png
src/wx/img/c2.png

11.8 KB | W: | H:

src/wx/img/c2.png

19.2 KB | W: | H:

src/wx/img/c2.png
src/wx/img/c2.png
src/wx/img/c2.png
src/wx/img/c2.png
  • 2-up
  • Swipe
  • Onion skin
src/wx/img/c3.png
src/wx/img/c3.png

9.75 KB | W: | H:

src/wx/img/c3.png

19.1 KB | W: | H:

src/wx/img/c3.png
src/wx/img/c3.png
src/wx/img/c3.png
src/wx/img/c3.png
  • 2-up
  • Swipe
  • Onion skin
src/wx/img/c4.png
src/wx/img/c4.png

7.01 KB | W: | H:

src/wx/img/c4.png

19.1 KB | W: | H:

src/wx/img/c4.png
src/wx/img/c4.png
src/wx/img/c4.png
src/wx/img/c4.png
  • 2-up
  • Swipe
  • Onion skin
src/wx/img/c5.png
src/wx/img/c5.png

27.6 KB | W: | H:

src/wx/img/c5.png

19.2 KB | W: | H:

src/wx/img/c5.png
src/wx/img/c5.png
src/wx/img/c5.png
src/wx/img/c5.png
  • 2-up
  • Swipe
  • Onion skin
src/wx/pages/circle/circle.js
......@@ -11,7 +11,8 @@ Page({
active:1,
showNearCircles:0,
userCircleList:[],
circleList:[]
circleList:[],
showImg:true
},
/**
......@@ -168,14 +169,24 @@ Page({
//获取输入框的值
keywordInput(e) {
if(e.detail.value){
this.setData({
showImg: false
})
}
if(!e.detail.value){
this.setData({
showImg: true
})
}
this.setData({
kerword: e.detail.value
keyword: e.detail.value
})
},
//圈子检索
searchCircle(){
if (this.data.kerword == null || this.data.kerword=='') {
if (this.data.keyword == null || this.data.keyword=='') {
wx.showToast({
title: '请输入关键词',
icon: 'success',
......@@ -185,7 +196,7 @@ Page({
}
//获取输入框的值
wx.navigateTo({
url: '../searchCircle/searchCircle?keyword=' + this.data.kerword,
url: '../searchCircle/searchCircle?keyword=' + this.data.keyword,
})
}
})
\ No newline at end of file
src/wx/pages/circle/circle.wxml
<!--pages/log/log.wxml-->
<custom-navi text="圈子" back="{{false}}" home="{{false}}"></custom-navi>
<custom-navi text="圈子" back="{{false}}" home="{{false}}" color="#fff"></custom-navi>
<view class='quanzi'>
<view style='padding:15px 0;background:#fff'>
<view class='topQuanzi'>
<image src='../../img/search.png'></image>
<input class="input" name="keyword" placeholder="请输入圈子名称" bindinput ="keywordInput"/>
<view bindtap='searchCircle'>搜索</view>
</view>
</view>
<view class='newQuanzi'>
<view class='myQuanzi'>
<view style='color:#000'><text></text>我的圈子<view class='xinjian' bindtap='creatCircle'><image src='../../img/jia.png'></image>新建圈子</view></view>
<view class='myQuanzilist'>
<view class='listNull' wx:if="{{userCircleList==''}}">
<image src='../../img/null.png'></image>
<view>还没有加入或创建任何圈子</view>
</view>
<view wx:for="{{userCircleList}}" wx:key="{{index}}">
<view>
<image src='{{item.front_image}}'></image>
<text>{{item.circle_title}}</text>
</view>
<text bindtap="circleDetails" style='display:block;width:50px;height:20px;text-align:center;line-height:20px;border-radius:15px;font-size:12px;background:#0D76ED;color:#fff' data-index="{{item.circle_id}}">进入</text>
</view>
</view>
</view>
</view>
<view class='conQuanzi'>
<view class='top_conQuanzi'>
<image src='../../img/sanjiao.png'></image>附近志愿者圈子
</view>
<view class='quanziSearch'>
<view class='con_quanziSearch' bindtap='searchCircleNearby'>搜索</view>
</view>
<view class='con_conQuanzi'>
<view class='listNull' wx:if="{{circleList==''}}">
<image src='../../img/null.png'></image>
<view style='width:180px'>附近还没有圈子，快新建一个吧！</view>
</view>
<view class='quanziList' wx:for="{{circleList}}" wx:key="{{index}}">
<view>
<image src='{{item.front_image}}'></image>{{item.circle_title}}
<text>({{item.member_count}}人)</text>
</view>
<van-button type="default" size='mini' bind:click="joinCircle" data-index="{{item.id}}">进圈</van-button>
</view>
</view>
</view>
<van-toast id="van-toast" />
<view style='padding:15px 0;background: linear-gradient(to right, #e55b66, #ff6aa5, #ffa481);'>
<view class='topQuanzi'>
<image src='../../img/search1.png' wx:if="{{showImg}}"></image>
<input class="input" name="keyword" placeholder="搜索从这里开始" bindinput="keywordInput" placeholder-class="input_center" />
<view bindtap='searchCircle'>搜索</view>
</view>
</view>
<view class='newQuanzi'>
<view class='myQuanzi'>
<view class="title">我的圈子</view>
<view class='myQuanzilist'>
<view wx:for="{{userCircleList}}" wx:key="{{index}}">
<image class="txImg" src='{{item.front_image}}'></image>
<text>{{item.circle_title}}</text>
<text bindtap="circleDetails" style='display:block;width:50px;height:20px;text-align:center;line-height:20px;border-radius:15px;font-size:12px;background: linear-gradient(to right, #e85c6d, #fb689b);color:#fff' data-index="{{item.circle_id}}">进入</text>
</view>
<view class='xinjian' bindtap='creatCircle'>
<image src='../../img/jiahao.png'></image>
</view>
</view>
</view>
</view>
<view class='conQuanzi'>
<view class='top_conQuanzi'>附近志愿者圈子</view>
<view class='quanziSearch' >
<view class='con_quanziSearch' bindtap='searchCircleNearby' wx:if="{{circleList!=''}}">搜索</view>
<view class='con_quanziSearch1' bindtap='searchCircleNearby' wx:if="{{circleList==''}}">搜索</view>
</view>
<view class='con_conQuanzi'>
<view class='quanziList' wx:for="{{circleList}}" wx:key="{{index}}">
<view>
<image src='{{item.front_image}}'></image>{{item.circle_title}}
<text>({{item.member_count}}人)</text>
</view>
<!-- <van-button type="default" size='mini' bind:click="joinCircle" data-index="{{item.id}}">进圈</van-button> -->
<text bindtap="joinCircle" style='display:block;width:50px;height:20px;text-align:center;line-height:20px;border-radius:15px;font-size:12px;background: linear-gradient(to right, #e85c6d, #fb689b);color:#fff' data-index="{{item.id}}">进圈</text>
</view>
</view>
</view>
<van-toast id="van-toast" />
</view>
<!-- <van-tabbar active="{{ active }}" bind:change="onChange">
<van-tabbar-item>首页</van-tabbar-item>
<van-tabbar-item><view class='circle'>圈子</view></van-tabbar-item>
<van-tabbar-item>我的</van-tabbar-item>
</van-tabbar> -->
</van-tabbar> -->
\ No newline at end of file
src/wx/pages/circle/circle.wxss
/* pages/log/log.wxss */
page{
page {
width: 100%;
height: 100%;
background: #f5f5f5;
background: #fff;
}
.topQuanzi{
.topQuanzi {
width: 94%;
height: 40px;
display: flex;
align-items: center;
margin: 0 auto;
background: #f6f6f6;
border-radius: 30px;
}
.topQuanzi>image{
width: 25px;
height: 25px;
margin: 0 10px;
.topQuanzi>image {
position: absolute;
left: 17%;
width: 20px;
height: 20px;
}
.topQuanzi>input{
.topQuanzi>input {
flex: 1;
margin-left: 10px;
height: 40px;
line-height: 40px;
font-size: 14px;
background: #f6f6f6;
border-radius: 30px;
text-align: center;
}
.input_center {
text-align: center;
color: #bcbcbc;
}
.topQuanzi>view{
width: 90px;
.topQuanzi>view {
height: 40px;
text-align: center;
line-height: 40px;
font-size: 14px;
background: #0D76ED;
border-radius: 0 30px 30px 0;
font-size: 18px;
background: transparent;
margin: 0 20px;
color: #fff;
}
.newQuanzi{
.newQuanzi {
width: 100%;
background: #fff;
margin-top: 15px;
}
.btn_newQuanzi{
.btn_newQuanzi {
width: 200px;
height: 40px;
font-size: 18px;
......@@ -49,130 +62,132 @@ page{
justify-content: center;
align-items: center;
}
.btn_newQuanzi>image{
.btn_newQuanzi>image {
width: 25px;
height: 25px;
border-radius: 50%;
}
.myQuanzi{
.myQuanzi {
width: 100%;
}
.myQuanzi>view{
font-size: 14px;
.myQuanzi>view {
font-size: 16px;
color: #666;
font-weight: bolder;
box-sizing: border-box;
padding: 10px;
display: flex;
align-items: center;
flex-wrap: wrap;
}
.xinjian{
margin-left: auto;
margin-right: 5%;
.myQuanzilist {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
color: #0D76ED;
}
.xinjian>image{
width: 20px;
height: 20px;
margin-right: 5px;
}
.myQuanzi>view>text{
display: inline-block;
width: 5px;
height: 18px;
background: #f79b9b;
margin-right: 10px;
}
.myQuanzilist{
width: 100%;
}
.myQuanzilist>view{
.myQuanzilist>view {
display: flex;
justify-content: space-between;
flex-direction: column;
justify-content: center;
align-items: center;
box-sizing: border-box;
padding: 10px;
font-size: 14px;
width: 100%;
}
.myQuanzilist>view>view{
flex: 1;
display: flex;
align-items: center;
}
.myQuanzilist>view>view>image{
width: 30px;
height: 30px;
.myQuanzilist .txImg {
width: 40px;
height: 40px;
border-radius: 50%;
margin-right: 5px;
}
.listNull{
width: 100%;
display: block!important;
box-sizing: border-box;
padding-bottom: 20px;
.myQuanzilist>view>text {
margin-top: 5px;
}
.listNull>image{
display: block;
width: 80px;
height: 80px;
margin: 0 auto;
.xinjian {
width: 60px;
height: 60px;
background-color: #ffa0a5;
border-radius: 50%;
margin: 0 10px;
}
.listNull>view{
width: 150px;
margin: 0 auto;
font-size: 12px;
color: #ccc;
.xinjian image {
width: 30px;
height: 30px;
}
.conQuanzi{
.conQuanzi {
width: 100%;
background: #fff;
overflow: hidden;
margin-top: 15px;
}
.top_conQuanzi{
.top_conQuanzi {
font-size: 16px;
color: #666;
font-weight: bolder;
width: 100%;
display: flex;
align-items: center;
font-size: 14px;
margin-top: 20px;
box-sizing: border-box;
padding-left: 5px;
}
.top_conQuanzi>image{
width: 15px;
height: 15px;
margin-right: 10px;
padding: 10px;
flex-wrap: wrap;
}
.quanziSearch{
.quanziSearch {
margin-top: -25px;
width: 100%;
height: 60px;
position: relative;
position: absolute;
}
.con_quanziSearch{
.con_quanziSearch {
position: absolute;
top: 20px;
right: 20px;
top: -10px;
right: 15px;
width: 40px;
height: 40px;
line-height: 40px;
text-align: center;
font-size: 12px;
border-radius: 50%;
background: #0D76ED;
background: #eb5e76;
color: #fff;
}
.con_quanziSearch1 {
position: absolute;
top: 50px;
right: 50%;
width: 100px;
height: 100px;
margin-right: -50px;
line-height: 100px;
text-align: center;
font-size: 25px;
border-radius: 50%;
background: #eb5e76;
color: #fff;
}
.con_conQuanzi{
.con_conQuanzi {
width: 100%;
min-height: 150px;
box-sizing: border-box;
padding: 10px;
margin-bottom: 10px;
}
.quanziList{
.quanziList {
width: 100%;
height: 50px;
display: flex;
......@@ -180,18 +195,21 @@ page{
align-items: center;
font-size: 14px;
}
.quanziList>view{
.quanziList>view {
flex: 1;
display: flex;
align-items: center;
}
.quanziList>view>image{
.quanziList>view>image {
width: 30px;
height: 30px;
border: 1px solid #ccc;
border-radius: 50%;
margin-right: 5px;
}
.quanziList>view>text{
.quanziList>view>text {
margin-left: 10px;
}
\ No newline at end of file
src/wx/pages/circleDetails/circleDetails.wxml
<!--pages/testCircle/testCircle.wxml-->
<custom-navi text="圈子详情" back="{{true}}" home="{{true}}"></custom-navi>
<custom-navi text="我的圈子" back="{{true}}" home="{{true}}" bg1="#fff" bg2="#fff" bg3="#fff"></custom-navi>
<view class='testCircle'>
<view class='top_testCircle'>
<image src='{{circleDat.front_image}}'></image>
<view class='girdList'>
<view bindtap="circleEdit" wx:if="{{isOwner}}">
<image src='../../img/c1.png'></image>
<view>圈子编辑</view>
</view>
<view bindtap="circleMoments">
<image src='../../img/c5.png'></image>
<view>圈子动态</view>
</view>
<view bindtap="circleMembers">
<image src='../../img/c2.png'></image>
<view>成员管理</view>
</view>
<view bindtap="circleEvents">
<image src='../../img/c3.png'></image>
<view>活动管理</view>
</view>
<view bindtap="circleNews">
<image src='../../img/c4.png'></image>
<view>消息通知</view>
</view>
</view>
</view>
<view class='circleGonggao'>
<view class='top_circleGonggao'>
<image src='../../img/sanjiao.png'></image>圈子公告
</view>
<view class='con_circleGonggao'>
<text>{{noticeDat.title}}</text>
<image src='{{noticeDat.image}}'></image>
</view>
</view>
<view class='top_testCircle'>
<image src='{{circleDat.front_image}}'></image>
<view class='girdList'>
<view bindtap="circleEdit" wx:if="{{isOwner}}">
<image src='../../img/c1.png'></image>
<view>圈子编辑</view>
</view>
<view bindtap="circleMoments">
<image src='../../img/c2.png'></image>
<view>圈子动态</view>
</view>
<view bindtap="circleMembers">
<image src='../../img/c3.png'></image>
<view>成员管理</view>
</view>
<view bindtap="circleEvents">
<image src='../../img/c4.png'></image>
<view>活动管理</view>
</view>
<view bindtap="circleNews">
<image src='../../img/c5.png'></image>
<view>消息通知</view>
</view>
</view>
</view>
<view class='circleGonggao'>
<view class='top_circleGonggao'>
<view></view>圈子公告
</view>
<view class='con_circleGonggao'>
<text>{{noticeDat.title}}</text>
<view>
<image src='{{noticeDat.image}}' mode="widthFix" style="width:100%"></image>
</view>
</view>
</view>
<view class='circleMoment'>
<view class='top_circleMoment'>
<image src='../../img/sanjiao.png'></image>圈子动态
<view class='xinjian' bindtap='creatCircleMoment' wx:if="{{isOwner}}">
<image src='../../img/jia.png'></image>添加动态
</view>
</view>
<view class='con_circleMoment'>
<text class="con_circleMomentComment">{{momentDat.comment}}</text>
<view class='con_circleMomentImages'>
<image src='{{item}}' wx:for="{{momentDat.images}}" mode="aspectFit"></image>
</view>
</view>
</view>
<view class='circleGonggao'>
<view class='top_circleGonggao'>
<view style="background-color: #efc04c;"></view>圈子简介
</view>
<view class='con_circleGonggao'>
<text>{{circleDat.comment}}</text>
<image wx:for="{{circleDat.images}}" src='{{item}}'></image>
</view>
</view>
<view class='circleGonggao'>
<view class='top_circleGonggao'>
<image src='../../img/sanjiao.png'></image>圈子简介
</view>
<view class='con_circleGonggao'>
<text>{{circleDat.comment}}</text>
<image wx:for="{{circleDat.images}}" src='{{item}}'></image>
</view>
</view>
<view class='activefabu' bindtap='newCircleEvent' wx:if="{{isOwner}}">活动发布</view>
</view>
<view class='circleMoment'>
<view class='top_circleMoment'>
<view class="line"></view>圈子动态
<view class='xinjian' bindtap='creatCircleMoment' wx:if="{{isOwner}}">
<image src='../../img/jia.png'></image>添加动态
</view>
</view>
<view class='con_circleMoment'>
<text class="con_circleMomentComment">{{momentDat.comment}}</text>
<view class='con_circleMomentImages'>
<image src='{{item}}' wx:for="{{momentDat.images}}" mode="aspectFit"></image>
</view>
</view>
</view>
<view class='activefabu' bindtap='newCircleEvent' wx:if="{{isOwner}}">活动发布</view>
</view>
\ No newline at end of file
src/wx/pages/circleDetails/circleDetails.wxss
/* pages/testCircle/testCircle.wxss */
.girdList{
width: 98%;
.top_testCircle {
width: 100%;
margin-bottom: 40px;
}
.top_testCircle>image {
width: 100%;
border-radius: 0 0 10px 10px;
margin-bottom: 20px;
}
.girdList {
width: 95%;
margin: 0 auto;
display: flex;
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
font-size: 12px;
font-size: 10px;
}
.girdList>view{
.girdList>view {
width: 20%;
height: 70px;
display: flex;
......@@ -16,103 +28,120 @@
align-items: center;
flex-wrap: wrap;
}
.girdList>view>image{
.girdList>view>image {
width: 42px;
height: 42px;
margin-bottom: 10px;
}
.girdList>view>view{
.girdList>view>view {
width: 100%;
text-align: center;
}
.top_testCircle{
width: 100%;
border-bottom: 1px solid #ccc;
}
.top_testCircle>image{
width: 100%;
.circleGonggao {
padding: 5%;
}
.top_circleGonggao{
.top_circleGonggao {
width: 100%;
display: flex;
align-items: center;
font-size: 14px;
margin-top: 10px;
margin-bottom: 20px;
font-weight: bold;
}
.top_circleGonggao>image{
width: 12px;
height: 12px;
margin: 0 5px;
.top_circleGonggao>view {
width: 5px;
height: 20px;
margin-right: 10px;
border-radius: 5px;
background-color: #eb5e76;
}
.con_circleGonggao{
.con_circleGonggao {
width: 100%;
}
.con_circleGonggao>text{
.con_circleGonggao>text {
display: block;
font-size: 14px;
width: 90%;
margin: 0 auto;
margin-left: 15px;
}
.con_circleGonggao>image{
.con_circleGonggao>view {
display: block;
width: 90%;
margin: 10px auto;
width: 95%;
margin: 10px 0 0 15px;
}
.activefabu{
width: 150px;
height: 30px;
.activefabu {
width: 80%;
height: 40px;
text-align: center;
line-height: 30px;
font-size: 14px;
background: #0D76ED;
line-height: 40px;
font-size: 15px;
background: linear-gradient(to right, #e85c6d, #fb689b);
color: #fff;
border-radius: 15px;
border-radius: 20px;
margin: 20px auto;
}
.xinjian{
.xinjian {
margin-left: auto;
margin-right: 5%;
display: flex;
align-items: center;
color: #0D76ED;
}
.xinjian>image{
.xinjian>image {
width: 20px;
height: 20px;
margin-right: 5px;
}
.top_circleMoment{
.circleMoment {
padding: 5%;
}
.top_circleMoment {
width: 100%;
display: flex;
align-items: center;
font-size: 14px;
margin-top: 10px;
margin-bottom: 20px;
font-weight: bold;
}
.top_circleMoment>image{
width: 12px;
height: 12px;
margin: 0 5px;
.top_circleMoment .line {
width: 5px;
height: 20px;
margin-right: 10px;
border-radius: 5px;
background-color: #9cc64d;
}
.con_circleMoment{
.con_circleMoment {
width: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
}
.con_circleMoment .con_circleMomentComment{
.con_circleMoment .con_circleMomentComment {
font-size: 14px;
width: 90%;
line-height: 18px;
margin: 0 auto;
}
.con_circleMoment .con_circleMomentImages{
.con_circleMoment .con_circleMomentImages {
width: 90%;
display: flex;
flex-direction: row;
......@@ -120,8 +149,8 @@
align-items: center;
}
.con_circleMomentImages>image{
height:75px;
.con_circleMomentImages>image {
height: 75px;
margin-top: 10px;
margin-right: 5px;
}
\ No newline at end of file
src/wx/pages/index/index.wxml
......@@ -58,9 +58,10 @@
</view>
<view class='volunteers'>
<view class='topTitle' wx:if="{{isvolunteerEventList}}">
<view class='leftLine'></view>
<text class="title">志愿者活动</text>
<!-- 志愿要闻 -->
<!-- <view class='topTitle' wx:if="{{isvolunteerEventList}}">
<view class='leftLine' style="border-left: 5px solid #eb5e76;"></view>
<text class="title">志愿要闻</text>
<view class='lookmore' bindtap='moreVolunteers'>
<text>全部</text>
<image src="/img/right.png"></image>
......@@ -69,15 +70,95 @@
<view class='listActivity'>
<view class="activity" bindtap='volunteersEventDetail' wx:for="{{volunteerEventList}}" data-index='{{item.id}}' wx:key="{{index}}">
<view class='activityContent'>
<image src='/img/homePage/1.png' mode="widthFix"></image>
<text class="bottom_title">【志愿精神】武汉一线青年志愿者说：“我愿意...</text>
</view>
<view class="text1">
<view>【志愿精神】与我爱的城市共度抗疫岁月——对话90后志愿者</view>
<image src='/img/homePage/1_1.jpg'></image>
</view>
<view class="borderLine"></view>
<view class="text2">
<view>【领会精神】吉林青年志愿者宣讲总书记新年贺词，传播新时代奋进强音</view>
<image src='/img/homePage/1_2.jpg'></image>
</view>
</view>
</view> -->
<view class='topTitle'>
<view class='leftLine' style="border-left: 5px solid #eb5e76;"></view>
<text class="title">志愿要闻</text>
<view class='lookmore' bindtap='moreVolunteers'>
<text>全部</text>
<image src="/img/right.png"></image>
</view>
</view>
<view class='listActivity'>
<view class="activity" bindtap='volunteersEventDetail'>
<view class='activityContent'>
<!-- <text class="top_title">{{item.status_title}}</text> -->
<!-- <image src='{{item.front_image}}' mode="widthFix"></image>
<text class="bottom_title">{{item.title}}</text> -->
<image src='/img/homePage/1.png' mode="widthFix"></image>
<text class="bottom_title">【志愿精神】武汉一线青年志愿者说：“我愿意...</text>
</view>
<view class="text1">
<view>【志愿精神】与我爱的城市共度抗疫岁月——对话90后志愿者</view>
<image src='/img/homePage/1_1.jpg'></image>
</view>
<view class="borderLine"></view>
<view class="text2">
<view>【领会精神】吉林青年志愿者宣讲总书记新年贺词，传播新时代奋进强音</view>
<image src='/img/homePage/1_2.jpg'></image>
</view>
</view>
</view>
<!-- 最新活动 -->
<!-- <view class='topTitle' wx:if="{{isvolunteerEventList}}">
<view class='leftLine' style="border-left: 5px solid #eb5e76;"></view>
<text class="title">最新活动</text>
<view class='lookmore' bindtap='moreVolunteers'>
<text>全部</text>
<image src="/img/right.png"></image>
</view>
</view> -->
<view class='topTitle'>
<view class='leftLine' style="border-left: 5px solid #eb5e76;"></view>
<text class="title">最新活动</text>
<view class='lookmore' bindtap='moreVolunteers'>
<text>全部</text>
<image src="/img/right.png"></image>
</view>
</view>
<view class='listActivity'>
<!-- <view class="activity" bindtap='volunteersEventDetail' wx:for="{{volunteerEventList}}" data-index='{{item.id}}' wx:key="{{index}}">
<view class='activityContent'>
<text class="top_title">{{item.status_title}}</text>
<image src='{{item.front_image}}' mode="widhtFix"></image>
<image src='{{item.front_image}}' mode="widthFix"></image>
<text class="bottom_title">{{item.title}}</text>
</view>
<text class="enroll_time">报名截止：{{item.enroll_time}}</text>
</view> -->
<view class="activity" bindtap='volunteersEventDetail'>
<view class='activityContent'>
<text class="top_title">征集中</text>
<image src='/img/homePage/2.png' mode="widthFix"></image>
<text class="bottom_title">周末图书馆清洁活动</text>
</view>
<text class="enroll_time">报名截止：2020.4.21</text>
</view>
<view class="activity" bindtap='volunteersEventDetail'>
<view class='activityContent'>
<text class="top_title" style="background:#0a9a7b">已报名</text>
<image src='/img/homePage/3.png' mode="widthFix"></image>
<text class="bottom_title">周末图书馆清洁活动</text>
</view>
<text class="enroll_time">报名截止：2020.4.21</text>
</view>
</view>
<!-- 社会实践 -->
<view class='practice'>
<!-- <view class='practice'>
<view class='topTitle' wx:if="{{showSocial}}">
<view class='leftLine'></view>
<text class="title">社会实践</text>
......@@ -85,34 +166,34 @@
<view class='listActivity'>
<view class="activity" wx:for="{{socialEventList}}" bindtap='socialEventDetail' wx:key="{{index}}" data-index="{{item.event_id}}">
<view class='activityContent'>
<image src='{{item.front_image}}' mode="widhtFix"></image>
<image src='{{item.front_image}}' mode="widthFix"></image>
<text class="bottom_title">{{item.title}}</text>
</view>
<text class="enroll_time">{{item.publish_time}}</text>
</view>
</view>
</view>
</view> -->
<!-- 亲子活动 -->
<view class='qingzi'>
<!-- 在线答疑 -->
<!-- <view class='qingzi'>
<view class='topTitle' wx:if="{{showFamily}}">
<view class='leftLine'></view>
<text class="title">亲子活动</text>
<text class="title">在线答疑</text>
</view>
<view class='listActivity'>
<view class="activity" wx:for="{{familyEventList}}" bindtap='familyEventDetail' wx:key="{{index}}" data-index="{{item.event_id}}">
<view class='activityContent'>
<image src='{{item.front_image}}' mode="widhtFix"></image>
<image src='{{item.front_image}}' mode="widthFix"></image>
<text class="bottom_title">{{item.title}}</text>
</view>
<text class="enroll_time">发布时间：{{item.publish_time}}\n</text>
</view>
</view>
</view>
</view> -->
<!-- 公益课堂 wx:if="{{ismediaList}}" -->
<view class='publicWelfare'>
<view class='topTitle'>
<view class='leftLine'></view>
<view class='leftLine' style="border-left: 5px solid #eb5e76;"></view>
<text class="title">公益课堂</text>
<view class='lookmore' bindtap='moreVolunteers'>
<text>全部</text>
......@@ -120,19 +201,10 @@
</view>
</view>
<view class='listActivity'>
<view class="activity" wx:for="{{mediaList}}" wx:key="{{index}}" bindtap='classDetails' data-index="{{item.id}}">
<!-- <view class="activity" wx:for="{{mediaList}}" wx:key="{{index}}" bindtap='classDetails' data-index="{{item.id}}">
<view class='activityContent'>
<image src='{{item.front_image}}' mode="widhtFix"></image>
<image src='{{item.front_image}}' mode="widthFix"></image>
</view>
<!-- <view class='right_listPublicWelfare'>
<text class='activeTitle'>{{item.title}}</text>
<view>
<view style='padding:0px 5px 0 0;color:#0D76ED;font-size:14px;margin-right:5px'>小学课堂</view>
<image src='../../img/kefu.png'></image>
<text>{{item.view_count}}</text>
</view>
<text>主讲教师：{{item.teacher}}</text>
</view> -->
<view class="class_info">
<view>
<image src="/img/hot.png"></image>
......@@ -140,10 +212,41 @@
</view>
<view>
<image src="/img/shoucang.png"></image>
<text>小学课程</text>
<text>小学课程</text>
</view>
<text class="watch">{{item.view_count}}观看</text>
</view>
</view> -->
<view class="activity" bindtap='classDetails'>
<view class='activityContent'>
<image src='/img/homePage/4.png' mode="widthFix"></image>
</view>
<view class="class_info">
<view>
<image src="/img/hot.png"></image>
<text>主讲教师：陈老师</text>
</view>
<view>
<image src="/img/shoucang.png"></image>
<text>小学课程</text>
</view>
<text class="watch">10000 观看</text>
</view>
</view>
<view class="activity" bindtap='classDetails'>
<view class='activityContent'>
<image src='/img/homePage/5.png' mode="widthFix"></image>
</view>
<view class="class_info">
<view>
<text>主讲教师：李老师</text>
</view>
<view>
<image src="/img/shoucang.png"></image>
<text>初中课程</text>
</view>
<text class="watch">10000 观看</text>
</view>
</view>
</view>
</view>
......
src/wx/pages/index/index.wxss
......@@ -115,9 +115,9 @@
.topTitle .title {
margin-left: 10px;
font-size: 15px;
font-size: 20px;
font-weight: bolder;
color: #000;
font-weight: bold;
}
.topTitle .leftLine {
......@@ -160,6 +160,52 @@
height: 30px;
}
.listActivity .activity .text1 {
padding: 20px 10px 10px 10px;
display: flex;
flex-direction: row;
}
.listActivity .activity .borderLine {
width: 70%;
border-bottom: 1px solid #d4d4d4;
margin-left: 20px;
}
.listActivity .activity .text1 view {
width: 80%;
margin-right: 20px;
font-size: 14px;
font-weight: bolder;
display: flex;
align-items: center;
}
.listActivity .activity .text1 image {
width: 50px;
height: 50px;
}
.listActivity .activity .text2 {
padding: 10px;
display: flex;
flex-direction: row;
}
.listActivity .activity .text2 view {
width: 80%;
margin-right: 20px;
font-size: 14px;
font-weight: bolder;
display: flex;
align-items: center;
}
.listActivity .activity .text2 image {
width: 50px;
height: 50px;
}
.activityContent {
position: relative;
}
......@@ -184,7 +230,7 @@
bottom: 3px;
left: 0;
background: rgba(0, 0, 0, 0.5);
font-size: 16px;
font-size: 14px;
color: #fff;
padding: 5px 0;
font-weight: bold;
......
src/wx/project.config.json
......@@ -80,6 +80,20 @@
"pathName": "pages/donationIndex/donationIndex",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/circle/circle",
"pathName": "pages/circle/circle",
"query": "圈子",
"scene": null
},
{
"id": -1,
"name": "pages/circleDetails/circleDetails",
"pathName": "pages/circleDetails/circleDetails",
"query": "circleId=5",
"scene": null
}
]
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment