add

.idea/encodings.xml

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

.idea/workspace.xml

@@ -12,6 +12,7 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
   </component>
@@ -20,32 +21,54 @@
     <favorites_list name="miao" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="edit.blade.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/server/resources/views/admin/user/info/edit.blade.php">
+    <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1755">
-              <caret line="31" column="47" selection-start-line="31" selection-start-column="47" selection-end-line="31" selection-end-column="47" />
+            <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="index.blade.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/server/resources/views/admin/user/info/index.blade.php">
+      <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 relative-caret-position="162">
-              <caret line="96" column="0" selection-start-line="96" selection-start-column="0" selection-end-line="96" selection-end-column="0" />
+            <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>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="view.blade.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/server/resources/views/admin/user/info/view.blade.php">
+      <file leaf-file-name="userDetail.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/userDetail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="13" column="42" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" />
+            <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" />
+              <folding>
+                <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">
+        <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" />
               <folding />
             </state>
           </provider>
@@ -53,21 +76,43 @@
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="HTML File" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <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/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/home/userDetail.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" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" />
+  <component name="JsBuildToolPackageJson" detection-done="true" />
   <component name="JsGulpfileManager">
     <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="338" />
+    <option name="width" value="1029" />
+    <option name="height" value="728" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -80,7 +125,7 @@
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
+    <navigator proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -93,188 +138,74 @@
       <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="server" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="server" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="views" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="server" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="views" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="admin" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="server" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="views" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="admin" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="user" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="info" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="server" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="views" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="admin" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="user" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="miao" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="server" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scratches" />
-    </panes>
+    <panes />
   </component>
   <component name="PropertiesComponent">
     <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" />
+    <property name="DefaultHtmlFileTemplate" value="HTML File" />
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
+      <method />
+    </configuration>
+    <configuration default="true" type="DartTestRunConfigurationType" factoryName="Dart Test">
+      <method />
+    </configuration>
+    <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
+      <method />
+    </configuration>
+    <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" working-dir="">
+      <method />
+    </configuration>
+    <configuration default="true" type="cucumber.js" factoryName="Cucumber.js">
+      <option name="cucumberJsArguments" value="" />
+      <option name="executablePath" />
+      <option name="filePath" />
+      <method />
+    </configuration>
+    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
+      <command value="run-script" />
+      <scripts />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
+      <node-options />
+      <working-directory>$PROJECT_DIR$</working-directory>
+      <pass-parent-env>true</pass-parent-env>
+      <envs />
+      <ui>bdd</ui>
+      <extra-mocha-options />
+      <test-kind>DIRECTORY</test-kind>
+      <test-directory />
+      <recursive>false</recursive>
+      <method />
+    </configuration>
   </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
+  <component name="ShelveChangesManager" show_recycled="false" />
+  <component name="SvnConfiguration">
+    <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="8d0ff32c-dbe7-4c40-aafa-d07233a74a74" name="Default" comment="" />
       <created>1499239199509</created>
       <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
       <updated>1499239199509</updated>
       <workItem from="1499239200884" duration="2201000" />
     </task>
@@ -284,26 +215,26 @@
     <option name="totallyTimeSpent" value="2201000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <frame x="338" y="0" width="1029" 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="true" show_stripe_button="true" weight="0.16111952" sideWeight="0.49460918" order="0" side_tool="false" content_ui="combo" />
+      <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" />
       <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="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32884097" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295129" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32884097" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17120343" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12622951" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.125817" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33022922" sideWeight="0.5053908" order="1" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.06334232" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295129" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -322,26 +253,254 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <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="195" column="44" selection-start-line="195" selection-start-column="37" selection-end-line="195" selection-end-column="44" />
+          <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="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/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
+          <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="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#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>
+    </entry>
     <entry file="file://$PROJECT_DIR$/server/resources/views/admin/user/info/edit.blade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1755">
+        <state vertical-scroll-proportion="0.0">
           <caret line="31" column="47" selection-start-line="31" selection-start-column="47" selection-end-line="31" selection-end-column="47" />
-          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/resources/views/admin/user/info/index.blade.php">
+      <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$/server/resources/views/admin/user/info/view.blade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
+        <state vertical-scroll-proportion="0.0">
           <caret line="13" column="42" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" />
-          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/resources/views/admin/user/info/edit.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="31" column="47" selection-start-line="31" selection-start-column="47" selection-end-line="31" selection-end-column="47" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/server/resources/views/admin/user/info/index.blade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="96" column="0" selection-start-line="96" selection-start-column="0" selection-end-line="96" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.2054054">
+          <caret line="101" column="28" selection-start-line="101" selection-start-column="28" selection-end-line="101" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/server/resources/views/admin/user/info/view.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.034234233">
+          <caret line="13" column="42" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/oldDream.html">
+      <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/css/style.css">
+      <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/chcp.json">
+      <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">
+      <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-message.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>
+      </provider>
+    </entry>
+    <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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/withdraw.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/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>
+      </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.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/supportDream.html">
+      <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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/search.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/home/shareDream.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" />
+          <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" />
+          </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="-17.107143">
+          <caret line="406" column="10" selection-start-line="406" selection-start-column="10" selection-end-line="406" selection-end-column="10" />
+          <folding>
+            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </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="-6.7586207">
+          <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#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/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/js/config/router.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" />
+          <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="-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>
+      </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" />
           <folding />
         </state>
       </provider>

miaomiao/www/css/style.css

@@ -186,12 +186,10 @@ overflow:auto;
 .icontent {
     padding-top:50px
 }
-.subcontent {
-    width: 100%;
-}
 .subcontent img{
     width:20%;
-    margin: 10px 0 10px 3%;
+    height: 80%;
+    margin: 3% auto 3% 3%;
     border-radius:100%;
 }
     .subcontent i {
@@ -217,9 +215,10 @@ overflow:auto;
     .mainitem img {
         width:100%;
     }
-    .mainitem .row .col img {
-        max-width: 45px;
-        border-radius: 30px;
+    .avatarCol img {
+        width: 30%;
+        height: 73%;
+        border-radius: 100%;
     }
     .mainitem .myblock {
         display:inline-block;
@@ -496,6 +495,17 @@ a:visited,a:link{
 }
  .detail-like .send span em{
     color: #00C3DA;
+}
+ .detail-like .row{
+     padding: 0;
+ }
+ .detail-like .col{
+     text-align: center;
+     padding: 0;
+ }
+.detail-like .col img{
+    height: 35px;
+    width: 35px;
 }
 .hdcontent {
     padding-top:49px;
@@ -568,7 +578,7 @@ a:visited,a:link{
     margin-top: 20px; text-align: center; float:left; height: 100px; width: 100px;color: #6B6B6B;font-size: 16px;
 }
 .top1{
-    text-align: center; float:left; height: 120px; width: 120px;color: #6B6B6B;font-size: 16px;
+    text-align: center; float:left; height: 111px; width: 111px;color: #6B6B6B;font-size: 14px;
 }
 /*seach.html*/
 .search-hot {

miaomiao/www/js/config/router.js

@@ -41,7 +41,7 @@
                     }
                 }
             })
-            .state('app.userDetail', {
+            .state('app.home_userDetail', {
                 url: '/home/userDetail',
                 params:{id:null},
                 views: {
@@ -175,7 +175,7 @@
                 views: {
                     'app-home': {
                         templateUrl: 'templates/my/my-message.html',
-                        controller: 'messageCtrl'
+                        controller: 'homeMessageCtrl'
                     }
                 }
             })
@@ -188,6 +188,15 @@
                     }
                 }
         })
+            .state('app.message_sys', {
+                url: '/home/message/sys',
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/my/my-message-sys.html',
+                        controller: 'sysCtrl'
+                    }
+                }
+            })
         .state('app.my_message_reply', {
             url: '/my/message/reply',
             views: {
@@ -197,6 +206,15 @@
                 }
             }
         })
+            .state('app.message_reply', {
+                url: '/home/message/reply',
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/my/my-message-reply.html',
+                        controller: 'messageReplyCtrl'
+                    }
+                }
+            })
 
             .state('app.personalLetter', {
                 url: '/my/message/personalLetter',
@@ -207,6 +225,15 @@
                     }
                 }
             })
+            .state('app.letter', {
+                url: '/home/message/personalLetter',
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/my/personalLetter.html',
+                        controller: 'letterCtrl'
+                    }
+                }
+            })
         .state('app.my_recharge', {
             url: '/my/recharge',
             views: {
@@ -216,6 +243,15 @@
                 }
             }
         })
+            .state('app.recharge', {
+                url: '/home/recharge',
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/my/my-recharge.html',
+                        controller: 'payCtrl'
+                    }
+                }
+            })
         .state('app.my_setting', {
             url: '/my/setting',
             views: {
@@ -243,6 +279,15 @@
                     }
                 }
             })
+            .state('app.explain', {
+                url: '/home/explain',
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/my/payExplain.html',
+                        controller: 'explainCtrl'
+                    }
+                }
+            })
             .state('app.withdraw', {
                 url: '/my/withdraw',
                 views: {
@@ -252,6 +297,15 @@
                     }
                 }
             })
+            .state('app.payout', {
+                url: '/home/payout',
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/my/withdraw.html',
+                        controller: 'payoutCtrl'
+                    }
+                }
+            })
             .state('app.contact', {
                 url: '/my/contact',
                 views: {
@@ -261,6 +315,18 @@
                     }
                 }
             })
+            .state('app.shareDream', {
+                url: '/home/shareDream',
+                params:{
+                  item:null
+                },
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/home/shareDream.html',
+                        controller: 'shareDreamCtrl'
+                    }
+                }
+            });
         if (localStorage['token']) {
             $urlRouterProvider.otherwise('/app/home');
         } else {

miaomiao/www/js/controllers/home.js

@@ -1,6 +1,9 @@
 (function (app) {
-    app.controller('homeCtrl', ["$scope", "$http", 'config', "$state", "msg", "$ionicPopover", "homeService"
-        , function ($scope, $http, config, $state, msg, $ionicPopover, homeService) {
+    app.controller('homeCtrl', ["$scope", "$ionicTabsDelegate","$http", 'config', "$state", "msg", "$ionicPopover", "homeService"
+        , function ($scope, $ionicTabsDelegate,$http, config, $state, msg, $ionicPopover, homeService) {
+            $scope.$on('$ionicView.beforeEnter', function (viewResult) {
+                $ionicTabsDelegate.showBar(true);
+            });
         $scope.type = 'hot';//tab切换
 
             $scope.chosedIndex = 0;
@@ -27,7 +30,7 @@
             $state.go('app.home_dreamdetail',{id:id});
         };
         $scope.toUserDetail = function (id) {
-            $state.go('app.userDetail',{id:id});
+            $state.go('app.home_userDetail',{id:id});
         };
         $scope.filter = {
             hasMore: false,
@@ -77,7 +80,7 @@
             }, function (error) {
                 msg.hide();
             });
-        }
+        };
         $scope.qrscan = function () {
             cordova.plugins.barcodeScanner.scan(
                     function (result) {
@@ -106,7 +109,7 @@
                         disableSuccessBeep: false // iOS      禁止成功后提示声音 “滴”
                     }
                 );
-        }
+        };
         $scope.data = {};
         $scope.load(true);
         $scope.$on('$ionicView.beforeLeave', function () {
@@ -123,8 +126,21 @@
             $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) {
@@ -139,7 +155,6 @@
                 $scope.multi.b = new Date($scope.dream.created_at.replace(/-/g, "/"));
                 $scope.multi.c  = $scope.dream.c;
                 $scope.multi.promise =  $scope.dream.a;
-                debugger;
                 var newtop3user = '' ;
                 angular.forEach($scope.dream.top3user, function(user) {  
                   newtop3user= newtop3user +user.id+","
@@ -186,10 +201,24 @@
             $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: ''
@@ -199,22 +228,11 @@
             $scope.type = type;
         };
         $scope.index = 0;
-        $scope.$on('$ionicView.beforeEnter', function () {
-            $scope.load(id);
-            $ionicTabsDelegate.showBar(false);
-            $scope.thisUser = storage.getObject('user');
-            console.log($scope.user);
-        });
-        $scope.$on('$ionicView.leave', function () {
-            $ionicTabsDelegate.showBar(true);
-            if($scope.multi.promise)$interval.cancel($scope.multi.promise);
-            if($scope.leftTimer)$interval.cancel($scope.leftTimer);
-        });
 
         $scope.vm = {
             coin:"",
             title:""
-        }
+        };
         $scope.timer = '';
         var leftTimer = function (countDown) {
             if (isNaN(countDown)) {
@@ -235,14 +253,14 @@
             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 () {
@@ -258,7 +276,7 @@
                 $scope.multi.result = Math.round(number * 100 / 100);
             },1000);
             //  点击支持取消   $interval.cancel($scope.multi.promise); 获取数据后重新开始执行
-        }
+        };
         $scope.supportDream = function (data) {
             if(!$scope.vm.coin){
                 msg.error("请选择梦想币数量！");
@@ -280,19 +298,19 @@
             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,
+                pics:$scope.imgs
             };
             homeService.add_interaction(data).then(function(){
                 $scope.load(id);
                 $scope.closeModal();
             })
-        }
+        };
 
         $scope.showText = function(){ 
             $scope.aboutStyle = {
@@ -312,26 +330,26 @@
             $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,
+                content:$scope.vm.comment
             };
-            console.log($scope.vm.comment+" "+iid)
+            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) {
@@ -381,9 +399,12 @@
             $scope.modal.remove();
           });
         }]);
-    app.controller('userDetailCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
-        , function ($scope,homeService,$stateParams, $state, msg) {
+    app.controller('userDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
+        , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
             var id = $stateParams.id;
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $ionicTabsDelegate.showBar(false);
+            });
             $scope.load = function (id) {
                 msg.loading();
                 homeService.dreamDetail(id).then(function (result) {
@@ -395,26 +416,42 @@
             };
             $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.home_dreamdetail',{id:id});
             };
             $scope.toOldDream = function(){
                 $state.go("app.oldDream");
-            }
+            };
             $scope.toSupportDream = function(){
                 $state.go("app.supportDream");
-            }
+            };
+        }]);
+
+    app.controller('shareDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
+        , function ($scope,homeService,$stateParams, $state, msg) {
+            $scope.dream = $stateParams.item
 
         }]);
     app.controller('oldDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
 
-
         }]);
     app.controller('supportDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
 
-
         }]);
     app.controller('searchCtrl', ["$scope","homeService", "$state", "msg", "$ionicTabsDelegate", "$ionicNavBarDelegate"
         , function ($scope,homeService, $state, msg, $ionicTabsDelegate, $ionicNavBarDelegate) {
@@ -457,17 +494,9 @@
                 $scope.history_searches = result.data.data.history_searches;
             });
         });
-        $scope.$on('$ionicView.leave', function () {
-            $ionicTabsDelegate.showBar(true);
-
-        }); 
     }]);
     app.controller('interactionAddCtrl', ["$scope","homeService", "$state", "msg","config","common", "$ionicTabsDelegate", "$ionicNavBarDelegate"
         , function ($scope,homeService, $state, msg,config,common, $ionicTabsDelegate, $ionicNavBarDelegate) {
-        $scope.$on('$ionicView.beforeEnter', function () {
-         
-            
-        }); 
 
     }]);
     app.controller('homeDreamsCtrl', ["$scope", "$state", "myService", "msg"

miaomiao/www/js/controllers/my.js

@@ -1,7 +1,8 @@
 (function (app) {
-    app.controller('myCtrl', ["$scope", "$state", "$http", "storage", "myService", "common", "config", "msg","$timeout"
-        , function ($scope, $state, $http, storage, myService, common, config, msg, $timeout) {
+    app.controller('myCtrl', ["$scope","$ionicTabsDelegate", "$state", "$http", "storage", "myService", "common", "config", "msg","$timeout"
+        , function ($scope,$ionicTabsDelegate, $state, $http, storage, myService, common, config, msg, $timeout) {
         $scope.$on('$ionicView.beforeEnter', function (viewResult) {
+            $ionicTabsDelegate.showBar(true);
             myService.myInfo().then(function(result){
               console.log(result.data.data);
               $scope.user = result.data.data
@@ -17,8 +18,11 @@
         };
 
     }]);
-    app.controller('profileCtrl', ["$scope", "$state","$filter", "storage", "myService", "msg", "common"
-      , function ($scope, $state, $filter, storage, myService, msg, common) {
+    app.controller('profileCtrl', ["$scope", "$ionicTabsDelegate","$state","$filter", "storage", "myService", "msg", "common"
+      , function ($scope,$ionicTabsDelegate, $state, $filter, storage, myService, msg, common) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $ionicTabsDelegate.showBar(false);
+            });
             $scope.setAvator = function () {
                 common.setAvator().then(function (result) {
                     var response = JSON.parse(result.response);
@@ -84,11 +88,11 @@
                 })
             }
         }]);
-    app.controller('settingCtrl', ["$scope", "$state", "myService", "msg","storage"
-     , function ($scope, $state,myService, msg, storage) {
-         $scope.$on('$ionicView.beforeEnter', function () {
-
-         });
+    app.controller('settingCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
+     , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $ionicTabsDelegate.showBar(false);
+            });
             //退出登陆
             $scope.logout = function(){
                 storage.remove("token");
@@ -97,94 +101,150 @@
             }
 
      }]);
-    app.controller('aboutMiaoCtrl', ["$scope", "$state", "myService", "msg","storage"
-        , function ($scope, $state,myService, msg, storage) {
-            $scope.$on('$ionicView.beforeEnter', function () {
-
-            });
+    app.controller('aboutMiaoCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
 
         }]);
-    app.controller('withdrawCtrl', ["$scope", "$state", "myService", "msg","storage"
-        , function ($scope, $state,myService, msg, storage) {
-            $scope.$on('$ionicView.beforeEnter', function () {
+    app.controller('withdrawCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
 
-            });
+        }]);
+    app.controller('payoutCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
 
         }]);
-    app.controller('payExplainCtrl', ["$scope", "$state", "myService", "msg","storage"
-        , function ($scope, $state,myService, msg, storage) {
-            $scope.$on('$ionicView.beforeEnter', function () {
+    app.controller('payExplainCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
 
-            });
+        }]);
+    app.controller('explainCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
 
         }]);
-    app.controller('contactCtrl', ["$scope", "$state", "myService", "msg","storage"
-        , function ($scope, $state,myService, msg, storage) {
-            $scope.$on('$ionicView.beforeEnter', function () {
+    app.controller('contactCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
 
-            });
+        }]);
+    app.controller('attentionCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
 
         }]);
-    app.controller('attentionCtrl', ["$scope", "$state", "myService", "msg","storage"
-        , function ($scope, $state,myService, msg, storage) {
-            $scope.$on('$ionicView.beforeEnter', function () {
+    app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
 
-            });
+        }]);
+    app.controller('personalLetterCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
 
         }]);
-    app.controller('personalLetterCtrl', ["$scope", "$state", "myService", "msg","storage"
-        , function ($scope, $state,myService, msg, storage) {
+    app.controller('rechargeCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg"
+  , function ($scope, $ionicTabsDelegate,$state, myService, msg) {
             $scope.$on('$ionicView.beforeEnter', function () {
-
+                $ionicTabsDelegate.showBar(false);
+                myService.myInfo().then(function(result){
+                    $scope.vm = result.data.data;
+                    $scope.vm.money = '';
+                })
             });
-
-        }]);
-    app.controller('rechargeCtrl', ["$scope", "$state", "myService", "msg"
-  , function ($scope, $state, myService, msg) {
-       $scope.$on('$ionicView.beforeEnter', function () {
-           myService.myInfo().then(function(result){
-                // alert(JSON.stringify(result.data.data));
-                $scope.vm = result.data.data;
-                $scope.vm.money = '';
-              })
-      });
+            $scope.payExplain = function(){
+                $state.go("app.payExplain")
+            };
+            $scope.withdraw = function(){
+                $state.go("app.withdraw")
+            };
       //充值
       $scope.recharge = function(money){
           myService.recharge(money).then(function(result){
+              msg.text("充值成功");
             $state.go('app.my');
           });
       }
 
   }]);
-    app.controller('messageCtrl', ["$scope", "$state", "myService", "msg"
-  , function ($scope, $state, myService, msg) {
-      $scope.$on('$ionicView.beforeEnter', function () {
+    app.controller('payCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg"
+        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                myService.myInfo().then(function(result){
+                    $scope.vm = result.data.data;
+                    $scope.vm.money = '';
+                })
+            });
+            $scope.payExplain = function(){
+                $state.go("app.explain")
+            };
+            $scope.withdraw = function(){
+                $state.go("app.payout")
+            };
+            //充值
+            $scope.recharge = function(money){
+                myService.recharge(money).then(function(result){
+                    msg.text("充值成功");
+                    $state.go('app.my');
+                });
+            }
 
-      });
+        }]);
+    app.controller('messageCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
+        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $ionicTabsDelegate.showBar(false);
+            });
             //系统消息
             $scope.systemInfo = function(){
+                $state.go("app.my_message_sys");
                 myService.systemInfo().then(function(result){
+                },function(error){
 
+                });
+            };
+            //回复我的
+            $scope.replyMy = function(){
+                $state.go("app.my_message_reply");
+                myService.replyMy().then(function(result){
+                    //$scope.comments = result;
+                },function(error){
+
+                });
+            };
+            $scope.personalLetter = function(){
+                $state.go("app.personalLetter");
+            }
+
+        }]);
+    app.controller('homeMessageCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
+        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $ionicTabsDelegate.showBar(false);
+            });
+            //系统消息
+            $scope.systemInfo = function(){
+                $state.go("app.message_sys");
+                myService.systemInfo().then(function(result){
                 },function(error){
 
                 });
             };
             //回复我的
             $scope.replyMy = function(){
+                $state.go("app.message_reply");
                 myService.replyMy().then(function(result){
                     //$scope.comments = result;
                 },function(error){
 
                 });
             };
+            $scope.personalLetter = function(){
+                $state.go("app.letter");
+            }
 
-  }]);
-    app.controller('dreamCtrl', ["$scope", "$state", "myService", "msg"
-  , function ($scope, $state, myService, msg) {
+
+        }]);
+    app.controller('dreamCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
+  , function ($scope, $ionicTabsDelegate,$state, myService, msg) {
       $scope.$on('$ionicView.beforeEnter', function () {
+          $ionicTabsDelegate.showBar(false);
             myService.myDream().then(function(result){
               $scope.dreams = result.data.data;
-                debugger;
             });
           myService.myInfo().then(function(result){
               $scope.user = result.data.data
@@ -195,28 +255,31 @@
           };
 
   }]);
-    app.controller('collectCtrl', ["$scope", "$state", "myService", "msg"
-       , function ($scope, $state, myService, msg) {
-      $scope.$on('$ionicView.beforeEnter', function () {
-          myService.collect().then(function(result){
-              $scope.dreams = result.data.data.dreams;
-              $scope.users = result.data.data.users;
-              debugger;
-          });
-      });
+    app.controller('collectCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg"
+       , function ($scope, $ionicTabsDelegate,$state, myService, msg) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $ionicTabsDelegate.showBar(false);
+                myService.collect().then(function(result){
+                    $scope.dreams = result.data.data.dreams;
+                    $scope.users = result.data.data.users;
+                });
+            });
       $scope.toDetail = function (id) {
           $state.go('app.my_dreamdetail',{id:id});
       };
     }]);
-    app.controller('messageSysCtrl', ["$scope", "$state", "myService", "msg"
-       , function ($scope, $state, myService, msg) {
-           $scope.$on('$ionicView.beforeEnter', function () {
-
-           });
+    app.controller('messageSysCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
+       , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
        }]);
 
-    app.controller('messageReplyCtrl', ["$scope", "$state", "myService", "msg", "$ionicModal"
-       , function ($scope, $state, myService, msg, $ionicModal) {
+    app.controller('sysCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
+        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+        }]);
+    app.controller('letterCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
+        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+        }]);
+    app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg", "$ionicModal"
+       , function ($scope,$ionicTabsDelegate, $state, myService, msg, $ionicModal) {
                 $ionicModal.fromTemplateUrl('my-modal.html', {
                 scope: $scope,
                 animation: 'slide-in-up'
@@ -231,9 +294,6 @@
                 $scope.modal.hide();
 
             };
-           $scope.$on('$ionicView.beforeEnter', function () {
-
-           });
 
             //我的回复
             $scope.vm={

miaomiao/www/js/services/homeservice.js

@@ -71,8 +71,12 @@
                     data:data
                 })
             },
-
-            
+            myInfo:function(){
+                return $http({
+                    url:config.server + "api/my/show",
+                    method:"get"
+                })
+            },
         };
     }]);
 })(angular.module('app.services'));

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

@@ -1,9 +1,9 @@
 <ion-view view-title="梦想">
     <ion-nav-buttons side="right">
-        <button class="button button-clear homeIcon">
+        <button class="button button-clear homeIcon" ui-sref="app.message">
             <img src="img/icon_message_h.svg" style="height: 100%; width: 100%">
         </button>
-        <button class="button button-clear button-small" style="padding-top: 3px;">
+        <button ng-click="share($event)" class="button button-clear button-small" style="padding-top: 3px;">
             <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
         </button>
     </ion-nav-buttons>
@@ -72,7 +72,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="detail-head" ng-if="dream.top3user.length>0">
+                <div class="detail-head" style="height: 190px" ng-if="dream.top3user.length>0">
                     <div class="row">
                         <div class="col top2" ng-if="dream.top3user.length>1" style="background: url('img/img_No2.svg') no-repeat; background-size: 100% 100%;">
                             <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[1].avatar }}" /><br>
@@ -81,10 +81,10 @@
                             <em style="font-size: 18px">{{ dream.top3user[1].score }}</em>
                         </div>
                         <div class="col top1" ng-if="dream.top3user.length>0" style="background: url('img/img_No1.svg') no-repeat; background-size: 100% 100%;">
-                            <img style="width: 80px; margin: 28px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[0].avatar }}" /><br>
+                            <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[0].avatar }}" /><br>
                             {{ dream.top3user[0].nickname }}<br>
-                            <img src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
-                            <em style="font-size: 18px">{{ dream.top3user[0].score }}</em>
+                            <img src="img/icon_gongxian.svg" style="height: 18px; width: 18px; margin-top: 5px" />
+                            <em style="font-size: 16px">{{ dream.top3user[0].score }}</em>
                         </div>
                         <div class="col top2" ng-if="dream.top3user.length>2" style="background: url('img/img_No3.svg') no-repeat; background-size: 100% 100%;">
                             <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[2].avatar }}" /><br>
@@ -114,15 +114,15 @@
        
         </div>
         <div ng-if="type==2" class="hdcontent">
-            <div>
+            <div style="color: red">
                 <div class="list">
-                    <div class="item itemjs" style="padding: 10px" >
+                    <div ng-if="user.id == dream.user_id" class="item itemjs" style="padding: 10px" >
                         <a class="button button-outline button-block button-calm button-icon" ng-click="openModal()">
                             <i class="icon ion-plus"></i>
                             发布梦想互动
                         </a>
                     </div>
-                    <div class="item" style="border-bottom:15px solid #F2F2F2;" ng-click="comment()" ng-repeat="interaction in dream.interactions">
+                    <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>
                         <span class="utitle kz">剩余{{dream.end_time | lastDate}}天</span>
@@ -137,6 +137,7 @@
                             <img class="slt" ng-src="{{interaction.pic7}}" ng-if="interaction.pic7"/>
                             <img class="slt" ng-src="{{interaction.pic8}}" ng-if="interaction.pic8"/>
                         </div>
+                        <!--<p style="margin: 10px 0 0 50px; color: #00C3DA">评论</p>-->
                         <div class="list padding" ng-click="showForm=true; focusInput=true">
                             <div class="item subitem" ng-click="replay($event,'百川1')">
                                 <img ng-src="img/demo/head4.jpg" />
@@ -147,7 +148,6 @@
                             <div style="color: #00C3DA; margin-left: 50px">
                                 查看更多评论
                             </div>
-
                         </div>
                     </div>
                 </div>
@@ -155,24 +155,26 @@
         </div>
         
         <div ng-if="type==3" class="phbcontent">
-            <div class="row" style="background: #F2F2F2; width: 100%; height: 200px; text-align: center">
-                <div class="col top2" ng-if="dream.top3user.length>1" style="background: url('img/img_No2.svg') no-repeat; background-size: 100% 100%;">
-                    <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[1].avatar }}" /><br>
-                    {{ dream.top3user[1].nickname }}<br>
-                    <img src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
-                    <em style="font-size: 18px">{{ dream.top3user[1].score }}</em>
-                </div>
-                <div class="col top1" ng-if="dream.top3user.length>0" style="background: url('img/img_No1.svg') no-repeat; background-size: 100% 100%;">
-                    <img style="width: 80px; margin: 28px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[0].avatar }}" /><br>
-                    {{ dream.top3user[0].nickname }}<br>
-                    <img src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
-                    <em style="font-size: 18px">{{ dream.top3user[0].score }}</em>
-                </div>
-                <div class="col top2" ng-if="dream.top3user.length>2" style="background: url('img/img_No3.svg') no-repeat; background-size: 100% 100%;">
-                    <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[2].avatar }}" /><br>
-                    {{ dream.top3user[2].nickname }}<br>
-                    <img src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
-                    <em style="font-size: 18px">{{ dream.top3user[2].score }}</em>
+            <div class="detail-head" style="height: 180px" ng-if="dream.top3user.length>0">
+                <div class="row">
+                    <div class="col top2" ng-if="dream.top3user.length>1" style="background: url('img/img_No2.svg') no-repeat; background-size: 100% 100%;">
+                        <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[1].avatar }}" /><br>
+                        {{ dream.top3user[1].nickname }}<br>
+                        <img src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
+                        <em style="font-size: 18px">{{ dream.top3user[1].score }}</em>
+                    </div>
+                    <div class="col top1" ng-if="dream.top3user.length>0" style="background: url('img/img_No1.svg') no-repeat; background-size: 100% 100%;">
+                        <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[0].avatar }}" /><br>
+                        {{ dream.top3user[0].nickname }}<br>
+                        <img src="img/icon_gongxian.svg" style="height: 18px; width: 18px; margin-top: 5px" />
+                        <em style="font-size: 16px">{{ dream.top3user[0].score }}</em>
+                    </div>
+                    <div class="col top2" ng-if="dream.top3user.length>2" style="background: url('img/img_No3.svg') no-repeat; background-size: 100% 100%;">
+                        <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[2].avatar }}" /><br>
+                        {{ dream.top3user[2].nickname }}<br>
+                        <img src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
+                        <em style="font-size: 18px">{{ dream.top3user[2].score }}</em>
+                    </div>
                 </div>
             </div>
             <div class="list padding">
@@ -245,157 +247,173 @@
         </ion-content>
       </div>
     </script>
-
     <script id="recharge-modal.html" type="text/ng-template">
       <div class="modal">
         <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
-          <h1 class="title">充值</h1>
-        <button class="button button-clear" ng-click="closeRechargeModal()">关闭</button>
+            <button class="button button-clear" ng-click="closeRechargeModal()">关闭</button>
+            <h1 class="title">充值</h1>
+            <button class="button button-clear" ui-sref="app.pay">支付说明</button>
         </ion-header-bar>
         <ion-content>
-              <div class="list">
-                    <div class="item" style="padding:20px">
-                        <span><i class="icon ion-ios-star-outline calm re-border"></i>剩余梦想币</span>
-                        <div class="re-num">50000</div>
-                    </div>
-                    <div class="item item-input">
-                        <span class="input-label">金额</span>
-                        <input type="number" placeholder="请输入充值金额" ng-model="vm.money" >
-                    </div>
-                    <div class="item item-divider">
-                       请选择以下支付方式
+            <div class="list recharge padding">
+                <div class="item" style="padding:20px">
+                    <div class="row">
+                        <div class="col col-20">
+                            <img src="img/icon_gold.svg" style="height: 100%; width: 100%">
+                        </div>
+                        <div class="col">
+                            <div>剩余梦想币</div>
+                            <div class="re-num">{{vm.coin}}</div>
+                        </div>
+                        <div class="col col-33" style="padding: 30px 0 0 20px">
+                            <a ui-sref="app.withdraw" style="border: 1px solid #00C3DA; color: #00C3DA; padding: 5px 25px; border-radius: 30px;">提现</a>
+                        </div>
                     </div>
-                    <ion-list class="re-radio">
-                        <ion-radio ng-model="choice" ng-value="'A'">
-                            <img ng-src="img/alipay.png" />
-                            <span>支付宝支付</span> 
-                        </ion-radio>
-                        <ion-radio ng-model="choice" ng-value="'B'">
-                        <img ng-src="img/weixinpay.png" /><span>微信支付</span>
-                          </ion-radio>
-                    </ion-list>
                 </div>
-                <div class="padding">
-                    <button  class="button button-full button-calm" ng-click="recharge(vm.money)">
-                        支付
-                    </button>
+                <div class="item item-input" style="padding-top: 20px; padding-bottom: 20px">
+                    <span class="input-label" style="width: 60px">金额</span>
+                    <input type="number" placeholder="请输入充值金额" ng-model="vm.money">
                 </div>
+                <div class="item" style="color: #969696; padding-top: 40px">
+                    选择支付方式
+                </div>
+                <ion-list class="re-radio">
+                    <ion-radio ng-model="choice" ng-value="'A'">
+                        <img ng-src="img/icon_ Alipay.svg" />
+                        <span>支付宝支付</span>
+                    </ion-radio>
+                    <ion-radio ng-model="choice" ng-value="'B'">
+                        <img ng-src="img/icon_ WeChat Pay.svg" />
+                        <span>微信支付</span>
+                    </ion-radio>
+                </ion-list>
+            </div>
+            <div class="padding">
+                <button  class="button button-block button-calm" ng-click="recharge(vm.money)">
+                    支付
+                </button>
+            </div>
         </ion-content>
       </div>
     </script>
     </ion-content>
-    <div class="detail-like" ng-if="tosupport">
-        <div style="text-align: center; border-bottom: 3px solid #1E1D1C">
-            <img src="img/img_miao.png" style="width: 25%; height: 55px;margin-bottom: -13px">
-        </div>
-        <div>
-            <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%">
-                        <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: 15%;">
-                        <img src="img/icon_gold.svg" style="width: 100%">
-                    </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%">
-                        <img src="img/icon_candy.png" style="width: 100%;">
+        <div class="detail-like" ng-if="tosupport">
+            <div style="text-align: center; border-bottom: 3px solid #1E1D1C">
+                <img src="img/img_miao.png" style="width: 25%; height: 55px;margin-bottom: -13px">
+            </div>
+            <div>
+                <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%">
+                            <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: 15%;">
+                            <img src="img/icon_gold.svg" style="width: 100%">
+                        </div>
                     </div>
-                    <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
-                        50
+                    <div class="col box {{index==5?'selected':''}}" ng-click="changeIndex(5)" ng-model="coin">
+                        <div style="float:left; width: 40%; margin-right: 8%">
+                            <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: 15%;">
+                            <img src="img/icon_gold.svg" style="width: 100%">
+                        </div>
                     </div>
-                    <div style="float:left; width: 20%; margin-top: 15%;">
-                        <img src="img/icon_gold.svg" style="width: 100%">
+                    <div class="col box {{index==10?'selected':''}}" ng-click="changeIndex(10)" ng-model="coin">
+                        <div style="float:left; width: 40%; margin-right: 2%">
+                            <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: 15%;">
+                            <img src="img/icon_gold.svg" style="width: 100%">
+                        </div>
                     </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%">
-                        <img src="img/icon_balloon.png" style="width: 100%;">
+                <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%">
+                            <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: 15%;">
+                            <img src="img/icon_gold.svg" style="width: 100%">
+                        </div>
                     </div>
-                    <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
-                        100
+                    <div class="col box {{index==30?'selected':''}}" ng-click="changeIndex(30)" ng-model="coin">
+                        <div style="float:left; width: 40%; margin-right: 0.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: 15%;">
+                            <img src="img/icon_gold.svg" style="width: 100%">
+                        </div>
                     </div>
-                    <div style="float:left; width: 20%; margin-top: 15%;">
-                        <img src="img/icon_gold.svg" style="width: 100%">
+                    <div class="col box {{index==50?'selected':''}}" ng-click="changeIndex(50)" ng-model="coin">
+                        <div style="float:left; width: 40%; margin-right: 2.3%">
+                            <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: 15%;">
+                            <img src="img/icon_gold.svg" style="width: 100%">
+                        </div>
                     </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%">
-                        <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: 15%;">
-                        <img src="img/icon_gold.svg" style="width: 100%">
-                    </div>
+            <div class="send">
+                <div style="float:left;">余额：
                 </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%">
-                        <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: 15%;">
-                        <img src="img/icon_gold.svg" style="width: 100%">
+                <div style="float: left;">
+                    <div style="float:left; padding-top: 4px;">
+                        <img src="img/icon_gold.svg"/>
                     </div>
+                    <em>{{dream.user_coin}}&nbsp;</em>
                 </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%">
-                        <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 class="calm" ng-click="toRecharge()" style="float: left;">
+                    <div style="float:left; padding-top: 4px;">
+                        <img src="img/icon_ recharge.png">
                     </div>
-                    <div style="float:left; width: 20%; margin-top: 15%;">
-                        <img src="img/icon_gold.svg" style="width: 100%">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="send">
-            <div style="float:left;">余额：
-                <span style="width: 60px;">
-                    <img src="img/icon_gold.svg"/>
-                </span>
-                {{dream.user_coin}}
-            </div>&nbsp;
-            <div class="calm" ng-click="openRechargeModal()" style="float: left;">
-                <div style="float:left; padding-top: 4px;">
-                    <img src="img/icon_ recharge.png">
+                    <em>&nbsp;充值</em>
                 </div>
-                <em>充值</em>
-            </div>
             <span style="height:100%;float: right;">
                 <a style="border-radius:100px; width:100px; font-size:1.2em; padding: 0" class="button button-calm"  ng-click="supportDream()">发送</a>
             </span>
+            </div>
         </div>
-    </div>
-    <script id="supportExplain.html" type="text/ng-template">
-        <div class="modal">
-            <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
-                <h1 class="title">说明</h1>
-                <button class="button button-clear" ng-click="closeSupportmodal()">关闭</button>
-            </ion-header-bar>
-            <ion-content>
-                <div class="list">
-                    <div class="item" style="padding:20px">
-                        <span><i class="icon ion-ios-star-outline calm re-border"></i>剩余梦想币</span>
-                        <div class="re-num">50000</div>
-                    </div>
-                    <div class="item item-input">
-                        <span class="input-label">金额</span>
-                        <input type="number" placeholder="请输入充值金额" ng-model="vm.money" >
-                    </div>
-                </div>
-            </ion-content>
+    <div class="detail-like" ng-if="toshare">
+        <div class="row" style="background: #CCCCCC;">
+            <div class="col" ng-click="shareDream()">
+                <img src="img/weixin.png" ><br>
+                微信
+            </div>
+            <div class="col" ng-click="shareDream()">
+                <img src="img/weibo.png" ><br>
+                微博
+            </div>
         </div>
+    </div>
+        <script id="supportExplain.html" type="text/ng-template">
+            <div class="modal">
+                <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
+                    <h1 class="title">说明</h1>
+                    <button class="button button-clear" ng-click="closeSupportmodal()">关闭</button>
+                </ion-header-bar>
+                <ion-content style="color: red">
+                    1.测试文本
+                </ion-content>
+            </div>
     </script>
 </ion-view>

miaomiao/www/templates/home/index.html

@@ -41,8 +41,8 @@
                     <i class="icon ion-ios-arrow-left"  style="font-size: 1.5rem; color: #00C3DA; line-height: 100%"></i>
                 </div>
                 <div class="col" style="overflow: hidden;">
-                     <span class="subcontent" ng-repeat="user in index.users" style="position: relative">
-                         <img ng-click="clickAvatar($index)" ng-if="$index<4" ng-src="{{user.avatar |avator}}"  ng-class="{'defaultClass':$index !=chosedIndex,'chosenClass':$index ==chosedIndex}" style="padding: 2px;"/>
+                     <span class="subcontent" ng-repeat="user in index.users">
+                         <img ng-click="clickAvatar($index)" ng-if="$index<4" ng-src="{{user.avatar |avator}}"  ng-class="{'defaultClass':$index !=chosedIndex,'chosenClass':$index ==chosedIndex}" style="padding: 0.5%;"/>
                      </span>
                 </div>
                 <div class="col col-10" style="margin-top: 7%; text-align: right" ng-click="next(2)">
@@ -54,8 +54,8 @@
             <div class="list">
                 <div class="item mainitem" ng-repeat="item in index.dreams">
                     <div class="row">
-                        <div class="col">
-                            <img style="position: relative" ng-src="{{item.user.avatar}}"  ng-click="toUserDetail(item.id)" />
+                        <div class="col avatarCol">
+                            <img ng-src="{{item.user.avatar | avator}}"  ng-click="toUserDetail(item.id)" />
                             <div  class="myblock">
                                <div>{{item.user.nickname}}<span>{{item.user.birthday | getage}}岁</span></div>
                                 <div class="mysecond">{{item.user.city}}</div>
@@ -103,7 +103,6 @@
                      <i class="icon ion-ios-folder-outline"></i>
                      我的收藏
                  </a>
-                 
              </div>
             </ion-content>
         </ion-popover-view>

miaomiao/www/templates/home/oldDream.html

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

miaomiao/www/templates/home/shareDream.html

@@ -0,0 +1,54 @@
+<ion-view view-title="分享梦想页">
+    <ion-content>
+        <div class="list detail-list">
+            <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>
+                    </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>
+                    </ion-slide-page>
+                </ion-slides>
+            </div>
+            <div class="item">
+                <p>{{dream.name}}</p>
+                <p style="font-size: 13px" ng-style="aboutStyle">
+                    {{dream.about}}
+                </p>
+                <div style="text-align: center">
+                    <i class="icon ion-chevron-down" ng-style="ionDownStyle" style="color: #00C3DA" ng-click="showText()"></i>
+                </div>
+            </div>
+            <div class="item detail-item2" style="padding:5px; border-top: 1px solid #E6E6E6;">
+                <div class="row">
+                    <div class="col" style="text-align:left">
+                        <h2>{{timer}}</h2>
+                        <p>剩余时间</p>
+                    </div>
+                    <div class="col" style="text-align:right">
+                        <h2>{{dream.score}}</h2>
+                        <p>当前获得梦想分数</p>
+                    </div>
+                </div>
+            </div>
+            <div class="item" style="padding:5px; border-top: 1px solid #E6E6E6;">
+                <div class="row">
+                    <div class="col" style="text-align:left">
+                        <p style="color: #FF6600; font-size: 16px">{{dream.get_coin}}</p>
+                        <p>目前已获梦想币</p>
+                    </div>
+                    <div class="col" style="text-align:right">
+                        <h2>{{dream.coin}}</h2>
+                        <p>我要求的梦想币</p>
+                    </div>
+                </div>
+                <div class="reply-bar">
+                    <div style="width: {{100*dream.get_coin/dream.coin}}%;">
+                    </div>
+                </div>
+            </div>
+    </ion-content>
+</ion-view>

miaomiao/www/templates/home/supportDream.html

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

miaomiao/www/templates/home/userDetail.html

@@ -1,8 +1,8 @@
-<ion-view>
+<ion-view view-title="瞄瞄">
     <ion-nav-buttons side="right">
-        <button class="button button-clear button-small" style="padding-top: 2px"><img src="img/icon_share.svg" style="height: 16px; width: 20px;"></button>
+        <button ng-click="share($event)" class="button button-clear button-small" style="padding-top: 2px"><img src="img/icon_share.svg" style="height: 16px; width: 20px;"></button>
     </ion-nav-buttons>
-    <ion-content>
+    <ion-content ng-click="cancelSupport()">
         <div class="user-box">
             <div class="myinfo">
                 <img ng-src="{{user.user.avatar | avator }}" />
@@ -67,5 +67,17 @@
             </a>
         </div>
     </ion-content>
+    <div class="detail-like" ng-if="toshare">
+        <div class="row" style="background: #CCCCCC;">
+            <div class="col" ng-click="shareDream()">
+                <img src="img/weixin.png" ><br>
+                微信
+            </div>
+            <div class="col" ng-click="shareDream()">
+                <img src="img/weibo.png" ><br>
+                微博
+            </div>
+        </div>
+    </div>
 </ion-view>
 

miaomiao/www/templates/my/attention.html

@@ -4,8 +4,8 @@
             <div class="item reply-item" ng-click="toDetail(dream.id)">
                 <div class="item" style="height:90px; border-bottom: 1px solid #EFEFEF">
                     <div style="float:left;">
-                        <!--<img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />-->
-                        <img style="width: 45px; height: 45px;border-radius: 100%;" />
+                        <!--<img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avatar }}" />-->
+                        <img style="width: 45px; height: 45px;border-radius: 100%;"  />
                     </div>
                     <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
                         <h2>瞄瞄</h2>
@@ -15,7 +15,7 @@
                 </div>
                 <div class="item" style="height:90px; border-bottom: 1px solid #EFEFEF">
                     <div style="float:left;">
-                        <!--<img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />-->
+                        <!--<img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avatar }}" />-->
                         <img style="width: 45px; height: 45px;border-radius: 100%;" />
                     </div>
                     <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
@@ -26,7 +26,7 @@
                 </div>
                 <div class="item" style="height:90px; border-bottom: 1px solid #EFEFEF">
                     <div style="float:left;">
-                        <!--<img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />-->
+                        <!--<img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avatar }}" />-->
                         <img style="width: 45px; height: 45px;border-radius: 100%;" />
                     </div>
                     <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">

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

@@ -20,7 +20,7 @@
                 </div>
                 <div class="item item-thumbnail-left reply-content">
                     <div style="float:left; height: 60px; width: 60px">
-                        <img ng-src="{{dream.pic}}" />
+                        <img ng-src="{{dream.img.pic}}" />
                     </div>
                     <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
                         <h2>{{dream.name}}</h2>

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

@@ -6,7 +6,7 @@
     </ion-nav-buttons>
     <ion-content>
         <div class="list padding list-user-set" style="color: #737373">
-            <a class="item" ui-sref="app.my_message_sys" ng-click="systemInfo()" style="border-bottom: 1px solid #EAEAEA">
+            <a class="item" ng-click="systemInfo()" style="border-bottom: 1px solid #EAEAEA">
                 <em class="fl">系统消息</em>
                 <i class="fr">
                     <em class="badge badge-assertive" style="background: red;">300</em>
@@ -15,7 +15,7 @@
                     300条系统消息
                 </i>
             </a>
-            <a class="item" ui-sref="app.my_message_reply" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
+            <a class="item" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
                 <em class="fl">回复我的</em>
                 <i class="fr">
                     <em class="badge badge-assertive" style="background: red;">300</em>
@@ -24,7 +24,7 @@
                     300条回复消息
                 </i>
             </a>
-            <a class="item" ui-sref="app.personalLetter" style="border-bottom: 1px solid #EAEAEA">
+            <a class="item" ng-click="personalLetter()" style="border-bottom: 1px solid #EAEAEA">
                 <em class="fl">私信</em>
                 <i class="fr" style="color: #B3B3B3">
                     哈哈哈

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

@@ -1,4 +1,4 @@
-<ion-view view-title="个人信息" >
+<ion-view view-title="个人信息">
     <ion-content>
      <div class="list myprofile">
          <a class="item item-avatar-right" ng-click="setAvator()">

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

@@ -1,6 +1,6 @@
 <ion-view view-title="充值">
     <ion-nav-buttons side="right">
-        <button class="button button-clear" ui-sref="app.payExplain">
+        <button class="button button-clear" ng-click="payExplain()">
             支付说明
         </button>
     </ion-nav-buttons>
@@ -16,7 +16,7 @@
                         <div class="re-num">{{vm.coin}}</div>
                     </div>
                     <div class="col col-33" style="padding: 30px 0 0 20px">
-                        <a ui-sref="app.withdraw" style="border: 1px solid #00C3DA; color: #00C3DA; padding: 5px 25px; border-radius: 30px;">提现</a>
+                        <a ng-click="withdraw()" style="border: 1px solid #00C3DA; color: #00C3DA; padding: 5px 25px; border-radius: 30px;">提现</a>
                     </div>
                 </div>
             </div>

miaomiao/www/templates/my/personalLetter.html

@@ -1,15 +1,15 @@
 <ion-view view-title="私信">
     <ion-content>
         <div class="list list-user-set" style="color: #737373">
-            <a class="item" ui-sref="app.my_message_reply" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
+            <a class="item" style="border-bottom: 1px solid #EAEAEA">
                 来自 <em style="color: #000">瞄瞄</em> 的私信
                 <p>测试文本</p>
             </a>
-            <a class="item" ui-sref="app.my_message_reply" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
+            <a class="item" style="border-bottom: 1px solid #EAEAEA">
                 来自 <em style="color: #000">瞄瞄</em> 的私信
                 <p>测试文本</p>
             </a>
-            <a class="item" ui-sref="app.my_message_reply" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
+            <a class="item" style="border-bottom: 1px solid #EAEAEA">
                 来自 <em style="color: #000">瞄瞄</em> 的私信
                 <p>测试文本</p>
             </a>