Merge branch 'master' of http://git.9026.com/roobe/miao.git

.idea/blade.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="BladeInjectionConfiguration" escapedTextEnd="!!}" escapedTextStart="{!!" />
-</project>

.idea/copyright/profiles_settings.xml

@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>

.idea/encodings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>

.idea/miao.iml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="PHARS">
-        <CLASSES>
-          <root url="phar://$MODULE_DIR$/server/vendor/phpunit/phpunit/tests/_files/phpunit-example-extension/tools/phpunit.d/phpunit-example-extension-1.0.0.phar/" />
-        </CLASSES>
-        <SOURCES>
-          <root url="phar://$MODULE_DIR$/server/vendor/phpunit/phpunit/tests/_files/phpunit-example-extension/tools/phpunit.d/phpunit-example-extension-1.0.0.phar/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-  </component>
-</module>

.idea/misc.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/miao.iml" filepath="$PROJECT_DIR$/.idea/miao.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

.idea/workspace.xml

@@ -21,74 +21,7 @@
     <favorites_list name="miao" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/add/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-1.9310344">
-              <caret line="30" column="52" selection-start-line="30" selection-start-column="49" selection-end-line="30" selection-end-column="52" />
-              <folding>
-                <element signature="n#style#0;n#label#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#em#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#a#2;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#em#0;n#a#2;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#6;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="add.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/add.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="66" column="15" selection-start-line="56" selection-start-column="14" selection-end-line="66" selection-end-column="15" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="my-account-add.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-account-add.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-6.357143">
-              <caret line="65" column="108" selection-start-line="65" selection-start-column="104" selection-end-line="65" selection-end-column="108" />
-              <folding>
-                <element signature="n#style#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#0;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#0;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#0;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#2;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#0;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#1;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#1;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#a#1;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#1;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#em#0;n#a#1;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#1;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/my.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="260" column="67" selection-start-line="260" selection-start-column="67" selection-end-line="260" selection-end-column="67" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/home.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.5978836">
-              <caret line="679" column="23" selection-start-line="679" selection-start-column="23" selection-end-line="679" selection-end-column="23" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -170,7 +103,7 @@
     <panes />
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../quanzhouda/receive/receive" />
+    <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" />
@@ -245,7 +178,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="349" y="0" width="1018" height="728" extended-state="0" />
-    <editor active="true" />
+    <editor active="false" />
     <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.16016427" sideWeight="0.49460918" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -683,8 +616,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5978836">
-          <caret line="679" column="23" selection-start-line="679" selection-start-column="23" selection-end-line="679" selection-end-column="23" />
+        <state vertical-scroll-proportion="0.9664903">
+          <caret line="690" column="15" selection-start-line="690" selection-start-column="15" selection-end-line="690" selection-end-column="15" />
           <folding />
         </state>
       </provider>

miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao/www",
-  "release": "2017.08.10-15.19.30"
+  "release": "2017.08.11-17.05.32"
 }

miaomiao/www/chcp.manifest

@@ -29,7 +29,7 @@
   },
   {
     "file": "css/style.css",
-    "hash": "e4885711bbb6a15da9f350020fdae4b4"
+    "hash": "a9502d0927b04368a96b0bca39d29eff"
   },
   {
     "file": "img/alipay.png",
@@ -373,11 +373,11 @@
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "2d2ea6701c98cf2bc5300f1f28470bd4"
+    "hash": "b3af09342eabd861ae10cbc1f32600a3"
   },
   {
     "file": "js/controllers/my.js",
-    "hash": "9b41b876414cecaa8169077c9ae244e6"
+    "hash": "11e33fcf2993706d761fc4d6e1c514dc"
   },
   {
     "file": "js/controllers/tabs.js",
@@ -713,15 +713,15 @@
   },
   {
     "file": "templates/add/index.html",
-    "hash": "dbd6da8a2a31c6cf23def0427e085d29"
+    "hash": "48a24aa2af91b082a939628b4057e551"
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "bba5497e83fe870116ad882e60af6329"
+    "hash": "e5153ecfb9bf0146397da989e1fe8ec3"
   },
   {
     "file": "templates/home/index.html",
-    "hash": "ec81a4ade03177e1bca7a559a5f122ba"
+    "hash": "b141632617dc331ac9cb39e4bf79e6a3"
   },
   {
     "file": "templates/home/oldDream.html",
@@ -773,7 +773,7 @@
   },
   {
     "file": "templates/my/my-dream.html",
-    "hash": "11c183d37c9484f41ab6688567337517"
+    "hash": "f86ee815e900a04bb91368d3ce380752"
   },
   {
     "file": "templates/my/my-message-reply.html",
@@ -813,6 +813,6 @@
   },
   {
     "file": "templates/tabs.html",
-    "hash": "2222e6d0cc59f701194f64a8f7f0e4de"
+    "hash": "b284695cab3a6e5bf4b435feeb095c20"
   }
 ]

miaomiao/www/css/style.css

@@ -66,7 +66,7 @@ a.tab-item-add {
     position: relative;
     height: 70px;
     flex: none;
-    top: -40px;
+    top: -30px;
     opacity: 1;
 }
 a.tab-item-add .icon {
@@ -76,6 +76,15 @@ a.tab-item-add .icon {
     line-height: 40px;
     font-size: 60px;
 }
+.tab-item-home{
+    height: 200px;
+}
+.tabs{
+    height: 52px;
+}
+.tab-item .icon{
+    font-size: 23px;
+}
 /*add*/
 .addcontent .item{
     border:0;
@@ -218,13 +227,13 @@ overflow:auto;
         display:inline-block;
         color: #5A5A5A;
         width: 100px;
-        padding-top: 5px;
+        padding-top: 4px;
         margin-left: 5px;
         float: left;
     }
 .mysecond {
     color: #BEBEBE;
-    margin-top:5px;
+    margin-top:1px;
     font-size: 15px;
 }
 .swiper-pagination-bullet{
@@ -255,6 +264,10 @@ overflow:auto;
     color: #fff;
     /*font-family: 宋体;*/
 }
+.popup-buttons .button:last-child{
+    margin: 0 20%;
+    border-radius: 30px;
+}
 
 /*my-html*/
 
@@ -487,9 +500,7 @@ a:visited,a:link{
 }
 
 .detail-like .send div{
-    /*position:relative;*/
     color: #929292;
-    top:15px;
 }
 .detail-like .send img{
     width: 30px;
@@ -577,12 +588,39 @@ a:visited,a:link{
     padding-top:49px;
 }
 /*dreamDetail*/
+.popover-backdrop{
+    background: rgba(50, 50, 50, 0.5);
+    height: -webkit-fill-available;
+    /*height: 100%;*/
+}
+.popover-backdrop img{
+    position: absolute;
+    z-index: 11;
+    display: block;
+    width: 80%;
+    height: 55%;
+    margin: 30% 10%;
+}
 .top2{
     margin-top: 20px; text-align: center; float:left; height: 100px; width: 100px;color: #6B6B6B;font-size: 16px;
 }
 .top1{
     text-align: center; float:left; height: 111px; width: 111px;color: #6B6B6B;font-size: 14px;
 }
+.dreamButton{
+    /*border: 1px solid red;*/
+    text-align: center;
+}
+.dreamButton button{
+    background: #fff;
+    height: 40px;
+    line-height: 15px;
+    border-radius:30px;
+}
+.button{
+    min-width: 90px;
+    min-height: 10px;
+}
 /*seach.html*/
 .search-hot {
     font-size:1rem;

miaomiao/www/js/controllers/home.js

@@ -125,8 +125,8 @@
         });
     }]);
 
-    app.controller('dreamDetailCtrl', ["$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) {
+    app.controller('dreamDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams","$ionicBackdrop", "$timeout", "$ionicScrollDelegate", "$interval"
+        , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams,$ionicBackdrop, $timeout, $ionicScrollDelegate, $interval) {
         var id = $stateParams.id;
         var top3user = '';
             $scope.chosedIndex = 0;
@@ -154,6 +154,8 @@
                 msg.hide();
                 console.log(result);
                 $scope.dream = result.data.data;
+                var reg = new RegExp("\n", "g");
+                $scope.dream.about = $scope.dream.about.replace(reg, "<br/>");
                 var end_time = new Date($scope.dream.end_time.replace(/-/g, "/"));
                 var date = new Date();
                 var inter = (end_time.getTime() - date.getTime()) / 1000;
@@ -255,16 +257,19 @@
             var h=parseInt(countDown/(60*60)%24);
             var m=parseInt(countDown/60%60);
             var s=parseInt(countDown%60); 
-            $scope.timer=(h<10?'0'+h:h)+'时'+(m<10?'0'+m:m)+'分'+(s<10?'0'+s:s)+'秒';
-            if(day>0) $scope.timer = day+'天'+ $scope.timer;
+            //$scope.timer=(h<10?'0'+h:h)+'时'+(m<10?'0'+m:m)+'分'+(s<10?'0'+s:s)+'秒';
+            if(day>0) $scope.timer = day+'天';
+            if(day<0 && h>0) $scope.timer = h+'小时';
+            if(day<0 && h<0 && m>0) $scope.timer = m+'分钟';
+            if(day<0 && h<0 && m<0) $scope.timer = '结束';
             
-            if($scope.leftTimer)$interval.cancel($scope.leftTimer);
+           /* if($scope.leftTimer)$interval.cancel($scope.leftTimer);
             $scope.leftTimer = $interval(function () {
                 if (countDown >= 1) leftTimer(countDown - 1);
-            },1000);
-            if(countDown<=0){
+            },1000);*/
+           /* if(countDown<=0){
               $scope.timer='结束'; 
-            }
+            }*/
         };
         $scope.changeIndex = function (index) {
             $scope.index = index;
@@ -372,7 +377,15 @@
                 $scope.closeModal();
             })
         };
-        $scope.addpict = function () {
+            $scope.bigImage = false;
+            $scope.showBigImage  = function(imageName){
+                $scope.url = imageName;
+                $scope.bigImage = true;
+            };
+            $scope.hideBigImage = function(){
+                $scope.bigImage = false;
+            };
+            $scope.addpict = function () {
             common.chooseImage().then(function (img) {
                 common.uploadFiles(img,1).then(function (result) {
                     var response = JSON.parse(result.response);
@@ -453,6 +466,8 @@
                     msg.hide();
                     console.log(result);
                     $scope.dream = result.data.data;
+                    var reg = new RegExp("\n", "g");
+                    $scope.dream.about = $scope.dream.about.replace(reg, "<br/>");
                     var end_time = new Date($scope.dream.end_time.replace(/-/g, "/"));
                     var date = new Date();
                     var inter = (end_time.getTime() - date.getTime()) / 1000;
@@ -515,6 +530,7 @@
             $scope.cancelSupport = function () {
                 $scope.tosupport = false;
                 $scope.toshare = false;
+                $scope.input.show = false;
 
             };
             $scope.toshare = false;
@@ -526,7 +542,7 @@
                 $state.go("app.recharge")
             };
             $scope.shareDream = function(){
-                $state.go("app.my_shareDream",{item:$scope.dream});
+                $state.go("app.shareDream",{item:$scope.dream});
             };
 
             //实时排行
@@ -553,16 +569,19 @@
                 var h=parseInt(countDown/(60*60)%24);
                 var m=parseInt(countDown/60%60);
                 var s=parseInt(countDown%60);
-                $scope.timer=(h<10?'0'+h:h)+'时'+(m<10?'0'+m:m)+'分'+(s<10?'0'+s:s)+'秒';
-                if(day>0) $scope.timer = day+'天'+ $scope.timer;
-
-                if($scope.leftTimer)$interval.cancel($scope.leftTimer);
-                $scope.leftTimer = $interval(function () {
-                    if (countDown >= 1) leftTimer(countDown - 1);
-                },1000);
-                if(countDown<=0){
-                    $scope.timer='结束';
-                }
+                //$scope.timer=(h<10?'0'+h:h)+'时'+(m<10?'0'+m:m)+'分'+(s<10?'0'+s:s)+'秒';
+                if(day>0) $scope.timer = day+'天';
+                if(day<0 && h>0) $scope.timer = h+'小时';
+                if(day<0 && h<0 && m>0) $scope.timer = m+'分钟';
+                if(day<0 && h<0 && m<0) $scope.timer = '结束';
+
+                /* if($scope.leftTimer)$interval.cancel($scope.leftTimer);
+                 $scope.leftTimer = $interval(function () {
+                 if (countDown >= 1) leftTimer(countDown - 1);
+                 },1000);*/
+                /* if(countDown<=0){
+                 $scope.timer='结束';
+                 }*/
             };
             $scope.changeIndex = function (index) {
                 $scope.index = index;
@@ -640,12 +659,14 @@
             };
             $scope.input = {
                 placeholder: '评论',
-                focus:false
+                focus: false,
+                show:false
             };
-
             $scope.replay = function ($event, name) {
+
                 $event.stopPropagation();
                 $scope.input.focus = true;
+                $scope.input.show = true;
                 $scope.input.placeholder = "回复" + name;
                 $scope.vm.title='';
             };
@@ -668,6 +689,14 @@
                     $scope.closeModal();
                 })
             };
+            $scope.bigImage = false;
+            $scope.showBigImage  = function(imageName){
+                $scope.url = imageName;
+                $scope.bigImage = true;
+            };
+            $scope.hideBigImage = function(){
+                $scope.bigImage = false;
+            };
             $scope.addpict = function () {
                 common.chooseImage().then(function (img) {
                     common.uploadFiles(img,1).then(function (result) {
@@ -717,7 +746,7 @@
                 $scope.modal.remove();
             });
             $scope.toMessage = function(){
-                $state.go("app.my_message");
+                $state.go("app.message");
             }
         }]);
     app.controller('userDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
@@ -787,11 +816,15 @@
         }]);
     app.controller('oldDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
-
+            $scope.toDetail = function(){
+                $state.go("app.home_userDetail")
+            }
         }]);
     app.controller('supportDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
-
+            $scope.toDetail = function(){
+                $state.go("app.home_userDetail")
+            }
         }]);
     app.controller('searchCtrl', ["$scope","homeService", "$state", "msg", "$ionicTabsDelegate", "$ionicNavBarDelegate"
         , function ($scope,homeService, $state, msg, $ionicTabsDelegate, $ionicNavBarDelegate) {

miaomiao/www/js/controllers/my.js

@@ -159,7 +159,7 @@
                 $scope.toshare = true;
             };
             $scope.shareDream = function(){
-                $state.go("app.my_shareDream",{item:$scope.user});
+                $state.go("app.shareDream",{item:$scope.user});
             };
             $scope.toDetail = function (id) {
                 $state.go('app.home_dreamdetail',{id:id});

miaomiao/www/js/filters/filter.js

@@ -80,6 +80,11 @@
             return number;
         };
     });
+    module.filter('trustHtml',['$sce',function($sce){
+        return function (html){
+            return $sce.trustAsHtml(html);
+        };
+    }]);
     module.filter('storeavator', function () {
         return function (input) {
             

miaomiao/www/templates/add/index.html

@@ -38,7 +38,7 @@
             <div class="item item-input-inset itemjs">
                 <label class="item-input-wrapper" style="background: #fff; border: 1px solid #D7D7D7; margin: 0 12px 0 5px">
                     ￥
-                    <input type="text" ng-model="vm.coin">
+                    <input type="tel" ng-model="vm.coin">
                 </label>
             </div>
         </div>

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

@@ -7,19 +7,22 @@
             <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
         </button>
     </ion-nav-buttons>
-    <div ng-if="type==1" style="position: fixed; bottom: -8px; width: 100%; z-index: 5;background: #fff;border-top: 1px solid #ECF2F7;height: 68px">
+    <div ng-if="type==1 && user.id == dream.user_id" style="position: fixed; bottom: -8px; width: 100%; z-index: 5;background: #fff;border-top: 1px solid #ECF2F7;height: 68px">
         <div class="row">
-            <div class="col">
-                <button ng-click="openSupport()" class="button button-outline button-calm" style="width:100%; background: #fff; border-radius:30px; white-space:normal;line-height:20px; border: 1px solid #00C3DA">支持乘数×{{multi.result}}</button>
+            <div class="col dreamButton">
+                <button ng-click="openSupport()" class="button button-outline button-calm" style="border: 1px solid #00C3DA">
+                    支持乘数<br>
+                    ×{{multi.result}}
+                </button>
             </div>
-            <div class="col">
-                <button class="button button-calm" style="width:100%; border-radius:30px; font-size: 20px;" ng-click="support($event)">支持</button>
+            <div class="col dreamButton">
+                <button class="button button-calm" ng-click="support($event)">支持</button>
             </div>
-            <div class="col" ng-if="dream.is_collection==0">
-                <button class="button button-outline button-calm" style="width:100%; border-radius:30px; border: 1px solid #00C3DA" ng-click="collectionDream(1)">＋关注</button>
+            <div class="col dreamButton" ng-if="dream.is_collection==0">
+                <button class="button button-outline button-calm" style="border: 1px solid #00C3DA" ng-click="collectionDream(1)">＋关注</button>
             </div>
-            <div class="col" ng-if="dream.is_collection==1">
-                <button class="button button-outline" style="width:100%; background: #fff; border-radius:30px; border: 1px solid #A3A3A3"  ng-click="collectionDream(0)">已关注</button>
+            <div class="col dreamButton" ng-if="dream.is_collection==1">
+                <button class="button button-outline" style="background: #fff; border: 1px solid #A3A3A3"  ng-click="collectionDream(0)">已关注</button>
             </div>
         </div>
     </div>
@@ -42,8 +45,8 @@
                 <div class="item" style="padding: 0">
                     <ion-slides slider="data.slider">
                         <ion-slide-page ng-if="dream.video">
-                            <div class="box banner" style="height: 220px" >
-                                <video ng-src="{{dream.video | trustUrl}}" width="100%"  class="centerme" controls="controls" ></video>
+                            <div class="box banner">
+                                <video ng-src="{{dream.video | trustUrl}}" width="100%" style="max-height: 400px" class="centerme" controls="controls" ></video>
                             </div>
                         </ion-slide-page>
                         <ion-slide-page ng-repeat="img in dream.imgs" >
@@ -51,10 +54,9 @@
                         </ion-slide-page>
                     </ion-slides>
                 </div>
-                <div class="item">
+                <div class="item" style="padding: 0 16px">
                     <p style="font-size: 17px; color: #000">{{dream.name}}</p>
-                    <p style="font-size: 13px;" ng-style="aboutStyle">
-                        {{dream.about}}
+                    <p style="font-size: 13px;" ng-style="aboutStyle" ng-bind-html="dream.about | trustHtml">
                     </p>
                     <div style="text-align: center">
                         <i class="icon ion-chevron-down" ng-if="showAbout" ng-style="aboutStyle" style="color: #00C3DA;" ng-click="showText()"></i>
@@ -110,6 +112,11 @@
                     </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>
         </div>
         <div ng-if="type==2" class="hdcontent">
             <div style="color: red">
@@ -121,12 +128,12 @@
                         </a>
                     </div>
                     <div class="item" style="border-bottom:15px solid #F2F2F2;" ng-click="add_comment()" ng-repeat="interaction in dream.interactions">
-                        <img class="head" ng-src="{{dream.user.avatar}}" />
-                        <span class="utitle">{{dream.user.nickname}}</span>
+                        <img ng-click="replay($event,dream.user.nickname)" class="head" ng-src="{{dream.user.avatar}}" />
+                        <span ng-click="replay($event,dream.user.nickname)" class="utitle">{{dream.user.nickname}}</span>
                         <span class="utitle kz">剩余{{dream.end_time | lastDate}}天</span>
-                        <p class="subtile"  style="white-space:normal; color: #666666">{{interaction.title}}</p>
-                        <div class="picts item" ng-click="replay($event,dream.user.nickname)">
-                            <img class="slt" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1"/>
+                        <p ng-click="replay($event,dream.user.nickname)" class="subtile"  style="white-space:normal; color: #666666">{{interaction.title}}</p>
+                        <div class="picts item">
+                            <img class="slt" ng-click="showBigImage('{{interaction.pic1}}')" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1"/>
                             <img class="slt" ng-src="{{interaction.pic2}}" ng-if="interaction.pic2"/>
                             <img class="slt" ng-src="{{interaction.pic3}}" ng-if="interaction.pic3"/>
                             <img class="slt" ng-src="{{interaction.pic4}}" ng-if="interaction.pic4"/>
@@ -154,7 +161,6 @@
                 </div>
             </div>
         </div>
-        
         <div ng-if="type==3" class="phbcontent">
             <div class="detail-head" style="height: 180px" ng-if="dream.top3user.length>0">
                 <div class="row">
@@ -218,7 +224,10 @@
             </div>
             
         </div>
-
+        <!--点击看大图-->
+        <div ng-if="bigImage && type==2" ng-click="hideBigImage()" class="popover-backdrop">
+            <img src="{{url}}">
+        </div>
      <script id="interaction-modal.html" type="text/ng-template">
       <div class="modal">
         <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
@@ -303,79 +312,79 @@
     </script>
     </ion-content>
         <div class="detail-like" ng-if="tosupport">
-            <div style="text-align: center; border-bottom: 3px solid #1E1D1C">
+            <div style="text-align: center; border-bottom: 3px solid #8D8D8E">
                 <img src="img/img_miao.png" style="width: 25%; height: 55px;margin-bottom: -13px">
             </div>
             <div style="background: #fff;">
                 <div class="coin">
                     <div class="row">
                         <div class="col box {{index==2?'selected':''}}" ng-click="changeIndex(2)" ng-model="coin">
-                            <div style="float:left; width: 40%; margin-right: 8%">
+                            <div style="float:left; width: 35%;  margin-top: 2%; margin-left: 5%">
                                 <img src="img/icon_kiss.png" style="width: 100%;">
                             </div>
-                            <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
-                                20
-                            </div>
-                            <div style="float:left; width: 20%; margin-top: 5%;">
+                            <div style="float:right; width: 20%; margin-top: 5%; margin-right: 5px">
                                 <img src="img/icon_gold.svg" style="width: 100%">
                             </div>
+                            <div style="float:right; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
+                                20
+                            </div>
                         </div>
                         <div class="col box {{index==5?'selected':''}}" ng-click="changeIndex(5)" ng-model="coin">
-                            <div style="float:left; width: 40%; margin-right: 8%">
+                            <div style="float:left; width: 35%;  margin-top: 2%; margin-left: 5%">
                                 <img src="img/icon_candy.png" style="width: 100%;">
                             </div>
-                            <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
-                                50
-                            </div>
-                            <div style="float:left; width: 20%; margin-top: 5%;">
+                            <div style="float:right; width: 20%; margin-top: 5%; margin-right: 5px">
                                 <img src="img/icon_gold.svg" style="width: 100%">
                             </div>
+                            <div style="float:right; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
+                                50
+                            </div>
                         </div>
                         <div class="col box {{index==10?'selected':''}}" ng-click="changeIndex(10)" ng-model="coin">
-                            <div style="float:left; width: 40%; margin-right: 2%">
+                            <div style="float:left; width: 35%;  margin-top: 2%; margin-left: 5%">
                                 <img src="img/icon_balloon.png" style="width: 100%;">
                             </div>
-                            <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
-                                100
-                            </div>
-                            <div style="float:left; width: 20%; margin-top: 5%;">
+                            <div style="float:right; width: 20%; margin-top: 5%; margin-right: 5px">
                                 <img src="img/icon_gold.svg" style="width: 100%">
                             </div>
+                            <div style="float:right; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
+                                100
+                            </div>
                         </div>
                     </div>
                     <div class="row">
                         <div class="col box {{index==20?'selected':''}}" ng-click="changeIndex(20)" ng-model="coin">
-                            <div style="float:left; width: 40%; margin-right: 0.5%">
+                            <div style="float:left; width: 35%; margin-top: 2%; margin-left: 5%">
                                 <img src="img/icon_rose.png" style="width: 100%;">
                             </div>
-                            <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
-                                200
-                            </div>
-                            <div style="float:left; width: 20%; margin-top: 5%;">
+                            <div style="float:right; width: 20%; margin-top: 5%; margin-right: 5px">
                                 <img src="img/icon_gold.svg" style="width: 100%">
                             </div>
+                            <div style="float:right; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
+                                200
+                            </div>
                         </div>
                         <div class="col box {{index==30?'selected':''}}" ng-click="changeIndex(30)" ng-model="coin">
-                            <div style="float:left; width: 40%; margin-right: 0.5%">
+                            <div style="float:left; width: 35%; margin-top: 3%; margin-left: 5%">
                                 <img src="img/icon_haert.png" style="width: 100%;">
                             </div>
-                            <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
-                                300
-                            </div>
-                            <div style="float:left; width: 20%; margin-top: 5%;">
+                            <div style="float:right; width: 20%; margin-top: 5%; margin-right: 5px">
                                 <img src="img/icon_gold.svg" style="width: 100%">
                             </div>
+                            <div style="float:right; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
+                                300
+                            </div>
                         </div>
                         <div class="col box {{index==50?'selected':''}}" ng-click="changeIndex(50)" ng-model="coin">
-                            <div style="float:left; width: 40%; margin-right: 2.3%">
+                            <div style="float:left; width: 35%; margin-top: 2%; margin-left: 5%">
                                 <img src="img/icon_diamond.png" style="width: 100%;">
                             </div>
-                            <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
-                                500
-                            </div>
-                            <div style="float:left; width: 20%; margin-top: 5%;">
+                            <div style="float:right; width: 20%; margin-top: 5%; margin-right: 5px">
                                 <img src="img/icon_gold.svg" style="width: 100%">
                             </div>
+                            <div style="float:right; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
+                                500
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -395,7 +404,7 @@
                         <em>&nbsp;充值</em>
                     </div>
                     <span style="height:100%;float: right;">
-                        <a style="border-radius:90px; width:90px; height: 40px; min-height: 30px; font-size:1.1em; padding: 0; line-height: 40px" class="button button-calm"  ng-click="supportDream()">发送</a>
+                        <a style="border-radius:90px; min-width: 60px; height: 30px; min-height: 30px; font-size:1.1em; padding: 0; line-height: 24px; margin-top: 9px" class="button button-calm"  ng-click="supportDream()">发送</a>
                     </span>
                 </div>
             </div>

miaomiao/www/templates/home/index.html

@@ -60,7 +60,7 @@
                             <div class="item mainitem" ng-repeat="item in index.dreams">
                                 <div class="row">
                                     <div class="col avatarCol">
-                                        <div class="fl" style="width: 30%">
+                                        <div class="fl" style="width: 27%">
                                             <img ng-src="{{item.user.avatar | avator}}" ng-click="toUserDetail(item.id)" />
                                         </div>
                                         <div class="myblock">
@@ -89,7 +89,7 @@
                     </div>
                     <!--上拉更多-->
                     <ion-infinite-scroll ng-if="filter.hasMore" on-infinite="load(false)" distance="10%"></ion-infinite-scroll>
-</ion-content> 
+            </ion-content>
         </ion-side-menu-content>
         <!-- Left menu -->
         <ion-side-menu side="left" width="200">

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

@@ -51,7 +51,7 @@
                     </div>
                     <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px;">
                         <h2>{{dream.name}}</h2>
-                        <p>{{dream.about}}</p>
+                        <p style="height: 60px; overflow: hidden">{{dream.about}}</p>
                     </div>
                     <div style="float:right; width: 15%; text-align: right; color: #00C3DA; font-size: 16px">
                         已实现<br>

miaomiao/www/templates/tabs.html

@@ -1,5 +1,5 @@
 <ion-tabs class="tabs-icon-top tabs-color-active-calm">
-    <ion-tab title="首页" icon-off="thsfont-icon_home_n" icon-on="thsfont-icon_home_h" ng-click="go('app.home')">
+    <ion-tab title="首页" class="tab-item-home" icon-off="thsfont-icon_home_n" icon-on="thsfont-icon_home_h" ng-click="go('app.home')">
         <ion-nav-view name="app-home"></ion-nav-view>
     </ion-tab>
     <ion-tab class="tab-item-add" ng-click="go('app.add')">