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

miaomiao/.idea/workspace.xml

@@ -24,87 +24,47 @@
       <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.0">
-              <caret line="0" column="9" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="9" />
+            <state vertical-scroll-proportion="-2.1166666">
+              <caret line="311" column="87" selection-start-line="311" selection-start-column="87" selection-end-line="311" selection-end-column="92" />
               <folding>
-                <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="payExplain.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/templates/my/payExplain.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-9.428572">
-              <caret line="8" column="48" selection-start-line="0" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
-              <folding>
-                <element signature="n#style#0;n#div#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#div#0;n#div#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#img#0;n#div#0;n#div#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#div#1;n#div#0;n#div#1;n#div#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#div#1;n#div#1;n#div#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="payDetail.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/templates/my/payDetail.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-15.321428">
-              <caret line="13" column="32" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="32" />
-              <folding>
-                <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#p#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#i#0;n#p#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#p#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#p#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="my-account-add.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/templates/my/my-account-add.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-22.392857">
-              <caret line="33" column="66" selection-start-line="33" selection-start-column="66" selection-end-line="33" selection-end-column="66" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="my.js" pinned="false" current-in-tab="true">
+      <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.3035144">
-              <caret line="232" column="39" selection-start-line="232" selection-start-column="39" selection-end-line="232" selection-end-column="39" />
+            <state vertical-scroll-proportion="-13.0625">
+              <caret line="755" column="63" selection-start-line="755" selection-start-column="63" selection-end-line="755" selection-end-column="63" />
               <folding>
-                <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
-                <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
+                <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
+                <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="router.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/js/config/router.js">
+      <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/www/js/controllers/home.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-13.5625">
-              <caret line="403" column="50" selection-start-line="403" selection-start-column="37" selection-end-line="403" selection-end-column="50" />
+            <state vertical-scroll-proportion="0.6441083">
+              <caret line="399" column="17" selection-start-line="399" selection-start-column="17" selection-end-line="399" selection-end-column="17" />
               <folding />
             </state>
           </provider>
@@ -122,17 +82,23 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/www/templates/my/my-message-reply.html" />
-        <option value="$PROJECT_DIR$/www/templates/home/dream-detail.html" />
         <option value="$PROJECT_DIR$/../server/app/Http/Controllers/Api/V1/MyController.php" />
         <option value="$PROJECT_DIR$/www/js/services/msgservice.js" />
-        <option value="$PROJECT_DIR$/www/js/controllers/home.js" />
-        <option value="$PROJECT_DIR$/www/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/www/templates/my/my-recharge.html" />
         <option value="$PROJECT_DIR$/www/js/config/router.js" />
         <option value="$PROJECT_DIR$/www/templates/my/payExplain.html" />
         <option value="$PROJECT_DIR$/www/templates/my/payDetail.html" />
+        <option value="$PROJECT_DIR$/www/templates/account/loginAccount.html" />
+        <option value="$PROJECT_DIR$/www/js/controllers/account.js" />
+        <option value="$PROJECT_DIR$/www/js/config/config.js" />
+        <option value="$PROJECT_DIR$/www/templates/my/my-message-reply.html" />
+        <option value="$PROJECT_DIR$/www/templates/my/my-message-sys.html" />
+        <option value="$PROJECT_DIR$/www/templates/my/my-dream.html" />
+        <option value="$PROJECT_DIR$/www/templates/home/index.html" />
+        <option value="$PROJECT_DIR$/www/templates/add/index.html" />
+        <option value="$PROJECT_DIR$/www/templates/home/dream-detail.html" />
         <option value="$PROJECT_DIR$/www/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/www/js/controllers/home.js" />
       </list>
     </option>
   </component>
@@ -150,7 +116,7 @@
     <option name="x" value="1358" />
     <option name="y" value="-8" />
     <option name="width" value="2576" />
-    <option name="height" value="1452" />
+    <option name="height" value="1456" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -251,7 +217,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1358" y="-8" width="2576" height="1452" extended-state="0" />
+    <frame x="1358" y="-8" width="2576" height="1456" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -289,7 +255,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="javascript">
           <url>file://$PROJECT_DIR$/www/js/controllers/my.js</url>
-          <line>686</line>
+          <line>627</line>
         </line-breakpoint>
       </breakpoints>
       <option name="time" value="1" />
@@ -297,12 +263,23 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
+    <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
+          <caret line="18" column="29" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="29" />
           <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#div#1;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-dream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="17" column="21" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="21" />
+          <folding>
+            <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#p#0;n#div#3;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -312,19 +289,22 @@
         <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>
-            <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
+            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -333,9 +313,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -344,19 +322,22 @@
         <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>
-            <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
+            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -364,10 +345,8 @@
     <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="2" column="74" selection-start-line="2" selection-start-column="74" selection-end-line="2" selection-end-column="74" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+          <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -376,27 +355,56 @@
         <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>
-            <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
+            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-18.321428">
-          <caret line="75" column="59" selection-start-line="75" selection-start-column="59" selection-end-line="77" selection-end-column="39" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="2" column="74" selection-start-line="2" selection-start-column="74" selection-end-line="2" selection-end-column="74" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
+            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -414,140 +422,169 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/services/myservice.js">
+    <entry file="file://$PROJECT_DIR$/www/js/services/msgservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.16277258">
-          <caret line="11" column="62" selection-start-line="11" selection-start-column="62" selection-end-line="11" selection-end-column="62" />
-          <folding />
+        <state vertical-scroll-proportion="0.4201278">
+          <caret line="56" column="57" selection-start-line="56" selection-start-column="57" selection-end-line="56" selection-end-column="57" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/services/msgservice.js">
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-recharge.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4201278">
-          <caret line="56" column="57" selection-start-line="56" selection-start-column="57" selection-end-line="56" selection-end-column="57" />
-          <folding />
+        <state vertical-scroll-proportion="0.24203822">
+          <caret line="16" column="26" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/www/js/config/router.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6168224">
-          <caret line="238" column="21" selection-start-line="238" selection-start-column="21" selection-end-line="238" selection-end-column="21" />
+        <state vertical-scroll-proportion="-13.5625">
+          <caret line="403" column="50" selection-start-line="403" selection-start-column="37" selection-end-line="403" selection-end-column="50" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/config/config.js">
+    <entry file="file://$PROJECT_DIR$/www/templates/account/login.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.10358255">
-          <caret line="7" column="46" selection-start-line="7" selection-start-column="46" selection-end-line="7" selection-end-column="46" />
+        <state vertical-scroll-proportion="-4.071429">
+          <caret line="6" column="77" selection-start-line="6" selection-start-column="77" selection-end-line="6" selection-end-column="77" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/account/loginAccount.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="26" selection-start-line="0" selection-start-column="26" selection-end-line="0" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-account-add.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.09076433">
+          <caret line="6" column="42" selection-start-line="6" selection-start-column="42" selection-end-line="6" selection-end-column="42" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/payExplain.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.18550955">
+          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="15" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/www/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31152648">
-          <caret line="16" column="79" selection-start-line="16" selection-start-column="79" selection-end-line="16" selection-end-column="79" />
+        <state vertical-scroll-proportion="0.5194704">
+          <caret line="81" column="65" selection-start-line="81" selection-start-column="65" selection-end-line="81" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/services/myservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.7205414">
+          <caret line="213" column="69" selection-start-line="213" selection-start-column="59" selection-end-line="213" selection-end-column="69" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/my/my-recharge.html">
+    <entry file="file://$PROJECT_DIR$/www/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24203822">
-          <caret line="16" column="26" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+        <state vertical-scroll-proportion="0.11801242">
+          <caret line="8" column="60" selection-start-line="8" selection-start-column="60" selection-end-line="8" selection-end-column="60" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/my/payExplain.html">
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.428572">
-          <caret line="8" column="48" selection-start-line="0" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
-          <folding>
-            <element signature="n#style#0;n#div#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#div#0;n#div#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#img#0;n#div#0;n#div#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#div#1;n#div#0;n#div#1;n#div#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#div#1;n#div#1;n#div#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="-2.0714285">
+          <caret line="2" column="176" selection-start-line="2" selection-start-column="176" selection-end-line="2" selection-end-column="176" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/config/router.js">
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-sys.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-13.5625">
-          <caret line="403" column="50" selection-start-line="403" selection-start-column="37" selection-end-line="403" selection-end-column="50" />
+        <state vertical-scroll-proportion="-3.7142856">
+          <caret line="4" column="147" selection-start-line="4" selection-start-column="147" selection-end-line="4" selection-end-column="147" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-dream.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.785714">
-          <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
+        <state vertical-scroll-proportion="-7.9666667">
+          <caret line="26" column="50" selection-start-line="26" selection-start-column="50" selection-end-line="26" selection-end-column="50" />
           <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#div#1;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#p#0;n#div#3;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/www/templates/home/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.0">
-          <caret line="0" column="9" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="9" />
+        <state vertical-scroll-proportion="0.3420635">
+          <caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
           <folding>
-            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/my/my-account-add.html">
+    <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-22.392857">
-          <caret line="33" column="66" selection-start-line="33" selection-start-column="66" selection-end-line="33" selection-end-column="66" />
-          <folding />
+        <state vertical-scroll-proportion="-2.1166666">
+          <caret line="311" column="87" selection-start-line="311" selection-start-column="87" selection-end-line="311" selection-end-column="92" />
+          <folding>
+            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/my/payDetail.html">
+    <entry file="file://$PROJECT_DIR$/www/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-15.321428">
-          <caret line="13" column="32" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="32" />
+        <state vertical-scroll-proportion="0.14444445">
+          <caret line="12" column="18" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
           <folding>
-            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#i#0;n#p#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#video#0;n#div#0;n#div#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3035144">
-          <caret line="232" column="39" selection-start-line="232" selection-start-column="39" selection-end-line="232" selection-end-column="39" />
+        <state vertical-scroll-proportion="-13.0625">
+          <caret line="755" column="63" selection-start-line="755" selection-start-column="63" selection-end-line="755" selection-end-column="63" />
           <folding>
-            <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
-            <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
+            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
+            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6441083">
+          <caret line="399" column="17" selection-start-line="399" selection-start-column="17" selection-end-line="399" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

miaomiao/config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<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">
+<widget id="com.miaomiao.app" version="0.0.7" 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/js/controllers/home.js

@@ -384,7 +384,7 @@
                     Wechat.share({
                         message: {
                             title: $scope.dream.name,
-                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '<br/>' + $scope.dream.about,
+                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '+\n+' + $scope.dream.about,
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                                 type: Wechat.Type.WEBPAGE,
@@ -402,7 +402,7 @@
                     Wechat.share({
                         message: {
                             title: $scope.dream.name,
-                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '<br/>' + $scope.dream.about,
+                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '+\n+' + $scope.dream.about,
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                                 type: Wechat.Type.WEBPAGE,

miaomiao/www/js/controllers/my.js

@@ -638,10 +638,6 @@
                 }
                 else {
                     $state.go("app.message_sys");
-                    //myService.systemInfo().then(function(result){
-                    //},function(error){
-                    //
-                    //});
                 }
             };
             //支持消息
@@ -717,8 +713,8 @@
           $state.go('app.my_dreamdetail',{id:id});
       };
     }]);
-    app.controller('messageSysCtrl', ["$scope","$ionicPopup","$location", "$ionicTabsDelegate","$state", "myService", "msg"
-       , function ($scope,$ionicPopup,$location,$ionicTabsDelegate, $state, myService, msg) {
+    app.controller('messageSysCtrl', ["$scope","common","config","$ionicPopup","$location", "$ionicTabsDelegate","$state", "myService", "msg"
+       , function ($scope,common,config,$ionicPopup,$location,$ionicTabsDelegate, $state, myService, msg) {
             $scope.$on('$ionicView.beforeEnter', function () {
                 myService.systemInfo().then(function(result){
                     $scope.sysInfos = result.data.data;
@@ -731,6 +727,7 @@
             $scope.imgs = [];
             $scope.video = {};
             $scope.addpict = function () {
+                // alert('选择图片');
                 common.chooseImage().then(function (img) {
                     common.uploadFiles(img,1).then(function (result) {
                         var response = JSON.parse(result.response);
@@ -750,6 +747,7 @@
                 })
             };
             $scope.addvideo = function () {
+                // alert('选择视频');
                 common.chooseVideo().then(function (file) {
                     common.uploadFiles(file, 2).then(function (result) {
                         var response = JSON.parse(result.response);
@@ -770,7 +768,7 @@
                     alert(JSON.stringify(erro));
                 })
             };
-            $scope.goMes = function(is_reply,is_url,dream_id,is_end,message,user_id){
+            $scope.goMes = function(is_reply,is_url,dream_id,is_end,message,user_id,info,attr_id){
                 //发送私信
                 if(is_reply==1){
                     var myPopup = $ionicPopup.show({
@@ -790,7 +788,7 @@
                             '<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>' +
+                            '<video ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px" poster="{{video.vpic}}" controls="controls"></video>' +
                             '</div>' +
                             '</div>' +
                             '</div>',
@@ -806,8 +804,8 @@
                                     var data = {
                                         to_user_id:user_id,
                                         content:$scope.vm.content,
-                                        image:$scope.imgs,
                                         video:$scope.video.file,
+                                        image:$scope.imgs,
                                         //image:['http://img0.imgtn.bdimg.com/it/u=2398075737,160631337&fm=214&gp=0.jpg']
                                     };
                                     myService.sendLetter(data).then(function(result){
@@ -830,8 +828,8 @@
                     }
                 }
                 //梦想结束
-                else if(is_end==1){
-                    var endTemplate = '<div style="text-align: center"><p>恭喜你成功地向你的梦想迈出最大的一步，照接下来的步骤做就可以领取你的梦想资金啦！</p>' +
+                else if(is_end==1&&attr_id==6){
+                    var endTemplate = '<div style="text-align: center"><p>恭喜你成功地你的梦想迈出最大的一步，</p>' +
                         '<p>要取出全部梦想资金，</p>' +
                         '<p>你需要亲自问候你的梦主</p>' +
                         '<p>致出最诚挚的感谢</p>' +
@@ -848,7 +846,7 @@
                                         msg.success('该梦想暂无梦主！');
                                     }
                                     else {
-                                        msg.success('确定见面，期待与梦主的相见吧！');
+                                        msg.success('确定见面，期待相见吧！');
                                     }
                                 }
                             })
@@ -876,7 +874,7 @@
                }, function (error) {
                });
            };
-            $scope.goMes = function(info,img,is_max,mes,video,attr_id,dream_id){
+            $scope.goMes = function(info,img,is_max,mes,video,attr_id,dream_id,to_user_id,is_end,is_url){
                 //收到私信
                 if(attr_id==7){
                     if(video!=null){
@@ -892,24 +890,48 @@
                             '<p>'+info+'</p>' +
                             '</div>';
                     }
-                    msg.confirm('私信',letterTemplate,'梦想页').then(function(){
-                        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});
+                    msg.confirm('私信',letterTemplate,'梦想页').then(function(result){
+                        if(result==true){
+                            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});
+                            }
                         }
                     })
                 }
                 //成为梦主
-                else if(is_max==1){
+                else if(is_max==1&&is_end==1){
                     var maxTemplate = '<div style="text-align: center"><p>'+ mes +'</p>' +
                         '<p>'+ info +'</p>' +
-                        //'<p>小蝶将以你提供的微信/电话联系你，并到你越好的地点亲自感谢你给予的支持和鼓励。</p>' +
-                        //'<p>如果你不希望见面或者不想要梦想者拥有你的联系方式，请按《不要见面的按钮或者联系客服》</p>' +
-                        //'<p>请按《不要见面的按钮或者联系客服》</p>' +
                         '</div>';
-                    msg.confirm('恭喜你！',maxTemplate);
+                    msg.confirm('恭喜你！',maxTemplate).then(function(result){
+                        if(result==true){
+                            myService.sure_meet2(to_user_id,1).then(function(res){
+                                if(res.data.status_code==0) {
+                                    msg.success('确定见面，期待相见吧！');
+                                }
+                            })
+                        }
+                        else {
+                            myService.sure_meet2(to_user_id,0).then(function(res){
+                                if(res.data.status_code==0){
+                                    msg.success('已取消见面！');
+                                }
+                            })
+                        }
+                    })
+                }//确认见面/扫一扫
+                else if(is_max==0&&is_url==0){
+                    var maxTemplate = '<div style="text-align: center"><p>'+ mes +'</p>' +
+                        '</div>';
+                    msg.alert('恭喜你！',maxTemplate).then(function(result){
+
+                    })
+                }
+                else if(is_end==0&&is_url==0){
+
                 }
                 else {
                     if($location.path()=="/app/home/message/reply"){

miaomiao/www/templates/account/loginAccount.html

@@ -25,7 +25,7 @@
             </div>
         </div>
         <button type="submit" ng-click="login()" class="button button-block button-calm" style="border-radius: 50px;">
-            登 录
+            注 册
         </button>
     </ion-content>
 </ion-view>

miaomiao/www/templates/add/index.html

@@ -27,7 +27,7 @@
                 <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 ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px" poster="{{video.vpic}}" controls="controls">
                         </video>
                     </div>
                 </div>

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

@@ -323,7 +323,7 @@
                 <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 ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px" poster="{{video.vpic}}" controls="controls">
                         </video>
                     </div>
                 </div>

miaomiao/www/templates/home/index.html

@@ -27,7 +27,7 @@
         <button class="button button-clear" ui-sref="app.home_search" style="margin-top:-3px">
             <i class="icon iconfont icon-sousuo"></i>
         </button>
-        <button class="button button-clear" style="height: 37px; margin-top: 0.6px" ui-sref="app.message">
+        <button class="button button-clear" style="height: 37px; margin-top: 1px" ui-sref="app.message">
             <img ng-if="showMessage==1" src="img/icon_message_h.svg" style="height: 60%; width: 100%">
             <img ng-if="showMessage==0" src="img/icon_message_n.svg" style="height: 55%; width: 100%">
         </button>

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

@@ -6,7 +6,6 @@
         <div ng-if="dreams.length==0" class="padding" style="color: #BEBEBE; font-size: 15px">
             还未发布任何梦想
         </div>
-        {{d1}}
        <div ng-if="dreams.length!=0" ng-repeat="dream in dreams" class="list">
            <div class="item reply-item" ng-click="toDetail(dream.id)">
                <div class="item" style="height:70px; padding-left: 0; border-bottom: 1px solid #EFEFEF">
@@ -25,12 +24,12 @@
                        <h2>{{dream.name}}</h2>
                        <p>{{dream.about}}</p>
                    </div>
-                   <div ng-if="100*dream.get_coin/dream.coin<100" style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
-                       {{dream.end_time|lastDate}}进行中
+                   <div ng-if="dream.type_name=='进行中'" style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
+                       进行中
                    </div>
-                   <div ng-if="dream.end_time|lastDate=='已结束'" style="float:right; width: 15%; text-align: right; color: #00C3DA; font-size: 16px">
-                       {{dream.end_time|lastDate}}已结束
-                       <!--<p style="color: #DBDBDB; margin-top: 5px">已结束</p>-->
+                   <div ng-if="dream.type_name!='进行中'" style="float:right; width: 15%; text-align: right; color: #00C3DA; font-size: 16px">
+                       已结束
+                       <p style="color: #DBDBDB; margin-top: 5px">{{dream.type_name}}</p>
                    </div>
                </div>
 

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

@@ -1,6 +1,6 @@
 <ion-view view-title="支持消息">
     <ion-content>
-        <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">
+        <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,item.user.id,item.is_end,item.is_url)" ng-repeat="item in comments" style="color: #737373; margin-bottom: 0">
             <a class="item" style="border-bottom: 1px solid #EAEAEA">
                 <p style="white-space: normal">{{item.message}}</p>
             </a>

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

@@ -2,7 +2,7 @@
     <ion-content>
         <div style="color: #B3B3B3" ng-if="sysInfos==''">暂时还没有梦想消息哦</div>
         <div class="list" ng-repeat="sysInfo in sysInfos">
-            <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">
+            <a ng-click="goMes(sysInfo.is_reply,sysInfo.is_url,sysInfo.dream_id,sysInfo.is_end,sysInfo.message,sysInfo.user_id,sysInfo.info,sysInfo.attr_id)" class="item item-icon-left">
                 <i class="icon ion-volume-medium"></i>
                 <p style="white-space: normal">{{sysInfo.message}}</p>
             </a>