add

miaomiao/www/.idea/workspace.xml

@@ -20,12 +20,12 @@
     <favorites_list name="www" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="userDetail.html" pinned="false" current-in-tab="true">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="userDetail.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.8914286">
-              <caret line="100" column="0" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
+            <state vertical-scroll-proportion="-10.928572">
+              <caret line="84" column="45" selection-start-line="84" selection-start-column="45" selection-end-line="84" selection-end-column="45" />
               <folding>
                 <element signature="n#style#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -36,10 +36,22 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/templates/my/index.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.6882883">
+              <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
+              <folding>
+                <element signature="n#div#2;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="style.css" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/css/style.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-6.293103">
+            <state vertical-scroll-proportion="0.0">
               <caret line="604" column="16" selection-start-line="604" selection-start-column="16" selection-end-line="604" selection-end-column="16" />
               <folding />
             </state>
@@ -49,7 +61,7 @@
       <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-3.6724138">
+            <state vertical-scroll-proportion="0.0">
               <caret line="227" column="14" selection-start-line="224" selection-start-column="8" selection-end-line="227" selection-end-column="14" />
               <folding />
             </state>
@@ -59,8 +71,8 @@
       <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-7.6666665">
-              <caret line="898" column="55" selection-start-line="898" selection-start-column="55" selection-end-line="898" selection-end-column="55" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="898" column="21" selection-start-line="898" selection-start-column="21" selection-end-line="898" selection-end-column="21" />
               <folding />
             </state>
           </provider>
@@ -84,7 +96,6 @@
         <option value="$PROJECT_DIR$/templates/my/my-recharge.html" />
         <option value="$PROJECT_DIR$/templates/my/my-message.html" />
         <option value="$PROJECT_DIR$/js/controllers/add.js" />
-        <option value="$PROJECT_DIR$/templates/my/index.html" />
         <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
         <option value="$PROJECT_DIR$/templates/home/user-detail.html" />
         <option value="$PROJECT_DIR$/js/services/tabsService.js" />
@@ -100,6 +111,7 @@
         <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/templates/home/userDetail.html" />
+        <option value="$PROJECT_DIR$/templates/my/index.html" />
       </list>
     </option>
   </component>
@@ -109,8 +121,8 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="40" />
-    <option name="y" value="171" />
+    <option name="x" value="416" />
+    <option name="y" value="29" />
     <option name="width" value="974" />
     <option name="height" value="744" />
   </component>
@@ -141,7 +153,7 @@
     <panes />
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="E:/Graduation design/huiwei" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../.." />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -210,7 +222,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="40" y="171" width="974" height="744" extended-state="0" />
+    <frame x="416" y="29" width="974" height="744" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1688988" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -247,6 +259,43 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="n#style#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#span#0;n#div#1;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/style.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="604" column="16" selection-start-line="604" selection-start-column="16" selection-end-line="604" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="227" column="14" selection-start-line="224" selection-start-column="8" selection-end-line="227" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="898" column="21" selection-start-line="898" selection-start-column="21" selection-end-line="898" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/js/app.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.1183534">
@@ -387,13 +436,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.107143">
-          <caret line="9" column="55" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/tabs.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.380789">
@@ -433,7 +475,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-13.1">
           <caret line="101" column="38" selection-start-line="101" selection-start-column="24" selection-end-line="101" selection-end-column="38" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -441,7 +482,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-8.666667">
           <caret line="264" column="49" selection-start-line="264" selection-start-column="49" selection-end-line="264" selection-end-column="49" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -449,14 +489,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6742857">
           <caret line="110" column="35" selection-start-line="110" selection-start-column="35" selection-end-line="110" selection-end-column="35" />
-          <folding>
-            <element signature="n#style#0;n#p#0;n#div#1;n#div#1;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#2;n#div#1;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#span#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -464,27 +496,20 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-7.964286">
           <caret line="41" column="37" selection-start-line="41" selection-start-column="37" selection-end-line="41" selection-end-column="37" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#i#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#span#0;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.6666665">
-          <caret line="898" column="55" selection-start-line="898" selection-start-column="55" selection-end-line="898" selection-end-column="55" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="898" column="21" selection-start-line="898" selection-start-column="21" selection-end-line="898" selection-end-column="21" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.6724138">
+        <state vertical-scroll-proportion="0.0">
           <caret line="227" column="14" selection-start-line="224" selection-start-column="8" selection-end-line="227" selection-end-column="14" />
           <folding />
         </state>
@@ -492,7 +517,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.293103">
+        <state vertical-scroll-proportion="0.0">
           <caret line="604" column="16" selection-start-line="604" selection-start-column="16" selection-end-line="604" selection-end-column="16" />
           <folding />
         </state>
@@ -500,8 +525,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8914286">
-          <caret line="100" column="0" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
+        <state vertical-scroll-proportion="-10.928572">
+          <caret line="84" column="45" selection-start-line="84" selection-start-column="45" selection-end-line="84" selection-end-column="45" />
           <folding>
             <element signature="n#style#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -511,5 +536,15 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6882883">
+          <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
+          <folding>
+            <element signature="n#div#2;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

miaomiao/www/js/config/router.js

@@ -125,7 +125,7 @@
             views: {
                 'app-home': {
                     templateUrl: 'templates/my/my-collect.html',
-                    controller: 'collectCtrl'
+                    controller: 'homeCollectCtrl'
                 }
             }
         })

miaomiao/www/js/controllers/account.js

@@ -13,12 +13,13 @@
                 storage.setObject('user', result.data.data.user);
                 storage.set('token', result.data.data.token);
                 $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
+                $scope.user=storage.getObject('user');
                 $state.go('app.home');
             }, function (error) {
                // msg.hide();
                 // msg.error(error.data.message);
             });
-        }
+        };
         $scope.loginbywx = function () {
             var scope = "snsapi_userinfo", state = "_" + (+new Date());
             Wechat.auth(scope, state, function (response) {
@@ -27,7 +28,7 @@
             }, function (reason) {
                 alert("Failed: " + reason);
             });
-        }
+        };
         //获取验证码
         $scope.getVerifyCode = function () {
             // if (!util.isMobile($scope.vm.mobile)) {

miaomiao/www/js/controllers/home.js

@@ -3,6 +3,17 @@
         , function ($scope, $ionicTabsDelegate, $http, config, $state, msg, $ionicPopover, homeService, $ionicPopup, $timeout, $ionicSideMenuDelegate) {
             $scope.$on('$ionicView.beforeEnter', function (viewResult) {
                 $ionicTabsDelegate.showBar(true);
+                homeService.messageInfo().then(function(result){
+                    $scope.infos = result.data.data;
+                    if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){
+                        $scope.showMessage=0;
+                    }
+                    else {
+                        $scope.showMessage=1;
+                    }
+                },function(error){
+
+                });
             });
         $scope.type = 'hot';//tab切换
 
@@ -212,7 +223,17 @@
                 homeService.myInfo().then(function(result){
                     $scope.user = result.data.data;
                 });
-                console.log($scope.user);
+                homeService.messageInfo().then(function(result){
+                    $scope.infos = result.data.data;
+                    if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){
+                        $scope.showMessage=0;
+                    }
+                    else {
+                        $scope.showMessage=1;
+                    }
+                },function(error){
+
+                });
             });
             $scope.$on('$ionicView.leave', function () {
                 if($scope.multi.promise)$interval.cancel($scope.multi.promise);
@@ -388,8 +409,8 @@
             $scope.leftTimer = $interval(function () {
                 if (countDown >= 1) leftTimer(countDown - 1);
             },1000);*/
-           /* if(countDown<=0){
-              $scope.timer='结束'; 
+            /*if(countDown<=0){
+              $scope.timer='结束';
             }*/
         };
         $scope.changeIndex = function (index) {
@@ -574,7 +595,17 @@
                 homeService.myInfo().then(function(result){
                     $scope.user = result.data.data;
                 });
-                console.log($scope.user);
+                homeService.messageInfo().then(function(result){
+                    $scope.infos = result.data.data;
+                    if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){
+                        $scope.showMessage=0;
+                    }
+                    else {
+                        $scope.showMessage=1;
+                    }
+                },function(error){
+
+                });
             });
             $scope.$on('$ionicView.leave', function () {
                 if($scope.multi.promise)$interval.cancel($scope.multi.promise);
@@ -884,7 +915,6 @@
                     $scope.items.is_care=result.data.data;
                 })
             };
-
             $scope.next = function (type) {
                 //type:1 前一个，type:2 后一个
                 if($scope.items.imgs.length>0){
@@ -951,6 +981,18 @@
                 })
             };
         }]);
+    app.controller('homeCollectCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg"
+        , function ($scope, $ionicTabsDelegate,$state, myService, msg) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $ionicTabsDelegate.showBar(false);
+                myService.collect().then(function(result){
+                    $scope.dreams = result.data.data.dreams;
+                });
+            });
+            $scope.toDetail = function (id) {
+                $state.go('app.home_dreamdetail',{id:id});
+            };
+        }]);
     app.controller('shareDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
             $scope.dream = $stateParams.item;
@@ -1024,7 +1066,8 @@
             };
             $scope.toDetail = function(){
                 $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) {

miaomiao/www/js/controllers/my.js

@@ -628,18 +628,6 @@
             });
        }]);
 
-  /*  app.controller('sysCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
-        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
-            $scope.$on('$ionicView.beforeEnter', function () {
-                myService.systemInfo().then(function(result){
-                    $scope.sysInfos = result.data.data;
-                },function(error){
-                });
-            });
-        }]);*/
-   /* app.controller('letterCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
-        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
-        }]);*/
     app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg", "$ionicModal"
        , function ($scope,$ionicTabsDelegate, $state, myService, msg, $ionicModal) {
             $scope.$on('$ionicView.beforeEnter', function () {

miaomiao/www/js/controllers/tabs.js

@@ -1,5 +1,8 @@
 (function (module) {
     module.controller('tabsCtrl', ["$scope","$http", "myService","storage", "$ionicHistory", "$state", function ($scope,$http, myService, storage,$ionicHistory, $state) {
+        $scope.$on('$ionicView.beforeEnter', function () {
+            $scope.user = storage.getObject('user');
+        });
         $scope.go = function(target) {
             $ionicHistory.clearHistory();
             if($state.current.name=="app.home"&&target=="app.add"){

miaomiao/www/js/filters/filter.js

@@ -65,10 +65,13 @@
             var end_time = new Date(end_time.replace(/-/g, "/"));
             var date = new Date();
             var inter = (end_time.getTime() - date.getTime()) / (1000*3600*24);
-            // number = Math.abs(inter * 100) / 100;
+             //number = Math.abs(inter * 100) / 100;
             number = inter.toFixed(0);
             if(number<0){
-                number = "<1";
+                number="结束";
+            }
+            else {
+                number="剩余"+number+"天"
             }
             return number;
         };

miaomiao/www/js/services/homeservice.js

@@ -17,7 +17,7 @@
             collectionDream:function(id,is_collection){
                 return $http({
                     url:config.server + "api/dream/collection?id=" + id+"&is_collection="+is_collection,
-                    method:"get",
+                    method:"get"
                 })
             },
             search:function (keyword){
@@ -88,6 +88,18 @@
                     url:config.server + "api/user/care?id=" + id+"&is_care="+is_care,
                     method:"get"
                 })
+            },
+       /*     collectionDream:function(id,is_collection){
+                return $http({
+                    url:config.server + "api/dream/collection?id=" + id+"&is_collection="+is_collection,
+                    method:"get"
+                })
+            },*/
+            messageInfo:function(){
+                return $http({
+                    url:config.server + "api/my/info",
+                    method:"get"
+                })
             }
         };
     }]);

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

@@ -1,7 +1,8 @@
 <ion-view view-title="梦想">
     <ion-nav-buttons side="right">
         <button class="button button-clear homeIcon" ng-click="toMessage()">
-            <img src="img/icon_message_h.svg" style="height: 100%; width: 100%">
+            <img ng-if="showMessage==1" src="img/icon_message_h.svg" style="height: 100%; width: 100%">
+            <img ng-if="showMessage==0" src="img/icon_message_n.svg" style="height: 50%; width: 100%">
         </button>
         <button ng-click="share($event)" class="button button-clear button-small" style="padding-top: 3px;">
             <img src="img/icon_share.svg" style="height: 16px; width: 20px;">

miaomiao/www/templates/home/index.html

@@ -12,7 +12,8 @@
             <img src="img/icon_search.svg" style="height: 65%; width: 100%">
         </button>
         <button class="button button-clear" style="height: 37px; margin-top: 0.5px" ui-sref="app.message">
-            <img src="img/icon_message_h.svg" style="height: 60%; width: 100%">
+            <img ng-if="showMessage==1" src="img/icon_message_h.svg" style="height: 60%; width: 100%">
+            <img ng-if="showMessage==0" src="img/icon_message_n.svg" style="height: 55%; width: 100%">
         </button>
     </ion-nav-buttons>
     <ion-side-menus>
@@ -73,7 +74,7 @@
                                             <span style="color: #F16571">{{item.care_num}}</span>
                                             <span>人关注</span>
                                         </div>
-                                        <div class="mysecond">剩余{{item.end_time | lastDate}}天</div>
+                                        <div class="mysecond">{{item.end_time | lastDate}}</div>
                                     </div>
                                 </div>
                                 <div ng-click="toDetail(item.id)">

miaomiao/www/templates/home/oldDream.html

@@ -1,6 +1,6 @@
 <ion-view view-title="瞄喵">
     <ion-content>
-        <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;">

miaomiao/www/templates/home/userDetail.html

@@ -10,7 +10,7 @@
                     {{items.user.nickname}}
                 </div>
                 <div style="font-size:0.7rem; margin-bottom: 10px"> {{items.user.city}}</div>
-                <div ng-if="user.id != dream.user_id">
+                <div ng-if="user.id != items.user.id">
                     <div ng-if="items.is_care==0">
                         <span style="background: #fff; color: #00C3DA; font-size:0.7rem; border-radius: 20px; padding: 2px 20px" ng-click="attentionUser(1)">关注</span>
                     </div>

miaomiao/www/templates/my/index.html

@@ -10,26 +10,22 @@
             </div>
             
            <div class="row user-row">
-               <div class="col"><i class="icon ion-heart"></i> 关注&nbsp;&nbsp;{{user.collection_number}}</div>
-               <div class="col"><i class="icon ion-person"></i> 粉丝&nbsp;&nbsp;{{user.collection_number}}</div>
-               <div class="col"><i class="icon ion-ios-film"></i> 梦想&nbsp;&nbsp;{{user.care_dreams_number}}</div>
+               <div class="col"><i class="icon ion-heart"></i> 关注&nbsp;&nbsp;{{user.care_number}}</div>
+               <div class="col"><i class="icon ion-person"></i> 粉丝&nbsp;&nbsp;{{user.fans_number}}</div>
+               <div class="col"><i class="icon ion-ios-film"></i> 梦想&nbsp;&nbsp;{{user.dreams_number}}</div>
            </div>
         </div>
         <div class="row user-dz">
             <div class="col">
-                <div class="num">{{user.care_dreams_number}}</div>
+                <div class="num">{{user.collection_number}}</div>
                 <div class="mysecond">收藏</div>
             </div>
-            <div class="col">
-                <div class="num">123</div>
-                <div class="mysecond">点赞</div>
-            </div>
             <div class="col">
                 <div class="num">{{user.interaction_number}}</div>
                 <div class="mysecond">发帖</div>
             </div>
             <div class="col">
-                <div class="num">123</div>
+                <div class="num">{{user.huitie}}</div>
                 <div class="mysecond">回帖</div>
             </div>
         </div>

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

@@ -1,11 +1,5 @@
 <ion-view view-title="瞄喵">
     <ion-nav-buttons side="right">
-<!--         <button class="button button-clear homeIcon" ui-sref="app.my_message">
-            <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 ng-repeat="dream in dreams" ng-if="100*dream.get_coin/dream.coin!=100" class="list">