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

.idea/workspace.xml

@@ -22,53 +22,38 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="router.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
+      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-9.3">
-              <caret line="186" column="51" selection-start-line="186" selection-start-column="37" selection-end-line="186" selection-end-column="51" />
-              <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="-5.7">
-              <caret line="9" column="11" selection-start-line="3" selection-start-column="8" selection-end-line="9" selection-end-column="11" />
-              <folding />
+            <state vertical-scroll-proportion="-2.913793">
+              <caret line="242" column="88" selection-start-line="242" selection-start-column="84" selection-end-line="242" selection-end-column="88" />
+              <folding>
+                <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="userDetail.html" pinned="false" current-in-tab="false">
+      <file leaf-file-name="userDetail.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/userDetail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-6.7586207">
-              <caret line="58" column="57" selection-start-line="58" selection-start-column="57" selection-end-line="58" selection-end-column="57" />
+            <state vertical-scroll-proportion="0.45825604">
+              <caret line="13" column="155" selection-start-line="13" selection-start-column="155" selection-end-line="13" selection-end-column="155" />
               <folding>
+                <element signature="n#style#0;n#span#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#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#0;n#ion-view#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
+      <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/home.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.24767226">
-              <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
-              <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="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <state vertical-scroll-proportion="-11.666667">
+              <caret line="735" column="71" selection-start-line="735" selection-start-column="71" selection-end-line="735" selection-end-column="71" />
               <folding />
             </state>
           </provider>
@@ -89,17 +74,21 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/miaomiao/www/css/style.css" />
-        <option value="$PROJECT_DIR$/miaomiao/www/templates/home/index.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/my/personalLetter.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/my/my-message.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/my/my-recharge.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/home/shareDream.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/my/withdraw.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/css/style.css" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/home/index.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/my/my-dream.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html" />
-        <option value="$PROJECT_DIR$/miaomiao/www/templates/home/userDetail.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/my/attention-detail.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/my/attention.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/js/config/router.js" />
         <option value="$PROJECT_DIR$/miaomiao/www/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/miaomiao/www/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/home/userDetail.html" />
       </list>
     </option>
   </component>
@@ -110,8 +99,8 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
-    <option name="x" value="338" />
-    <option name="width" value="1029" />
+    <option name="x" value="336" />
+    <option name="width" value="1031" />
     <option name="height" value="728" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -215,7 +204,7 @@
     <option name="totallyTimeSpent" value="2201000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="338" y="0" width="1029" height="728" extended-state="0" />
+    <frame x="336" y="0" width="1031" height="728" 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.16071428" sideWeight="0.49460918" order="0" side_tool="false" content_ui="combo" />
@@ -249,10 +238,115 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager />
+    <breakpoint-manager>
+      <option name="time" value="2" />
+    </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-dream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="2" column="52" selection-start-line="2" selection-start-column="52" selection-end-line="2" selection-end-column="52" />
+          <folding>
+            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.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#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#1;n#div#2;n#div#0;n#div#1;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="73" column="46" selection-start-line="73" selection-start-column="46" selection-end-line="73" selection-end-column="46" />
+          <folding>
+            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#1;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </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.0">
+          <caret line="161" column="51" selection-start-line="161" selection-start-column="51" selection-end-line="161" selection-end-column="51" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="176" column="27" selection-start-line="171" selection-start-column="10" selection-end-line="180" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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="256" column="6" selection-start-line="256" selection-start-column="6" selection-end-line="256" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="186" column="51" selection-start-line="186" selection-start-column="37" selection-end-line="186" selection-end-column="51" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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="9" column="11" selection-start-line="3" selection-start-column="8" selection-end-line="9" selection-end-column="11" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/userDetail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="58" column="57" selection-start-line="58" selection-start-column="57" selection-end-line="58" selection-end-column="57" />
+          <folding>
+            <element signature="n#style#0;n#span#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#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#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </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.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -282,16 +376,8 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="11" column="74" selection-start-line="11" selection-start-column="74" selection-end-line="11" selection-end-column="74" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;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#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <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-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#2;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#0;n#div#2;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="false" />
             <element signature="n#style#0;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#1;n#div#0;n#div#0;n#div#2;n#div#1;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#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -338,172 +424,184 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/oldDream.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/chcp.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.107143">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+        <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" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/css/style.css">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/personalLetter.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334">
-          <caret line="173" column="18" selection-start-line="173" selection-start-column="18" selection-end-line="173" selection-end-column="18" />
+        <state vertical-scroll-proportion="0.44504505">
+          <caret line="13" column="27" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/chcp.json">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/payExplain.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" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/personalLetter.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/supportDream.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44504505">
-          <caret line="13" column="27" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
-          <folding />
+        <state vertical-scroll-proportion="-0.61621624">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-message.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/search.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.7142856">
-          <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
-          <folding>
-            <element signature="n#style#0;n#em#0;n#i#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#a#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <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" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/payExplain.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/shareDream.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 />
+        <state vertical-scroll-proportion="-3.392857">
+          <caret line="5" column="48" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/withdraw.html">
+    <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="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-recharge.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-12.214286">
-          <caret line="18" column="48" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="48" />
-          <folding>
-            <element signature="n#style#0;n#a#0;n#div#2;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="0.15398887">
+          <caret line="29" column="35" selection-start-line="29" selection-start-column="35" selection-end-line="29" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/withdraw.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.58666664">
-          <caret line="51" column="59" selection-start-line="51" selection-start-column="59" selection-end-line="51" selection-end-column="59" />
-          <folding>
-            <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-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="-4.071429">
+          <caret line="6" column="20" selection-start-line="6" selection-start-column="20" selection-end-line="6" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/supportDream.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.61621624">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="-4.551724">
+          <caret line="471" column="18" selection-start-line="471" selection-start-column="18" selection-end-line="471" selection-end-column="18" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/search.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/index.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 />
+        <state vertical-scroll-proportion="-7.035714">
+          <caret line="43" column="51" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="51" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/shareDream.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-message.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.392857">
-          <caret line="5" column="48" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="48" />
+        <state vertical-scroll-proportion="0.2820037">
+          <caret line="8" column="48" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-dream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-0.6785714">
+          <caret line="2" column="52" selection-start-line="2" selection-start-column="52" selection-end-line="2" selection-end-column="52" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#1;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#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#i#0;n#div#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#div#2;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#3;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#3;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#div#0;n#div#0;n#div#3;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#3;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#3;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/aboutMiao.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 />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/attention.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-17.107143">
-          <caret line="406" column="10" selection-start-line="406" selection-start-column="10" selection-end-line="406" selection-end-column="10" />
+        <state vertical-scroll-proportion="-6.785714">
+          <caret line="10" column="35" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" />
           <folding>
-            <element signature="n#style#0;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#ion-content#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#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/userDetail.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.7586207">
-          <caret line="58" column="57" selection-start-line="58" selection-start-column="57" selection-end-line="58" selection-end-column="57" />
+        <state vertical-scroll-proportion="-0.6785714">
+          <caret line="1" column="33" selection-start-line="1" selection-start-column="33" selection-end-line="1" selection-end-column="33" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#1;n#div#0;n#div#2;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/add.js">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
       <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" />
+        <state vertical-scroll-proportion="-2.1666667">
+          <caret line="23" column="38" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="38" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.3">
-          <caret line="186" column="51" selection-start-line="186" selection-start-column="37" selection-end-line="186" selection-end-column="51" />
+        <state vertical-scroll-proportion="0.6163873">
+          <caret line="168" column="38" selection-start-line="168" selection-start-column="38" selection-end-line="168" selection-end-column="38" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/oldDream.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.7">
-          <caret line="9" column="11" selection-start-line="3" selection-start-column="8" selection-end-line="9" selection-end-column="11" />
+        <state vertical-scroll-proportion="-4.75">
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-2.913793">
+          <caret line="242" column="88" selection-start-line="242" selection-start-column="84" selection-end-line="242" selection-end-column="88" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </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.24767226">
-          <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
+        <state vertical-scroll-proportion="-11.666667">
+          <caret line="735" column="71" selection-start-line="735" selection-start-column="71" selection-end-line="735" selection-end-column="71" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/userDetail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.45825604">
+          <caret line="13" column="155" selection-start-line="13" selection-start-column="155" selection-end-line="13" selection-end-column="155" />
+          <folding>
+            <element signature="n#style#0;n#span#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#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#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

miaomiao/www/css/style.css

@@ -469,6 +469,7 @@ a:visited,a:link{
     background: #fff;
     padding: 5px 2%;
     margin:2%;
+    height: 220px;
     border-radius: 20px;
     text-align:center;
 }

miaomiao/www/js/config/router.js

@@ -27,7 +27,7 @@
                 views: {
                     'app-my': {
                         templateUrl: 'templates/home/dream-detail.html',
-                        controller: 'dreamDetailCtrl'
+                        controller: 'myDreamDetailCtrl'
                     }
                 }
             })
@@ -51,6 +51,16 @@
                     }
                 }
             })
+            .state('app.attention_Detail', {
+                url: '/my/attention/userDetail',
+                params:{id:null},
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/home/userDetail.html',
+                        controller: 'attention_DetailCtrl'
+                    }
+                }
+            })
             .state('app.oldDream', {
                 url: '/home/oldDream',
                 params:{id:null},
@@ -61,6 +71,16 @@
                     }
                 }
             })
+            .state('app.myOldDream', {
+                url: '/my/oldDream',
+                params:{id:null},
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/home/oldDream.html',
+                        controller: 'oldDreamCtrl'
+                    }
+                }
+            })
             .state('app.supportDream', {
                 url: '/home/supportDream',
                 params:{id:null},
@@ -71,6 +91,16 @@
                     }
                 }
             })
+            .state('app.mySupportDream', {
+                url: '/my/supportDream',
+                params:{id:null},
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/home/supportDream.html',
+                        controller: 'supportDreamCtrl'
+                    }
+                }
+            })
             .state('app.home_search', {
                 url: '/home/search',
                 views: {
@@ -179,6 +209,15 @@
                     }
                 }
             })
+            .state('app.dream_message', {
+                url: '/my/message',
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/my/my-message.html',
+                        controller: 'messageCtrl'
+                    }
+                }
+            })
         .state('app.my_message_sys', {
                 url: '/my/message/sys',
                 views: {
@@ -197,6 +236,15 @@
                     }
                 }
             })
+            .state('app.dream_sys', {
+                url: '/my/message/sys',
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/my/my-message-sys.html',
+                        controller: 'sysCtrl'
+                    }
+                }
+            })
         .state('app.my_message_reply', {
             url: '/my/message/reply',
             views: {

miaomiao/www/js/controllers/home.js

@@ -147,6 +147,7 @@
                 msg.hide();
                 console.log(result);
                 $scope.dream = result.data.data;
+                debugger
                 var end_time = new Date($scope.dream.end_time.replace(/-/g, "/"));
                 var date = new Date();
                 var inter = (end_time.getTime() - date.getTime()) / 1000;
@@ -296,7 +297,7 @@
 
         $scope.collectionDream = function(is_collection){
             homeService.collectionDream(id,is_collection).then(function(result){
-                $scope.dream.is_collection=result.data.data;
+                //$scope.dream.is_collection=result.data.data;
             })
         };
 
@@ -398,6 +399,294 @@
           $scope.$on('$destroy', function() {
             $scope.modal.remove();
           });
+            $scope.toMessage = function(){
+                $state.go("app.message");
+            }
+        }]);
+    app.controller('myDreamDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
+        , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
+            var id = $stateParams.id;
+            var top3user = '';
+
+            $scope.toMessage = function(){
+                $state.go("app.dream_message");
+            }
+            $scope.chosedIndex = 0;
+            $scope.clickAvatar = function(index){
+                $scope.chosedIndex = index;
+            };
+            // id=5;
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $ionicTabsDelegate.showBar(false);
+                $scope.load(id);
+                $scope.thisUser = storage.getObject('user');
+                homeService.myInfo().then(function(result){
+                    $scope.user = result.data.data;
+                });
+                console.log($scope.user);
+            });
+            $scope.$on('$ionicView.leave', function () {
+                if($scope.multi.promise)$interval.cancel($scope.multi.promise);
+                if($scope.leftTimer)$interval.cancel($scope.leftTimer);
+            });
+
+            $scope.load = function (id) {
+                msg.loading();
+                homeService.dreamDetail(id).then(function (result) {
+                    msg.hide();
+                    console.log(result);
+                    $scope.dream = result.data.data;
+                    var end_time = new Date($scope.dream.end_time.replace(/-/g, "/"));
+                    var date = new Date();
+                    var inter = (end_time.getTime() - date.getTime()) / 1000;
+                    leftTimer(inter);
+                    $scope.multi.a =  $scope.dream.a;
+                    $scope.multi.b = new Date($scope.dream.created_at.replace(/-/g, "/"));
+                    $scope.multi.c  = $scope.dream.c;
+                    $scope.multi.promise =  $scope.dream.a;
+                    var newtop3user = '' ;
+                    angular.forEach($scope.dream.top3user, function(user) {
+                        newtop3user= newtop3user +user.id+","
+                    });
+                    if(top3user!=''&&newtop3user!=top3user){
+                        //测试动画切换
+                        $timeout(function() {
+                            $scope.sort.slide1 = 'list-grow-animation';
+                            $scope.sort.slide2 = 'slide-in-both-ways';
+                            $scope.sort.slide3 = 'bounce-animation';
+                        }, 50);
+                    }
+                    top3user = newtop3user;
+                    if($scope.dream.top3user[0])$scope.sort.first = $scope.dream.top3user[0].avatar;
+                    if($scope.dream.top3user[1])$scope.sort.second = $scope.dream.top3user[1].avatar;
+                    if($scope.dream.top3user[2])$scope.sort.third = $scope.dream.top3user[2].avatar;
+                    $scope.calcmultiplier();
+                }, function (error) {
+                    msg.hide();
+                });
+            };
+            $ionicModal.fromTemplateUrl('supportExplain.html', {
+                scope: $scope
+            }).then(function(modal) {
+                $scope.supportmodal = modal;
+            });
+            $scope.openSupportmodal = function() {
+                $scope.supportmodal.show();
+            };
+            $scope.closeSupportmodal = function() {
+                $scope.supportmodal.hide();
+            };
+            $scope.multi = {
+                a: '',
+                b: '',
+                c: '',
+                result: 1,
+                promise:null
+            };
+            $scope.type = 1;//tab切换
+            $scope.tosupport = false;
+            $scope.support = function ($event) {
+                $event.stopPropagation();
+                $scope.tosupport = true;
+                $scope.vm.coin = 0;
+                $scope.index = 0;
+            };
+            $scope.cancelSupport = function () {
+                $scope.tosupport = false;
+                $scope.toshare = false;
+
+            };
+            $scope.toshare = false;
+            $scope.share = function ($event) {
+                $event.stopPropagation();
+                $scope.toshare = true;
+            };
+            $scope.toRecharge = function(){
+                $state.go("app.recharge")
+            };
+            $scope.shareDream = function(){
+                $state.go("app.shareDream",{item:$scope.dream});
+            };
+
+            //实时排行
+            $scope.sort = {
+                slide: ''
+            };
+            $scope.changeType = function (type) {
+                $ionicScrollDelegate.scrollTop(true);
+                $scope.type = type;
+            };
+            $scope.index = 0;
+
+            $scope.vm = {
+                coin:"",
+                title:""
+            };
+            $scope.timer = '';
+            var leftTimer = function (countDown) {
+                if (isNaN(countDown)) {
+                    $scope.timer = '结束';
+                    return;
+                }
+                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);
+                $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.changeIndex = function (index) {
+                $scope.index = index;
+                $scope.vm.coin = index*5;
+            };
+            $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 = Math.round(number * 100) / 100;
+                    $scope.multi.result = Math.round(number * 100 / 100);
+                },1000);
+                //  点击支持取消   $interval.cancel($scope.multi.promise); 获取数据后重新开始执行
+            };
+            $scope.supportDream = function (data) {
+                if(!$scope.vm.coin){
+                    msg.error("请选择梦想币数量！");
+                    return ;
+                }
+                var data = {
+                    id:id,
+                    coin:$scope.vm.coin
+                };
+
+                homeService.supportDream(data).then(function(result){
+                    $scope.tosupport = false;
+                    $scope.load(id);
+                    $interval.cancel($scope.multi.promise);
+                })
+            };
+
+            $scope.collectionDream = function(is_collection){
+                homeService.collectionDream(id,is_collection).then(function(result){
+                    $scope.dream.is_collection=result.data.data;
+                })
+            };
+
+            $scope.add = function(is_collection){
+                var data = {
+                    id:id,
+                    title:$scope.vm.title,
+                    pics:$scope.imgs
+                };
+                homeService.add_interaction(data).then(function(){
+                    $scope.load(id);
+                    $scope.closeModal();
+                })
+            };
+
+            $scope.showText = function(){
+                $scope.aboutStyle = {
+                    "white-space" : "normal"
+                };
+                $scope.ionDownStyle = {
+                    "display" : "none"
+                }
+            };
+            $scope.input = {
+                placeholder: '评论',
+                focus:false
+            };
+
+            $scope.replay = function ($event, name) {
+                $event.stopPropagation();
+                $scope.input.focus = true;
+                $scope.input.placeholder = "回复" + name;
+                $scope.vm.title='';
+            };
+            $scope.comment = function(){
+                //  $event.stopPropagation();
+                //$scope.input.placeholder = "评论";
+                $scope.input.focus = true;
+                $scope.vm.title='';
+            };
+            $scope.submitComment = function(iid){
+                if($scope.vm.comment&&$scope.vm.comment==''||!iid)return;
+                var data = {
+                    id:iid,
+                    content:$scope.vm.comment
+                };
+                console.log($scope.vm.comment+" "+iid);
+                homeService.add_comment(data).then(function(){
+                    $scope.vm.comment = '' ;
+                    $scope.load(id);
+                    $scope.closeModal();
+                })
+            };
+            $scope.addpict = function () {
+                common.chooseImage().then(function (img) {
+                    common.uploadFiles(img,1).then(function (result) {
+                        var response = JSON.parse(result.response);
+                        var file = response.data.file;
+                        $scope.imgs.push(config.imgServer+file);
+                        console.log(JSON.stringify(config.imgServer+file));
+                    }, function (error) {
+                        msg.error('图片上传失败');
+                    });
+                }, function (error) {
+                    console.log('图片选择失败');
+                });
+            };
+
+            $ionicModal.fromTemplateUrl('recharge-modal.html', {
+                scope: $scope,
+                animation: 'slide-in-up'
+            }).then(function(modal) {
+                $scope.rechagemodal = modal;
+            });
+
+            $scope.openRechargeModal = function() {
+                $scope.rechagemodal.show();
+                $scope.vm.money = '';
+            };
+            $scope.closeRechargeModal = function() {
+                $scope.rechagemodal.hide();
+            };
+
+            $ionicModal.fromTemplateUrl('interaction-modal.html', {
+                scope: $scope,
+                animation: 'slide-in-up'
+            }).then(function(modal) {
+                $scope.modal = modal;
+            });
+            $scope.openModal = function() {
+                $scope.modal.show();
+                $scope.vm.title = '';
+                $scope.imgs = [];
+            };
+            $scope.closeModal = function() {
+                $scope.modal.hide();
+            };
+            //当我们用到模型时，清除它！
+            $scope.$on('$destroy', function() {
+                $scope.modal.remove();
+            });
         }]);
     app.controller('userDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
         , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
@@ -438,8 +727,12 @@
             $scope.toSupportDream = function(){
                 $state.go("app.supportDream");
             };
+            $scope.collectionDream = function(is_collection){
+                homeService.collectionDream(id,is_collection).then(function(result){
+                    $scope.user.is_collection=result.data.data;
+                })
+            };
         }]);
-
     app.controller('shareDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
             $scope.dream = $stateParams.item

miaomiao/www/js/controllers/my.js

@@ -127,8 +127,52 @@
         }]);
     app.controller('attentionCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
+            $scope.toDetail = function(){
+                $state.go("app.attention_Detail");
+            }
+        }]);
+
+    app.controller('attention_DetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
+        , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
+            var id = $stateParams.id;
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $ionicTabsDelegate.showBar(false);
+            });
+            $scope.load = function (id) {
+                msg.loading();
+                homeService.dreamDetail(id).then(function (result) {
+                    msg.hide();
+                    $scope.user = result.data.data;
+                }, function (error) {
+                    msg.hide();
+                });
+            };
+            $scope.load(id);
 
+            $scope.cancelSupport = function () {
+                $scope.tosupport = false;
+                $scope.toshare = false;
+
+            };
+            $scope.toshare = false;
+            $scope.share = function ($event) {
+                $event.stopPropagation();
+                $scope.toshare = true;
+            };
+            $scope.shareDream = function(){
+                $state.go("app.shareDream",{item:$scope.user});
+            };
+            $scope.toDetail = function (id) {
+                $state.go('app.my_dreamdetail',{id:id});
+            };
+            $scope.toOldDream = function(){
+                $state.go("app.myOldDream");
+            };
+            $scope.toSupportDream = function(){
+                $state.go("app.mySupportDream");
+            };
         }]);
+
     app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
 

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

@@ -1,6 +1,6 @@
 <ion-view view-title="梦想">
     <ion-nav-buttons side="right">
-        <button class="button button-clear homeIcon" ui-sref="app.message">
+        <button class="button button-clear homeIcon" ng-click="toMessage()">
             <img src="img/icon_message_h.svg" style="height: 100%; width: 100%">
         </button>
         <button ng-click="share($event)" class="button button-clear button-small" style="padding-top: 3px;">
@@ -26,12 +26,12 @@
                 <div class="item" style="padding: 0">
                     <ion-slides slider="data.slider">
                         <ion-slide-page ng-if="dream.video">
-                            <div class="box banner">
-                                <video ng-src="{{dream.video | trustUrl}}" height="170px" width="100%"  class="centerme" controls="controls" ></video>
+                            <div class="box banner" style="height: 220px" >
+                                <video ng-src="{{dream.video | trustUrl}}" width="100%"  class="centerme" controls="controls" ></video>
                             </div>
                         </ion-slide-page>
                         <ion-slide-page ng-repeat="img in dream.imgs" >
-                            <div class="box banner" style="height: 170px; width: 100%"><img ng-src="{{img.pic}}" style="width: 100%" /></div>
+                            <div class="box banner" style="height: 220px; width: 100%"><img ng-src="{{img.pic}}" style="width: 100%;" /></div>
                         </ion-slide-page>
                     </ion-slides>
                 </div>

miaomiao/www/templates/home/index.html

@@ -71,7 +71,7 @@
                         </div>
                     </div>
                     <div ng-click="toDetail(item.id)">
-                        <img ng-src="{{item.img.pic}}" />
+                        <img style="height: 220px" ng-src="{{item.img.pic}}" />
                         <div class="homeDream">
                             <p style="font-size: 16px">{{ item.name }}</p>
                             <p>{{ item.about }}</p>

miaomiao/www/templates/home/userDetail.html

@@ -10,8 +10,11 @@
                     {{user.user.nickname}}
                 </div>
                 <div style="font-size:0.7rem; margin-bottom: 10px"> {{user.user.city}}</div>
-                <div>
-                    <span style="background: #fff; color: #00C3DA; font-size:0.7rem; border-radius: 20px; padding: 2px 20px">关注</span>
+                <div ng-if="user.is_collection==0">
+                    <span style="background: #fff; color: #00C3DA; font-size:0.7rem; border-radius: 20px; padding: 2px 20px" ng-click="collectionDream(1)">关注</span>
+                </div>
+                <div ng-if="user.is_collection==1">
+                    <span style="background: #fff; color: #B3B3B3; font-size:0.7rem; border-radius: 20px; padding: 2px 20px" ng-click="collectionDream(0)">已关注</span>
                 </div>
             </div>
             <div class="row user-row">

miaomiao/www/templates/my/withdraw.html

@@ -2,8 +2,8 @@
     <ion-content>
         <div class="list myprofile">
             <label class="item item-input ">
-                <span class="input-label">昵称</span>
-                <input name="signture" style="text-align: right" type="text" placeholder="请输入昵称" ng-model="vm.nickname">
+                <span class="input-label">提现金额</span>
+                <input name="signture" style="text-align: right" type="text" placeholder="请输入提现金额" ng-model="vm.nickname">
             </label>
             <label class="item item-select item-select-width">
              <span class="input-label">
@@ -11,7 +11,7 @@
              </span>
                 <select name="pay" ng-model="vm.pay">
                     <option value="0">支付宝</option>
-                    <option value="1">中国邮政</option>
+                    <option value="1">微信</option>
                 </select>
             </label>
             <label class="item item-input ">