Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.miaomiao.app" version="0.0.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.miaomiao.app" version="0.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>瞄喵</name>
   <description>
         An Ionic Framework and Cordova project.

miaomiao/www/.idea/workspace.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="BookmarkManager">
+    <bookmark url="file://$PROJECT_DIR$/js/controllers/my.js" line="897" mnemonic="1" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="da700f62-8b79-488e-8484-af89b2c5db2d" name="Default" comment="" />
     <ignored path="www.iws" />
@@ -20,54 +23,155 @@
     <favorites_list name="www" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.38680783">
-              <caret line="320" column="24" selection-start-line="320" selection-start-column="24" selection-end-line="320" selection-end-column="24" />
-              <folding>
-                <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#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#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#p#0;n#div#1;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#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#p#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#textarea#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#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="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-8.6875">
-              <caret line="722" column="45" selection-start-line="722" selection-start-column="45" selection-end-line="722" selection-end-column="45" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <splitter split-orientation="horizontal" split-proportion="0.40536278">
+      <split-first>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <file leaf-file-name="my-message-sys.html" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="-9.321428">
+                  <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
+                  <folding>
+                    <element signature="n#style#0;n#p#0;n#a#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.46254072">
+                  <caret line="204" column="38" selection-start-line="204" selection-start-column="38" selection-end-line="204" selection-end-column="38" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="my-dream.html" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="-1.0">
+                  <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="my-message-reply.html" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="-2.142857">
+                  <caret line="2" column="131" selection-start-line="2" selection-start-column="131" selection-end-line="2" selection-end-column="131" />
+                  <folding>
+                    <element signature="n#style#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#p#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="-16.071428">
+                  <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="-10.375">
+                  <caret line="897" column="30" selection-start-line="897" selection-start-column="30" selection-end-line="897" selection-end-column="30" />
+                  <folding>
+                    <marker date="1509530604269" expanded="true" signature="35229:35254" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="35501:35565" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="35617:35633" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="35829:35893" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="35945:35960" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="36160:36191" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="36423:36441" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="38588:38606" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="40901:40919" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="40980:40999" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="41262:41280" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="41341:41360" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="41656:41674" placeholder="..." />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="myservice.js" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.0">
+                  <caret line="211" column="48" selection-start-line="211" selection-start-column="48" selection-end-line="211" selection-end-column="48" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.33280253">
+                  <caret line="312" column="25" selection-start-line="312" selection-start-column="16" selection-end-line="312" selection-end-column="25" />
+                  <folding>
+                    <element signature="e#10842#11161#0" expanded="false" />
+                    <element signature="e#11426#11513#0" expanded="false" />
+                    <element signature="e#14849#14965#0" expanded="false" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="HTML File" />
+      </list>
+    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/templates/my/my-message-sys.html" />
-        <option value="$PROJECT_DIR$/js/controllers/account.js" />
-        <option value="$PROJECT_DIR$/js/controllers/add.js" />
-        <option value="$PROJECT_DIR$/js/services/myservice.js" />
         <option value="$PROJECT_DIR$/js/services/homeservice.js" />
-        <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
-        <option value="$PROJECT_DIR$/js/config/router.js" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
-        <option value="$PROJECT_DIR$/templates/home/index.html" />
-        <option value="$PROJECT_DIR$/js/services/msgservice.js" />
+        <option value="$PROJECT_DIR$/templates/my/index.html" />
+        <option value="$PROJECT_DIR$/templates/my/attention.html" />
+        <option value="$PROJECT_DIR$/templates/home/search.html" />
+        <option value="$PROJECT_DIR$/templates/my/care.html" />
+        <option value="$PROJECT_DIR$/templates/my/letterDetailCtrl.html" />
+        <option value="$PROJECT_DIR$/templates/my/letterDetail.html" />
         <option value="$PROJECT_DIR$/templates/add/index.html" />
+        <option value="$PROJECT_DIR$/templates/home/index.html" />
+        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
         <option value="$PROJECT_DIR$/js/config/config.js" />
+        <option value="$PROJECT_DIR$/templates/my/my-message.html" />
+        <option value="$PROJECT_DIR$/js/config/router.js" />
+        <option value="$PROJECT_DIR$/js/controllers/account.js" />
+        <option value="$PROJECT_DIR$/templates/my/personalLetter.html" />
+        <option value="$PROJECT_DIR$/js/controllers/add.js" />
         <option value="$PROJECT_DIR$/js/controllers/home.js" />
-        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/js/services/msgservice.js" />
+        <option value="$PROJECT_DIR$/css/style.css" />
+        <option value="$PROJECT_DIR$/templates/my/my-message-sys.html" />
+        <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
+        <option value="$PROJECT_DIR$/js/services/myservice.js" />
+        <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
       </list>
     </option>
   </component>
@@ -93,7 +197,7 @@
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
+    <navigator proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -106,120 +210,16 @@
       <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes>
-      <pane id="Scratches" />
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="templates" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="templates" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="my" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="templates" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="home" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="controllers" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-    </panes>
+    <panes />
   </component>
   <component name="PropertiesComponent">
     <property name="settings.editor.selected.configurable" value="preferences.keymap" />
     <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="E:/Graduation design/huiwei/www" />
+    <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">
@@ -245,6 +245,11 @@
       <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">
@@ -267,6 +272,9 @@
     </configuration>
   </component>
   <component name="ShelveChangesManager" show_recycled="false" />
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="da700f62-8b79-488e-8484-af89b2c5db2d" name="Default" comment="" />
@@ -298,128 +306,200 @@
       <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" />
     </layout>
   </component>
+  <component name="Vcs.Log.UiProperties">
+    <option name="RECENTLY_FILTERED_USER_GROUPS">
+      <collection />
+    </option>
+    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+      <collection />
+    </option>
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="1" />
+      <breakpoints>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/js/controllers/account.js</url>
+          <line>32</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/js/config/config.js</url>
+          <line>8</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="4" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.0">
-          <caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.16587302">
-          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="372" column="38" selection-start-line="372" selection-start-column="38" selection-end-line="372" selection-end-column="38" />
+          <folding>
+            <element signature="e#10842#11161#0" expanded="false" />
+            <element signature="e#11426#11513#0" expanded="false" />
+            <element signature="e#14849#14965#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/app.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="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$/js/controllers/add.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/care.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.43869427">
-          <caret line="19" column="14" selection-start-line="19" selection-start-column="14" selection-end-line="19" selection-end-column="14" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="17" column="46" selection-start-line="17" selection-start-column="46" selection-end-line="17" selection-end-column="46" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/tabs.html">
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+          <folding>
+            <element signature="e#10842#11161#0" expanded="false" />
+            <element signature="e#11426#11513#0" expanded="false" />
+            <element signature="e#14849#14965#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/personalLetter.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.53125">
-          <caret line="56" column="32" selection-start-line="56" selection-start-column="32" selection-end-line="56" selection-end-column="32" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="4" column="31" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
+    <entry file="file://$PROJECT_DIR$/templates/my/letterDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-10.333333">
-          <caret line="113" column="12" selection-start-line="113" selection-start-column="1" selection-end-line="113" selection-end-column="12" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="4" column="76" selection-start-line="4" selection-start-column="76" selection-end-line="4" selection-end-column="76" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/dreamservice.js">
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17701863">
-          <caret line="12" column="35" selection-start-line="12" selection-start-column="35" selection-end-line="12" selection-end-column="35" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="374" column="65" selection-start-line="374" selection-start-column="65" selection-end-line="374" selection-end-column="65" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
+    <entry file="file://$PROJECT_DIR$/js/config/router.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.2857144">
-          <caret line="2" column="91" selection-start-line="2" selection-start-column="91" selection-end-line="2" selection-end-column="91" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="333" column="27" selection-start-line="333" selection-start-column="27" selection-end-line="333" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="73" column="24" selection-start-line="73" selection-start-column="12" selection-end-line="73" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/care.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="17" column="46" selection-start-line="17" selection-start-column="46" selection-end-line="17" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="e#10842#11161#0" expanded="false" />
+            <element signature="e#11426#11513#0" expanded="false" />
+            <element signature="e#14849#14965#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/personalLetter.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="4" column="31" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/letterDetail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="4" column="76" selection-start-line="4" selection-start-column="76" selection-end-line="4" selection-end-column="76" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.13354038">
-          <caret line="724" column="0" selection-start-line="724" selection-start-column="0" selection-end-line="724" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="374" column="65" selection-start-line="374" selection-start-column="65" selection-end-line="374" selection-end-column="65" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/js/config/router.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.38455415">
-          <caret line="41" column="44" selection-start-line="41" selection-start-column="44" selection-end-line="41" selection-end-column="44" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="333" column="27" selection-start-line="333" selection-start-column="27" selection-end-line="333" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31369427">
-          <caret line="28" column="66" selection-start-line="28" selection-start-column="52" selection-end-line="28" selection-end-column="66" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="73" column="24" selection-start-line="73" selection-start-column="12" selection-end-line="73" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5">
-          <caret line="40" column="38" selection-start-line="40" selection-start-column="34" selection-end-line="40" selection-end-column="38" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.16666667">
-          <caret line="11" column="93" selection-start-line="11" selection-start-column="93" selection-end-line="11" selection-end-column="144" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="722" column="45" selection-start-line="722" selection-start-column="45" selection-end-line="722" selection-end-column="45" />
+          <folding>
+            <element signature="e#10842#11161#0" expanded="false" />
+            <element signature="e#11426#11513#0" expanded="false" />
+            <element signature="e#14849#14965#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/app.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/dreamservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.17701863">
+          <caret line="12" column="35" selection-start-line="12" selection-start-column="35" selection-end-line="12" selection-end-column="35" />
         </state>
       </provider>
     </entry>
@@ -427,15 +507,111 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.13136943">
           <caret line="5" column="48" selection-start-line="5" selection-start-column="48" selection-end-line="5" selection-end-column="49" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/aboutMiao.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.30745342">
-          <caret line="39" column="55" selection-start-line="39" selection-start-column="43" selection-end-line="39" selection-end-column="55" />
-          <folding />
+        <state vertical-scroll-proportion="0.07539683">
+          <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/attention.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-8.142858">
+          <caret line="12" column="52" selection-start-line="12" selection-start-column="52" selection-end-line="12" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/home/search.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-4.733333">
+          <caret line="34" column="27" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/letterDetail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="4" column="76" selection-start-line="4" selection-start-column="76" selection-end-line="4" selection-end-column="76" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-5.357143">
+          <caret line="6" column="35" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-recharge.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-0.96666664">
+          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/care.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.10714286">
+          <caret line="6" column="42" selection-start-line="6" selection-start-column="42" selection-end-line="6" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/tabs.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.04761905">
+          <caret line="2" column="53" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/commonservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.24363057">
+          <caret line="72" column="59" selection-start-line="72" selection-start-column="53" selection-end-line="72" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.28582802">
+          <caret line="51" column="25" selection-start-line="51" selection-start-column="25" selection-end-line="51" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-21.75">
+          <caret line="30" column="35" selection-start-line="30" selection-start-column="24" selection-end-line="30" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39171976">
+          <caret line="89" column="18" selection-start-line="89" selection-start-column="18" selection-end-line="89" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-2.9">
+          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.24442676">
+          <caret line="265" column="14" selection-start-line="265" selection-start-column="14" selection-end-line="266" selection-end-column="38" />
         </state>
       </provider>
     </entry>
@@ -447,53 +623,128 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.27018633">
+          <caret line="45" column="39" selection-start-line="45" selection-start-column="39" selection-end-line="45" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/personalLetter.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3330619">
-          <caret line="117" column="78" selection-start-line="117" selection-start-column="77" selection-end-line="117" selection-end-column="78" />
+        <state vertical-scroll-proportion="0.10714286">
+          <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.46195653">
+          <caret line="47" column="25" selection-start-line="47" selection-start-column="23" selection-end-line="47" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-7.0">
+          <caret line="7" column="28" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/style.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-6.516667">
+          <caret line="799" column="25" selection-start-line="799" selection-start-column="25" selection-end-line="799" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-16.071428">
+          <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-2.142857">
+          <caret line="2" column="131" selection-start-line="2" selection-start-column="131" selection-end-line="2" selection-end-column="131" />
           <folding>
-            <element signature="n#style#0;n#ion-slide-box#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#ion-slide#0;n#ion-slide-box#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#i#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#span#0;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <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-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#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#p#0;n#a#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$/js/services/commonservice.js">
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33280253">
-          <caret line="142" column="18" selection-start-line="142" selection-start-column="12" selection-end-line="142" selection-end-column="18" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="211" column="48" selection-start-line="211" selection-start-column="48" selection-end-line="211" selection-end-column="48" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.6875">
-          <caret line="722" column="45" selection-start-line="722" selection-start-column="45" selection-end-line="722" selection-end-column="45" />
+        <state vertical-scroll-proportion="-9.321428">
+          <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
+          <folding>
+            <element signature="n#style#0;n#p#0;n#a#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-10.375">
+          <caret line="897" column="30" selection-start-line="897" selection-start-column="30" selection-end-line="897" selection-end-column="30" />
+          <folding>
+            <marker date="1509530604269" expanded="true" signature="35229:35254" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="35501:35565" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="35617:35633" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="35829:35893" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="35945:35960" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="36160:36191" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="36423:36441" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="38588:38606" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="40901:40919" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="40980:40999" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="41262:41280" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="41341:41360" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="41656:41674" placeholder="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-1.0">
+          <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.38680783">
-          <caret line="320" column="24" selection-start-line="320" selection-start-column="24" selection-end-line="320" selection-end-column="24" />
+        <state vertical-scroll-proportion="0.46254072">
+          <caret line="204" column="38" selection-start-line="204" selection-start-column="38" selection-end-line="204" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33280253">
+          <caret line="312" column="25" selection-start-line="312" selection-start-column="16" selection-end-line="312" selection-end-column="25" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#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#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#div#1;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#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#textarea#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="e#10842#11161#0" expanded="false" />
+            <element signature="e#11426#11513#0" expanded="false" />
+            <element signature="e#14849#14965#0" expanded="false" />
           </folding>
         </state>
       </provider>

miaomiao/www/css/style.css

@@ -111,9 +111,10 @@ a.tab-item-add .icon {
 }
 .btn-file-up i { display: block; padding: 5px 0 0 0; font-size: 30px; color: #00C3DA; }
 .btn-file-up-position { position: absolute; right: 20px; }
-.img-file-up { float: left; margin: 5px 5px 5px 0; width: 100px; height: 100px; }
+.img-file-up { float: left; margin: 5px 5px 5px 0; width: 100px; height: 100px;}
 .img-file-up b {  width: 100px; height: 100px; position: relative;display: table-cell; vertical-align: middle; text-align: center; border: 1px solid #EEE; padding: 2px; background:no-repeat center; background-size:cover; -webkit-background-size:cover}
 .img-file-up img { max-height: 100%; max-width: 100%; }
+.img-file-up video { max-height: 100%; max-width: 100%; width: 100%; height: 100%}
 .img-file-up em { position: absolute; top: -10px; right: -10px; display: inline-block; width: 20px; height: 20px; z-index: 2; font-size: 1.5em; color: #dd4814 }
 .btn-file-up:hover { background-color: #dd4814; color: #FFF; border: 1px solid #dd4814 }
 
@@ -253,12 +254,19 @@ overflow:auto;
     left: 5px;
     margin-right: 5px;
 }
-.myblock span {
+.myblock .age {
     color: #fff;
     background: #00C3DA;
     margin-left:8px;
     border-radius:10px;
-    padding: 0px 10px
+    padding: 0 10px;
+}
+.sign{
+    color: #00C3DA;
+    margin-left:8px;
+    /*border-radius:10px;*/
+    /*border: 1px solid #00c3da;*/
+    /*padding: 0 10px*/
 }
 .homeDream{
     background: #767778;
@@ -548,7 +556,7 @@ a:visited,a:link{
         width:40%;
         /*max-height:95px;*/
         float:left;
-        border: 1px solid #B5B5B5;
+        /*border: 1px solid #B5B5B5;*/
         margin:5px 5px 5px 0;
     }
 
@@ -814,3 +822,6 @@ ion-tabs.tabs-color-active-calm .tab-item.tab-item-active, ion-tabs.tabs-color-a
 .ion-record{
     font-size: 5px
 }
+.popup-container .popup{
+    background-color: rgba(255,255,255,1);
+}

miaomiao/www/js/config/config.js

@@ -1,11 +1,11 @@
 (function (app) {
     //全局配置 
     app.constant("config", {
-          //server: 'http://q8.9026.com/',
-          //imgServer: 'http://q8.9026.com/attachment/'
+          // server: 'http://q8.9026.com/',
+          // imgServer: 'http://q8.9026.com/attachment/'
        // server: 'http://localhost:8092/',
       //  imgServer: 'http://localhost:8092/attachment/',
-        server: 'http://miao.beiyuesi.com/',
-         imgServer: 'http://miao.beiyuesi.com/attachment/'
+       server: 'http://miao.beiyuesi.com/',
+        imgServer: 'http://miao.beiyuesi.com/attachment/'
     });
 })(angular.module('app'));

miaomiao/www/js/config/router.js

@@ -210,6 +210,15 @@
                     }
                 }
             })
+            .state('app.care', {
+                url: '/my/care',
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/my/care.html',
+                        controller: 'careCtrl'
+                    }
+                }
+            })
         .state('app.my_dream', {
             url: '/my/dream',
             views: {
@@ -250,20 +259,20 @@
                 url: '/home/message',
                 views: {
                     'app-home': {
-                        templateUrl: 'templates/my/my-message.html',
-                        controller: 'homeMessageCtrl'
-                    }
-                }
-            })
-            .state('app.dream_message', {
-                url: '/my/message',
-                views: {
-                    'app-my': {
                         templateUrl: 'templates/my/my-message.html',
                         controller: 'messageCtrl'
                     }
                 }
             })
+            //.state('app.dream_message', {
+            //    url: '/my/message',
+            //    views: {
+            //        'app-my': {
+            //            templateUrl: 'templates/my/my-message.html',
+            //            controller: 'messageCtrl'
+            //        }
+            //    }
+            //})
         .state('app.my_message_sys', {
                 url: '/my/message/sys',
                 views: {
@@ -319,6 +328,30 @@
                     }
                 }
             })
+            .state('app.letterDetail', {
+                url: '/home/message/letterDetail',
+                params:{
+                    id:null
+                },
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/my/letterDetail.html',
+                        controller: 'letterDetailCtrl'
+                    }
+                }
+            })
+            .state('app.myLetterDetail', {
+                url: '/my/message/letterDetail',
+                params:{
+                    id:null
+                },
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/my/letterDetail.html',
+                        controller: 'letterDetailCtrl'
+                    }
+                }
+            })
         .state('app.my_recharge', {
             url: '/my/recharge',
             views: {

miaomiao/www/js/controllers/account.js

@@ -29,38 +29,38 @@
                  //}, function (error) {
                  //   console.log("Failed: " + JSON.stringify(error));
                  //});
-                //$state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
-                userService.isTest().then(function(res){
-                    if(res.data.data){
-                        Wechat.auth(scope, state, function (response) {
-                            // alert("response:"+JSON.stringify(response));
-                            // var response={code:1231};
-                           if(response.code){
-                               msg.loading('登录中...');
-                               userService.wechat_login(response.code).then(function(result){
-                                   msg.hide();
-                                    // alert("wechat_login success: " + JSON.stringify(result));
-                                   if(result.data.data.user){
-                                       storage.setObject('user', result.data.data.user);
-                                       storage.set('token', result.data.data.token);
-                                       $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
-                                       $scope.user=storage.getObject('user');
-                                       $state.go('app.home');
-                                   }else{
-                                       $state.go("loginAccount",{wechat:result.data.data.openid})
-                                   }
-                               },function(error){
-                                    console.log("loginbywx Failed: " + JSON.stringify(error));
-                                   $state.go("loginAccount");
-                               });
-                           }
-                        }, function (error) {
-                           console.log("Failed: " + JSON.stringify(error));
-                        })
-                    }else{
-                        $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
-                    }
-                } )
+                $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
+                //userService.isTest().then(function(res){
+                //    if(res.data.data){
+                //        Wechat.auth(scope, state, function (response) {
+                //            // alert("response:"+JSON.stringify(response));
+                //            // var response={code:1231};
+                //           if(response.code){
+                //               msg.loading('登录中...');
+                //               userService.wechat_login(response.code).then(function(result){
+                //                   msg.hide();
+                //                    // alert("wechat_login success: " + JSON.stringify(result));
+                //                   if(result.data.data.user){
+                //                       storage.setObject('user', result.data.data.user);
+                //                       storage.set('token', result.data.data.token);
+                //                       $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
+                //                       $scope.user=storage.getObject('user');
+                //                       $state.go('app.home');
+                //                   }else{
+                //                       $state.go("loginAccount",{wechat:result.data.data.openid})
+                //                   }
+                //               },function(error){
+                //                    console.log("loginbywx Failed: " + JSON.stringify(error));
+                //                   $state.go("loginAccount");
+                //               });
+                //           }
+                //        }, function (error) {
+                //           console.log("Failed: " + JSON.stringify(error));
+                //        })
+                //    }else{
+                //        $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
+                //    }
+                //} )
 
             }
     }]);
@@ -102,7 +102,7 @@
                 }
                 $scope.vm.waitSeconds = "正在发送";
                 userService.getVerifyCode($scope.vm.mobile).then(function (result) {
-                    wait(50);
+                    wait(60);
                     // $scope.returncode = result.data;
                     if(result.data.data.verify_code)msg.success(result.data.data.verify_code);
                 }, function (error) {

miaomiao/www/js/controllers/add.js

@@ -45,12 +45,13 @@
                 common.deletefile(file).then(function () {
                 })
             };
+            $scope.deletevideo = function (file) {
+                common.deletefile(file).then(function () {
+                })
+            };
             $scope.add = function () {
-                //if($scope.video.server){
-                //    $scope.imgs=[];
-                //}
                 var data = {
-                     //pics: ["https://www.baidu.com/img/bd_logo1.png"],
+                    //pics:['http://img0.imgtn.bdimg.com/it/u=2398075737,160631337&fm=214&gp=0.jpg'],
                     pics: $scope.imgs,
                     video: $scope.video.server,
                     name: $scope.vm.name,

miaomiao/www/js/controllers/home.js

@@ -10,10 +10,9 @@
             //    effect: 'fade',
             //    speed: 500
             //};
-
             homeService.messageInfo().then(function(result){
                 $scope.infos = result.data.data;
-                if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){
+                if($scope.infos.dream_info.number==0 && $scope.infos.sup_info.number==0 && $scope.infos.system_info.number==0){
                     $scope.showMessage=0;
                 }
                 else {
@@ -162,13 +161,7 @@
             });
         };
             $scope.clickAvatar = function(id,dream_id){
-                if(dream_id!=0){
-                    $state.go('app.home_dreamdetail',{id:dream_id,dream_user_id:id,type:2});
-                }
-                else {
-                    $scope.toUserDetail(id);
-                }
-
+                $state.go('app.home_dreamdetail',{id:dream_id,dream_user_id:id,type:2});
             };
         $scope.qrscan = function () {
             cordova.plugins.barcodeScanner.scan(
@@ -251,7 +244,7 @@
                 });
                 homeService.messageInfo().then(function(result){
                     $scope.infos = result.data.data;
-                    if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){
+                    if($scope.infos.dream_info.number==0 && $scope.infos.sup_info.number==0 && $scope.infos.system_info.number==0){
                         $scope.showMessage=0;
                     }
                     else {
@@ -381,13 +374,12 @@
                     Wechat.share({
                         message: {
                             title: $scope.dream.name,
-                            description: $scope.dream.about,
+                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '<br/>' + $scope.dream.about,
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                                 type: Wechat.Type.WEBPAGE,
                                 webpageUrl: config.server + "/admin/share/view?id=" + id
-
-                }
+                            }
                         },
                         scene: Wechat.Scene.SESSION
                     }, function () {
@@ -400,7 +392,7 @@
                     Wechat.share({
                         message: {
                             title: $scope.dream.name,
-                            description: $scope.dream.about,
+                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '<br/>' + $scope.dream.about,
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                                 type: Wechat.Type.WEBPAGE,
@@ -470,10 +462,8 @@
                 if (number<=1) {
                     number = 1;
                 }
-                //$scope.multi.result = Math.round(number * 100) / 100;
                 $scope.multi.result = Math.round(number * 100 / 100);
             },1000);
-            //  点击支持取消   $interval.cancel($scope.multi.promise); 获取数据后重新开始执行
         };
         $scope.supportDream = function (data) {
             if(!$scope.vm.coin){
@@ -503,6 +493,7 @@
         };
 
          $scope.add = function(is_collection){
+             debugger;
             var data = {
                 id:id,
                 title:$scope.vm.title,
@@ -543,7 +534,7 @@
                 $scope.dream.interactions[index].showmore = true;
             }
         };
-        $scope.replay = function ($event, name, to_suerid, index) {
+        $scope.replay = function ($event, name, to_userid, index) {
             $event.stopPropagation();
             $scope.input.focus = true;
             $scope.input.show = true;
@@ -553,6 +544,7 @@
             $scope.dream.interactions[index].show = true;
             $scope.dream.interactions[index].focus = true;
             $scope.input.placeholder = "评论" + name+":";
+            $scope.to_userid = to_userid;
             $scope.vm.title='';
             $scope.vm.comment='';
         };
@@ -571,13 +563,12 @@
                 $scope.vm.title='';
                 $scope.vm.comment='';
             }
-            else {
+            else if($scope.timer!='已结束') {
                 msg.confirm("评论","是否删除评论").then(function(result){
                     if(result==true)
                     {
                         homeService.deleteComment($scope.dream.interactions[index].comments[currentindex].id).then(function(result){
                             msg.text("删除成功");
-                            alert('删除成功');
                             $scope.load(id);
                         },function(error){
                             msg.error(error.data.message);
@@ -658,14 +649,20 @@
             var data = {
                 id:iid,
                 content:$scope.vm.comment,
-                comment_user_id:to_userid
+                comment_user_id:to_userid,
+                to_user_id: $scope.dream.user.id
             };
-            console.log($scope.vm.comment+" "+iid);
-            homeService.add_comment(data).then(function(){
-                $scope.vm.comment = '' ;
-                $scope.load(id);
-                $scope.closeModal();
-            });
+            if($scope.timer=='已结束'){
+                msg.alert("评论","该梦想已结束，不支持评论");
+            }
+            else {
+                homeService.add_comment(data).then(function(){
+                    msg.success('评论成功');
+                    $scope.vm.comment = '' ;
+                    $scope.load(id);
+                    $scope.closeModal();
+                });
+            }
         };
             $scope.bigImage = false;
             $scope.showBigImage = function ($event, imageName) {
@@ -730,11 +727,9 @@
                     common.uploadFiles(file, 2).then(function (result) {
                         var response = JSON.parse(result.response);
                         var file = config.imgServer+response.data.file;
-                        //console.log("file:"+file);
                         $scope.video.isOK = true;
-                        $scope.video.file = file;
+                        $scope.video.file = response.data.file;
                         $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
-                        //console.log("vpic:"+$scope.video.vpic);
                     }, function (error) {
                         msg.error('视频上传失败');
                     });
@@ -743,7 +738,9 @@
                 });
             };
             $scope.deletevideo = function (file) {
-                common.deletefile(file).then(function () {
+                common.deletefile(file).then(function (res) {
+                },function(erro){
+                    alert(JSON.stringify(erro));
                 })
             };
           $ionicModal.fromTemplateUrl('recharge-modal.html', {
@@ -781,7 +778,6 @@
             $scope.modal.remove();
           });
             $scope.toMessage = function(){
-                //var dreamdetailUrl = $location.path();
                 if($location.path()=="/app/home/dreamdetail"){
                     $state.go("app.message");
                 }
@@ -938,48 +934,48 @@
                 $scope.hideAbout = false;
             };
         }]);
-    app.controller('homeMessageCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
-        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
-            $scope.$on('$ionicView.beforeEnter', function () {
-                $ionicTabsDelegate.showBar(false);
-                myService.messageInfo().then(function(result){
-                    $scope.infos = result.data.data;
-                },function(error){
-
-                });
-            });
-            $scope.notRead = function(){
-                myService.notRead().then(function(result){
-                    myService.messageInfo().then(function(result){
-                        $scope.infos = result.data.data;
-                    },function(error){
-
-                    });
-                },function(error){
-
-                })
-            };
-            //系统消息
-            $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){
-
-                },function(error){
-
-                });
-            };
-            $scope.personalLetter = function(){
-                $state.go("app.letter");
-            }
-        }]);
+    //app.controller('homeMessageCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
+    //    , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+    //        $scope.$on('$ionicView.beforeEnter', function () {
+    //            $ionicTabsDelegate.showBar(false);
+    //            myService.messageInfo().then(function(result){
+    //                $scope.infos = result.data.data;
+    //            },function(error){
+    //
+    //            });
+    //        });
+    //        $scope.notRead = function(){
+    //            myService.notRead().then(function(result){
+    //                myService.messageInfo().then(function(result){
+    //                    $scope.infos = result.data.data;
+    //                },function(error){
+    //
+    //                });
+    //            },function(error){
+    //
+    //            })
+    //        };
+    //        //系统消息
+    //        $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){
+    //
+    //            },function(error){
+    //
+    //            });
+    //        };
+    //        $scope.personalLetter = function(){
+    //            $state.go("app.letter");
+    //        }
+    //    }]);
     app.controller('oldDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
             var user_id = $stateParams.user_id;

miaomiao/www/js/controllers/my.js

@@ -269,6 +269,57 @@
             };
 
         }]);
+    app.controller('careCtrl', ["$scope","$ionicTabsDelegate",'$ionicModal',"$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate,$ionicModal, $state,myService, msg, storage) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                myService.careMe().then(function(result){
+                    $scope.users = result.data.data;
+                },function(error){
+
+                })
+            });
+            $scope.toMyUserDetail = function (id) {
+                myService.toMyUserDetail(id).then(function(result){
+                    $scope.items = result.data.data;
+                    $state.go('app.attention_Detail',{id:id,items:$scope.items});
+                },function(error){
+                    //msg.error(msg.data.error)
+                })
+            };
+            $ionicModal.fromTemplateUrl('my-modal.html', {
+                scope: $scope,
+                animation: 'slide-in-up'
+            }).then(function (modal) {
+                $scope.modal = modal;
+            });
+            //发私信
+            $scope.vm={
+                content:"",
+                comment_id:""
+            };
+            $scope.closeModal = function () {
+                var data = {
+                    content: $scope.vm.content,
+                    to_user_id: $scope.item.id
+                };
+                myService.sendLetter(data).then(function (result) {
+                    msg.success('回复成功');
+                    $scope.vm.content = '';
+                    $scope.item = null;
+                    $scope.modal.hide();
+                }, function (error) {
+                    msg.error('回复失败');
+                });
+            };
+            $scope.hideModal = function(){
+                $scope.modal.hide();
+            };
+            $scope.reply = function (user) {
+                event.stopPropagation();
+                $scope.item = user;
+                $scope.modal.show();
+            }
+        }]);
 
     app.controller('mySupportDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
@@ -308,15 +359,34 @@
                 $state.go("app.attention_Detail",{user_id:user_id,items:$scope.items})
             };
         }]);
-    app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
-        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
-            
+    //app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
+    //    , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
+    //
+    //    }]);
+    app.controller('personalLetterCtrl', ["$scope","$ionicTabsDelegate", '$location',"$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate,$location, $state,myService, msg, storage) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                myService.letter().then(function(result){
+                    $scope.items = result.data.data;
+                },function(error){
+                });
+            });
+            $scope.toLetter = function(id){
+                if($location.path()=="/app/home/message/letter"){
+                    console.log($location.path());
+                    $state.go('app.letterDetail')
+                }
+                else {
+                    $state.go('app.myLetterDetail')
+                }
+            }
         }]);
-    app.controller('personalLetterCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
-        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
+    app.controller('letterDetailCtrl', ["$scope","$ionicTabsDelegate",'$stateParams',"$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate,$stateParams, $state,myService, msg, storage) {
+            var id = $stateParams.id;
             $scope.$on('$ionicView.beforeEnter', function () {
                 myService.letter().then(function(result){
-                    $scope.comments = result.data.data;
+                    $scope.items = result.data.data;
                 },function(error){
                 });
             });
@@ -408,6 +478,7 @@
                       // msg.alert("支付失败:" + JSON.stringify(reason));
                   });
               }
+
              // msg.text("充值成功");
             //   $state.go('app.my');
           });
@@ -591,8 +662,8 @@
             }
 
         }]);
-    app.controller('messageCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
-        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+    app.controller('messageCtrl', ["$scope", "$location","$ionicTabsDelegate","$state", "myService", "msg"
+        , function ($scope,$location,$ionicTabsDelegate, $state, myService, msg) {
             $scope.$on('$ionicView.beforeEnter', function () {
                 $ionicTabsDelegate.showBar(false);
                 myService.messageInfo().then(function(result){
@@ -601,10 +672,6 @@
 
                 });
             });
-            //系统消息
-            $scope.systemInfo = function(){
-                $state.go("app.my_message_sys");
-            };
 
             $scope.notRead = function(){
                 myService.notRead().then(function(result){
@@ -617,14 +684,37 @@
 
                 })
             };
-            //回复我的
+            //梦想消息
+            $scope.systemInfo = function(){
+                if($location.path()=='/app/my/message'){
+                    $state.go("app.my_message_sys");
+                }
+                else {
+                    $state.go("app.message_sys");
+                    //myService.systemInfo().then(function(result){
+                    //},function(error){
+                    //
+                    //});
+                }
+            };
+            //支持消息
             $scope.replyMy = function(){
-                $state.go("app.my_message_reply");
+                if($location.path()=='/app/my/message'){
+                    $state.go("app.my_message_reply");
+                }
+                else {
+                    $state.go("app.message_reply");
+                }
             };
+            //通知
             $scope.personalLetter = function(){
-                $state.go("app.personalLetter");
-            }
-
+                if($location.path()=='/app/my/message'){
+                    $state.go("app.personalLetter");
+                }
+                else {
+                    $state.go("app.letter");
+                }
+            };
         }]);
     app.controller('dreamCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
   , function ($scope, $ionicTabsDelegate,$state, myService, msg) {
@@ -678,18 +768,156 @@
           $state.go('app.my_dreamdetail',{id:id});
       };
     }]);
-    app.controller('messageSysCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
-       , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+    app.controller('messageSysCtrl', ["$scope","$ionicPopup","$location", "$ionicTabsDelegate","$state", "myService", "msg"
+       , function ($scope,$ionicPopup,$location,$ionicTabsDelegate, $state, myService, msg) {
             $scope.$on('$ionicView.beforeEnter', function () {
                 myService.systemInfo().then(function(result){
                     $scope.sysInfos = result.data.data;
                 },function(error){
                 });
             });
+            $scope.vm = {
+                content:""
+            };
+            $scope.imgs = [];
+            $scope.video = {};
+            $scope.addpict = function () {
+                common.chooseImage().then(function (img) {
+                    common.uploadFiles(img,1).then(function (result) {
+                        var response = JSON.parse(result.response);
+                        var file = config.imgServer + response.data.file;
+                        $scope.imgs.push(file);
+                    }, function (error) {
+                        msg.error('图片上传失败');
+                    });
+                }, function (error) {
+                    console.log('图片选择失败');
+                });
+            };
+            $scope.deletefile = function (file) {
+                var index = $scope.imgs.indexOf(file);
+                $scope.imgs.splice(index, 1);
+                common.deletefile(file).then(function () {
+                })
+            };
+            $scope.addvideo = function () {
+                common.chooseVideo().then(function (file) {
+                    common.uploadFiles(file, 2).then(function (result) {
+                        var response = JSON.parse(result.response);
+                        var file = config.imgServer+response.data.file;
+                        $scope.video.isOK = true;
+                        $scope.video.file = response.data.file;
+                        $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
+                    }, function (error) {
+                        msg.error('视频上传失败');
+                    });
+                }, function (erro) {
+                    console.log('选择视频失败');
+                });
+            };
+            $scope.deletevideo = function (file) {
+                common.deletefile(file).then(function (res) {
+                },function(erro){
+                    alert(JSON.stringify(erro));
+                })
+            };
+            $scope.goMes = function(is_reply,is_url,dream_id,is_end,message,user_id){
+                //发送私信
+                if(is_reply==1){
+                    var myPopup = $ionicPopup.show({
+                        template : '<div>' +
+                            '<textarea autofocus style="border: 1px solid #D0D0D0" name="" id="" cols="30" rows="8"  ng-model="vm.content" placeholder="对他的好意给予感谢的回复"></textarea onf>' +
+                            '<a class="btn-file-up" ng-click="addpict()">' +
+                            '<img src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>' +
+                            '<em style="font-size:  16px">添加图片</em>' +
+                            '</a>' +
+                            '<a class="btn-file-up" ng-click="addvideo()">' +
+                            '<img src="img/icon_video.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>' +
+                            '<em style="font-size: 16px">添加视频</em>' +
+                            '</a>' +
+                            '<a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">' +
+                            '<b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>' +
+                            '</a>' +
+                            '<div class="img-file-up" ng-if="video.isOK">' +
+                            '<div style="position:relative;">' +
+                            '<em ng-click="deletevideo(video.file)" class="ion-ios-close-outline"></em>' +
+                            '<video ng-src="{{video.file | trustUrl}}" poster="{{video.vpic}}" controls="controls"></video>' +
+                            '</div>' +
+                            '</div>' +
+                            '</div>',
+                        title: message,
+                        //subTitle: 'Please use normal things',
+                        scope: $scope,
+                        buttons: [
+                            { text: '取消' },
+                            {
+                                text: '<b>确定</b>',
+                                type: 'button-positive',
+                                onTap: function(e) {
+                                    var data = {
+                                        to_user_id:user_id,
+                                        content:$scope.vm.content,
+                                        image:$scope.imgs,
+                                        video:$scope.video.file,
+                                        //image:['http://img0.imgtn.bdimg.com/it/u=2398075737,160631337&fm=214&gp=0.jpg']
+                                    };
+                                    myService.sendLetter(data).then(function(result){
+                                        if(result.data.status_code==0){
+                                            msg.success('发送成功');
+                                        }
+                                    })
+                                }
+                            }
+                        ]
+                    });
+                }
+                //跳转
+                else if(is_url==1){
+                    if($location.path()=="/app/home/message/sys"){
+                        $state.go('app.home_dreamdetail',{id:dream_id,type:2});
+                    }
+                    else {
+                        $state.go('app.my_dreamdetail',{id:dream_id,type:2});
+                    }
+                }
+                //梦想结束
+                else if(is_end==1){
+                    var endTemplate = '<div style="text-align: center"><p>恭喜你成功地向你的梦想迈出最大的一步，照接下来的步骤做就可以领取你的梦想资金啦！</p>' +
+                        '<p>要取出全部梦想资金，</p>' +
+                        '<p>你需要亲自问候你的梦主</p>' +
+                        '<p>致出最诚挚的感谢</p>' +
+                        '<p>点击《确定》我们会提供</p>' +
+                        '<p>《梦主》的资料</p>' +
+                        '<p>如果你觉得不合适，你可以点击《取消》,但是《梦主》的资金会被退还给他</p>' +
+                        '<p>你以后创建梦想也会比较难</p>' +
+                        '</div>';
+                    msg.confirm('恭喜你！',endTemplate).then(function(result){
+                        if(result==true){
+                            myService.sure_meet(dream_id,1).then(function(res){
+                                if(res.data.status_code==0){
+                                    if(res.data.data==0){
+                                        msg.success('该梦想暂无梦主！');
+                                    }
+                                    else {
+                                        msg.success('确定见面，期待与梦主的相见吧！');
+                                    }
+                                }
+                            })
+                        }
+                        else {
+                            myService.sure_meet(dream_id,0).then(function(res){
+                                if(res.data.status_code==0){
+                                    msg.success('已取消见面！');
+                                }
+                            })
+                        }
+                    })
+                }
+            }
        }]);
 
-    app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg", "$ionicModal"
-       , function ($scope,$ionicTabsDelegate, $state, myService, msg, $ionicModal) {
+    app.controller('messageReplyCtrl', ["$scope","$location","$ionicPopup","$ionicTabsDelegate", "$state", "myService", "msg", "$ionicModal"
+       , function ($scope,$location,$ionicPopup,$ionicTabsDelegate, $state, myService, msg, $ionicModal) {
            $scope.$on('$ionicView.beforeEnter', function () {
                $scope.load();
            });
@@ -699,6 +927,43 @@
                }, function (error) {
                });
            };
+            $scope.goMes = function(info,img,is_max,mes,video,attr_id,dream_id){
+                //收到私信
+                if(attr_id==7){
+                    if(video!=null){
+                        var letterTemplate = '<div style="text-align: center">' +
+                            '<img src="'+img+'" style="border-radius: 100%">' +
+                            '<video src="'+video+'"></video>' +
+                            '<p>'+info+'</p>' +
+                            '</div>';
+                    }
+                    else {
+                        var letterTemplate = '<div style="text-align: center">' +
+                            '<img src="'+img+'" style="border-radius: 100%">' +
+                            '<p>'+info+'</p>' +
+                            '</div>';
+                    }
+                    msg.confirm('私信',letterTemplate);
+                }
+                //成为梦主
+                else if(is_max==1){
+                    var maxTemplate = '<div style="text-align: center"><p>'+ mes +'</p>' +
+                        '<p>'+ info +'</p>' +
+                        //'<p>小蝶将以你提供的微信/电话联系你，并到你越好的地点亲自感谢你给予的支持和鼓励。</p>' +
+                        //'<p>如果你不希望见面或者不想要梦想者拥有你的联系方式，请按《不要见面的按钮或者联系客服》</p>' +
+                        //'<p>请按《不要见面的按钮或者联系客服》</p>' +
+                        '</div>';
+                    msg.confirm('恭喜你！',maxTemplate);
+                }
+                else {
+                    if($location.path()=="/app/home/message/reply"){
+                        $state.go('app.home_dreamdetail',{id:dream_id,type:2});
+                    }
+                    else {
+                        $state.go('app.my_dreamdetail',{id:dream_id,type:2});
+                    }
+                }
+            };
            //我的回复
            $scope.vm = {
                content: "" 

miaomiao/www/js/services/myservice.js

@@ -35,13 +35,13 @@
             },
             systemInfo:function(){
                 return $http({
-                    url:config.server + "api/my/system_info",
+                    url:config.server + "api/my/dream_info",
                     method:"get"
                 })
             },
             replyMy:function(){
                 return $http({
-                    url:config.server + "api/my/reply",
+                    url:config.server + "api/my/sup_info",
                     method:"get"
                 })
             },
@@ -64,6 +64,19 @@
                     data: data
                 })
             },
+            sendLetter:function(data){
+                return $http({
+                    url: config.server + '/api/my/letter/store',
+                    method: "post",
+                    data: data
+                })
+            },
+            letterDetail:function(id){
+                return $http({
+                    url: config.server + 'api/my/letter/show?id=' + id,
+                    method: "get"
+                })
+            },
             myMes:function(){
                 return $http({
                     url:config.server + "api/my/persona",
@@ -108,6 +121,12 @@
                     method:"get"
                 })
             },
+            careMe:function(){
+                return $http({
+                    url:config.server + "api/my/careme",
+                    method:"get"
+                })
+            },
             toMyUserDetail:function(id){
                 return $http({
                     url:config.server + "api/user/show?user_id=" + id ,
@@ -180,7 +199,19 @@
             },
             letter:function(){
                 return $http({
-                    url:config.server + "api/my/letter",
+                    url:config.server + "api/my/system_info",
+                    method:"get"
+                })
+            },
+            sure_meet:function(dream_id,value){
+                return $http({
+                    url:config.server + "api/my/sure_meet?dream_id=" + dream_id + '&value=' + value,
+                    method:"get"
+                })
+            },
+            sure_meet2:function(to_user_id,value){
+                return $http({
+                    url:config.server + "api/my/sure_meet2?to_user_id=" + to_user_id + '&value=' + value,
                     method:"get"
                 })
             }

miaomiao/www/templates/add/index.html

@@ -13,21 +13,24 @@
             </div>
             <div class="item" style="color: #7B7B7B">上传图片或视频，让别人更好地了解你</div>
             <div class="item itemjs">
-                <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
-                    <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
-                </a>
                 <a class="btn-file-up" ng-click="addpict()" ng-show="imgs.length<9">
                     <img src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加图片</em>
                 </a>
-                <!--<video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="100px" width="100px" controls="controls">-->
-                <!--</video>-->
-                <video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="100px" width="100px" style="margin-top: 5px;">
-                </video>
                 <a class="btn-file-up" ng-click="addvideo()" ng-show="!video.isOK">
                     <img src="img/icon_video.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加视频</em>
                 </a>
+                <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
+                    <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
+                </a>
+                <div class="img-file-up" ng-if="video.isOK">
+                    <div style="position:relative;">
+                        <em ng-click="deletevideo(video.file)" class="ion-ios-close-outline"></em>
+                        <video ng-src="{{video.file | trustUrl}}" poster="{{video.vpic}}" controls="controls">
+                        </video>
+                    </div>
+                </div>
             </div>
             <div class="item" style="color: #7B7B7B">实现梦想所需要的人民币</div>
             <div class="item item-input-inset itemjs">

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

@@ -16,7 +16,7 @@
                     ×{{multi.result}}
                 </button>
             </div>
-            <div ng-if="timer!='已结束'&& 100*dream.get_coin/dream.coin<100" class="col dreamButton">
+            <div ng-if="timer!='已结束'" class="col dreamButton">
                 <button class="button button-calm" ng-click="support($event)">支持</button>
             </div>
             <div ng-if="codeBtn && user.id==dream.top3user[0].id && dream.code!=''" class="col dreamButton">
@@ -90,7 +90,7 @@
                             <h2>{{timer}}</h2>
                             <p>剩余时间</p>
                         </div>
-                        <div class="col" style="text-align:right">
+                        <div ng-if="user.id == dream.user.id" class="col" style="text-align:right">
                             <h2>{{dream.score}}</h2>
                             <p>当前获得梦想分数</p>
                         </div>
@@ -98,11 +98,11 @@
                 </div>
                 <div class="item" style="padding:0 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: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>
@@ -188,7 +188,7 @@
                                         <span style="margin-top: 10px; display: inline-block;font-size: 12px">{{c.user_nickname}}</span>
                                         <span style="font-size: 12px" class="utitle kz">{{c.updated_at}}</span>
                                         <p style="white-space:normal; color: #666666;font-size: 12px">
-                                            <span ng-if="c.to_user_nickname&&c.to_user_nickname!=' '&&c.to_user_nickname!=dream.user.nickname" style="font-size: 12px">
+                                            <span ng-if="c.to_user_nickname&&c.to_user_nickname!=''&&c.to_user_nickname!=dream.user.nickname" style="font-size: 12px">
                                                 回复<span style="color:#333333;font-size: 12px"> {{c.to_user_nickname}}</span> ：
                                             </span>
                                             {{c.content}}
@@ -201,14 +201,14 @@
                                     <p ng-click="showmore($index)" ng-if="interaction.comments.length>4" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px"> {{interaction.showmore?"只看最近评论":"查看更多评论"}}</p>
                                 </div>
                                 <div class="col-20">
-                                    <p ng-if="user.id == dream.user.id" ng-click="destroyInter(interaction.id,interaction.dream_id)" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px">删除该互动</p>
+                                    <p ng-if="user.id == dream.user.id&&timer!='已结束'" ng-click="destroyInter(interaction.id,interaction.dream_id)" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px">删除该互动</p>
                                 </div>
                             </div>
                         </div>
                         <!--<p ng-click="replay($event,dream.user.nickname,$index)" style="margin: 10px 0 0 50px; color: #00C3DA">评论</p>-->
                         <div class="item item-input" ng-if="input.show&&interaction.show">
                             <textarea name="comment" focus-me="input.focus" placeholder="{{input.placeholder}}" ng-model="vm.comment" style="padding: 0 20px;"></textarea>
-                            <a class="button button-calm" style="margin-right:5px;line-height:35px;min-width:30px" ng-click="submitComment($index,to_userid)">
+                            <a class="button button-calm" style="padding: 0; min-width: 54px;" ng-click="submitComment($index,to_userid)">
                                 发送
                             </a>
                         </div>
@@ -309,20 +309,24 @@
             </div>
             <div class="item">上传图片，让别人更好的了解你的梦想</div>
             <div class="item itemjs">
-                <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
-                    <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
-                </a>
                 <a ng-if="!video.isOK&&imgs.length<9" class="btn-file-up" ng-click="addpict()">
                     <img src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size:  16px">添加图片</em>
                 </a>
-                <video ng-src="{{video.file | trustUrl}}" ng-if="video.isOK" poster="{{video.vpic}}" height="100px" width="100px" style="margin-top: 5px" controls="controls">
-                    <em ng-click="deletevideo(video.file)" class="ion-ios-close-outline"></em>
-                </video>
                 <a ng-if="imgs.length==0" class="btn-file-up" ng-click="addvideo()">
                     <img src="img/icon_video.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加视频</em>
                 </a>
+                <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
+                    <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
+                </a>
+                <div class="img-file-up" ng-if="video.isOK">
+                    <div style="position:relative;">
+                        <em ng-click="deletevideo(video.file)" class="ion-ios-close-outline"></em>
+                        <video ng-src="{{video.file | trustUrl}}" poster="{{video.vpic}}" controls="controls">
+                        </video>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="padding">

miaomiao/www/templates/home/index.html

@@ -74,7 +74,8 @@
                             </div>
                             <div class="col" style="overflow: hidden;padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
                                 <span class="subcontent" ng-repeat="user in index.users">
-                                    <img ng-click="clickAvatar(user.other_user_id,user.dream_id)" ng-if="$index<4" ng-src="{{user.other_user.avatar |avator}}" ng-class="{'chosenClass':user.dream_number>0}" style="padding: 0.5%;" />
+                                    <!--<img ng-click="clickAvatar(user.other_user_id,user.dream_id)" ng-if="$index<4" ng-src="{{user.other_user.avatar |avator}}" ng-class="{'chosenClass':user.dream_number>0}" style="padding: 0.5%;" />-->
+                                    <img ng-click="clickAvatar(user.id,user.dream_id)" ng-if="$index<4" ng-src="{{user.other_user.avatar |avator}}" class="chosenClass" style="padding: 0.5%;" />
                                 </span>
                             </div>
                             <div class="col col-10" style="margin-top: 7%; text-align: right" ng-click="next(2)">
@@ -91,8 +92,8 @@
                                             <img ng-src="{{item.user.avatar | avator}}" ng-click="toUserDetail(item.user.id)" />
                                         </div>
                                         <div class="myblock">
-                                            <div>{{item.user.nickname}}<span>{{item.user.birthday | getage}}岁</span></div>
-                                            <div class="mysecond">{{item.user.city}}</div>
+                                            <div>{{item.user.nickname}}<span class="age">{{item.user.birthday | getage}}岁</span></div>
+                                            <div class="mysecond">{{item.user.city}}<span class="sign" ng-if="item.signs!=''" ng-repeat="sign in item.signs">{{sign}}</span></div>
                                         </div>
                                     </div>
                                     <div class="col" style="text-align:right">

miaomiao/www/templates/home/search.html

@@ -29,7 +29,7 @@
                      用户
                  </div>
                  <div class="item sarch-item dream_item" ng-repeat="user_info in user_infos" ng-if="$index<3" ng-click="toUserDetail(user_info.id)">
-                     <img ng-src="{{user_info.avatar}}" />  
+                     <img ng-src="{{user_info.avatar |avator}}" />
                      <span style="padding:5px;">{{user_info.nickname}}</span>
                  </div>
                  <div class="item" style="text-align:center;color:#00C3DA;font-size:1rem;padding:10px;" ng-click="showMore(vm.keyword,1)" ng-if="user_infos.length>=3">查看更多</div>
@@ -39,10 +39,10 @@
                  <div class="item dream_item" style="color: #A7A7A7">
                      梦想
                  </div>
-                 <div class="item item-thumbnail-left dream_item" ng-repeat="dream_info in dream_infos" ng-if="$index<3" ng-click="toDetail(dream_info.id)">
+                 <div class="item item-thumbnail-left dream_item" style="height: 90px" ng-repeat="dream_info in dream_infos" ng-if="$index<3" ng-click="toDetail(dream_info.id)">
                      <img ng-src="{{dream_info.img.pic}}" />
                      <h2>{{dream_info.name}}</h2>
-                     <p style="white-space:normal">{{dream_info.about}}</p>
+                     <p style="white-space:normal;">{{dream_info.about}}</p>
                  </div>
                  <div class="item" style="text-align:center;color:#00C3DA;font-size:1rem;padding:10px;" ng-click="showMore(vm.keyword,2)" ng-if="dream_infos.length>=3">查看更多</div>
                  
@@ -84,7 +84,7 @@
              </div>
              <div ng-if="index==1" class="list more-userlist">
                  <div class="item sarch-item" ng-repeat="user_info in user_infos" ng-click="toUserDetail(user_info.id)">
-                     <img ng-src="{{user_info.avatar}}" />
+                     <img ng-src="{{user_info.avatar |avator}}" />
                      <span style="padding:5px;">{{user_info.nickname}}</span>
                      <span style="color:#B6B6B6; font-size: 0.9em">
                          {{user_info.signture}}

miaomiao/www/templates/my/attention.html

@@ -9,10 +9,11 @@
                     <div style="float:left;">
                         <img style="width: 45px; height: 45px;border-radius: 100%; border: 1px solid #D8D8D8" ng-src="{{ user.avatar | avator }}" />
                     </div>
-                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
+                    <div style="float:left; width: 80%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
                         <h2> {{user.nickname}} </h2>
                         <p> {{user.city}} </p>
-                        <p> {{user.signture}} </p>
+                        <p ng-if="user.signture==''"> 这个人很懒，什么都没留下 </p>
+                        <p ng-if="user.signture!=''"> {{user.signture}} </p>
                     </div>
                 </div>
             </div>

miaomiao/www/templates/my/care.html

@@ -0,0 +1,45 @@
+<ion-view view-title="瞄喵">
+    <ion-content>
+        <div ng-if="users.length==0" class="padding" style="color: #BEBEBE; font-size: 15px">
+            还没有用户关注你哦
+        </div>
+        <div class="list">
+            <div class="item reply-item" >
+                <div ng-repeat="user in users" class="item" style="height:90px; border-bottom: 2px solid #EFEFEF" ng-click="toMyUserDetail(user.id)">
+                    <div style="float:left;">
+                        <img style="width: 45px; height: 45px;border-radius: 100%; border: 1px solid #D8D8D8" ng-src="{{ user.avatar | avator }}" />
+                    </div>
+                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
+                        <h2> {{user.nickname}} </h2>
+                        <p> {{user.city}} </p>
+                        <p ng-if="user.signture==''"> 这个人很懒，什么都没留下 </p>
+                        <p ng-if="user.signture!=''"> {{user.signture}} </p>
+                    </div>
+                    <div style="float: right">
+                        <button ng-click="reply(user)" class="button button-calm">
+                            发送私信
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </ion-content>
+    <script id="my-modal.html" type="text/ng-template">
+        <ion-modal-view>
+            <ion-header-bar class="bar-calm">
+                <h1 class="title">发送私信</h1>
+                <div class="buttons">
+                    <div class="button" ng-click="hideModal()" style="font-size: 16px; margin-top: 3px">关闭</div>
+                </div>
+            </ion-header-bar>
+            <ion-content>
+                <textarea autofocus rows="5" style="width:100%; padding: 5px" ng-model="vm.content" placeholder="请输入私信内容"></textarea>
+                <div class="padding">
+                    <button class="button button-full button-calm" ng-click="closeModal()">
+                        回复
+                    </button>
+                </div>
+            </ion-content>
+        </ion-modal-view>
+    </script>
+</ion-view>

miaomiao/www/templates/my/index.html

@@ -61,6 +61,10 @@
                 <img class="fl" src="img/icon_collect.svg">
                 <em style="line-height: 30px">我的收藏</em>
             </a>
+            <a class="item" ui-sref="app.care">
+                <img class="fl" src="img/icon_care.svg">
+                <em style="line-height: 30px">关注我的</em>
+            </a>
             <a class="item" ui-sref="app.my_setting">
                 <img class="fl" src="img/icon_setting.svg">
                 <em style="line-height: 30px">设置</em>

miaomiao/www/templates/my/letterDetail.html

@@ -0,0 +1,10 @@
+<ion-view view-title="私信">
+    <ion-content>
+        <div class="list list-user-set" ng-repeat="item in items" style="color: #737373">
+            <a class="item" style="border-bottom: 1px solid #EAEAEA">
+                来自<em style="color: #000"> {{item.touser.nickname}} </em>的私信
+                <p>{{item.message}}</p>
+            </a>
+        </div>
+    </ion-content>
+</ion-view>

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

@@ -28,8 +28,8 @@
                        进行中
                    </div>
                    <div ng-if="100*dream.get_coin/dream.coin>=100" style="float:right; width: 15%; text-align: right; color: #00C3DA; font-size: 16px">
-                       已实现
-                       <p style="color: #DBDBDB; margin-top: 5px">已结束</p>
+                       已结束
+                       <!--<p style="color: #DBDBDB; margin-top: 5px">已结束</p>-->
                    </div>
                </div>
 

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

@@ -1,25 +1,25 @@
-<ion-view view-title="回复我的">
+<ion-view view-title="支持消息">
     <ion-content>
-        <div class="list list-user-set" ng-click="goDetail(item.dreamid,item.interaction_id)" ng-repeat="item in comments" style="color: #737373; margin-bottom: 0">
+        <div class="list list-user-set" ng-click="goMes(item.info,item.image,item.is_max,item.message,item.video,item.attr_id,item.dream_id)" ng-repeat="item in comments" style="color: #737373; margin-bottom: 0">
             <a class="item" style="border-bottom: 1px solid #EAEAEA">
-                <em style="color: #000">{{item.user_nickname}} </em> 回复你：
-                <p>{{item.content}}</p>
+                <p style="white-space: normal">{{item.message}}</p>
             </a>
+            <!--<img ng-if="item.image!=null" src="{{item.image}}" alt="">-->
         </div>
     </ion-content>
-    <script id="my-modal.html" type="text/ng-template">
-        <ion-modal-view>
-            <ion-header-bar class="bar-calm">
-                <h1 class="title">消息回复</h1>
-            </ion-header-bar>
-            <ion-content>
-                <textarea autofocus rows="5" style="width:100%" ng-model="vm.content" placeholder="请输入回复内容"></textarea>
-                <div class="padding">
-                    <button class="button button-full button-calm" ng-click="closeModal()">
-                        回复
-                    </button>
-                </div>
-            </ion-content>
-        </ion-modal-view>
-    </script>
+    <!--<script id="my-modal.html" type="text/ng-template">-->
+        <!--<ion-modal-view>-->
+            <!--<ion-header-bar class="bar-calm">-->
+                <!--<h1 class="title">消息回复</h1>-->
+            <!--</ion-header-bar>-->
+            <!--<ion-content>-->
+                <!--<textarea autofocus rows="5" style="width:100%" ng-model="vm.content" placeholder="请输入回复内容"></textarea>-->
+                <!--<div class="padding">-->
+                    <!--<button class="button button-full button-calm" ng-click="closeModal()">-->
+                        <!--回复-->
+                    <!--</button>-->
+                <!--</div>-->
+            <!--</ion-content>-->
+        <!--</ion-modal-view>-->
+    <!--</script>-->
 </ion-view>

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

@@ -1,9 +1,10 @@
-<ion-view view-title="系统消息">
+<ion-view view-title="梦想消息">
     <ion-content>
+        <div style="color: #B3B3B3" ng-if="sysInfos==''">暂时还没有梦想消息哦</div>
         <div class="list" ng-repeat="sysInfo in sysInfos">
-            <a class="item item-icon-left">
+            <a ng-click="goMes(sysInfo.is_reply,sysInfo.is_url,sysInfo.dream_id,sysInfo.is_end,sysInfo.message,sysInfo.user_id)" class="item item-icon-left">
                 <i class="icon ion-volume-medium"></i>
-                <em class="fl">{{sysInfo.message}}</em>
+                <p style="white-space: normal">{{sysInfo.message}}</p>
             </a>
         </div>
         <ion-infinite-scroll ng-if="filter.hasMore" on-infinite="load(false)" distance="10%"></ion-infinite-scroll>

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

@@ -7,30 +7,21 @@
     <ion-content>
         <div class="list padding list-user-set" style="color: #737373">
             <a class="item" ng-click="systemInfo()" style="border-bottom: 1px solid #EAEAEA">
-                <em class="fl">系统消息</em>
-                <i class="fr" ng-if="infos.systemInfo.is_read!=0">
-                    <em class="badge badge-assertive" style="background: red; padding: 0.5px 10px; margin-top: 2px">{{infos.systemInfo.is_read}}</em>
-                </i>
-                <i class="fr" style="margin-right: 10px">
-                    {{infos.systemInfo.number}}条系统消息
+                <em class="fl">梦想消息</em>
+                <i class="fr" ng-if="infos.dream_info.number!=0">
+                    <em class="badge badge-assertive" style="background: red; padding: 2px 5px; display: inline-block; margin-top: 2px">{{infos.dream_info.number}}</em> 条新消息
                 </i>
             </a>
             <a class="item" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
-                <em class="fl">回复我的</em>
-                <i class="fr" ng-if="infos.reply.is_read!=0">
-                    <em class="badge badge-assertive" style="background: red; padding: 0.5px 10px; margin-top: 2px">{{infos.reply.is_read}}</em>
-                </i>
-                <i class="fr" style="margin-right: 10px">
-                    {{infos.reply.number}}条回复消息
+                <em class="fl">支持消息</em>
+                <i class="fr" ng-if="infos.sup_info.number!=0">
+                    <em class="badge badge-assertive" style="background: red; padding: 2px 5px; display: inline-block; margin-top: 2px">{{infos.sup_info.number}}</em>条新消息
                 </i>
             </a>
             <a class="item" ng-click="personalLetter()" style="border-bottom: 1px solid #EAEAEA">
-                <em class="fl">私信</em>
-                <i class="fr" ng-if="infos.letter.is_read!=0">
-                    <em class="badge badge-assertive" style="background: red; padding: 0.5px 10px; margin-top: 2px">{{infos.letter.is_read}}</em>
-                </i>
-                <i class="fr" style="margin-right: 10px">
-                    {{infos.letter.number}}条私信
+                <em class="fl">通知</em>
+                <i class="fr" ng-if="infos.system_info.number!=0">
+                    <em class="badge badge-assertive" style="background: red; padding: 2px 5px; display: inline-block; margin-top: 2px">{{infos.system_info.number}}</em>条新消息
                 </i>
             </a>
           

miaomiao/www/templates/my/payExplain.html

@@ -1,5 +1,51 @@
 <ion-view view-title="支付说明">
-    <ion-content class="padding" style="color: red">
-        <div ng-bind-html="items.value | trustHtml"></div>
+    <ion-content>
+        <div class="list">
+            <div class="item reply-item" >
+                <div class="item" style="height:90px; border-bottom: 2px solid #EFEFEF">
+                    <div style="float:left;">
+                        <img style="width: 45px; height: 45px;border-radius: 100%; border: 1px solid #D8D8D8" ng-src="{{ user.avatar | avator }}" />
+                    </div>
+                    <div style="float:left; width: 60%; margin-left: 10px; height: 60px; overflow: hidden">
+                        <h2> 梦想 - 带我去法国 </h2>
+                        <p> 10月30日 19:26 </p>
+                    </div>
+                    <div style="float: right; font-weight: 900; font-size: 20px; margin-top: 15px">
+                       +1524.00
+                    </div>
+                </div>
+                <div class="item" style="height:90px; border-bottom: 2px solid #EFEFEF">
+                    <div style="float:left;">
+                        <img style="width: 45px; height: 45px;border-radius: 100%; border: 1px solid #D8D8D8" ng-src="{{ user.avatar | avator }}" />
+                    </div>
+                    <div style="float:left; width: 51%; margin-left: 10px; height: 60px; overflow: hidden">
+                        <h2> 微信充值 </h2>
+                        <p> 10月30日 19:26 </p>
+                        <p> 交易号：30012151591781798 </p>
+                    </div>
+                    <div style="float: right; font-weight: 900; font-size: 20px; margin-top: 15px">
+                        +1524.00
+                    </div>
+                </div>
+            </div>
+        </div>
     </ion-content>
+    <script id="my-modal.html" type="text/ng-template">
+        <ion-modal-view>
+            <ion-header-bar class="bar-calm">
+                <h1 class="title">发送私信</h1>
+                <div class="buttons">
+                    <div class="button" ng-click="hideModal()" style="font-size: 16px; margin-top: 3px">关闭</div>
+                </div>
+            </ion-header-bar>
+            <ion-content>
+                <textarea autofocus rows="5" style="width:100%; padding: 5px" ng-model="vm.content" placeholder="请输入私信内容"></textarea>
+                <div class="padding">
+                    <button class="button button-full button-calm" ng-click="closeModal()">
+                        回复
+                    </button>
+                </div>
+            </ion-content>
+        </ion-modal-view>
+    </script>
 </ion-view>

miaomiao/www/templates/my/personalLetter.html

@@ -1,9 +1,8 @@
-<ion-view view-title="私信">
+<ion-view view-title="通知">
     <ion-content>
-        <div class="list list-user-set" ng-repeat="item in comments" style="color: #737373">
+        <div class="list list-user-set" ng-repeat="item in items" style="color: #737373">
             <a class="item" style="border-bottom: 1px solid #EAEAEA">
-                来自 <em style="color: #000">瞄喵</em> 的私信
-                <p>{{item.content}}</p>
+                <em style="color: #000">{{item.message}}</em>
             </a>
         </div>
     </ion-content>