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

src/frontend/views/my-income/index.php

@@ -43,7 +43,9 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
     <ul class="user-list-main" id="userList">
         <?php foreach ($data as $row) { ?>
         <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="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>
@@ -60,18 +62,19 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
         <?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>
 <?php } else { ?>
 <div class="empty-data" style="margin-top:80px;">您还没有卖出课程的记录！</div>
-<?php } ?>
\ No newline at end of file
+<?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();
+        $("#userList li").find(".reg-time b").eq(activeindex).toggle();
+    });
+</script>

src/frontend/views/my-member/index.php

@@ -38,8 +38,13 @@ $this->title = '我的会员';
                 <div class="txt">
                     <p>来自：推广</p>
                     <p>时间：<?=date('Y年m月d日', $row['user']['created_at'])?></p>
+                    <?php if (!empty($row['first_order'])) { ?>
+                        <p>首次购买：<a target="_blank" href="<?=\common\models\Course::url($row['first_order']['course_id'],true)?>">《<?=$row['first_order']['course']['name']?>》</a></p>
+                    <?php } else { ?>
+                    <p>首次购买：无</p>
+                    <?php } ?>
                 </div>
-                <div class="consume">
+                <div class="consume" style="padding-top: 20px;">
                     累计消费 <br/>
                     <?=$row['credit_total']?>
                 </div>
@@ -48,13 +53,7 @@ $this->title = '我的会员';
         <?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])?>
@@ -62,4 +61,12 @@ $this->title = '我的会员';
 </div>
 <?php } else { ?>
 <div class="empty-data" style="margin-top:80px;">您还没有会员！</div>
-<?php } ?>
\ No newline at end of file
+<?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>

src/frontend/web/css/style.css

@@ -1610,7 +1610,12 @@ textarea.input-r-control {
     right: 0;
     top: 0;
     padding: 0 20px;
-    color: red;
+}
+.user-list-main li div.reg-time b {
+    font-weight: normal;
+}
+.user-list-main li div.reg-time b i {
+    padding-left: 10px;
 }
 
 .user-list-main li div.user-detail-box {
@@ -1770,6 +1775,9 @@ textarea.input-r-control {
     .buy-recode-top .col-md-4 {
         border-bottom: 1px solid #f3f3f3;
     }
+    .buy-recode-top .col-md-4:last-child {
+        border-bottom: none;
+    }
 }
 
 .menu-mask {