Merge branch 'master' of http://114.215.101.231:8099/lihan/integral into juan

@@ -63,7 +63,7 @@ class FriendController extends HomeBaseController
             $total = $request->param('total');
             $total = $request->param('total');
             //获取赠送者角色、父级、当前积分和赠送密码
             //获取赠送者角色、父级、当前积分和赠送密码
             $info = Db::name('user')->field('role,parent_id,balance,integral_pwd')->where(['id' => $uid])->find();
             $info = Db::name('user')->field('role,parent_id,balance,integral_pwd')->where(['id' => $uid])->find();
-            $integral_pwd = $request->param('integral_pwd');
+            $integral_pwd = (empty($request->param('integral_pwd'))) ? $info['integral_pwd'] : $request->param('integral_pwd');
             //判断密码是否正确
             //判断密码是否正确
             if (md5($integral_pwd) != $info['integral_pwd']) {
             if (md5($integral_pwd) != $info['integral_pwd']) {
                 echo json_encode(['msg' => '密码错误', 'status' => false]);
                 echo json_encode(['msg' => '密码错误', 'status' => false]);
@@ -170,7 +170,7 @@ class FriendController extends HomeBaseController
                             $msg = '未知错误';
                             $msg = '未知错误';
                         }
                         }
 
 
-                        echo json_encode(['msg' => $msg, 'status' => $tag, 'data' => Db::name('user')->where(['id'=>session('user.id')])->value('balance')]);
+                        echo json_encode(['msg' => $msg, 'status' => $tag, 'data' => Db::name('user')->where(['id' => session('user.id')])->value('balance')]);
                         exit();
                         exit();
                     }
                     }
                 }
                 }