Merge branch 'master' of https://git.bjtdba.com/shop/php

.vscode/sftp.json

@@ -0,0 +1,12 @@
+{
+    "name": "8.141.0.149",
+    "host": "8.141.0.149",
+    "protocol": "sftp",
+    "port": 22,
+    "username": "root",
+    "password": "hhq15801255760",
+    "remotePath": "/data/www/api.hebeiyhc.com/web",
+    "uploadOnSave": true,
+    "useTempFile": false,
+    "openSsh": false
+}

app/controller/api/user/User.php

@@ -193,6 +193,19 @@ class User extends BaseController
         }
 
     }
+
+
+    public function vr_name()
+    {
+        $uid = $this->request->uid();
+        $data = [
+            "name"=>"VR转账",
+            "url"=>'https://show.gdjbp.com/?uid=' .$uid,
+        ];
+        return app('json')->success($data);
+    }
+
+
     public function  hongbao_list(){
         $pm = $this->request->param('pm');
 
@@ -722,9 +735,15 @@ class User extends BaseController
             if ($res) {
                 //赠送积分 完善实名送20个积分，同时送邀请人20个积
                 $this->sign_add($member_id, 20,1,'完善实名系统赠送20个积分','','');
+<<<<<<< HEAD
                 $member_info = Db::name('user')->where( array('uid' => $member_id) )->find(); 
                 if($member_info['spread_uid']){
                      //首次邀请好友奖励积分
+=======
+                $member_info = Db::name('user')->where( array('uid' => $member_id) )->find();
+                if($member_info['spread_uid']){
+                    //首次邀请好友奖励积分
+>>>>>>> 5a864c5d52463e1d71d2e80b95a91a2d09015473
                     $spreadUid = $member_info['spread_uid'];
                     $this->sign_add($spreadUid, 20,1,'好友完善实名系统赠送20个积分','','');
                 }
@@ -739,7 +758,11 @@ class User extends BaseController
     }
 
 
+<<<<<<< HEAD
         /**
+=======
+    /**
+>>>>>>> 5a864c5d52463e1d71d2e80b95a91a2d09015473
      * @param int $uid 用户ID
      * @param string $score 积分
      * @param int $status 积分状态
@@ -3235,7 +3258,7 @@ class User extends BaseController
      * 转VR
      */
     public function transition_vr()
-    { 
+    {
         $uid = $this->request->uid();
         $user = $this->request->userInfo();
         $type = $this->request->param('type', 'brokerage');
@@ -3243,11 +3266,11 @@ class User extends BaseController
         if ($type == 'brokerage') {
             $brokerage_price = Db::name('user')->where('uid', $uid)->value('brokerage_price');
             $no_clear_amount = Db::name('user_bill')
-            ->where('uid', $uid)
-            ->where('commission_type', '<>', 5)
-            ->where('pm', 1)
-            ->where('status', 0)
-            ->sum('number');
+                ->where('uid', $uid)
+                ->where('commission_type', '<>', 5)
+                ->where('pm', 1)
+                ->where('status', 0)
+                ->sum('number');
             $clear_amount = $brokerage_price - $no_clear_amount;
             if ($user['brokerage_price'] < (systemConfig('withdrawal_money'))){
                 return app('json')->fail('未到达提现最低额度');
@@ -3287,20 +3310,20 @@ class User extends BaseController
      * 转VR记录
      */
     public function transition_vr_log()
-    { 
+    {
         $uid = $this->request->uid();
         $type = $this->request->param('type', 1);
-		[$page, $limit] = $this->getPage();
-		$where = [];
-		$where[] = ['uid', '=', $uid];
+        [$page, $limit] = $this->getPage();
+        $where = [];
+        $where[] = ['uid', '=', $uid];
         $where[] = ['type', '=', $type];
-		$query = Db::name("user_transition_vr");
+        $query = Db::name("user_transition_vr");
         $count = $query->where($where)->count();
         $list = $query->page($page, $limit)->where($where)->select()->each(function ($item){
-			$item['create_time'] = date("Y-m-d H:i:s", $item['create_time']);
+            $item['create_time'] = date("Y-m-d H:i:s", $item['create_time']);
             return $item;
         });
-		return app('json')->success('获取转VR记录成功', ['list'=>$list, 'count'=>$count]);
+        return app('json')->success('获取转VR记录成功', ['list'=>$list, 'count'=>$count]);
     }