Commit abf506c3 authored by 汪波's avatar 汪波

Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
parent 515a1d9a
...@@ -39,36 +39,37 @@ AppAsset::addScript($this, '@web/assets/my_income.js'); ...@@ -39,36 +39,37 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
<?php if ($count > 0) { ?> <?php if ($count > 0) { ?>
<div class="con-md-12"> <div class="con-md-12">
<div class="table-box">
<table class="table table-hover">
<thead>
<tr>
<th>订单</th>
<th>会员信息</th>
<th>课程</th>
<th>价格</th>
<th>状态</th>
</tr>
</thead>
<tbody>
<?php foreach ($data as $row) { ?>
<tr>
<td>
<?=$row['order']['number']?><br/>
<?=date('Y-m-d H:i', $row['order']['updated_at'])?>
</td>
<td><?=$row['order']['user']['telephone']?> / <?=$row['order']['user']['username']?></td>
<td><a href="<?=\common\models\Course::url($row['order']['course_id'])?>" target="_blank">《<?=$row['order']['course']['name']?>》</a></td>
<td>¥<?=$row['order']['credit']?></td>
<td><?=($row['status'] ? '已结算' : '未结算')?></td>
</tr>
<?php } ?>
</tbody>
</table>
<div class="text-center"> <ul class="user-list-main" id="userList">
<?=\yii\widgets\LinkPager::widget(['pagination'=>$pagination])?> <?php foreach ($data as $row) { ?>
</div> <li>
<div class="reg-time"><a href="<?=\common\models\Course::url($row['order']['course_id'])?>" target="_blank"></a>课程:<?=$row['order']['course']['name']?><span>价格 ¥<?=$row['order']['credit']?></span></div>
<div class="user-detail-box">
<div class="txt">
<p>用户:<?=$row['order']['user']['username']?> / <?=$row['order']['user']['telephone']?></p>
<p>订单:<?=$row['order']['number']?></p>
<p>时间:<?=date('Y-m-d H:i', $row['order']['updated_at'])?></p>
</div>
<div class="consume">
价格<br/>
<?=$row['order']['credit']?><br />
<span class="red-color"><?=($row['status'] ? '已结算' : '未结算')?></span>
</div>
</div>
</li>
<?php } ?>
</ul>
<script type='text/javascript'>
$("#userList li .reg-time").click(function(){
var activeindex = $("#userList li").find(".reg-time").index(this);
$("#userList li").find(".user-detail-box").eq(activeindex).toggle();
$("#userList li").find(".reg-time span").eq(activeindex).toggle();
});
</script>
<div class="text-center">
<?=\yii\widgets\LinkPager::widget(['pagination'=>$pagination])?>
</div> </div>
</div> </div>
<?php } else { ?> <?php } else { ?>
......
...@@ -28,37 +28,36 @@ $this->title = '我的会员'; ...@@ -28,37 +28,36 @@ $this->title = '我的会员';
<?php if ($count > 0) { ?> <?php if ($count > 0) { ?>
<div class="con-md-12"> <div class="con-md-12">
<div class="table-box">
<table class="table table-hover">
<thead>
<tr>
<th>注册时间</th>
<th>会员信息</th>
<th>来自</th>
<th>首次购买</th>
<th>累计消费</th>
</tr>
</thead>
<tbody>
<?php foreach ($data as $row) { ?>
<tr>
<td>2016-12-11</td>
<td><?=$row['user']['telephone']?> / <?=$row['user']['username']?></td>
<td>推广</td>
<?php if (!empty($row['first_order'])) { ?>
<td><a target="_blank" href="<?=\common\models\Course::url($row['first_order']['course_id'],true)?>">《<?=$row['first_order']['course']['name']?>》</a></td>
<?php } else { ?>
<td>无</td>
<?php } ?>
<td>¥<?=$row['credit_total']?></td>
</tr>
<?php } ?>
</tbody>
</table>
<div class="text-center hide"> <?php foreach ($data as $row) { ?>
<?=\yii\widgets\LinkPager::widget(['pagination'=>$pagination])?> <ul class="user-list-main" id="userList">
</div> <?php foreach ($data as $row) { ?>
<li>
<div class="reg-time">昵称:<?=$row['user']['username']?> / <?=$row['user']['telephone']?><span>累计消费 ¥<?=$row['credit_total']?></span></div>
<div class="user-detail-box">
<div class="txt">
<p>来自:推广</p>
<p>时间:2016-12-21</p>
</div>
<div class="consume">
累计消费 <br/>
<?=$row['credit_total']?>
</div>
</div>
</li>
<?php } ?>
</ul>
<?php } ?>
<script type='text/javascript'>
$("#userList li .reg-time").click(function(){
var activeindex = $("#userList li").find(".reg-time").index(this);
$("#userList li").find(".user-detail-box").eq(activeindex).toggle();
$("#userList li").find(".reg-time span").eq(activeindex).toggle();
});
</script>
<div class="text-center hide">
<?=\yii\widgets\LinkPager::widget(['pagination'=>$pagination])?>
</div> </div>
</div> </div>
<?php } else { ?> <?php } else { ?>
......
...@@ -41,7 +41,24 @@ a,a:hover,a:link { ...@@ -41,7 +41,24 @@ a,a:hover,a:link {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-agree:before {
content: "\e906";
}
.icon-agree-fill:before {
content: "\e907";
}
.icon-comments:before {
content: "\e909";
}
.icon-comments-fill:before {
content: "\e90a";
}
.icon-like:before {
content: "\e90b";
}
.icon-like-fill:before {
content: "\e90c";
}
.icon-jian:before { .icon-jian:before {
content: "\e906"; content: "\e906";
} }
......
...@@ -230,6 +230,24 @@ i, em { ...@@ -230,6 +230,24 @@ i, em {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-agree:before {
content: "\e906";
}
.icon-agree-fill:before {
content: "\e907";
}
.icon-comments:before {
content: "\e909";
}
.icon-comments-fill:before {
content: "\e90a";
}
.icon-like:before {
content: "\e90b";
}
.icon-like-fill:before {
content: "\e90c";
}
.icon-home:before { .icon-home:before {
content: "\e908"; content: "\e908";
} }
......
...@@ -1383,12 +1383,12 @@ textarea.input-r-control { ...@@ -1383,12 +1383,12 @@ textarea.input-r-control {
.money-vip-box i { .money-vip-box i {
position: absolute; position: absolute;
display: block; display: block;
font-size: 200px; font-size: 100px;
bottom: -50px; bottom: 20px;
left: 50%; left: 50%;
margin-left: -100px; margin-left: -50px;
z-index: 1; z-index: 1;
color: rgba(255, 255, 255, .1); color: rgba(255,255,255,.1);
} }
.table-box { .table-box {
...@@ -1581,6 +1581,70 @@ textarea.input-r-control { ...@@ -1581,6 +1581,70 @@ textarea.input-r-control {
color: #999; color: #999;
} }
/*我的会员 购买记录*/
.user-list-main {
margin: 15px;
}
.user-list-main li {
background-color: #fff;
border-radius: 3px;
margin-bottom: 15px;
}
.user-list-main li div.reg-time {
position: relative;
height: 44px;
line-height: 44px;
padding: 0 20px;
border-bottom: 1px solid #f3f3f3;
font-size: 12px;
cursor: pointer;
}
.user-list-main li div.reg-time span {
display: block;
height: 44px;
line-height: 44px;
position: absolute;
right: 0;
top: 0;
padding: 0 20px;
color: red;
}
.user-list-main li div.user-detail-box {
position: relative;
padding: 0 20px;
font-size: 12px;
display: none;
}
.user-list-main li div.user-detail-box p {
height: 24px;
line-height: 24px;
margin-bottom: 0;
}
.user-list-main li div.user-detail-box .txt {
padding: 10px 0;
}
.user-list-main li div.user-detail-box .consume {
position: absolute;
right: 0;
top: 0;
display: inline-block;
height: 100%;
border-left: 1px solid #f3f3f3;
text-align: center;
padding: 10px 20px;
line-height: 24px;
}
.red-color {
color: red;
}
/*模态框重置*/ /*模态框重置*/
.modal-content { .modal-content {
box-shadow: none; box-shadow: none;
......
This diff is collapsed.
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
售价:<small>¥</small>{{item.price}} 售价:<small>¥</small>{{item.price}}
</div> </div>
<div class="v-detail"> <div class="v-detail">
<span><i class="icon-comment-full"></i> {{item.comment_count}}</span> <span><i class="icon-comments-fill"></i> {{item.comment_count}}</span>
<span><i class="icon-fav-full"></i> {{item.favorite_count}}</span> <span><i class="icon-like-fill"></i> {{item.favorite_count}}</span>
<span><i class="icon-zan-full"></i> {{item.support_count}}</span> <span><i class="icon-agree-fill"></i> {{item.support_count}}</span>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -30,18 +30,18 @@ ...@@ -30,18 +30,18 @@
</div> </div>
<div class="video-sm-info pull-right"> <div class="video-sm-info pull-right">
<p v-if="!coursewareInfo.isPreview" class="mb-right"> <p v-if="!coursewareInfo.isPreview" class="mb-right">
<a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a> <a href="javascript:;"><i class="icon-comments"></i>{{coursewareInfo.comment_count}}</a>
<a @click="favorite" href="javascript:;"><i <a @click="favorite" href="javascript:;"><i
:class="{'icon-fav-full':coursewareInfo.isFavorite,'icon-fav-empty':!coursewareInfo.isFavorite}"></i>{{coursewareInfo.favorite_count}}</a> :class="{'icon-like-fill':coursewareInfo.isFavorite,'icon-like':!coursewareInfo.isFavorite}"></i>{{coursewareInfo.favorite_count}}</a>
<a @click="support" href="javascript:;"><i <a @click="support" href="javascript:;"><i
:class="{'icon-zan-full':coursewareInfo.isSupport,'icon-zan-empty':!coursewareInfo.isSupport}"></i>{{coursewareInfo.support_count}}</a> :class="{'icon-agree-fill':coursewareInfo.isSupport,'icon-agree':!coursewareInfo.isSupport}"></i>{{coursewareInfo.support_count}}</a>
</p> </p>
<p v-else class="mb-right"> <p v-else class="mb-right">
<a href="javascript:;"><i class="icon-comment-empty"></i>{{coursewareInfo.comment_count}}</a> <a href="javascript:;"><i class="icon-comments"></i>{{coursewareInfo.comment_count}}</a>
<a href="javascript:;"><i <a href="javascript:;"><i
:class="{'icon-fav-full':coursewareInfo.isFavorite,'icon-fav-empty':!coursewareInfo.isFavorite}"></i>{{coursewareInfo.favorite_count}}</a> :class="{'icon-like-fill':coursewareInfo.isFavorite,'icon-like':!coursewareInfo.isFavorite}"></i>{{coursewareInfo.favorite_count}}</a>
<a href="javascript:;"><i <a href="javascript:;"><i
:class="{'icon-zan-full':coursewareInfo.isSupport,'icon-zan-empty':!coursewareInfo.isSupport}"></i>{{coursewareInfo.support_count}}</a> :class="{'icon-agree-fill':coursewareInfo.isSupport,'icon-agree':!coursewareInfo.isSupport}"></i>{{coursewareInfo.support_count}}</a>
</p> </p>
<button v-if="coursewareInfo.isPreview" class="btn btn-danger m-l-20 mb-left">购买 <button v-if="coursewareInfo.isPreview" class="btn btn-danger m-l-20 mb-left">购买
......
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