Commit 35217efb authored by 汪波's avatar 汪波

修改我的会员 购买记录相关适配问题

parent 4adc53b1
...@@ -44,7 +44,8 @@ AppAsset::addScript($this, '@web/assets/my_income.js'); ...@@ -44,7 +44,8 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
<?php foreach ($data as $row) { ?> <?php foreach ($data as $row) { ?>
<li> <li>
<div class="reg-time"> <div class="reg-time">
<a href="<?=\common\models\Course::url($row['order']['course_id'])?>" target="_blank"></a>课程:<?=$row['order']['course']['name']?> <a href="<?=\common\models\Course::url($row['order']['course_id'])?>" target="_blank">课程:<?=$row['order']['course']['name']?></a>
<b class="hidden-xs"><i>昵称:<?=$row['order']['user']['username']?></i></b>
<span>价格 ¥<?=$row['order']['credit']?></span></div> <span>价格 ¥<?=$row['order']['credit']?></span></div>
<div class="user-detail-box"> <div class="user-detail-box">
<div class="txt"> <div class="txt">
......
...@@ -29,11 +29,10 @@ $this->title = '我的会员'; ...@@ -29,11 +29,10 @@ $this->title = '我的会员';
<?php if ($count > 0) { ?> <?php if ($count > 0) { ?>
<div class="con-md-12"> <div class="con-md-12">
<?php foreach ($data as $row) { ?>
<ul class="user-list-main" id="userList"> <ul class="user-list-main" id="userList">
<?php foreach ($data as $row) { ?> <?php foreach ($data as $row) { ?>
<li> <li>
<div class="reg-time">昵称:<?=$row['user']['username']?> / <?=$row['user']['telephone']?><span>累计消费 ¥<?=$row['credit_total']?></span></div> <div class="reg-time">昵称:<?=$row['user']['username']?><u class="hidden-xs"> / <?=$row['user']['telephone']?></u><span>累计消费 ¥<?=$row['credit_total']?></span></div>
<div class="user-detail-box"> <div class="user-detail-box">
<div class="txt"> <div class="txt">
<p>来自:推广</p> <p>来自:推广</p>
...@@ -52,8 +51,6 @@ $this->title = '我的会员'; ...@@ -52,8 +51,6 @@ $this->title = '我的会员';
</li> </li>
<?php } ?> <?php } ?>
</ul> </ul>
<?php } ?>
<div class="text-center hide"> <div class="text-center hide">
<?=\yii\widgets\LinkPager::widget(['pagination'=>$pagination])?> <?=\yii\widgets\LinkPager::widget(['pagination'=>$pagination])?>
......
...@@ -1601,6 +1601,10 @@ textarea.input-r-control { ...@@ -1601,6 +1601,10 @@ textarea.input-r-control {
font-size: 12px; font-size: 12px;
cursor: pointer; cursor: pointer;
} }
.user-list-main li div.reg-time u {
text-decoration: none;
}
.user-list-main li div.reg-time span { .user-list-main li div.reg-time span {
display: block; display: block;
...@@ -1626,7 +1630,7 @@ textarea.input-r-control { ...@@ -1626,7 +1630,7 @@ textarea.input-r-control {
} }
.user-list-main li div.user-detail-box p { .user-list-main li div.user-detail-box p {
height: 24px; display: block;
line-height: 24px; line-height: 24px;
margin-bottom: 0; margin-bottom: 0;
} }
...@@ -1778,6 +1782,22 @@ textarea.input-r-control { ...@@ -1778,6 +1782,22 @@ textarea.input-r-control {
.buy-recode-top .col-md-4:last-child { .buy-recode-top .col-md-4:last-child {
border-bottom: none; border-bottom: none;
} }
.reg-vip-box {
margin-bottom: 10px;
}
.user-detail-box .txt p {
display: inline-block;
word-wrap:break-word;
padding-right: 80px;
}
.reg-time a {
display: inline-block;
width: 155px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
} }
.menu-mask { .menu-mask {
......
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