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.8" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.miaomiao.app" version="0.0.9" 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

@@ -21,13 +21,67 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+      <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="0.25968993">
-              <caret line="94" column="66" selection-start-line="94" selection-start-column="66" selection-end-line="94" selection-end-column="66" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="732" column="37" selection-start-line="732" selection-start-column="37" selection-end-line="732" selection-end-column="37" />
               <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" />
+                <marker date="1510042840166" expanded="true" signature="32141:33901" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="32202:32227" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="32510:32574" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="32626:32642" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="32874:32938" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="32990:33005" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="33205:33236" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="33422:33862" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="33468:33486" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="33487:33823" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="33677:33731" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="33691:33704" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="35645:35663" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="37973:37991" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="38092:38106" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="38363:38382" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="38443:38489" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="38688:38706" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="39478:39496" placeholder="..." />
+                <marker date="1510042840166" expanded="true" signature="40489:40507" placeholder="..." />
+              </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="-4.0625">
+              <caret line="428" column="25" selection-start-line="428" selection-start-column="25" selection-end-line="429" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="config.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/js/config/config.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.13276398">
+              <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="payExplain.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-4.142857">
+              <caret line="4" column="68" selection-start-line="3" selection-start-column="68" selection-end-line="4" selection-end-column="68" />
+              <folding>
+                <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#3;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -62,12 +116,9 @@
         <option value="$PROJECT_DIR$/js/filters/filter.js" />
         <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
-        <option value="$PROJECT_DIR$/templates/add/index.html" />
         <option value="$PROJECT_DIR$/templates/my/withdraw.html" />
         <option value="$PROJECT_DIR$/js/services/msgservice.js" />
-        <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
         <option value="$PROJECT_DIR$/templates/my/my-collect.html" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/templates/home/share.html" />
         <option value="$PROJECT_DIR$/templates/home/index.html" />
@@ -75,8 +126,12 @@
         <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$USER_HOME$/Desktop/shareDream.html" />
         <option value="$PROJECT_DIR$/../../../miao2/miaomiao/config.xml" />
-        <option value="$PROJECT_DIR$/js/config/config.js" />
+        <option value="$PROJECT_DIR$/templates/add/index.html" />
+        <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/templates/home/userDetail.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" />
       </list>
     </option>
   </component>
@@ -86,10 +141,10 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
+    <option name="x" value="1358" />
     <option name="y" value="-8" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="width" value="2576" />
+    <option name="height" value="1456" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -190,25 +245,25 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
+    <frame x="1358" y="-8" width="2576" height="1456" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16798107" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32885906" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24916202" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32885906" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297953" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -236,16 +291,143 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/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="1510042840166" expanded="true" signature="32141:33901" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32202:32227" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32510:32574" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32626:32642" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32874:32938" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32990:33005" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33205:33236" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33422:33862" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33468:33486" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33487:33823" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33677:33731" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33691:33704" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="35645:35663" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="37973:37991" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="38092:38106" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="38363:38382" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="38443:38489" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="38688:38706" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="39478:39496" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="40489:40507" placeholder="..." />
+          </folding>
+        </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.0">
+          <caret line="20" column="43" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="4" column="52" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="52" />
+          <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="0.0">
+          <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <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="false" />
+          </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.0">
-          <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
+          <caret line="318" column="63" selection-start-line="318" selection-start-column="63" selection-end-line="318" selection-end-column="63" />
+          <folding>
+            <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
+            <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#1;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#video#0;n#div#0;n#ion-slide-page#0;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#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#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#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/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>
-            <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" />
+            <marker date="1510042840166" expanded="true" signature="32141:33901" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32202:32227" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32510:32574" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32626:32642" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32874:32938" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32990:33005" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33205:33236" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33422:33862" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33468:33486" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33487:33823" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33677:33731" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33691:33704" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="35645:35663" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="37973:37991" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="38092:38106" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="38363:38382" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="38443:38489" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="38688:38706" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="39478:39496" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="40489:40507" placeholder="..." />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="2" column="36" selection-start-line="2" selection-start-column="36" selection-end-line="2" selection-end-column="36" />
+        </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.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/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" />
+        </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.0">
+          <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -310,23 +492,120 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/letterDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.296875">
-          <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
+        <state vertical-scroll-proportion="-3.392857">
+          <caret line="5" column="37" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.03015873">
+          <caret line="2" column="36" selection-start-line="2" selection-start-column="36" selection-end-line="2" selection-end-column="36" />
+        </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.0">
+          <caret line="732" column="37" selection-start-line="732" selection-start-column="37" selection-end-line="732" selection-end-column="37" />
+          <folding>
+            <marker date="1510042840166" expanded="true" signature="32141:33901" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32202:32227" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32510:32574" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32626:32642" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32874:32938" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="32990:33005" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33205:33236" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33422:33862" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33468:33486" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33487:33823" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33677:33731" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="33691:33704" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="35645:35663" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="37973:37991" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="38092:38106" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="38363:38382" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="38443:38489" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="38688:38706" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="39478:39496" placeholder="..." />
+            <marker date="1510042840166" expanded="true" signature="40489:40507" placeholder="..." />
+          </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="0.21111111">
+          <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <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="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-10.821428">
+          <caret line="72" column="16" selection-start-line="72" selection-start-column="16" selection-end-line="72" selection-end-column="16" />
+          <folding />
+        </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.0">
+          <caret line="7" column="46" selection-start-line="7" selection-start-column="46" selection-end-line="7" selection-end-column="47" />
           <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.25968993">
-          <caret line="94" column="66" selection-start-line="94" selection-start-column="66" selection-end-line="94" selection-end-column="66" />
+        <state vertical-scroll-proportion="0.09690554">
+          <caret line="10" column="176" selection-start-line="10" selection-start-column="176" selection-end-line="10" selection-end-column="176" />
           <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" />
+            <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
+            <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#1;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#video#0;n#div#0;n#ion-slide-page#0;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#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#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#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-4.0625">
+          <caret line="428" column="25" selection-start-line="428" selection-start-column="25" selection-end-line="429" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-4.142857">
+          <caret line="4" column="68" selection-start-line="3" selection-start-column="68" selection-end-line="4" selection-end-column="68" />
+          <folding>
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#3;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.13276398">
+          <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

miaomiao/www/js/controllers/my.js

@@ -769,6 +769,8 @@
                 //发送私信
                 if(is_reply==1){
                     $scope.vm.content='';
+                    $scope.imgs=[];
+                    $scope.video.file='';
                     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>' +
@@ -786,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}}" style="width: 100px; height: 100px" poster="{{video.vpic}}" controls="controls"></video>' +
+                            '<video ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px; border: 1px solid #D0D0D0" poster="{{video.vpic}}" controls="controls"></video>' +
                             '</div>' +
                             '</div>' +
                             '</div>',

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.server)" class="ion-ios-close-outline"></em>
-                        <video ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px" poster="{{video.vpic}}" controls="controls">
+                        <video ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px; border: 1px solid #D0D0D0" poster="{{video.vpic}}" controls="controls">
                         </video>
                     </div>
                 </div>

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

@@ -17,7 +17,7 @@
                     ×{{dream.number}}
                 </button>
             </div>
-            <div ng-if="timer!='已结束'" class="col dreamButton">
+            <div ng-if="timer!='已结束'&&dream.status!=2" 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">
@@ -322,7 +322,7 @@
                 <div class="img-file-up" ng-if="video.isOK">
                     <div style="position:relative;">
                         <em ng-click="deletevideo(video.server)" class="ion-ios-close-outline"></em>
-                        <video ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px" poster="{{video.vpic}}" controls="controls">
+                        <video ng-src="{{video.file | trustUrl}}" style="width: 100px; height: 100px; border: 1px solid #D0D0D0" poster="{{video.vpic}}" controls="controls">
                         </video>
                     </div>
                 </div>

miaomiao/www/templates/home/userDetail.html

@@ -69,7 +69,7 @@
         <div style="border-bottom:10px solid #F2F2F2;"></div>
         <div class="list list-user-set list-set-arrow" style="color: #818181;">
             <a class="item" ng-click="toDetail(dream_id)">
-                <em class="fl">当前梦想</em>
+                <em class="fl">当前的梦想</em>
             </a>
             <a class="item" ng-click="toOldDream()">
                 <em class="fl">曾经的梦想</em>

miaomiao/www/templates/my/payExplain.html

@@ -11,10 +11,10 @@
                         <h2> {{item.op}} </h2>
                         <div>
                             <div class="fl">{{item.created_at}}</div>
-                            <div class="fr" ng-if="item.from_id==item.to_id&&item.op!='提现'" style="font-weight: bolder; font-size: 16px">+{{item.to_amount/100}}</div>
-                            <div class="fr" ng-if="item.from_id==item.to_id&&item.op=='提现'" style="font-weight: bolder; font-size: 16px">-{{item.to_amount/100}}</div>
-                            <div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.to_id" style="font-weight: bolder; font-size: 16px">+{{item.to_amount/100}}</div>
-                            <div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.from_id" style="font-weight: bolder; font-size: 16px">-{{item.to_amount/100}}</div>
+                            <div class="fr" ng-if="item.from_id==item.to_id&&item.op!='提现'" style="font-weight: bolder; font-size: 16px">+<span ng-if="item.from_type=='梦想币'">{{item.to_amount}}</span><span ng-if="item.from_type!='梦想币'">{{item.to_amount}}</span></div>
+                            <div class="fr" ng-if="item.from_id==item.to_id&&item.op=='提现'" style="font-weight: bolder; font-size: 16px">-<span ng-if="item.from_type=='梦想币'">{{item.to_amount}}</span><span ng-if="item.from_type!='梦想币'">{{item.to_amount}}</span></div>
+                            <div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.to_id" style="font-weight: bolder; font-size: 16px">+<span ng-if="item.from_type=='梦想币'">{{item.to_amount}}</span><span ng-if="item.from_type!='梦想币'">{{item.to_amount}}</span></div>
+                            <div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.from_id" style="font-weight: bolder; font-size: 16px">-<span ng-if="item.from_type=='梦想币'">{{item.to_amount}}</span><span ng-if="item.from_type!='梦想币'">{{item.to_amount}}</span></div>
                         </div>
                         <div ng-if="item.transaction_id!=null" style="clear:both;"> 交易号：{{item.transaction_id}} </div>
                     </div>