Revert "Revert "fix: 优化推荐用户不显示BUG""

This reverts commit eb17767f24e933b72d171a2990d6bc5ee4b4ddfe.

mini/api/user/index.js

@@ -74,6 +74,12 @@ export async function bind(id) {
   )
 }
 
+export async function parent() {
+  return request.get(
+    `user/parent`
+  )
+}
+
 export function isLogin() {
   return !!getToken()
 }
@@ -89,5 +95,6 @@ export default {
   recharge,
   collect,
   favorite,
-  vip
+  vip,
+  parent
 }

mini/pages/share/index.vue

@@ -7,7 +7,7 @@
         </view>
         <view class="base-info dir-top-wrap main-center">
           <view class="nickname">{{ userInfo.nickname }}</view>
-          <view class="parent">推荐人: {{ userInfo.parent ? userInfo.parent.nickname : '' }}</view>
+          <view class="parent">推荐人: {{ parent.nickname || '-' }}</view>
         </view>
       </view>
       <view class="withdraw-box main-between cross-center">
@@ -59,6 +59,7 @@
 <script>
 import { mapState } from 'vuex'
 import Qrcode from './components/Qrcode'
+import { parent } from '../../api/user'
 export default {
   components: { Qrcode },
   data() {
@@ -75,7 +76,8 @@ export default {
       ],
       qrcodeModal: {
         show: false
-      }
+      },
+      parent: {}
     }
   },
   computed: {
@@ -121,10 +123,18 @@ export default {
       }).catch(() => {
         this.$hideLoading()
       })
+    },
+    getParentInfo() {
+      this.$api.user.parent().then(res => {
+        this.parent = res.data
+      })
     }
   },
   onShareAppMessage() {
     return this.$util.shareMessage(this.userInfo)
+  },
+  onShow() {
+    this.getParentInfo()
   }
 }
 </script>

server/app/Http/Controllers/V1/UserController.php

@@ -155,6 +155,15 @@ class UserController extends Controller
         }
     }
 
+    public function parent()
+    {
+        if(empty(\user()->parent_id)){
+            return $this->success();
+        }
+        $parent = User::find(\user()->parent_id);
+        return $this->success($parent);
+    }
+
     // h5 绑定
     public function h5Bind()
     {

server/routes/api.php

@@ -75,6 +75,7 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\V1'], function ($api)
             $api->get('group_by_initial', 'UserController@groupByInitial'); //用户列表按照首字母分组排序，类似手机通讯录
             $api->post('feedback', 'UserController@feedback'); //问题反馈
             $api->get('info', 'UserController@info'); //用户信息
+            $api->get('parent', 'UserController@parent'); //用户信息
             $api->post('update', 'UserController@update'); //更新用户信息
             $api->post('{id}/bind', 'UserController@bind'); //绑定上级