0713-0105-h01

app/controller/api/Auth.php

@@ -74,7 +74,7 @@ class Auth extends Base
             if (empty($mobile)) return error("授权登录失败");
             $userInfo = [
                 "openid"    => $mobileData['openid'],
-                "nickname"  => $param['nickname'],
+                "nickname"  => $param['nickname']?removeEmoji2($param['nickname']):'',
                 "avatar"    => $param['avatar']
             ];
             $map = ["openid" => $mobileData['openid']];
@@ -103,7 +103,7 @@ class Auth extends Base
             if (empty($sessionKey)) return error("授权登录失败");
             $userInfo = [
                 "openid"    => $sessionKey['openid'],
-                "nickname"  => $param['nickname']??'',
+                "nickname"  => $param['nickname']?removeEmoji2($param['nickname']):'',
                 "avatar"    => $param['avatar']??'',
                 "create_ip" => $request->getRealIp()
             ];
@@ -112,7 +112,7 @@ class Auth extends Base
             if ($user->isEmpty()) {
                 $user->insertGetId($userInfo);
             } else {
-                $user->nickname = $param['nickname']??'';
+                $user->nickname = $param['nickname']?removeEmoji2($param['nickname']):'';
                 $user->avatar = $param['avatar']??'';
                 $user->save();
             }
@@ -139,7 +139,6 @@ class Auth extends Base
             }
             $userInfo = [
                 "openid"    => $sessionKey['openid'],
-                "nickname"  => "DY-".strtoupper(CodeExtend::random(5,3)),
                 "create_ip" => $request->getRealIp()
             ];
             $map = ["openid" => $sessionKey['openid']];

app/controller/merchant/Goods.php

@@ -155,7 +155,9 @@ class Goods extends Base
                     $skuData[$key]['specs'] = json_encode($value['specs']);
                 }
             }
-            $param['spu_id'] = CodeExtend::uniqidDate(18);
+            if (isset($param['id'])) {
+                $param['spu_id'] = CodeExtend::uniqidDate(18);
+            }
             unset($param['skuSpecs']);
             $param['line_price'] = $param['line_price'] * 100;
             if (empty($param['notification']))  return error("请最少添加一组添加使用规则");

app/controller/service/Service.php

@@ -48,14 +48,16 @@ class Service extends Base
             $param['field'] = "last_at";
             $data = $this->service->setModel()->getList($param,['user' => function($query){
                 $query->field("openid,nickname,avatar,mobile,create_at");
-            }],true,['last','avatar'],['last' => function($data,$resp) use($param){
+            }],true,['last','avatar','last_time'],['last' => function($data,$resp) use($param){
                 $last = (new SaasChatMsg)->where(["poi_id" => $resp['poi_id'],"service_id" => $param['service_id'],"openid" => $resp['openid']])->order("create_at desc")->field("content,create_at,type")->findOrEmpty();
                 if ($last->isEmpty()) {
                     return ['type' => "text","content"=>"无",'num' => 0,'time' => time(),"create_at"=> formatTime(date("Y-m-d H:i:s",time()))];
                 }
-                return ["content"=> hide_str($last['content']),'num' => 0,"create_at"=> formatTime($last['create_at']),"time"=> strtotime($last['create_at']),'type' => $last['type']];
+                return ["content"=> str_cut_ellipsis($last['content']),'num' => 0,"create_at"=> formatTime($last['create_at']),"time"=> strtotime($last['create_at']),'type' => $last['type']];
             },'avatar' => function(){
                 return "https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png";
+            },'last_time' => function($data,$resp){
+                return $resp['last_at']?date('Y-m-d',strtotime($resp['last_at'])):'-';
             }]);
             return successTrans(100010,pageFormat($data),200);
         } catch (\Throwable $th) {

app/extra/dyLife/data/BaseData.php

@@ -214,10 +214,10 @@ class BaseData extends BasicLife
                 $return = "true";
                 break;
             case "code_source_type": // 券码生成方式 "1-抖音码 2-三方码 3-预导码
-                $return = (string)$data['code_source_type'];
+                $return = $data['code_source_type']?(string)$data['code_source_type']:"1";
                 break;
             case "settle_type": // 收款方式 1-总店结算 2-分店结算
-                $return = (string)$data['code_source_type'];
+                $return = $data['code_source_type']?(string)$data['code_source_type']:"2";
                 break;
             case "limit_rule": // 限制购买
                 if ($data['limit_rule_type'] == 2) {

app/functions.php

@@ -687,4 +687,14 @@ if(! function_exists('removeEmoji2'))
         $pattern = '/[\x{1F600}-\x{1F64F}\x{1F300}-\x{1F5FF}\x{1F680}-\x{1F6FF}\x{1F1E0}-\x{1F1FF}\x{2600}-\x{26FF}\x{2700}-\x{27BF}\xFE00-\xFE0F\x{1F900}-\x{1F9FF}]/u';
         return preg_replace($pattern, '', $str);
     }
+}
+if(! function_exists('str_cut_ellipsis'))
+{
+    function str_cut_ellipsis(string $str, int $len = 20, string $dot = '...'): string
+    {
+        if (mb_strlen($str, 'UTF-8') <= $len) {
+            return $str;
+        }
+        return mb_substr($str, 0, $len, 'UTF-8') . $dot;
+    }
 }