add

miaomiao/www/js/config/router.js

@@ -45,7 +45,6 @@
                 url: '/home/userDetail',
                 params:{
                     id:null,
-                    dream_id:null,
                     items:null
                 },
                 views: {
@@ -59,7 +58,6 @@
                 url: '/my/attention/userDetail',
                 params:{
                     id:null,
-                    dream_id:null,
                     items:null
                 },
                 views: {
@@ -71,7 +69,7 @@
             })
             .state('app.oldDream', {
                 url: '/home/oldDream',
-                params:{id:null},
+                params:{user_id:null},
                 views: {
                     'app-home': {
                         templateUrl: 'templates/home/oldDream.html',
@@ -81,7 +79,7 @@
             })
             .state('app.myOldDream', {
                 url: '/my/oldDream',
-                params:{id:null},
+                params:{user_id:null},
                 views: {
                     'app-my': {
                         templateUrl: 'templates/home/oldDream.html',
@@ -91,7 +89,9 @@
             })
             .state('app.supportDream', {
                 url: '/home/supportDream',
-                params:{id:null},
+                params:{
+                    user_id:null
+                },
                 views: {
                     'app-home': {
                         templateUrl: 'templates/home/supportDream.html',
@@ -101,7 +101,9 @@
             })
             .state('app.mySupportDream', {
                 url: '/my/supportDream',
-                params:{id:null},
+                params:{
+                    user_id:null
+                },
                 views: {
                     'app-my': {
                         templateUrl: 'templates/home/supportDream.html',

miaomiao/www/js/controllers/home.js

@@ -37,10 +37,10 @@
         $scope.toDetail = function (id) {
             $state.go('app.home_dreamdetail',{id:id});
         };
-        $scope.toUserDetail = function (id,dream_id) {
-            homeService.toUserDetail(id,dream_id).then(function(result){
+        $scope.toUserDetail = function (id) {
+            homeService.toUserDetail(id).then(function(result){
                 $scope.items = result.data.data;
-                $state.go('app.home_userDetail',{id:id,dream_id:dream_id,items:$scope.items});
+                $state.go('app.home_userDetail',{id:id,items:$scope.items});
             },function(error){
                 //msg.error(msg.data.error)
             })
@@ -393,7 +393,7 @@
         };
         $scope.changeIndex = function (index) {
             $scope.index = index;
-            $scope.vm.coin = index*5;
+            $scope.vm.coin = index*10;
         };
         $scope.vidEnded = function () {
             alert('播放完毕');
@@ -705,7 +705,7 @@
             };
             $scope.changeIndex = function (index) {
                 $scope.index = index;
-                $scope.vm.coin = index*5;
+                $scope.vm.coin = index*10;
             };
             $scope.vidEnded = function () {
                 alert('播放完毕');
@@ -866,18 +866,18 @@
                 $scope.modal.remove();
             });
             $scope.toMessage = function(){
-                $state.go("app.message");
+                $state.go("app.my_message");
             }
         }]);
     app.controller('userDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
         , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
             var id = $stateParams.id;
-            $scope.dream_id = $stateParams.dream_id;
             $scope.items = $stateParams.items;
-            $scope.$on('$ionicView.beforeEnter', function () {
+            $scope.dream_id = $scope.items.near_dream.id;
+                $scope.$on('$ionicView.beforeEnter', function () {
                 $ionicTabsDelegate.showBar(false);
             });
-            $scope.attentionUser = function(id,is_care){
+            $scope.attentionUser = function(is_care){
                 homeService.attentionUser(id,is_care).then(function(result){
                     $scope.items.is_care=result.data.data;
                 })
@@ -900,10 +900,10 @@
                 $state.go('app.home_dreamdetail',{id:dream_id});
             };
             $scope.toOldDream = function(){
-                $state.go("app.oldDream");
+                $state.go("app.oldDream",{user_id:$scope.items.user.id});
             };
             $scope.toSupportDream = function(){
-                $state.go("app.supportDream");
+                $state.go("app.supportDream",{user_id:$scope.items.user.id});
             };
             $scope.collectionDream = function(is_collection){
                 homeService.collectionDream(id,is_collection).then(function(result){
@@ -933,14 +933,40 @@
         }]);
     app.controller('oldDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
+            var user_id = $stateParams.user_id;
+            $scope.$on('$ionicView.beforeEnter',function(){
+                $scope.toUserDetail(user_id);
+            });
+            $scope.toUserDetail = function(user_id){
+                homeService.toUserDetail(user_id).then(function(result){
+                    $scope.items = result.data.data;
+                    $scope.user = result.data.data.user;
+                    $scope.dreams = $scope.user.sup_dream;
+                },function(error){
+
+                })
+            };
             $scope.toDetail = function(){
-                $state.go("app.home_userDetail")
+                $state.go("app.home_userDetail",{user_id:user_id,items:$scope.items})
             }
         }]);
     app.controller('supportDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
+            var user_id = $stateParams.user_id;
+            $scope.$on('$ionicView.beforeEnter',function(){
+                $scope.toUserDetail(user_id);
+            });
+            $scope.toUserDetail = function(user_id){
+                homeService.toUserDetail(user_id).then(function(result){
+                    $scope.items = result.data.data;
+                    $scope.user = result.data.data.user;
+                    $scope.dreams = $scope.user.sup_dream;
+                },function(error){
+
+                })
+            };
             $scope.toDetail = function(){
-                $state.go("app.home_userDetail")
+                $state.go("app.home_userDetail",{user_id:user_id,items:$scope.items})
             }
         }]);
     app.controller('searchCtrl', ["$scope","homeService", "$state", "msg", "$ionicTabsDelegate", "$ionicNavBarDelegate"

miaomiao/www/js/controllers/my.js

@@ -147,10 +147,16 @@
     app.controller('attention_DetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
         , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
             var id = $stateParams.id;
-            $scope. items = $stateParams.items;
+            $scope.items = $stateParams.items;
+            $scope.dream_id = $scope.items.near_dream.id;
             $scope.$on('$ionicView.beforeEnter', function () {
                 $ionicTabsDelegate.showBar(false);
             });
+            $scope.attentionUser = function(id,is_care){
+                homeService.attentionUser(id,is_care).then(function(result){
+                    $scope.items.is_care=result.data.data;
+                })
+            };
 
             $scope.cancelSupport = function () {
                 $scope.tosupport = false;
@@ -165,14 +171,14 @@
             $scope.shareDream = function(){
                 $state.go("app.my_shareDream",{item:$scope.user});
             };
-            $scope.toDetail = function (id) {
-                $state.go('app.my_dreamdetail',{id:id});
+            $scope.toDetail = function (dream_id) {
+                $state.go('app.my_dreamdetail',{id:dream_id});
             };
             $scope.toOldDream = function(){
                 $state.go("app.myOldDream");
             };
             $scope.toSupportDream = function(){
-                $state.go("app.mySupportDream");
+                $state.go("app.mySupportDream",{user_id:$scope.items.user.id});
             };
             $scope.collectionDream = function(is_collection){
                 homeService.collectionDream(id,is_collection).then(function(result){
@@ -183,15 +189,41 @@
 
     app.controller('mySupportDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
+            var user_id = $stateParams.user_id;
+            $scope.$on('$ionicView.beforeEnter',function(){
+                $scope.toUserDetail(user_id);
+            });
+            $scope.toUserDetail = function(user_id){
+                homeService.toUserDetail(user_id).then(function(result){
+                    $scope.items = result.data.data;
+                    $scope.user = result.data.data.user;
+                    $scope.dreams = $scope.user.sup_dream;
+                },function(error){
+
+                })
+            };
             $scope.toDetail = function(){
-                $state.go("app.attention_Detail")
+                $state.go("app.attention_Detail",{user_id:user_id,items:$scope.items})
             }
         }]);
     app.controller('myOldDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
+            var user_id = $stateParams.user_id;
+            $scope.$on('$ionicView.beforeEnter',function(){
+                $scope.toUserDetail(user_id);
+            });
+            $scope.toUserDetail = function(user_id){
+                homeService.toUserDetail(user_id).then(function(result){
+                    $scope.items = result.data.data;
+                    $scope.user = result.data.data.user;
+                    $scope.dreams = $scope.user.sup_dream;
+                },function(error){
+
+                })
+            };
             $scope.toDetail = function(){
-                $state.go("app.attention_Detail")
-            }
+                $state.go("app.attention_Detail",{user_id:user_id,items:$scope.items})
+            };
         }]);
     app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
@@ -322,28 +354,36 @@
                     console.log('图片选择失败');
                 });
             };
-            $scope.addvideo = function () {
-                common.chooseVideo().then(function (file) {
-                    $scope.video.path = file;
-                    common.uploadFiles(file, 2).then(function (result) {
-                        var response = JSON.parse(result.response);
-                        var file = response.data.file;
-                        console.log("file:"+config.imgServer+file);
-                        $scope.video.isOK = true;
-                        $scope.video.server = config.imgServer+file;
-                    }, function (error) {
-                        msg.error('视频上传失败');
-                    });
-                }, function (erro) {
-                    console.log('选择视频失败');
-                });
-            };
             $scope.deletefile = function (file) {
                 var index = $scope.imgs.indexOf(file);
                 $scope.imgs.splice(index, 1);
                 common.deletefile(file).then(function () {
                 })
             };
+            $scope.vm={
+                name:'',
+                about:'',
+                coin:''
+            };
+            $scope.add = function () {
+                var data = {
+                    pics: $scope.imgs,
+                    video:$scope.video.server,
+                    name: $scope.vm.name,
+                    about: $scope.vm.about,
+                    days: 21, //默认21
+                    coin: $scope.vm.coin
+                };
+                msg.loading('保存中...');
+                dreamService.addDream(data).then(function (result) {
+                    msg.hide();
+                    $state.go('app.home');
+                }, function (error) {
+                    msg.hide();
+                    msg.error(error.data.message);
+                });
+            };
+
         }]);
     app.controller('messageCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
         , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
@@ -422,7 +462,6 @@
                 $ionicTabsDelegate.showBar(false);
                 myService.collect().then(function(result){
                     $scope.dreams = result.data.data.dreams;
-                    $scope.users = result.data.data.users;
                 });
             });
       $scope.toDetail = function (id) {

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

@@ -112,10 +112,8 @@
                     </div>
                 </div>
             </div>
-            <div style="width: 100px; margin: 0 auto">
-                <a class="btn-file-up" style="margin-left: -1px">
-                    <em style="font-size: 16px">二维码</em>
-                </a>
+            <div style="width: 152px; margin: 0 auto">
+                <img ng-src="{{dream.code}}" style="width: 150px; height: 150px">
             </div>
         </div>
         <div ng-if="type==2" class="hdcontent">

miaomiao/www/templates/home/index.html

@@ -61,7 +61,7 @@
                                 <div class="row">
                                     <div class="col avatarCol">
                                         <div class="fl" style="width: 27%">
-                                            <img ng-src="{{item.user.avatar | avator}}" ng-click="toUserDetail(item.user.id,item.id)" />
+                                            <img ng-src="{{item.user.avatar | avator}}" ng-click="toUserDetail(item.user.id)" />
                                         </div>
                                         <div class="myblock">
                                             <div>{{item.user.nickname}}<span>{{item.user.birthday | getage}}岁</span></div>

miaomiao/www/templates/home/oldDream.html

@@ -1,108 +1,7 @@
 <ion-view view-title="瞄喵">
-    <ion-nav-buttons side="right">
-        <button class="button button-clear homeIcon">
-            <img src="img/icon_message_h.svg" style="height: 100%; width: 100%">
-        </button>
-        <button class="button button-clear button-small" style="padding-top: 3px;">
-            <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
-        </button>
-    </ion-nav-buttons>
     <ion-content>
-        <div class="list">
+        <div ng-if="100*dream.get_coin/dream.coin!==0" class="list" ng-repeat="dream in dreams">
             <div class="item reply-item" ng-click="toDetail(dream.id)">
-                <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
-                    <div style="float:left;">
-                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
-                    </div>
-                    <div style="float:left; margin: 15px 0 0 10px">
-                        ldfg
-                    </div>
-                </div>
-                <div class="item item-thumbnail-left reply-content">
-                    <div style="float:left; height: 60px; width: 60px">
-                        <img ng-src="{{dream.pic}}" />
-                    </div>
-                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
-                        <h2>sdg</h2>
-                        <p>asuhdga</p>
-                    </div>
-                    <div style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
-                        进行中
-                    </div>
-                </div>
-
-                <div class="reply-bar">
-                    <div style="width: 50%;">
-                    </div>
-                </div>
-                <span style="font-size: 18px">50%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
-            </div>
-            <p style="background: #F8F8F8; height: 1rem"></p>
-        </div>
-        <div class="list">
-            <div class="item reply-item" ng-click="toDetail(dream.id)">
-                <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
-                    <div style="float:left;">
-                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
-                    </div>
-                    <div style="float:left; margin: 15px 0 0 10px">
-                        ldfg
-                    </div>
-                </div>
-                <div class="item item-thumbnail-left reply-content">
-                    <div style="float:left; height: 60px; width: 60px">
-                        <img ng-src="{{dream.pic}}" />
-                    </div>
-                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
-                        <h2>sdg</h2>
-                        <p>asuhdga</p>
-                    </div>
-                    <div style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
-                        进行中
-                    </div>
-                </div>
-
-                <div class="reply-bar">
-                    <div style="width: 50%;">
-                    </div>
-                </div>
-                <span style="font-size: 18px">50%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
-            </div>
-            <p style="background: #F8F8F8; height: 1rem"></p>
-        </div>
-        <div class="list">
-            <div class="item reply-item" ng-click="toDetail(dream.id)">
-                <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
-                    <div style="float:left;">
-                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
-                    </div>
-                    <div style="float:left; margin: 15px 0 0 10px">
-                        ldfg
-                    </div>
-                </div>
-                <div class="item item-thumbnail-left reply-content">
-                    <div style="float:left; height: 60px; width: 60px">
-                        <img ng-src="{{dream.pic}}" />
-                    </div>
-                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
-                        <h2>sdg</h2>
-                        <p>asuhdga</p>
-                    </div>
-                    <div style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
-                        进行中
-                    </div>
-                </div>
-
-                <div class="reply-bar">
-                    <div style="width: 50%;">
-                    </div>
-                </div>
-                <span style="font-size: 18px">50%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
-            </div>
-            <p style="background: #F8F8F8; height: 1rem"></p>
-        </div>
-        <!--<div ng-if="100*dream.get_coin/dream.coin!==0" class="list" ng-repeat="dream in dreams">
-        <div class="item reply-item" ng-click="toDetail(dream.id)">
                 <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
                     <div style="float:left;">
                         <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
@@ -113,7 +12,7 @@
                 </div>
                 <div class="item item-thumbnail-left reply-content">
                     <div style="float:left; height: 60px; width: 60px">
-                        <img ng-src="{{dream.pic}}" />
+                        <img ng-src="{{dream.imgs[0].pic}}" />
                     </div>
                     <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
                         <h2>{{dream.name}}</h2>
@@ -159,6 +58,6 @@
                 <span style="font-size: 18px">{{100*dream.get_coin/dream.coin | Rouder}}%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
             </div>
             <p style="background: #F8F8F8; height: 1rem"></p>
-        </div>-->
+        </div>
     </ion-content>
 </ion-view>

miaomiao/www/templates/home/supportDream.html

@@ -1,110 +1,6 @@
 <ion-view view-title="瞄喵">
-    <!--<ion-nav-buttons side="right">
-        <button class="button button-clear homeIcon">
-            <img src="img/icon_message_h.svg" style="height: 100%; width: 100%">
-        </button>
-        <button class="button button-clear button-small" style="padding-top: 3px;">
-            <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
-        </button>
-    </ion-nav-buttons>-->
     <ion-content>
-
-        <div class="list">
-            <div class="item reply-item" ng-click="toDetail(dream.id)">
-                <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
-                    <div style="float:left;">
-                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
-                    </div>
-                    <div style="float:left; margin: 15px 0 0 10px">
-                        ldfg
-                    </div>
-                </div>
-                <div class="item item-thumbnail-left reply-content">
-                    <div style="float:left; height: 60px; width: 60px">
-                        <img ng-src="{{dream.pic}}" />
-                    </div>
-                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
-                        <h2>sdg</h2>
-                        <p>asuhdga</p>
-                    </div>
-                    <div style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
-                        进行中
-                    </div>
-                </div>
-
-                <div class="reply-bar">
-                    <div style="width: 50%;">
-                    </div>
-                </div>
-                <span style="font-size: 18px">50%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
-            </div>
-            <p style="background: #F8F8F8; height: 1rem"></p>
-        </div>
-
-        <div class="list">
-            <div class="item reply-item" ng-click="toDetail(dream.id)">
-                <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
-                    <div style="float:left;">
-                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
-                    </div>
-                    <div style="float:left; margin: 15px 0 0 10px">
-                        ldfg
-                    </div>
-                </div>
-                <div class="item item-thumbnail-left reply-content">
-                    <div style="float:left; height: 60px; width: 60px">
-                        <img ng-src="{{dream.pic}}" />
-                    </div>
-                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
-                        <h2>sdg</h2>
-                        <p>asuhdga</p>
-                    </div>
-                    <div style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
-                        进行中
-                    </div>
-                </div>
-
-                <div class="reply-bar">
-                    <div style="width: 50%;">
-                    </div>
-                </div>
-                <span style="font-size: 18px">50%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
-            </div>
-            <p style="background: #F8F8F8; height: 1rem"></p>
-        </div>
-
-        <div class="list">
-            <div class="item reply-item" ng-click="toDetail(dream.id)">
-                <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
-                    <div style="float:left;">
-                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
-                    </div>
-                    <div style="float:left; margin: 15px 0 0 10px">
-                        ldfg
-                    </div>
-                </div>
-                <div class="item item-thumbnail-left reply-content">
-                    <div style="float:left; height: 60px; width: 60px">
-                        <img ng-src="{{dream.pic}}" />
-                    </div>
-                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
-                        <h2>sdg</h2>
-                        <p>asuhdga</p>
-                    </div>
-                    <div style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
-                        进行中
-                    </div>
-                </div>
-
-                <div class="reply-bar">
-                    <div style="width: 50%;">
-                    </div>
-                </div>
-                <span style="font-size: 18px">50%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
-            </div>
-            <p style="background: #F8F8F8; height: 1rem"></p>
-        </div>
-       <!-- <div ng-if="100*dream.get_coin/dream.coin!==0" class="list" ng-repeat="dream in dreams">
+        <div ng-if="100*dream.get_coin/dream.coin!==0" class="list" ng-repeat="dream in dreams">
             <div class="item reply-item" ng-click="toDetail(dream.id)">
                 <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
                     <div style="float:left;">
@@ -116,7 +12,7 @@
                 </div>
                 <div class="item item-thumbnail-left reply-content">
                     <div style="float:left; height: 60px; width: 60px">
-                        <img ng-src="{{dream.pic}}" />
+                        <img ng-src="{{dream.imgs[0].pic}}" />
                     </div>
                     <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
                         <h2>{{dream.name}}</h2>
@@ -162,6 +58,6 @@
                 <span style="font-size: 18px">{{100*dream.get_coin/dream.coin | Rouder}}%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
             </div>
             <p style="background: #F8F8F8; height: 1rem"></p>
-        </div>-->
+        </div>
     </ion-content>
 </ion-view>

miaomiao/www/templates/my/my-account-add.html

@@ -33,7 +33,10 @@
                                 <input  type="text" ng-model="vm.bank_name" placeholder="银行名称/支付宝">
                             </div>
                             <div class="item item-input" style="border-bottom: 1px solid #DDDDDD">
-                                <input  type="text" ng-model="vm.bank_number"  placeholder="账号" disabled style="background: #fff">
+                                <input  type="text" ng-model="vm.bank_user"  placeholder="姓名">
+                            </div>
+                            <div class="item item-input" style="border-bottom: 1px solid #DDDDDD">
+                                <input  type="text" ng-model="vm.bank_number"  placeholder="账号">
                             </div>
                             <div class="item item-input" style="border-bottom: 1px solid #DDDDDD">
                                 <input  type="number" ng-model="vm.bank_phone"  placeholder="手机号">

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

@@ -12,10 +12,10 @@
             <div class="item reply-item" ng-click="toDetail(dream.id)">
                 <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
                     <div style="float:left;">
-                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
+                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{ dream.user.avatar | avator }}" />
                     </div>
                     <div style="float:left; margin: 15px 0 0 10px">
-                        {{user.nickname}}
+                        {{ dream.user.nickname}}
                     </div>
                 </div>
                 <div class="item item-thumbnail-left reply-content">
@@ -42,14 +42,18 @@
         <div ng-repeat="dream in dreams" ng-if="100*dream.get_coin/dream.coin==100" class="list">
             <div class="item reply-item" ng-click="toDetail(dream.id)">
                 <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
-                    <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
-                    <span style="top: 10px;">{{user.nickname}}</span>
+                    <div style="float:left;">
+                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{ dream.user.avatar | avator }}" />
+                    </div>
+                    <div style="float:left; margin: 15px 0 0 10px">
+                        {{ dream.user.nickname}}
+                    </div>
                 </div>
                 <div class="item item-thumbnail-left reply-content">
-                    <div style="float:left;">
-                        <img ng-src="{{dream.pic}}" />
+                    <div style="float:left; height: 60px; width: 60px">
+                        <img ng-src="{{dream.img.pic}}" />
                     </div>
-                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px;">
+                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
                         <h2>{{dream.name}}</h2>
                         <p style="overflow-y: hidden;height: 40px;">{{dream.about}}</p>
                     </div>