add

miaomiao/www/css/style.css

@@ -174,13 +174,15 @@ overflow:auto;
     text-align: center;
     color:#FFF;
 }
-    .user-box .myinfo {
-        padding-top:30px;
-    }
-        .user-box .myinfo img {
-            width:60px;
-            border-radius:100%;
-        }
+.user-box .myinfo {
+    padding-top:30px;
+}
+.user-box .myinfo img {
+    width:60px;
+
+    height: 60px;
+    border-radius:100%;
+}
 .user-row {
     margin-top:10px;
 }

miaomiao/www/js/config/router.js

@@ -31,15 +31,6 @@
                     }
                 }
             })
-            .state('app.home_interactionadd', {
-                url: '/home/interactionadd',
-                views: {
-                    'app-home': {
-                        templateUrl: 'templates/home/interaction-add.html',
-                        controller: 'interactionAddCtrl'
-                    }
-                }
-            })
             .state('app.home_search', {
                 url: '/home/search',
                 views: {

miaomiao/www/js/controllers/home.js

@@ -51,7 +51,6 @@
                     }
                 }, function (error) {
                     msg.hide();
-                    msg.error(error.data.message);
                 });
             }
             $scope.data = {};
@@ -97,7 +96,8 @@
             });
 
             $scope.vm = {
-                coin:""
+                coin:"",
+                comment:""
             }
 
             $scope.changeindex = function (index) {
@@ -114,11 +114,16 @@
                     coin:$scope.vm.coin
                 };
                 homeService.supportDream(data).then(function(result){
-
-                },function(erro){
-
+                    $scope.tosupport = false;
+                    number = result.data.data;
+                    //最新支持乘数
                 })
             };
+            $scope.collectionDream = function(){
+                homeService.collectionDream(id).then(function(result){
+                    //最新支持乘数
+                })
+            }
             $scope.showText = function(){ 
                 $scope.aboutStyle = {
                     "white-space" : "normal"
@@ -129,8 +134,8 @@
             }
 
         $scope.placeholder="评论";
-        $scope.replay = function(id,cid,username){
-            $event.stopPropagation();
+        $scope.replay = function($event){
+            // $event.stopPropagation();
             $scope.placeholder="回复百川";
             $scope.addReplay=true;
             $scope.vm.comment='';

miaomiao/www/js/controllers/my.js

@@ -2,7 +2,10 @@
     app.controller('myCtrl', ["$scope", "$state", "$http", "storage", "myService", "common", "config", "msg"
         , function ($scope, $state, $http, storage, myService, common, config, msg) {
         $scope.$on('$ionicView.beforeEnter', function (viewResult) {
-            
+            myService.myIndex().then(function(result){
+              console.log(result.data.data);
+              $scope.user = result.data.data
+            });
         });
 
 
@@ -17,9 +20,9 @@
                 msg.erro(JSON.stringify(erro));
             });
         };
-            $scope.toprofile = function () {
-                $state.go('app.my_profile');
-            };
+        $scope.toprofile = function () {
+            $state.go('app.my_profile');
+        };
 
             //我的设置
         $scope.setting = function(){
@@ -84,8 +87,8 @@
             $scope.$on('$ionicView.beforeEnter', function () {
                 msg.loading();
                 myService.myIndex().then(function(result){
-                  // alert(JSON.stringify(result.data.data.user));
-                  $scope.vm = result.data.data.user;
+                  // alert(JSON.stringify(result.data.data));
+                  $scope.vm = result.data.data;
                   $scope.vm.sex = $scope.vm.sex+'';
                   $scope.vm.emotion = $scope.vm.emotion+'';
                   if($scope.vm.birthday){
@@ -100,7 +103,6 @@
             });
  
             $scope.saveMaterial = function(){
-               
                 var data = {
                     pic:'http://img.taopic.com/uploads/allimg/130103/240435-1301030P33161.jpg', 
                     sex:$scope.vm.sex,
@@ -118,6 +120,7 @@
                 myService.saveMaterial(data).then(function(result){
                   msg.hide();
                   msg.success("保存成功!");
+                  $state.go('app.my')
                 },function(error){
                   msg.hide();
                   msg.error(error.data.message);
@@ -139,15 +142,17 @@
      }]);
     app.controller('rechargeCtrl', ["$scope", "$state", "myService", "msg"
   , function ($scope, $state, myService, msg) {
-      $scope.$on('$ionicView.beforeEnter', function () {
+       $scope.$on('$ionicView.beforeEnter', function () {
 
+            $scope.vm = {
+                money:"",
+            }
       });
             //充值
-            $scope.recharge = function(){
-                myService.recharge().then(function(result){
-
-                },function(error){
+            $scope.recharge = function(money){
+                myService.recharge(money).then(function(result){
 
+            $state.go('app.my');
                 });
             }
 

miaomiao/www/js/services/homeservice.js

@@ -14,6 +14,12 @@
                     data:data
                 })
             },
+            collectionDream:function(id){
+                return $http({
+                    url:config.server + "api/dream/collection?id=" + id,
+                    method:"get",
+                })
+            },
             searchContent:function (data){
                 return $http({
                     url: config.server + 'api/index/search?' + data,

miaomiao/www/js/services/httpinterceptor.js

@@ -41,7 +41,10 @@
                     return;
                 }
                 if (rejection.status==400) {
-                    getMsg().error(rejection.data.error_description);
+                    getMsg().error(rejection.data.message);
+                }
+                if (rejection.status==500) {
+                    getMsg().error(rejection.data.message);
                 }
                 return $q.reject(rejection);
             }

miaomiao/www/js/services/myservice.js

@@ -15,9 +15,9 @@
                     data:data
                 })
             },
-            recharge:function(){
+            recharge:function(money){
                 return $http({
-                    url:config.server + "api/my/recharge",
+                    url:config.server + "api/my/recharge?money="+money,
                     method:"get"
                 })
             },

miaomiao/www/templates/home/dream-detail.html

@@ -78,7 +78,7 @@
                 <div class="item">
                     <button class="button button-assertive" style="width:25%;white-space:normal;line-height:20px">支持乘数×2.8</button>
                     <button class="button button-calm" style="width:50%" ng-click="support($event)">支持</button>
-                    <button class="button button-outline button-calm" style="width:25%">＋关注</button>
+                    <button class="button button-outline button-calm" style="width:25%" ng-click="collectionDream()">＋收藏</button>
                 </div>
             </div>
        
@@ -117,7 +117,7 @@
                         <span class="kz">2016-08-08 11:11</span>
                         <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
                     </div>
-                    <div class="item subitem" ng-click="replay(id,cid,username)">
+                    <div class="item subitem" ng-click="replay($event)">
                         <img ng-src="img/demo/head4.jpg" />
                         <span>百川</span>
                         <span class="kz">2016-08-08 11:11</span>
@@ -281,7 +281,7 @@
                     </div>
                     <div class="item item-input">
                         <span class="input-label">金额</span>
-                        <input type="text" placeholder="请输入充值金额">
+                        <input type="number" placeholder="请输入充值金额" ng-model="vm.money" >
                     </div>
                     <div class="item item-divider">
                        请选择以下支付方式
@@ -297,7 +297,7 @@
                     </ion-list>
                 </div>
                 <div class="padding">
-                    <button  class="button button-full button-calm" ng-click="recharge()">
+                    <button  class="button button-full button-calm" ng-click="recharge(vm.money)">
                         支付
                     </button>
                 </div>

miaomiao/www/templates/my/index.html

@@ -2,23 +2,23 @@
     <ion-content>
         <div class="user-box">
          
-            <div class="myinfo" ng-click="toprofile()">
-                <img ng-src="img/demo/head5.jpg" />
+            <div class="myinfo" ng-click="setAvator()">
+                <img ng-src=" {{user.pic}}" />
                 <div>
-                    喵喵喵喵酱
+                    {{user.nickname}}
                 </div>
-                <div style="font-size:0.7rem">上海市</div>
+                <div style="font-size:0.7rem"> {{user.city}}</div>
             </div>
             
            <div class="row user-row">
-               <div class="col"><i class="icon ion-heart"></i> 关注&nbsp;&nbsp;123456</div>
-               <div class="col"><i class="icon ion-person"></i> 粉丝&nbsp;&nbsp;123456</div>
-               <div class="col"><i class="icon ion-ios-film"></i> 徽章&nbsp;&nbsp;23</div>
+               <div class="col"><i class="icon ion-heart"></i> 关注&nbsp;&nbsp;{{user.care_num}}</div>
+               <div class="col"><i class="icon ion-person"></i> 粉丝&nbsp;&nbsp;{{user.fans_num}}</div>
+               <div class="col"><i class="icon ion-ios-film"></i> 梦想&nbsp;&nbsp;{{user.dream_num}}</div>
            </div>
         </div>
         <div class="row user-dz">
             <div class="col">
-                <div class="num">1231</div>
+                <div class="num">{{user.collection_num}}</div>
                 <div class="mysecond">收藏</div>
             </div>
             <div class="col">
@@ -38,7 +38,8 @@
             <a class="item item-icon-left" ui-sref="app.my_recharge">
                 <i class="icon ion-card"></i>
                 <em class="fl">账户余额</em>
-                <i class="fr">9990</i>
+                <i class="fr">
+                    {{user.coin}}</i>
             </a>
             <a class="item item-icon-left" ui-sref="app.my_message">
                 <i class="icon ion-email"></i>

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

@@ -14,6 +14,10 @@
              <i style="float:right" class="ng-binding">{{vm.tel}}</i>
          </div>
 
+         <label class="item item-input ">
+             <span class="input-label">昵称</span>
+             <input name="signture" type="text" placeholder="请输入" ng-model="vm.nickname">
+         </label>
          <label class="item item-input item-select item-select-width">
              <span class="input-label">
                  性别

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

@@ -12,7 +12,7 @@
             </div>
             <div class="item item-input">
                 <span class="input-label">金额</span>
-                <input type="text" placeholder="请输入充值金额">
+                <input type="number" placeholder="请输入充值金额" ng-model="vm.money" >
             </div>
             <div class="item item-divider">
                请选择以下支付方式
@@ -28,7 +28,7 @@
             </ion-list>
         </div>
         <div class="padding">
-            <button  class="button button-full button-calm" ng-click="recharge()">
+            <button  class="button button-full button-calm" ng-click="recharge(vm.money)">
                 支付
             </button>
         </div>

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

@@ -259,7 +259,7 @@ class DreamController extends Controller
         $number = 2;
 
         if ($user->money < $coin) {
-            return $this->error(ErrorCode::MERCHANT_BALANCE_NOT_ENOUGH);
+            return $this->error(ErrorCode::COIN_NOT_ENOUGH);
         }else{
             $user->money  =  $user->money - $coin;
             $user->save();
@@ -268,7 +268,7 @@ class DreamController extends Controller
             $data = [
                 'user_id'=>$user->id,
                 'dream_id'=>$dream_id,
-                'to_user_id'=>$user_id,
+                'dream_user_id'=>$user_id,
                 'coin'=>$coin,
                 'score'=>$coin*$number,
             ];
@@ -294,7 +294,7 @@ class DreamController extends Controller
             ];
             SystemInfoModel::create($info);
 
-            return $this->api('');
+            return $this->api($number);
         }
     }
 
@@ -326,7 +326,16 @@ class DreamController extends Controller
      */
     public function collection(Request $request)
     {
-        if (empty($request->id)) return $this->error(ErrorCode::KEY_ERROR);
+
+        $validator = \Validator::make($request->all(),
+            [
+                'id'  => 'required',
+            ],
+            [
+                'id.required'  => '支持梦想不能为空',
+            ]
+        );
+        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
 
         $user = $this->getUser();
         $data = [

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

@@ -25,11 +25,6 @@ class MyController extends Controller
      *  "status_code": 0,
      *  "message": "",
      *  "data": {
-     *      "my_care_num": 4,关注
-     *      "my_fens_num": 3,粉丝
-     *      "my_collection_num": 2,收藏
-     *      "my_dream_num": 1,发帖
-     *      "user": {
      *          "id": 1,
      *          "tel": "13880642880",
      *          "password": "",
@@ -46,7 +41,10 @@ class MyController extends Controller
      *          "detail_address": "",
      *          "status": 1,
      *          "remember_token": "",
-     *      }
+         *      "care_num": 4,关注
+         *      "fens_num": 3,粉丝
+         *      "collection_num": 2,收藏
+         *      "dream_num": 1,发帖
      *  }
      * @apiErrorExample {json} Error-Response:
      * HTTP/1.1 400 Bad Request
@@ -67,59 +65,16 @@ class MyController extends Controller
          * 点赞？徽章？
          * */
         $data1 = $user->myCareNum;
-        $data2 = $user->myFens;
+        $user->care_num = count($data1);
+        $data2 = $user->myFans;
+        $user->fans_num = count($data2);
         $data3 = $user->myCollection;
+        $user->collection_num = count($data3);
         $data4 = $user->UserDream;
-        $my_care_num = count($data1);
-        $my_fens_num = count($data2);
-        $my_collection_num = count($data3);
-        $my_dream_num = count($data4);//发帖数
-        return $this->api(compact('my_care_num','my_fens_num','my_collection_num','my_dream_num','user'));
+        $user->dream_num = count($data4);
+        return $this->api($user);
     }
 
-    /**
-     * @api {get} /api/my/persona 个人信息(persona)
-     * @apiDescription 个人信息(persona)
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *    "status": true,
-     *   "status_code": 0,
-     *    "message": "",
-     *    "data": {
-     *        "user": {
-     *              "id": 1,
-     *              "tel": "13880642880",手机
-     *              "nickname": "",昵称
-     *              "sex": 1,性别
-     *              "job": "", 职业
-     *              "emotion": 1,情感状态
-     *              "address": "",
-     *              "detail_address": "",
-     *              "status": 1,
-     *              "tall": 1,   身高
-     *         }
-     *    }
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     *{
-     *    "status": true,
-     *    "status_code": 0,
-     *    "message": "",
-     *    "data": {
-     *        "user": null
-     *    }
-     *}
-     */
-    public function persona()
-    {
-        $user = $this->getUser();
-        return $this->api(compact('user'));
-    }
 
     /**
      * @api {get} /api/my/edit_user_info 修改个人信息
@@ -232,9 +187,23 @@ class MyController extends Controller
      * @apiErrorExample {json} Error-Response:
      * HTTP/1.1 400 Bad Request
      */
-    public function recharge()
+    public function recharge(Request $request)
     {
+        $validator = \Validator::make($request->all(),
+            [
+                'money'  => 'required|integer',
+            ],
+            [
+                'money.required'  => '请输入金额',
+                'money.integer'  => '请输入整数',
+
+            ]
+        );
+        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
+
         $user = $this->getUser();
+        $user->coin += $request->money;
+        $user->save();
         return $this->api(compact('user'));
     }
 

server/app/Models/UserInfoModel.php

@@ -92,7 +92,7 @@ class UserInfoModel extends Authenticatable
         return $this->hasMany('App\Models\UserCareUser','user_id','id');
     }
 //关注我的用户
-    public function myFens()
+    public function myFans()
     {
         return $this->hasMany('App\Models\UserCareUser','other_user_id','id');
     }

server/app/Services/Base/ErrorCode.php

@@ -31,10 +31,10 @@ final class ErrorCode {
     const FAVORITE_NOT_EXIST = 1900;
     const MERCHANT_ADD_MEMBER_FAILED = 1301;
     const MERCHANT_STATUS_NOT_OK = 1302;
-    const MERCHANT_BALANCE_NOT_ENOUGH = 1303;
+    const BALANCE_NOT_ENOUGH = 1303;
     const PAY_TYPE_UNSUPPORTED = 2000;
     const MEMBER_NOT_EXIST = 1500;
-    const MEMBER_BALANCE_NOT_ENOUGH = 1501;
+    const COIN_NOT_ENOUGH = 1501;
     const MERCHANT_SERVICE_NOT_EXIST = 1400;
     const MERCHANT_SERVICE_ADD_FAILED = 1401;
     const CONTENT_GET_DETAIL_FAILED = 1402;
@@ -90,7 +90,7 @@ final class ErrorCode {
         self::MERCHANT_BALANCE_NOT_ENOUGH => '商户余额不足',
         self::PAY_TYPE_UNSUPPORTED => '不支持的支付方式',
         self::MEMBER_NOT_EXIST => '会员不存在',
-        self::MEMBER_BALANCE_NOT_ENOUGH => '会员余额不足',
+        self::COIN_NOT_ENOUGH => '梦想币不足',
         self::SERVICE_COST_OVERFLOW_BALANCE => '余额不足，请充值',
         self::CREATE_SERVICE_OVER_MAX => '服务数量达到系统上限',
         self::MERCHANT_SERVICE_STATUS_INVALID => '服务状态不正确',