Merge branch 'master' of http://git.liuniu946.com/Kirin/mccs

app/admin/model/user/User.php

@@ -178,6 +178,8 @@ class User extends BaseModel
                 $item['extract_count_price'] = UserExtract::getUserCountPrice($item['uid']);//累计提现
                 if ($item['spread_uid']) {
                     $item['spread_uid_nickname'] = self::where('uid', $item['spread_uid'])->value('nickname') . '/' . $item['spread_uid'];
+                    if ($item['lock_spread']) $item['spread_uid_nickname'] = '<font style="color: #4cd864">[已锁定]</font>' . $item['spread_uid_nickname'];
+                    else  $item['spread_uid_nickname'] = '<font style="color: #d58512">[未锁定]</font>' . $item['spread_uid_nickname'];
                 } else {
                     $item['spread_uid_nickname'] = '无';
                 }