add

miaomiao/config.xml

@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="com.ionicframework.ionictabs121641" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-  <name>喵喵</name>
+  <name>瞄瞄</name>
   <description>
         An Ionic Framework and Cordova project.
     </description>
   <author email="you@example.com" href="http://example.com.com/">
       Your Name Here
     </author>
-  <content src="index.html"/>
-  <access origin="*"/>
-  <preference name="webviewbounce" value="false"/>
-  <preference name="UIWebViewBounce" value="false"/>
-  <preference name="DisallowOverscroll" value="true"/>
-  <preference name="android-minSdkVersion" value="16"/>
-  <preference name="BackupWebStorage" value="none"/>
-  <preference name="KeepRunning" value="True"/>
-  <preference name="ShowTitle" value="True"/>
-  <preference name="InAppBrowserStorageEnabled" value="True"/>
-  <preference name="SuppressesIncrementalRendering" value="True"/>
-  <preference name="windows-target-version" value="10.0"/>
-  <preference name="SplashScreen" value="screen"/>
-  <preference name="SplashScreenDelay" value="3000"/>
+  <content src="index.html" />
+  <access origin="*" />
+  <preference name="webviewbounce" value="false" />
+  <preference name="UIWebViewBounce" value="false" />
+  <preference name="DisallowOverscroll" value="true" />
+  <preference name="android-minSdkVersion" value="16" />
+  <preference name="BackupWebStorage" value="none" />
+  <preference name="KeepRunning" value="True" />
+  <preference name="ShowTitle" value="True" />
+  <preference name="InAppBrowserStorageEnabled" value="True" />
+  <preference name="SuppressesIncrementalRendering" value="True" />
+  <preference name="windows-target-version" value="10.0" />
+  <preference name="SplashScreen" value="screen" />
+  <preference name="SplashScreenDelay" value="3000" />
   <feature name="StatusBar">
-    <param name="ios-package" onload="true" value="CDVStatusBar"/>
+    <param name="ios-package" onload="true" value="CDVStatusBar" />
   </feature>
   <platform name="ios">
-    <icon height="57" src="resources/ios/icon/icon.png" width="57"/>
-    <icon height="114" src="resources/ios/icon/icon@2x.png" width="114"/>
-    <icon height="40" src="resources/ios/icon/icon-40.png" width="40"/>
-    <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80"/>
-    <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120"/>
-    <icon height="50" src="resources/ios/icon/icon-50.png" width="50"/>
-    <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100"/>
-    <icon height="60" src="resources/ios/icon/icon-60.png" width="60"/>
-    <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120"/>
-    <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180"/>
-    <icon height="72" src="resources/ios/icon/icon-72.png" width="72"/>
-    <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144"/>
-    <icon height="76" src="resources/ios/icon/icon-76.png" width="76"/>
-    <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152"/>
-    <icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167"/>
-    <icon height="29" src="resources/ios/icon/icon-small.png" width="29"/>
-    <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58"/>
-    <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87"/>
-    <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640"/>
-    <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750"/>
-    <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242"/>
-    <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208"/>
-    <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048"/>
-    <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732"/>
-    <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024"/>
-    <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536"/>
-    <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048"/>
-    <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768"/>
-    <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640"/>
-    <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320"/>
+    <icon height="57" src="resources/ios/icon/icon.png" width="57" />
+    <icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
+    <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
+    <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" />
+    <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120" />
+    <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
+    <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
+    <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
+    <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
+    <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
+    <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
+    <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
+    <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
+    <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
+    <icon height="167" src="resources/ios/icon/icon-83.5@2x.png" width="167" />
+    <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
+    <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
+    <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
+    <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
+    <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
+    <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
+    <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
+    <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
+    <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" />
+    <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
+    <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
+    <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
+    <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
+    <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
+    <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
   </platform>
   <platform name="android">
-    <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
-    <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
-    <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
-    <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
-    <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
-    <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
-    <splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
-    <splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
-    <splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
-    <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/>
-    <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/>
-    <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/>
-    <splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
-    <splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
-    <splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
-    <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
-    <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
-    <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
+    <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi" />
+    <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi" />
+    <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi" />
+    <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi" />
+    <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi" />
+    <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi" />
+    <splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi" />
+    <splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi" />
+    <splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi" />
+    <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi" />
+    <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi" />
+    <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi" />
+    <splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi" />
+    <splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi" />
+    <splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi" />
+    <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi" />
+    <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi" />
+    <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi" />
   </platform>
-  <plugin name="cordova-plugin-device" spec="~1.1.1"/>
-  <plugin name="cordova-plugin-console" spec="~1.0.2"/>
-  <plugin name="cordova-plugin-whitelist" spec="~1.2.1"/>
-  <plugin name="cordova-plugin-statusbar" spec="~2.1.0"/>
-  <plugin name="ionic-plugin-keyboard" spec="~1.0.9"/>
-  <plugin name="cordova-plugin-file-transfer" version="1.6.2"/>
-  <plugin name="cordova-plugin-file" version="4.3.2"/>
-  <plugin name="cordova-plugin-camera" version="2.4.0"/>
-  <plugin name="cordova-plugin-actionsheet" version="2.3.3"/>
-  <plugin name="cordova-plugin-media-capture" version="1.4.3"/>
-  <plugin name="cordova-plugin-compat" version="1.1.0"/>
-  <plugin name="cordova-plugin-splashscreen" version="4.0.3"/>
+  <plugin name="cordova-plugin-device" spec="~1.1.1" />
+  <plugin name="cordova-plugin-console" spec="~1.0.2" />
+  <plugin name="cordova-plugin-whitelist" spec="~1.2.1" />
+  <plugin name="cordova-plugin-statusbar" spec="~2.1.0" />
+  <plugin name="ionic-plugin-keyboard" spec="~1.0.9" />
+  <plugin name="cordova-plugin-file-transfer" version="1.6.2" />
+  <plugin name="cordova-plugin-file" version="4.3.2" />
+  <plugin name="cordova-plugin-camera" version="2.4.0" />
+  <plugin name="cordova-plugin-actionsheet" version="2.3.3" />
+  <plugin name="cordova-plugin-media-capture" version="1.4.3" />
+  <plugin name="cordova-plugin-compat" version="1.1.0" />
+  <plugin name="cordova-plugin-splashscreen" version="4.0.3" />
   <chcp>
     <config-file url="http://i.9026.com/miaomiao/chcp.json"/>
   </chcp>

miaomiao/www/css/style.css

@@ -457,4 +457,71 @@ padding-right:3px;
             position:relative;
             top:-4px;
         }
- 
+ @-webkit-keyframes slideInBothWays {
+  0% {
+    -webkit-transform: translate3d(-100%,0,0);
+  }
+ 
+  50% {
+    -webkit-transform: translate3d(50%,0,0);
+  }
+ 
+  100% {
+    -webkit-transform: translate3d(0,0,0);
+  }
+}
+ 
+.slide-in-both-ways {
+   -webkit-animation: slideInBothWays ease-in 1; 
+  animation: slideInBothWays ease-in 1;
+  -webkit-animation-fill-mode: forwards;
+  animation-fill-mode: forwards;
+  -webkit-animation-duration: 750ms;
+  animation-duration: 750ms;
+}
+
+ 
+.list-grow-animation {
+  -webkit-animation: listGrow ease-in 1; 
+  animation: listGrow ease-in 1;
+  -webkit-animation-duration: 400ms;
+  animation-duration: 400ms;
+}
+@-webkit-keyframes listGrow {
+  0% {
+    -webkit-transform: scale3d(1, 0, 1);
+  }
+ 
+  100% {
+    -webkit-transform: scale3d(1, 1, 0);
+  }
+}
+
+@-webkit-keyframes bounce {
+  0% {
+    -webkit-transform: translate3d(0,0,0);
+  }
+ 
+  25% {
+    -webkit-transform: translate3d(0,-30%,0);
+  }
+ 
+  50% {
+    -webkit-transform: translate3d(0,0,0);
+  }
+ 
+  75% {
+    -webkit-transform: translate3d(0,-30%,0);
+  }
+ 
+  100% {
+    -webkit-transform: translate3d(0,0,0);
+  }
+}
+ 
+.bounce-animation {
+  -webkit-animation: bounce ease-in 1; 
+  animation: bounce ease-in 1;
+  -webkit-animation-duration: 1000ms;
+  animation-duration: 1000ms;
+}

miaomiao/www/js/controllers/home.js

@@ -60,8 +60,9 @@
           
             //});
         }]);
-    app.controller('dreamDetailCtrl', ["$scope", "$state", "msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout","$ionicScrollDelegate"
-        , function ($scope, $state, msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate) {
+
+    app.controller('dreamDetailCtrl', ["$scope", "$state", "msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
+        , function ($scope, $state, msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
             var id = $stateParams.id;
             // id=6;
             $scope.load = function (id) {
@@ -81,6 +82,15 @@
             $scope.tosupport = false;
             $scope.support = function ($event) {
                 $event.stopPropagation();
+                //测试动画切换
+                $scope.sort.first = 'img/demo/head7.jpg';
+                $scope.sort.second = 'img/demo/head6.jpg';
+                $scope.sort.third = 'img/demo/head5.jpg';
+                $scope.sort.slide1 = 'list-grow-animation';
+                $scope.sort.slide2 = 'slide-in-both-ways';
+                $scope.sort.slide3 = 'bounce-animation';
+                $interval.cancel($scope.multi.promise);
+                return;
                 $scope.tosupport = true;
                 $scope.vm.coin = 0;
                 $scope.index = 0;
@@ -94,10 +104,12 @@
             }
             $scope.index = 0;
             $scope.$on('$ionicView.beforeEnter', function () {
+                $scope.calcmultiplier();
                 $ionicTabsDelegate.showBar(false);
             });
             $scope.$on('$ionicView.leave', function () {
                 $ionicTabsDelegate.showBar(true);
+                $interval.cancel($scope.multi.promise);
             });
 
             $scope.vm = {
@@ -125,7 +137,39 @@
                 $scope.index = index;
                 $scope.vm.coin = index*5;
             }
-            $scope.supportDream = function(data){
+            //实时排行
+            $scope.sort = {
+                first: 'img/demo/head5.jpg',
+                second: 'img/demo/head6.jpg',
+                third: 'img/demo/head7.jpg',
+                slide: ''
+            }
+            $scope.multi = {
+                a: 0.5,
+                b:new Date('2017-03-03'),
+                c: 20,
+                result: 0,
+                promise:null,
+            }
+            $scope.vidEnded = function () {
+                alert('播放完毕');
+            }
+            //实时计算支持乘数
+            $scope.calcmultiplier = function () {
+                $scope.multi.promise=$interval(function () {
+                    var date = new Date();
+                    var inter = date.getTime() - $scope.multi.b.getTime();
+                    var minutes = Math.floor(inter / (60 * 1000));
+                    var number = $scope.multi.a * minutes + $scope.multi.c;//js浮点运算会失真,根据muti.a的可能值范围，比如乘以100再除以100
+                    if (number<=1) {
+                        number = 1;
+                    }
+                    $scope.multi.result = number;
+                },1000);
+                //  点击支持取消   $interval.cancel($scope.multi.promise); 获取数据后重新开始执行
+            }
+            $scope.supportDream = function (data) {
+                
                 if(!$scope.vm.coin){
                     msg.error("请选择梦想币数量！");
                     return ;
@@ -134,17 +178,20 @@
                     id:id,
                     coin:$scope.vm.coin
                 };
+
                 homeService.supportDream(data).then(function(result){
                     $scope.tosupport = false;
                     number = result.data.data;
                     //最新支持乘数
                 })
             };
+
             $scope.collectionDream = function(){
                 homeService.collectionDream(id).then(function(result){
                     //最新支持乘数
                 })
             }
+
             $scope.showText = function(){ 
                 $scope.aboutStyle = {
                     "white-space" : "normal"
@@ -153,18 +200,22 @@
                     "display" : "none"
                 }
             }
-
-        $scope.placeholder="评论";
-        $scope.replay = function($event,name){
-            // $event.stopPropagation();
-            $scope.placeholder = "回复" + name;
-            $scope.addReplay=true;
+            $scope.input = {
+                placeholder: '评论',
+                focus:false
+            }
+         
+            $scope.replay = function ($event, name) {
+                $scope.input.focus = true;
+            //$event.stopPropagation();
+            $scope.input.placeholder = "回复" + name;
+            
             $scope.vm.comment='';
         }
         $scope.comment = function(){
           //  $event.stopPropagation();
-            $scope.placeholder="评论"; 
-            $scope.addReplay=true; 
+            $scope.input.placeholder = "评论";
+            $scope.input.focus = true;
             $scope.vm.comment='';
         }
         $scope.addpict = function () {

miaomiao/www/js/directives/directive.js

@@ -1,13 +1,31 @@
 (function (module) {
     module.directive('focusMe', function ($timeout) {
         return {
-            link: function (scope, element, attrs) {
-                $timeout(function () {
-                    element[0].focus();
-                }, 150);
+            scope: { trigger: '=focusMe' },
+            link: function (scope, element) {
+                scope.$watch('trigger', function (value) {
+                    if (value === true) {
+                        $timeout(function() {
+                        element[0].focus();
+                        scope.trigger = false;
+                        });
+                    }
+                });
             }
         };
     });
+    module.directive('vidDir', [function () {
+        return {
+            restrict: 'A',
+            link: function (scope, elem, attr) {
+                console.log(elem)
+                debugger;
+                this.vidEnded= function(){
+                    console.log('vid ended')
+                } 
+            }
+        };
+    }]);
     module.filter("trustUrl", ['$sce', function ($sce) {
         return function (recordingUrl) {
             return $sce.trustAsResourceUrl(recordingUrl);

miaomiao/www/js/filters/filter.js

@@ -83,21 +83,7 @@
             }
         };
     });
-    module.filter('leftTimer', function () {
-        return  function (sec){           
-            var startDate=new Date();
-            var countDown=sec-startDate.getTime()/1000;
-            var day=parseInt(countDown/(24*60*60));
-            var h=parseInt(countDown/(60*60)%24);
-            var m=parseInt(countDown/60%60);
-            var s=parseInt(countDown%60);                
-            document.getElementById('time').innerHTML=day+'天'+p(h)+'时'+p(m)+'分'+p(s)+'秒';
-            setTimeout('getMyTime()',500);
-            if(countDown<=0){
-              document.getElementById('time').innerHTML='结束'; 
-            }              
-        }
-    });
+ 
     module.filter('getage', function () {
         return function (birthday) {
             var age = -1;

miaomiao/www/templates/account/login.html

@@ -1,4 +1,4 @@
-<ion-view view-title="喵喵">
+<ion-view view-title="瞄瞄">
     <ion-content>
         <div  style="padding:30px">
             <img ng-src="img/demo/photo_default_user.svg"  style="margin:0 auto;display:block;width:100px;border-radius:50px"/>

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

@@ -4,6 +4,7 @@
         <!-- <button class="button button-clear icon ion-ios-compose-outline" style="padding-left:10px"></button> -->
     </ion-nav-buttons>
     <ion-content style="background-color:#F3F3F3" ng-click="cancelsupport()">
+     
         <div class="tabs-striped tabs-top">
             <div class="tabs" style="top:0">
                 <a ng-class="type==1?'tab-item active':'tab-item'" ng-click="changetype(1)">
@@ -20,9 +21,9 @@
         <div class="icontent" ng-if="type==1">
             <ion-slides slider="data.slider">
                 <ion-slide-page ng-if="dream.video">
-                    <div class="box banner"> 
-                        <video ng-src="{{dream.video}}" class="centerme" controls="controls" autoplay></video>
-                    </div>  
+                    <div class="box banner">
+                        <video ng-src="http://i.9026.com/miaomiao/video.mp4" height="300px" width="300px"  class="centerme" controls="controls" autoplay></video>
+                    </div>
                 </ion-slide-page>
                 <ion-slide-page ng-repeat="img in dream.imgs" >
                     <div class="box banner"><img ng-src="{{img.pic}}" /></div>
@@ -61,16 +62,16 @@
                         <div class="col" style="text-align:right">
                             <h2>{{dream.coin}}</h2>
                             <p>我要求的梦想币</p>
-                        </div>
+                        </div>                    
                     </div>
                 </div>
-                <div class="item row detail-head">
-                    <div class="col"><img ng-src="img/demo/head7.jpg" /></div>
-                    <div class="col"><img ng-src="img/demo/head6.jpg" /></div>
-                    <div class="col"><img ng-src="img/demo/head5.jpg" /></div>
+                <div class="item row detail-head "  >
+                    <div class="col"><img ng-src="{{sort.second}}"  ng-class="sort.slide2" /></div>
+                    <div class="col"><img ng-src="{{sort.first}}" ng-class="sort.slide1" /></div>
+                    <div class="col"><img ng-src="{{sort.third}}"  ng-class="sort.slide3"/></div>
                 </div>
                 <div class="item">
-                    <button class="button button-assertive" style="width:25%;white-space:normal;line-height:20px">支持乘数×{{number}}</button>
+                    <button class="button button-assertive" style="width:25%;white-space:normal;line-height:20px">支持乘数×{{multi.result}}</button>
                     <button class="button button-calm" style="width:50%" ng-click="support($event)">支持</button>
                     <button class="button button-outline button-calm" style="width:25%" ng-click="collectionDream()">＋收藏</button>
                 </div>
@@ -88,38 +89,38 @@
                     </div>
                     <div class="item" ng-click="comment()"> 
                         <img class="head" src="../../img/demo/head2.jpg" />
-                        <span class="utitle">喵喵喵酱</span>
+                        <span class="utitle">瞄瞄喵酱</span>
                         <span class="utitle kz">剩余5天</span>
                         <p class="subtile" style="white-space:normal">在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得北欧时光!</p>
                         <div class="picts">
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
-                            <img class="slt" src="../../img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
+                            <img class="slt" src="img/demo/pict.png" />
                         </div>
                     </div>
                 </div>
                 <div class="list" style="margin-top:-22px;" ng-click="showForm=true; focusInput=true">
-                    <div class="item subitem">
+                    <div class="item subitem" ng-click="replay($event,'百川1')">
                         <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
+                        <span>百川1</span>
                         <span class="kz">2016-08-08 11:11</span>
                         <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
                     </div>
-                    <div class="item subitem" ng-click="replay($event)">
+                    <div class="item subitem" ng-click="replay($event,'百川2')">
                         <img ng-src="img/demo/head4.jpg" />
-                        <span>百川</span>
+                        <span>百川2</span>
                         <span class="kz">2016-08-08 11:11</span>
                         <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
                     </div>
-                     <label class="item item-input">
-                         <input name="comment" type="text" placeholder="{{placeholder}}" ng-model="vm.comment" ng-init="addReplay=false" style="padding: 0 20px;">
-                     </label>
+                     <div class="item item-input">
+                         <input name="comment" type="text" focus-me="input.focus"   placeholder="{{input.placeholder}}" ng-model="vm.comment"  style="padding: 0 20px;">
+                     </div>
  
                 </div>
             </div>
@@ -127,7 +128,7 @@
                 <div class="list">
                     <div class="item">
                         <img class="head" src="../../img/demo/head2.jpg" />
-                        <span class="utitle">喵喵喵酱</span>
+                        <span class="utitle">瞄瞄喵酱</span>
                         <span class="utitle kz">剩余5天</span>
                         <p class="subtile" style="white-space:normal">在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得北欧时光!</p>
                         <div class="picts">
@@ -172,7 +173,7 @@
                     <img style="width:30px" src="../../img/king.png" />
                     <span style="padding-left:20px">
                         <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">喵喵喵酱</span>
+                        <span style="position:relative;top:-20px">瞄瞄喵酱</span>
                         <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
                     </span>
                     <span style="padding-left:50px;">
@@ -184,7 +185,7 @@
                     <img style="width:30px" src="../../img/king.png" />
                     <span style="padding-left:20px">
                         <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">喵喵喵酱</span>
+                        <span style="position:relative;top:-20px">瞄瞄喵酱</span>
                         <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
                     </span>
                     <span style="padding-left:50px;">
@@ -196,7 +197,7 @@
                     <img style="width:30px" src="../../img/king.png" />
                     <span style="padding-left:20px">
                         <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">喵喵喵酱</span>
+                        <span style="position:relative;top:-20px">瞄瞄喵酱</span>
                         <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
                     </span>
                     <span style="padding-left:50px;">
@@ -208,7 +209,7 @@
                     <img style="width:30px" src="../../img/king.png" />
                     <span style="padding-left:20px">
                         <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">喵喵喵酱</span>
+                        <span style="position:relative;top:-20px">瞄瞄喵酱</span>
                         <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
                     </span>
                     <span style="padding-left:50px;">
@@ -220,7 +221,7 @@
                     <img style="width:30px" src="../../img/king.png" />
                     <span style="padding-left:20px">
                         <img style="width:40px;border-radius:100%" src="../../img/demo/head4.jpg" />
-                        <span style="position:relative;top:-20px">喵喵喵酱</span>
+                        <span style="position:relative;top:-20px">瞄瞄喵酱</span>
                         <span style="color:#9E9E9E;position:relative;left:-68px">Lv.3</span>
                     </span>
                     <span style="padding-left:50px;">

miaomiao/www/templates/home/index.html

@@ -1,4 +1,4 @@
-<ion-view view-title="喵喵" >
+<ion-view view-title="瞄瞄" >
     <ion-nav-buttons side="left">
         <button class="button button-clear icon ion-ios-list-outline" ng-click="openPopover($event)"></button>
     </ion-nav-buttons>
@@ -8,6 +8,7 @@
         <button class="button button-clear icon ion-email-unread" style="padding-left:10px"></button>
     </ion-nav-buttons>
     <ion-content>
+        
         <!--下拉刷新-->
         <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
         </ion-refresher>
@@ -25,6 +26,7 @@
             </div>
         </div>
         <div class="icontent">
+            <a ui-sref="app.my_dreamdetail">ttest</a>
             <ion-slides   options="data.sliderOptions" slider="data.sliderDelegate">
                 <ion-slide-page ng-repeat="banner in index.banners">
                     <div class="box banner"><img ng-src="{{banner.value}}" /></div>  

miaomiao/www/templates/home/search.html

@@ -64,12 +64,12 @@
                  </div>
                  <div class="item sarch-item">
                      <img   src="../../img/demo/head1.jpg" />  
-                     <span style="padding:5px;">哈哈喵喵酱</span>
+                     <span style="padding:5px;">哈哈瞄瞄酱</span>
                      <span class="level">Lv.3</span>
                  </div>
                  <div class="item sarch-item">
                      <img ng-src="img/demo/head1.jpg" />
-                     <span style="padding:5px;">哈哈喵喵酱</span>
+                     <span style="padding:5px;">哈哈瞄瞄酱</span>
                      <span class="level">Lv.3</span>
                  </div>
                  <div class="item" style="text-align:center;color:#FF4B82;font-size:1.1rem;padding:10px;" ng-click="showmore()">更多>></div>
@@ -125,7 +125,7 @@
              <div ng-if="type==1" class="list more-userlist">
                  <div class="item sarch-item">
                      <img ng-src="img/demo/head1.jpg" />
-                     <span style="padding:5px;">哈哈喵喵酱</span>
+                     <span style="padding:5px;">哈哈瞄瞄酱</span>
                      <span class="level">Lv.3</span>
                      <img ng-src="img/王冠.png" class="imgitem" />
                      <img ng-src="img/王冠.png" class="imgitem" />
@@ -135,7 +135,7 @@
                  </div>
                  <div class="item sarch-item">
                      <img ng-src="img/demo/head1.jpg" />
-                     <span style="padding:5px;">哈哈喵喵酱</span>
+                     <span style="padding:5px;">哈哈瞄瞄酱</span>
                      <span class="level">Lv.3</span>
                      <img ng-src="img/王冠.png" class="imgitem" />
                      <img ng-src="img/王冠.png" class="imgitem" />
@@ -143,7 +143,7 @@
                  </div>
                  <div class="item sarch-item">
                      <img ng-src="img/demo/head1.jpg" />
-                     <span style="padding:5px;">哈哈喵喵酱</span>
+                     <span style="padding:5px;">哈哈瞄瞄酱</span>
                      <span class="level">Lv.3</span>
                      <img ng-src="img/王冠.png" class="imgitem" />
                      <img ng-src="img/王冠.png" class="imgitem" />
@@ -152,7 +152,7 @@
                  </div>
                  <div class="item sarch-item">
                      <img ng-src="img/demo/head1.jpg" />
-                     <span style="padding:5px;">哈哈喵喵酱</span>
+                     <span style="padding:5px;">哈哈瞄瞄酱</span>
                      <span class="level">Lv.3</span>
                      <img ng-src="img/王冠.png" class="imgitem" />
                  </div>

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

@@ -3,7 +3,7 @@
         <div class="list list-user-set list-set-arrow">
             <a class="item item-icon-left">
                 <i class="icon ion-clipboard"></i>
-                <em class="fl">关于喵喵</em>
+                <em class="fl">关于瞄瞄</em>
             </a>
             <a class="item item-icon-left">
                 <i class="icon ion-ios-telephone-outline"></i>