Skip to content

C
Compass
Commit d133623b by biao
Options

1111

parent c8dbe0c0
Showing with 76 additions and 53 deletions
src/cn/compass/entity/CourseMediaDat.inc
......@@ -26,6 +26,8 @@ class CourseMediaDat extends CompassDynamicData
//用户是否已经购买本视频
var $haveBuy;
var $parent_category_title;
var $sub_category_title;
/**
* 构造实现。course_media_dat创建实例。
......
src/user/if/ajax_get_top_dat.php
......@@ -35,7 +35,10 @@ $userMst = $userList[0];
//判断用户身份分别获取数据
$volunteerEventList = array();
$tmpFamilyEventList = array();
$familyEventList = array();
$socialEventList = array();
$mediaList = array();
......@@ -69,7 +72,7 @@ if($userMst->role == 1) {
$param['school_no'] = $userMst->school_no;
$param['original_source'] = $userMst->original_source;
$param['delete_flg'] = false;
$familyEventList = FamilyEventDat::getList($param,'id','desc', 0, 1);
$tmpFamilyEventList = FamilyEventDat::getList($param,'id','desc', 0, 1);
}
//家校用户只显示本校社会实践
......@@ -87,7 +90,7 @@ if($userMst->role == 4 || $userMst->role == 5 || $userMst->role == 6) {
if($userMst->child_age == 1) {
$param = array();
$param['delete_flg'] = false;
$familyEventList = FamilyEventDat::getList($param,'id','desc', 0, 1);
$tmpFamilyEventList = FamilyEventDat::getList($param,'id','desc', 0, 1);
}
//7岁以上[社会实践]
if($userMst->child_age == 2) {
......@@ -97,6 +100,13 @@ if($userMst->role == 4 || $userMst->role == 5 || $userMst->role == 6) {
}
}
if(!empty($tmpFamilyEventList)) {
foreach($tmpFamilyEventList as $tmp) {
$tmp->publish_time = substr($tmp->publish_time,0,10);
$familyEventList[]= $tmp;
}
}
//公益课堂
$param = array();
$param['delete_flg'] = false;
......
src/wx/app.wxss
......@@ -55,7 +55,7 @@ video, live-player, live-pusher, open-data, web-view {
}
.activelist{
width: 95%;
height: 110px;
height: 125px;
margin: 0 auto;
display: flex;
justify-content: space-between;
......@@ -280,12 +280,12 @@ video, live-player, live-pusher, open-data, web-view {
.right_listPublicWelfare>text{
display: block;
height: 18px;
font-size: 12px;
font-size: 14px;
overflow:hidden;
text-overflow:ellipsis;
}
.right_listPublicWelfare .activeTitle{
font-size: 13px;
font-size: 15px;
font-weight: bold;
color: #000;
}
......
src/wx/pages/classDetails/classDetails.wxml
......@@ -11,7 +11,8 @@
</view>
</view>
<view class='kechengjianjie'>
课程简介<view>{{courseComment}}</view>
<view style="color:#4F4F4F">课程简介</view>
<view style="color:#969696">{{courseComment}}</view>
</view>
<view class='classfenji'>
<view class='top_classfenji'>
......
src/wx/pages/classDetails/classDetails.wxss
......@@ -17,10 +17,10 @@ page{
height: 50px;
line-height: 50px;
text-align: center;
font-size: 14px;
font-size: 15px;
}
.top_classDetails>view{
width: 80%;
width: 90%;
height: 170px;
margin: 0 auto;
display: flex;
......@@ -31,7 +31,7 @@ page{
height: 150px;
}
.top_classDetails>view>view{
width: 50%;
width: 55%;
height: 150px;
}
.top_classDetails>view>view>text{
......@@ -39,16 +39,17 @@ page{
width: 100%;
height: 40px;
font-size: 14px;
color:#4F4F4F;
}
.top_classDetails>view>view>view{
width: 100%;
font-size: 12px;
color: #666;
font-size: 14px;
color:#969696;
}
.kechengjianjie{
width: 100%;
box-sizing: border-box;
padding: 10px 10%;
padding: 10px 5%;
font-size: 14px;
line-height: 25px;
border-bottom: 1px solid #f0f0f0;
......@@ -59,8 +60,9 @@ page{
display: flex;
align-items: center;
box-sizing: border-box;
padding: 0 10%;
padding: 0 5%;
font-size: 14px;
color:#4F4F4F;
}
.top_classfenji>image{
width: 13px;
......@@ -69,25 +71,27 @@ page{
}
.bot_classfenji{
width: 100%;
font-size: 13px;
}
.bot_classfenji>view{
width: 80%;
width: 90%;
margin: 10px auto;
display: flex;
justify-content: space-between;
margin-bottom: 15px;
}
.bot_classfenji>view>view{
font-size: 14px;
padding: 4px 15px;
border-radius: 8px;
position: relative;
background: #0D76ED;
font-size:14px;
color: #fff;
}
.bot_classfenji>view>text{
flex: 1;
font-size: 14px;
color:#969696;
}
.suo{
position: absolute;
......
src/wx/pages/courseIndex/courseIndex.js
......@@ -34,7 +34,7 @@ Page({
})
}
var that=this;
wx:wx.request({
wx.request({
url: app.url+'ajax_get_course_category.php',
header: { 'content-type': 'application/json'},
success: function(res) {
......@@ -70,26 +70,6 @@ Page({
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
......
src/wx/pages/index/index.wxml
......@@ -110,19 +110,19 @@
<image src='{{item.front_image}}'></image>
</view>
<view class='right_listPractice'>
<text>{{item.title}}\n</text>
<view>
<text>{{item.title}}\n</text>
<text>{{item.content}}</text>
<text>发布人：{{item.author}}\n</text>
<text>发布时间：{{item.publish_time}}\n</text>
</view>
<text>{{item.author}}</text>
</view>
<text></text>
</view>
</view>
</view>
</view>
<!-- 公益课堂 -->
<view class='publicWelfare' wx:if="{{ismediaList}}">
<!-- 公益课堂 wx:if="{{ismediaList}}" -->
<view class='publicWelfare'>
<view class='topTitle'>
<view>
<view class='leftLine'></view>
......@@ -139,7 +139,7 @@
<view class='right_listPublicWelfare'>
<text class='activeTitle'>{{item.title}}</text>
<view>
<van-button type="default" size="mini">小学课堂</van-button>
<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>
......
src/wx/pages/volunteersEventDetail/volunteersEventDetail.wxml
......@@ -2,12 +2,24 @@
<view class='activeDetails'>
<image src='{{volunteerEventDat.front_image}}'></image>
<view class='con_activeDetails'>
<text>活动名称：{{volunteerEventDat.title}}</text>
<text>活动地点：{{volunteerEventDat.position}}</text>
<text>征集范围：{{volunteerEventDat.scope}}\n</text>
<text>活动人数：{{volunteerEventDat.max_member}}人</text>
<text>活动时长：{{volunteerEventDat.time_length}}</text>
<text>活动期限：{{volunteerEventDat.start_time}}-{{volunteerEventDat.finish_time}}</text>
<view class="row">
<text class="titleText">活动名称：</text><text class="dataText">{{volunteerEventDat.title}}</text>
</view>
<view class="row">
<text class="titleText">活动地点：</text><text class="dataText">{{volunteerEventDat.position}}</text>
</view>
<view class="row">
<text class="titleText">征集范围：</text><text class="dataText">{{volunteerEventDat.scope}}\n</text>
</view>
<view class="row">
<text class="titleText">活动人数：</text><text class="dataText">{{volunteerEventDat.max_member}}人</text>
</view>
<view class="row">
<text class="titleText">活动时长：</text><text class="dataText">{{volunteerEventDat.time_length}}</text>
</view>
<view class="row">
<text class="titleText">活动期限：</text><text class="dataText">{{volunteerEventDat.start_time}}至\n{{volunteerEventDat.finish_time}}</text>
</view>
</view>
<view class='botCon_activeDetails'>
<view>
......
src/wx/pages/volunteersEventDetail/volunteersEventDetail.wxss
......@@ -3,13 +3,26 @@
width: 100%;
}
.con_activeDetails{
width: 90%;
width: 92%;
margin: 30px auto;
}
.con_activeDetails>text{
display: block;
.con_activeDetails .row{
width: 100%;
font-size: 13px;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
text-align: left;
}
.con_activeDetails .row .titleText{
color:#4F4F4F;
wdith:100px;
margin-bottom: 15px;
}
.con_activeDetails .row .dataText{
color:#969696;
margin-bottom: 15px;
}
.botCon_activeDetails{
......@@ -18,7 +31,7 @@
border-bottom: 1px solid #ccc;
}
.botCon_activeDetails>view{
width: 180px;
width: 240px;
float: right;
color: #666;
font-size: 12px;
......@@ -27,6 +40,7 @@
display: block;
margin-bottom: 5px;
}
.activejieshao{
width: 100%;
height: 80px;
......
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