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

public/themes/admin_simpleboot3/admin/pools/presale.html

@@ -108,7 +108,7 @@
                                value="{$vo.id}" data-id="{$vo.user_id}" title="ID:{$vo.id}"></td>
                     <td>{$vo.user_id}</td>
                     <td>
-                        <img class="avatar" src="/upload/{$vo.avatar}"> <if condition="$vo['sex'] eq 1"><img class="sex" src="/static/images/male.png" alt=""><else><img class="sex" src="/static/images/fmale.png" alt=""></if> <span>{$vo['user_nickname']}</span>
+                        <img class="avatar" src="{$vo.avatar}"> <if condition="$vo['sex'] eq 1"><img class="sex" src="/static/images/male.png" alt=""><else><img class="sex" src="/static/images/fmale.png" alt=""></if> <span>{$vo['user_nickname']}</span>
                     </td>
                     <td>
                         <p class="profile">{$vo.profile_text}</p>

vendor/thinkcmf/cmf-app/src/admin/controller/PoolsController.php

@@ -77,7 +77,7 @@ class PoolsController extends AdminBaseController
             $educations = config('weixin.educations');
             $marrieds = config('weixin.marrieds');
             foreach ($datas['data'] as $k => &$item) {
-                $item['avatar'] = $item['avatar']? $item['avatar']:'';
+                $item['avatar'] = $item['avatar']? getPrevierUrl($item['avatar']):'';
 
                 $isVip = isset($item['vip_auth'])? $item['vip_auth'] : 0;
                 $vipExpire = isset($item['vip_expire'])? $item['vip_expire'] : 0;
@@ -193,7 +193,7 @@ class PoolsController extends AdminBaseController
             $educations = config('weixin.educations');
             $marrieds = config('weixin.marrieds');
             foreach ($datas['data'] as $k => &$item) {
-                $item['avatar'] = $item['avatar']? $item['avatar']:'';
+                $item['avatar'] = $item['avatar']? getPrevierUrl($item['avatar']):'';
 
                 $isVip = isset($item['vip_auth'])? $item['vip_auth'] : 0;
                 $vipExpire = isset($item['vip_expire'])? $item['vip_expire'] : 0;
@@ -309,7 +309,7 @@ class PoolsController extends AdminBaseController
             $educations = config('weixin.educations');
             $marrieds = config('weixin.marrieds');
             foreach ($datas['data'] as $k => &$item) {
-                $item['avatar'] = $item['avatar']? $item['avatar']:'';
+                $item['avatar'] = $item['avatar']? getPrevierUrl($item['avatar']):'';
 
                 $isVip = isset($item['vip_auth'])? $item['vip_auth'] : 0;
                 $vipExpire = isset($item['vip_expire'])? $item['vip_expire'] : 0;
@@ -429,7 +429,7 @@ class PoolsController extends AdminBaseController
             $educations = config('weixin.educations');
             $marrieds = config('weixin.marrieds');
             foreach ($datas['data'] as $k => &$item) {
-                $item['avatar'] = $item['avatar']? $item['avatar']:'';
+                $item['avatar'] = $item['avatar']? getPrevierUrl($item['avatar']):'';
 
                 $isVip = isset($item['vip_auth'])? $item['vip_auth'] : 0;
                 $vipExpire = isset($item['vip_expire'])? $item['vip_expire'] : 0;
@@ -547,7 +547,7 @@ class PoolsController extends AdminBaseController
             $educations = config('weixin.educations');
             $marrieds = config('weixin.marrieds');
             foreach ($datas['data'] as $k => &$item) {
-                $item['avatar'] = $item['avatar']? $item['avatar']:'';
+                $item['avatar'] = $item['avatar']? getPrevierUrl($item['avatar']):'';
 
                 $isVip = isset($item['vip_auth'])? $item['vip_auth'] : 0;
                 $vipExpire = isset($item['vip_expire'])? $item['vip_expire'] : 0;

vendor/thinkcmf/cmf/src/common.php

@@ -2785,4 +2785,17 @@ function filterEmoji($str)
         },
         $str);
     return $str;
+}
+
+/**
+ * 预览图
+ * @param $url
+ * @return string|string[]|null
+ */
+function getPrevierUrl($url){
+    if ($url) {
+        $url = preg_match("/^(http|https):\/\//", trim($url,'//')) ? $url :   '/upload/' . ltrim($url, '/');
+    }
+    $url = $url? preg_replace("/^(https|http):\/\//", '//', $url) : '';
+    return $url;
 }