add

miaomiao/www/js/controllers/add.js

@@ -7,7 +7,7 @@
                     common.uploadFiles(img,1).then(function (result) {
                         var response = JSON.parse(result.response);
                         var file = response.data.file;
-                        $scope.imgs.push(file);
+                        $scope.imgs.push(config.imgServer+file);
                     }, function (error) {
                         msg.error('图片上传失败');
                     });
@@ -18,12 +18,13 @@
             $scope.video = {};
             $scope.addvideo = function () {
                 common.chooseVideo().then(function (file) {
-                        $scope.video.path = file;
-                        $scope.video.isOK = true;
-                        common.uploadFiles(file, 2).then(function (result) {
+                    $scope.video.path = file;
+                    common.uploadFiles(file, 2).then(function (result) {
                         var response = JSON.parse(result.response);
                         var file = response.data.file;
-                        $scope.video.server = file;
+                        console.log("file:"+config.imgServer+file);
+                        $scope.video.isOK = true;
+                        $scope.video.server = config.imgServer+file;
                     }, function (error) {
                         msg.error('视频上传失败');
                     });

miaomiao/www/js/controllers/home.js

@@ -153,7 +153,7 @@
                 common.uploadFiles(img,1).then(function (result) {
                     var response = JSON.parse(result.response);
                     var file = response.data.file;
-                    $scope.imgs.push(file);
+                    $scope.imgs.push(config.imgServer+file);
                 }, function (error) {
                     msg.error('图片上传失败');
                 });

miaomiao/www/js/controllers/my.js

@@ -1,6 +1,6 @@
 (function (app) {
-    app.controller('myCtrl', ["$scope", "$state", "$http", "storage", "myService", "common", "config", "msg"
-        , function ($scope, $state, $http, storage, myService, common, config, msg) {
+    app.controller('myCtrl', ["$scope", "$state", "$http", "storage", "myService", "common", "config", "msg","$timeout"
+        , function ($scope, $state, $http, storage, myService, common, config, msg, $timeout) {
         $scope.$on('$ionicView.beforeEnter', function (viewResult) {
             myService.myInfo().then(function(result){
               console.log(result.data.data);
@@ -14,7 +14,7 @@
             common.setAvator().then(function (result) {
                 var response = JSON.parse(result.response);
                 $timeout(function () {
-                    $scope.vm.user.avatar = response.data.md5;
+                    $scope.vm.avatar = response.data.file;
                 });
             });
         };
@@ -32,7 +32,7 @@
                 common.setAvator().then(function (result) {
                     var response = JSON.parse(result.response);
                     $timeout(function () {
-                        $scope.vm.user.avatar = response.data.md5;
+                      $scope.vm.avatar = response.data.file;
                     });
                 });
             };

miaomiao/www/js/services/commonservice.js

@@ -15,7 +15,7 @@
                 var defaultCameraOptions = {
                     quality: 50,
                     sourceType: 1,
-                    allowEdit: false,
+                    allowEdit: true,
                     encodingType: 0,//0为jpg,1为png
                     //targetHeight: 112,
                     //targetWidth: 112
@@ -23,7 +23,7 @@
                 var options = angular.extend(defaultCameraOptions, cameraOptions);
                 var sheetOptions = {
                     title: '选择图片方式',
-                    buttonLabels: ['拍摄照片', '从图库选择'],
+                    buttonLabels: ['拍摄照片', '从相册选择'],
                     addCancelButtonWithLabel: '取消',
                     androidEnableCancelButton: true
                 };
@@ -58,7 +58,7 @@
                 var deferred = $q.defer();
                 var sheetOptions = {
                     title: '选择视频方式',
-                    buttonLabels: ['拍摄视频', '从图库选择'],
+                    buttonLabels: ['拍摄视频', '从相册选择'],
                     addCancelButtonWithLabel: '取消',
                     androidEnableCancelButton: true
                 };
@@ -76,8 +76,9 @@
                                 deferred.reject(error);
                             }, options1);
                             break;
-                        case 2://从图库选择
+                        case 2://从相册选择
                             var options2 = {
+                                quality:100,
                                 sourceType: 0,
                                 mediaType: 1
                             };
@@ -164,7 +165,7 @@
                     }, function (fail) {
                         msg.hide();
                         deferred.reject(fail);
-                        // alert('上传失败' + JSON.stringify(fail));
+                        alert('上传失败' + JSON.stringify(fail));
                     }, uploadOptions);
                 });
                 return deferred.promise;

miaomiao/www/templates/add/index.html

@@ -25,9 +25,9 @@
                     <b style="background-image:url({{imgServer+item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
                 </a>
                 <a class="btn-file-up" ng-click="addpict()"><i class="ion-image"></i>添加图片</a>
-                <video src="{{video.path}}" ng-if="video.isOK"  height="72px" width="72px" controls="controls">
+                <video src="{{video.path}}" ng-show="video.isOK"  height="72px" width="72px" controls="controls">
                 </video>
-                <a class="btn-file-up" ng-click="addvideo()" ng-if="!video.isOK"><i class="icon ion-cash"></i>添加视频</a>
+                <a class="btn-file-up" ng-click="addvideo()" ng-show="!video.isOK"><i class="icon ion-cash"></i>添加视频</a>
             </div>
             <div class="item">实现梦想所需要的人民币</div>
             <div class="item item-input-inset itemjs">

miaomiao/www/templates/my/index.html

@@ -3,7 +3,7 @@
         <div class="user-box">
          
             <div class="myinfo" ng-click="setAvator()">
-                <img ng-src=" {{user.pic}}" />
+                <img ng-src=" {{user.avatar}}" />
                 <div>
                     {{user.nickname}}
                 </div>

miaomiao/www/templates/my/my-profile.html

@@ -2,8 +2,8 @@
     <ion-content>
      <div class="list">
          <a class="item item-avatar-right" ng-click="setAvator()">
-             <img  src="img/demo/head5.jpg"/>
-             <!--<img ng-src="{{ vm.user.avatar | avator }}">-->
+             <!-- <img  src="img/demo/head5.jpg"/> -->
+             <img ng-src="{{ vm.avatar | avator }}">
              <h2>头像</h2>
              <p style="font-size:12px">点击上传</p>
          </a>

server/app/Helper/AttachmentHelper.php

@@ -51,7 +51,6 @@ trait AttachmentHelper
                 }
 
                 $fileMimeType = $file->getMimeType();
-                \Log::info("fileMimeType:".$fileMimeType);
                 if (!empty($mimeType) && !in_array($fileMimeType, $mimeType)) {
                     $result[$idx] = ErrorCode::ATTACHMENT_MIME_NOT_ALLOWED;
                     continue;
@@ -101,7 +100,7 @@ trait AttachmentHelper
      * @return int 错误码or 0（成功）
      */
     public function deleteAttachment($md5) {
-        $attachment = Attachment::where(['md5' => $md5])->first();
+        $attachment = BaseAttachmentModel::where(['md5' => $md5])->first();
         if (!$attachment) {
             return ErrorCode::ATTACHMENT_NOT_EXIST;
         }

server/app/Http/Controllers/Api/V1/AttachmentController.php

@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Helper\AttachmentHelper;
 use Illuminate\Http\Request;
-use App\Services\Base\Attachment;
+use App\Models\BaseAttachmentModel;
 use App\Services\Base\ErrorCode;
 use Validator, Response;
 
@@ -29,7 +29,7 @@ class AttachmentController extends Controller
      */
     public function download($md5)
     {
-        $attachment = Attachment::where(['md5' => $md5])->first();
+        $attachment = BaseAttachmentModel::where(['md5' => $md5])->first();
         if (!$attachment) {
             return view('errors.404');
         }
@@ -100,13 +100,15 @@ class AttachmentController extends Controller
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '', $validator->messages());
         }
 
-        $result = $this->uploadAttachment($request, $request->get('file'), $request->get('tag'), 10 * 1024 * 1024, [
+        \Log::info($request);
+        $result = $this->uploadAttachment($request, $request->get('file'), $request->get('tag'), 50 * 1024 * 1024, [
             'image/jpeg',
             'image/png',
             'image/gif',
             'video/mp4',
             'video/quicktime',
         ]);
+        \Log::info($result);
         if (is_array($result)) {
             return $this->api($result);
         } elseif (is_string($result)) {

server/app/Http/Controllers/Api/V1/AuthController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api\V1;
 
+use App\Helper\AttachmentHelper;
 use App\Helper\SmsHelper;
 use App\Models\UserBanks;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
@@ -14,7 +15,7 @@ use Validator, Auth, Cache;
 
 class AuthController extends Controller
 {
-    use SmsHelper,AuthenticatesUsers;
+    use SmsHelper,AuthenticatesUsers,AttachmentHelper;
 
     private $expireTime     = 1;
     private $keySmsCode     = 'auth:sms:';
@@ -284,7 +285,7 @@ class AuthController extends Controller
             $result = array_shift($result);
         }
         if (is_string($result)) {
-            $user->avatar = $result;
+            $user->avatar = config('app.url')."/api/attachment/download/".$result;
             if (!$user->save()) {
                 return $this->error(ErrorCode::SAVE_USER_FAILED);
             }

server/app/Services/Base/ErrorCode.php

@@ -65,6 +65,7 @@ final class ErrorCode {
     const CLIENT_WRONG_PARAMS = 1000;
     const DREAM_NOT_EXIST = 1308;
     const LOCK_USER = 1309;
+    const MERCHANT_BALANCE_NOT_ENOUGH = 1311;
     const KEY_ERROR = 1310;
 
     //错误常量枚举

server/routes/api.php

@@ -38,6 +38,11 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'attachment.delete',
         'uses' => 'AttachmentController@delete',
     ]);
+    //上传头像
+    $api->post('auth/avatar', [
+        'as' => 'auth.avatar',
+        'uses' => 'AuthController@avatar',
+    ]);
 
 
     // test