wesmiler 更新第5期更新代码合并

.idea/NN2021012701.iml

@@ -21,7 +21,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-message" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/ralouphie/getallheaders" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring - 副本" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/thinkcmf/cmf" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/thinkcmf/cmf-api" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/thinkcmf/cmf-app" />

.idea/php.xml

@@ -9,7 +9,6 @@
       <path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
       <path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
       <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring - 副本" />
       <path value="$PROJECT_DIR$/vendor/mtdowling/jmespath.php" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
       <path value="$PROJECT_DIR$/vendor/thinkcmf/cmf-app" />

app/api/controller/MarketController.php

@@ -453,7 +453,7 @@ class MarketController extends MarketBaseController
         $uid = input('uid', 0);
         $userId = $uid? $uid : $this->userId;
         $pageSize = input('pageSize', 50);
-        $dataList = UserBalanceLog::getIncomeRankList($pageSize, $userId);
+        $dataList = UserBalanceLog::getIncomeRankList($pageSize, $userId, 1);
         showJson(1005, 1001, $dataList);
     }
 }

app/weixin/model/UserBalanceLog.php

@@ -37,13 +37,16 @@ class UserBalanceLog extends Model
      * @return \think\Paginator
      * @throws \think\exception\DbException
      */
-    public static function getIncomeRankList($pageSize= 50, $userId=0){
+    public static function getIncomeRankList($pageSize= 50, $userId=0, $type=0){
         $dataList = UserBalanceLog::alias('ub')
             ->leftJoin('user u','u.id=ub.user_id')
             ->where(['ub.status'=> 2,'u.agent_type'=> 1,'u.agent_status'=> 1, 'u.user_type'=> 2])
             ->where('type','>', 1)
             ->where('type','<', 30)
-            ->field('u.id,u.user_nickname,u.avatar,'.db()->raw('sum(`ub`.`change`) as income'))
+            ->where(function($query) use($type){
+
+            })
+            ->field('u.id,u.user_nickname,u.sex,u.avatar,'.db()->raw('sum(`ub`.`change`) as income'))
             ->group('user_id')
             ->order(db()->raw('sum(`ub`.`change`) desc'))
             ->order('ub.user_id asc')

public/themes/default/weixin/market/rank.html

@@ -18,8 +18,8 @@
                     <span v-if="!status.loading">暂无数据</span>
                 </li>
                 <li v-else v-for="(item,k) in dataList">
-                    <div class="rank"><span :class="'rank-'+(k+1)">{{k+1}}</span></div>
-                    <div class="wodx"><img class="avatar" :src="item.avatar" onerror="this.src='__TMPL__/weixin/public/assets/img/tubiao7.png'"></div>
+                    <div class="rank"><span :class="'rank-'+(k+1)" v-text="k+1>3? (k+1) : ''"></span></div>
+                    <div class="wodx"><img class="avatar" :src="item.avatar" :onerror="getAvatar(item)"></div>
                     <div class="wodx_xim">
                         <div><h2 v-text="item.user_nickname"></h2> <span>收益<em v-text="item.income?item.income : '0.00'">0</em>元</span></div>
                     </div>

public/themes/default/weixin/public/assets/css/rank.css

@@ -60,7 +60,8 @@ body {
     margin-bottom: 15px;
     overflow: hidden;
     border-radius: 4px;
-    padding: 15px 0;
+    /*padding: 15px 0;*/
+    border: 1px solid #ffd132;
 }
 
 .shouc_lb li.loaded, .shouc_lb li.empty {
@@ -78,32 +79,39 @@ body {
     position: relative;
     vertical-align: middle;
     text-align: center;
+    margin-right: 10px;
 }
 .shouc_lb .rank span {
     font-weight: bold;
-    font-size: 24px;
     color: #555;
+    border-radius: 100%;
+    width: 36px;
+    height: 36px;
+    display: inline-block;
+    vertical-align: middle;
+    line-height: 36px;
 }
 .shouc_lb .rank .rank-1 {
-    color: #de3709;
+    background: url(../img/icon/rank1.png) no-repeat 100%/100%;
 }
 .shouc_lb .rank .rank-2 {
-    color: #e98d13;
+    background: url(../img/icon/rank2.png) no-repeat 100%/100%;
 }
 .shouc_lb .rank .rank-3 {
-    color: #eecc07;
+    background: url(../img/icon/rank3.png) no-repeat 100%/100%;
 }
 .wodx {
-    width: 72px;
-    height: 72px;
+    width: 48px;
+    height: 48px;
     background: #fff;
     margin: auto;
     float: left;
     border-radius: 100%;
-    /*margin-left: 10px;*/
+    /* margin-left: 10px; */
     position: relative;
     vert-align: middle;
     border: 1px solid #ffd132;
+    margin-top: 14px;
 }
 
 .wodx .avatar {
@@ -142,15 +150,20 @@ body {
     position: relative;
     display: inline-block;
     vertical-align: middle;
-    line-height: 72px;
+    height: 72px;
     font-size: 0;
 }
-
+.wodx_xim > div {
+    height: 100%;
+    line-height: 72px;
+}
 .wodx_xim h2 {
-    color: #333;
-    font-size: 16px;
-    font-weight: bold;
+    font-size: 14px;
     display: inline-block;
+    width: 110px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 .wodx_xim span {
     font-size: 14px;
@@ -174,11 +187,11 @@ body {
     position: relative;
     font-size: 14px;
     text-align: left;
-    min-height: 100px;
+    min-height: 72px;
 }
 
 .invite .yaoqrk {
-    height: 36px;
+    /*height: 36px;*/
     line-height: 36px;
     margin: 0 15px;
     display: block;

public/themes/default/weixin/public/assets/js/rank.js

@@ -111,5 +111,11 @@ var app = new Vue({
                 }
             }, "json");
         },
+        getAvatar: function(info){
+            var sex = info.sex;
+            sex = sex == 1? sex : 2;
+            var name = 'this.src="'+'/themes/default/weixin/public/assets/img/avatar/'+sex+'-'+(info.id%9)+'.jpg"';
+            return name;
+        }
     }
 });