add

miaomiao/www/js/services/myservice.js

@@ -8,16 +8,9 @@
                     data: { password: password }
                 })
             },
-<<<<<<< HEAD
             add:function (data){
                 return $http({
                     url:config.server + 'api/my/add_dream',
-=======
-           
-            reset:function(data){
-                return $http({
-                    url:config.server + "api/auth/avatar",
->>>>>>> 257ac8c26b1de045fb0ce6844de33ff94a5763f8
                     method:"post",
                     data:data
                 })

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

@@ -414,6 +414,7 @@ class MyController extends Controller
 
         foreach ($dreams as $dream){
             $dream->dream_pic = count($dream->dreamImgsFirst) > 0 ? $dream->dreamImgsFirst->pic : '';
+
             $dream->progress = $dream->money == 0 ? 0 :  floor($dream->get_money/$dream->money);
         }