2 次代碼提交 5369df62e6 ... a60d0b272c

作者 SHA1 備註 提交日期
  junghwi a60d0b272c Merge branch 'master' of http://git.meme100.com:10180/yigao/qpapi 6 年之前
  junghwi 93c90dff9f sd 6 年之前

+ 34 - 2
app/Http/Controllers/Api/UserController.php

@@ -11,7 +11,7 @@ class UserController extends Controller
     /*
      * 获取登录用户信息
      */
-    function getUserDetails(Request $req){
+    public function getUserDetails(Request $req){
         try {
             $uid = S('token_user_id');
             $member = new Models\Member;
@@ -26,9 +26,41 @@ class UserController extends Controller
             $user=$user->toArray();
             unset($user['password']);
             unset($user['solt']);
-            return toJson(1,1,$user);
+            return toJson(1,'',$user);
         } catch (Exception $e) {
             echo $e->getMessage();
         }
     }
+    /*
+     * 获取用户交易记录接口
+     */
+    public function tradeRecord(Request $req){
+        $member_id  = $_REQUEST['member_id'];
+        if(empty($member_id)){
+            return toJson(-20005);
+        }
+        $MembersDetailed = new Models\MoneyDetails;
+        $record = $MembersDetailed->tradeRecord($member_id);
+        return toJson(1,'',$record);
+    }
+
+    /*
+     * 用户资料修改接口
+     */
+    public  function editorMemberDetails(){
+        $member_id  = $_REQUEST['member_id'];
+        $phone  = $_REQUEST['phone'];
+        if(empty($member_id)){
+            return toJson(-20005);
+        }
+        $member = new Models\Member;
+        $avatarImg = $member->updateHeader($member_id);
+        if(!empty($avatarImg)){
+            $data = ['phone'=>$phone,'avatar'=>$avatarImg,'updated_at'=>date('Y-m-d H:i:s',time())];
+            $editor = $member->editorMemberDetails($member_id,$data);
+            return toJson($editor);
+        }
+    }
+
+
 }

+ 53 - 0
app/Models/Member.php

@@ -13,4 +13,57 @@ class Member extends Authenticatable
     protected $fillable = ['phone','name','password','avatar','remember_token','uuid'];
     protected $hidden = ['password','remember_token'];
 
+    /**
+     * 上传用户基本信息头像
+     *
+     * @access public
+     * @return String
+     */
+    public function updateHeader($member_id)
+    {
+        // 规定上传格式
+        $allowedType = ["png", "jpg", "gif"];
+        $allowedExtensions = ["image/jpg","image/jpeg","image/png","image/pjpeg","image/gif","image/bmp","image/x-png"];
+        // 最大为 100 Kb
+        $maxSize = 102400;
+        // 获取上传文件
+        $img = $_FILES['img'];
+        // 获取上传文件格式并转换为小写
+        $imgType = strtolower(substr($img['name'],strrpos($img['name'],".") + 1));
+        // 判断格式是否符合要求
+        if (!in_array($imgType, $allowedType) || !in_array(strtolower($img['type']), $allowedExtensions)) {
+            return toJson(-40001);
+        }
+        if ($img['size'] > $maxSize) {
+            return toJson(-40002);
+        }
+        // 修改文件名
+        $imgName = strtotime('now') + rand(10000, 99999);
+        $filePath = ROOT_PATH . '/images/header/';
+        $imgPath = '/Public/images/header/' . $imgName . ".png";
+        if (move_uploaded_file($img['tmp_name'], $filePath . $imgName . ".png")) {
+            $oldImg = $this->where('id',$member_id)->select('avatar')->first();
+            if(!empty($old_avatar)){
+                $old_avatar->toArray();
+                // 删除以前的文件
+                unlink(ROOT_PATH . $oldImg ->avatar);
+            }
+            return $imgPath;
+        } else {
+            return "";
+        }
+    }
+
+    /*
+     * 更改用户信息
+     */
+    public function editorMemberDetails($member_id,$data){
+        $update = $this->where('id',$member_id)->update($data);
+        if($update){
+            return 1;
+        }
+        return -20006;
+    }
+
+
 }

+ 0 - 1
app/Models/MembersDetailed.php

@@ -12,5 +12,4 @@ class MembersDetailed extends Model
 
     protected $table = 'membersDetailed';
 
-
 }

+ 9 - 0
app/Models/MoneyDetails.php

@@ -11,4 +11,13 @@ class MoneyDetails extends Model
 {
     protected $table = 'moneyDetails';
 
+    //查询用户交易记录
+    public function tradeRecord($member_id){
+        $record = $this->where(['members_id'=>$member_id])->orderby('moneyDetails_time','desc')->get();
+        if(!empty($record)){
+            $record->toArray();
+            return $record;
+        }
+        return [];
+    }
 }

二進制
public/images/header/1557246674.png


二進制
public/images/header/1559226238.png


二進制
public/images/header/1559243290.png


二進制
public/images/header/1559250517.png


二進制
public/images/header/1559256900.png


二進制
public/images/header/1559257459.png


二進制
public/images/header/1559269435.png


二進制
public/images/header/1559272084.png


二進制
public/images/header/1559274485.png


+ 1 - 0
public/index.php

@@ -37,6 +37,7 @@ require __DIR__.'/../vendor/autoload.php';
 
 $app = require_once __DIR__.'/../bootstrap/app.php';
 
+define('ROOT_PATH', dirname(__FILE__));
 /*
 |--------------------------------------------------------------------------
 | Run The Application

+ 7 - 0
resources/lang/zh-CN/error.php

@@ -9,6 +9,13 @@ return array(
     '-20001' => '注册用户失败,可能用户名已存在',
     '-20002' => '用户不存在',
     '-20003' => '密码错误',
+    '-20004' => '用户未登录',
+    '-20005' => '未获取到用户ID',
+    '-20006' => '更新失败',
     '-30001' => 'TOKEN无效',
 
+    //图片上传
+    '-40001' => '不支持该类型图片格式',
+    '-40002' => '图片太大'
+
 );