pdf,我的相亲

app/Admin/Controllers/Traits/WxSettingTraits/formPageMineTrait.php

@@ -52,7 +52,7 @@ HTML
             $form->html(function () {
                 return '<img src="https://img.mini.minisns.cn/hbx/tabbar/bg/mine_tip.jpg" style="width: 200px;border-radius: 10px;"/>';
             }, '');
-            $form->checkbox('app_user_grid_display_force', '强制显示')->options(['my_wallet'=>'我的钱包', 'my_used'=>'我的闲置' ,'my_vip'=>'我的会员', 'my_shop_order'=>'我的买入', 'my_shop_bag'=>'我的购物车', 'my_voter' => '我的选票', 'my_pets_adoption'=>'领养、送养'])->default(Settings::get('app_user_grid_display_force', ['my_shop_order', 'my_shop_bag']));
+            $form->checkbox('app_user_grid_display_force', '强制显示')->options(['my_wallet'=>'我的钱包', 'my_used'=>'我的闲置' ,'my_vip'=>'我的会员', 'my_shop_order'=>'我的买入', 'my_shop_bag'=>'我的购物车', 'my_voter' => '我的选票', 'my_pets_adoption'=>'领养、送养', 'my_pets_xiangqin'=>'我的相亲'])->default(Settings::get('app_user_grid_display_force', ['my_shop_order', 'my_shop_bag']));
             $form->checkbox('app_user_grid_three_display_force', '强制显示')->help('ta人视角')->options(['my_used' => 'Ta的闲置', 'my_voter' => 'Ta的选票', 'my_pets_adoption'=>'Ta的送养','my_pets_xiangqin'=>'Ta的相亲'])->default(Settings::get('app_user_grid_three_display_force', ['my_pets_adoption']));
             $form->html(function () {
                 return '<div style="background-color: powderblue;color: #414750;padding: 10px;border-radius: 5px;">内容列表样式</div>';

app/Wen/Utils/UserUtils.php

@@ -596,11 +596,12 @@ class UserUtils{
 
                 }else if($index == 'my_pets_xiangqin') {
                     $xiangqin_info = Conditions::where('user_id', $user->id)->first();
+                    if($scene == 5){ $ta = '我';}else{ $ta = 'TA';}
                     if (!isset($xiangqin_info) || $xiangqin_info->step == 0) {
                         $grid[] = [
                             'icon' => 'mini-songyanga',
-                            'title' => 'Ta的相亲',
-                            'desc' => 'ta 未发布相亲',
+                            'title' => $ta.'的相亲',
+                            'desc' => $ta.' 未发布相亲',
                             'target_type' => 6,
                             'path' => '/pagesP/pet-xiangqin/pet-xiangqin-list/index?user_id='.$user->id
                             // 'path' => '/'
@@ -608,8 +609,8 @@ class UserUtils{
                     } else {
                         $grid[] = [
                             'icon' => 'mini-songyanga',
-                            'title' => 'Ta的相亲',
-                            'desc' => 'ta的相亲',
+                            'title' => $ta.'的相亲',
+                            'desc' => $ta.'的相亲',
                             'target_type' => 6,
                             // 'path' => '/pagesP/pet-xiangqin/pet-xiangqin-list/index?user_id='.$user->id
                             'path' => '/pagesMeet/info/info?id='.$xiangqin_info->id