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

miaomiao/www/.idea/workspace.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="BookmarkManager">
+    <bookmark url="file://$PROJECT_DIR$/js/controllers/my.js" line="897" mnemonic="1" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="da700f62-8b79-488e-8484-af89b2c5db2d" name="Default" comment="" />
     <ignored path="www.iws" />
@@ -20,53 +23,111 @@
     <favorites_list name="www" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.5">
+    <splitter split-orientation="horizontal" split-proportion="0.40536278">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file leaf-file-name="my-message-sys.html" pinned="false" current-in-tab="true">
+          <file leaf-file-name="my-message-sys.html" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.1015873">
-                  <caret line="4" column="79" selection-start-line="4" selection-start-column="79" selection-end-line="4" selection-end-column="79" />
+                <state vertical-scroll-proportion="-9.321428">
+                  <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
+                  <folding>
+                    <element signature="n#style#0;n#p#0;n#a#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.46254072">
+                  <caret line="204" column="38" selection-start-line="204" selection-start-column="38" selection-end-line="204" selection-end-column="38" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="my-dream.html" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="-1.0">
+                  <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="my-message-reply.html" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="-2.142857">
+                  <caret line="2" column="131" selection-start-line="2" selection-start-column="131" selection-end-line="2" selection-end-column="131" />
                   <folding>
-                    <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                    <element signature="n#style#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                    <element signature="n#style#0;n#p#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="-16.071428">
+                  <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-first>
       <split-second>
-        <leaf>
-          <file leaf-file-name="my.js" pinned="false" current-in-tab="true">
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.42515925">
-                  <caret line="771" column="36" selection-start-line="771" selection-start-column="36" selection-end-line="771" selection-end-column="36" />
+                <state vertical-scroll-proportion="-10.375">
+                  <caret line="897" column="30" selection-start-line="897" selection-start-column="30" selection-end-line="897" selection-end-column="30" />
                   <folding>
-                    <marker date="1509445790345" expanded="true" signature="33215:33279" placeholder="..." />
-                    <marker date="1509445790345" expanded="true" signature="33319:33335" placeholder="..." />
-                    <marker date="1509445790345" expanded="true" signature="33495:33559" placeholder="..." />
-                    <marker date="1509445790345" expanded="true" signature="33599:33614" placeholder="..." />
-                    <marker date="1509445790345" expanded="true" signature="33778:33809" placeholder="..." />
-                    <marker date="1509445790345" expanded="true" signature="34005:34023" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="35229:35254" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="35501:35565" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="35617:35633" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="35829:35893" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="35945:35960" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="36160:36191" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="36423:36441" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="38588:38606" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="40901:40919" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="40980:40999" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="41262:41280" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="41341:41360" placeholder="..." />
+                    <marker date="1509530604269" expanded="true" signature="41656:41674" placeholder="..." />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
+          <file leaf-file-name="myservice.js" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
+              <provider selected="true" editor-type-id="text-editor">
+                <state vertical-scroll-proportion="0.0">
+                  <caret line="211" column="48" selection-start-line="211" selection-start-column="48" selection-end-line="211" selection-end-column="48" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="-18.53125">
-                  <caret line="866" column="21" selection-start-line="861" selection-start-column="20" selection-end-line="866" selection-end-column="21" />
+                <state vertical-scroll-proportion="0.33280253">
+                  <caret line="312" column="25" selection-start-line="312" selection-start-column="16" selection-end-line="312" selection-end-column="25" />
                   <folding>
                     <element signature="e#10842#11161#0" expanded="false" />
-                    <element signature="e#11218#11385#0" expanded="false" />
                     <element signature="e#11426#11513#0" expanded="false" />
                     <element signature="e#14849#14965#0" expanded="false" />
-                    <element signature="e#17726#18629#0" expanded="false" />
                   </folding>
                 </state>
               </provider>
@@ -87,11 +148,9 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/js/services/homeservice.js" />
-        <option value="$PROJECT_DIR$/js/services/msgservice.js" />
         <option value="$PROJECT_DIR$/templates/my/index.html" />
         <option value="$PROJECT_DIR$/templates/my/attention.html" />
         <option value="$PROJECT_DIR$/templates/home/search.html" />
-        <option value="$PROJECT_DIR$/js/controllers/add.js" />
         <option value="$PROJECT_DIR$/templates/my/care.html" />
         <option value="$PROJECT_DIR$/templates/my/letterDetailCtrl.html" />
         <option value="$PROJECT_DIR$/templates/my/letterDetail.html" />
@@ -102,14 +161,17 @@
         <option value="$PROJECT_DIR$/js/config/config.js" />
         <option value="$PROJECT_DIR$/templates/my/my-message.html" />
         <option value="$PROJECT_DIR$/js/config/router.js" />
-        <option value="$PROJECT_DIR$/js/controllers/home.js" />
-        <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
-        <option value="$PROJECT_DIR$/js/services/myservice.js" />
-        <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
         <option value="$PROJECT_DIR$/templates/my/personalLetter.html" />
+        <option value="$PROJECT_DIR$/js/controllers/add.js" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/js/services/msgservice.js" />
+        <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/templates/my/my-message-sys.html" />
+        <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
+        <option value="$PROJECT_DIR$/js/services/myservice.js" />
         <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
       </list>
     </option>
   </component>
@@ -269,25 +331,11 @@
           <option name="timeStamp" value="2" />
         </line-breakpoint>
       </breakpoints>
-      <option name="time" value="3" />
+      <option name="time" value="4" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="381" column="34" selection-start-line="381" selection-start-column="34" selection-end-line="381" selection-end-column="34" />
-          <folding>
-            <element signature="e#10842#11161#0" expanded="false" />
-            <element signature="e#11218#11385#0" expanded="false" />
-            <element signature="e#11426#11513#0" expanded="false" />
-            <element signature="e#14849#14965#0" expanded="false" />
-            <element signature="e#17726#18629#0" 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">
@@ -301,10 +349,8 @@
           <caret line="372" column="38" selection-start-line="372" selection-start-column="38" selection-end-line="372" selection-end-column="38" />
           <folding>
             <element signature="e#10842#11161#0" expanded="false" />
-            <element signature="e#11218#11385#0" expanded="false" />
             <element signature="e#11426#11513#0" expanded="false" />
             <element signature="e#14849#14965#0" expanded="false" />
-            <element signature="e#17726#18629#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -329,10 +375,8 @@
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="e#10842#11161#0" expanded="false" />
-            <element signature="e#11218#11385#0" expanded="false" />
             <element signature="e#11426#11513#0" expanded="false" />
             <element signature="e#14849#14965#0" expanded="false" />
-            <element signature="e#17726#18629#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -385,10 +429,8 @@
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="e#10842#11161#0" expanded="false" />
-            <element signature="e#11218#11385#0" expanded="false" />
             <element signature="e#11426#11513#0" expanded="false" />
             <element signature="e#14849#14965#0" expanded="false" />
-            <element signature="e#17726#18629#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -441,10 +483,8 @@
           <caret line="722" column="45" selection-start-line="722" selection-start-column="45" selection-end-line="722" selection-end-column="45" />
           <folding>
             <element signature="e#10842#11161#0" expanded="false" />
-            <element signature="e#11218#11385#0" expanded="false" />
             <element signature="e#11426#11513#0" expanded="false" />
             <element signature="e#14849#14965#0" expanded="false" />
-            <element signature="e#17726#18629#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -491,13 +531,6 @@
         </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.41925466">
-          <caret line="30" column="49" selection-start-line="30" selection-start-column="49" selection-end-line="30" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/letterDetail.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -540,13 +573,6 @@
         </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.073015876">
-          <caret line="4" column="21" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/services/commonservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24363057">
@@ -586,110 +612,139 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24442676">
           <caret line="265" column="14" selection-start-line="265" selection-start-column="14" selection-end-line="266" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.16226707">
+          <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$/css/style.css">
+    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.07936508">
-          <caret line="793" column="1" selection-start-line="793" selection-start-column="1" selection-end-line="793" selection-end-column="1" />
+        <state vertical-scroll-proportion="0.27018633">
+          <caret line="45" column="39" selection-start-line="45" selection-start-column="39" selection-end-line="45" selection-end-column="39" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/personalLetter.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.83598727">
-          <caret line="30" column="16" selection-start-line="30" selection-start-column="12" selection-end-line="30" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.10714286">
+          <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+    <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.16226707">
-          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.46195653">
+          <caret line="47" column="25" selection-start-line="47" selection-start-column="23" selection-end-line="47" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27018633">
-          <caret line="45" column="39" selection-start-line="45" selection-start-column="39" selection-end-line="45" selection-end-column="39" />
+        <state vertical-scroll-proportion="-7.0">
+          <caret line="7" column="28" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.38029316">
-          <caret line="326" column="32" selection-start-line="326" selection-start-column="32" selection-end-line="326" selection-end-column="32" />
+        <state vertical-scroll-proportion="-6.516667">
+          <caret line="799" column="25" selection-start-line="799" selection-start-column="25" selection-end-line="799" selection-end-column="25" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5209627">
-          <caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
+        <state vertical-scroll-proportion="-16.071428">
+          <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/personalLetter.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.10714286">
-          <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
+        <state vertical-scroll-proportion="-2.142857">
+          <caret line="2" column="131" selection-start-line="2" selection-start-column="131" selection-end-line="2" selection-end-column="131" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#em#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.10555556">
-          <caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="211" column="48" selection-start-line="211" selection-start-column="48" selection-end-line="211" selection-end-column="48" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.1015873">
-          <caret line="4" column="79" selection-start-line="4" selection-start-column="79" selection-end-line="4" selection-end-column="79" />
+        <state vertical-scroll-proportion="-9.321428">
+          <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#a#0;n#div#1;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">
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-18.53125">
-          <caret line="866" column="21" selection-start-line="861" selection-start-column="20" selection-end-line="866" selection-end-column="21" />
+        <state vertical-scroll-proportion="-10.375">
+          <caret line="897" column="30" selection-start-line="897" selection-start-column="30" selection-end-line="897" selection-end-column="30" />
           <folding>
-            <element signature="e#10842#11161#0" expanded="false" />
-            <element signature="e#11218#11385#0" expanded="false" />
-            <element signature="e#11426#11513#0" expanded="false" />
-            <element signature="e#14849#14965#0" expanded="false" />
-            <element signature="e#17726#18629#0" expanded="false" />
+            <marker date="1509530604269" expanded="true" signature="35229:35254" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="35501:35565" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="35617:35633" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="35829:35893" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="35945:35960" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="36160:36191" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="36423:36441" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="38588:38606" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="40901:40919" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="40980:40999" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="41262:41280" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="41341:41360" placeholder="..." />
+            <marker date="1509530604269" expanded="true" signature="41656:41674" placeholder="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.42515925">
-          <caret line="771" column="36" selection-start-line="771" selection-start-column="36" selection-end-line="771" selection-end-column="36" />
+        <state vertical-scroll-proportion="-1.0">
+          <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.46254072">
+          <caret line="204" column="38" selection-start-line="204" selection-start-column="38" selection-end-line="204" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33280253">
+          <caret line="312" column="25" selection-start-line="312" selection-start-column="16" selection-end-line="312" selection-end-column="25" />
           <folding>
-            <marker date="1509445790345" expanded="true" signature="33215:33279" placeholder="..." />
-            <marker date="1509445790345" expanded="true" signature="33319:33335" placeholder="..." />
-            <marker date="1509445790345" expanded="true" signature="33495:33559" placeholder="..." />
-            <marker date="1509445790345" expanded="true" signature="33599:33614" placeholder="..." />
-            <marker date="1509445790345" expanded="true" signature="33778:33809" placeholder="..." />
-            <marker date="1509445790345" expanded="true" signature="34005:34023" placeholder="..." />
+            <element signature="e#10842#11161#0" expanded="false" />
+            <element signature="e#11426#11513#0" expanded="false" />
+            <element signature="e#14849#14965#0" expanded="false" />
           </folding>
         </state>
       </provider>

miaomiao/www/css/style.css

@@ -822,12 +822,6 @@ ion-tabs.tabs-color-active-calm .tab-item.tab-item-active, ion-tabs.tabs-color-a
 .ion-record{
     font-size: 5px
 }
-.shadeStyle{
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 10;
-    background: rgba(0,0,0,0.5);
-    width: 100%;
-    height: 100%
+.popup-container .popup{
+    background-color: rgba(255,255,255,1);
 }

miaomiao/www/js/controllers/add.js

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

miaomiao/www/js/controllers/home.js

@@ -493,6 +493,7 @@
         };
 
          $scope.add = function(is_collection){
+             debugger;
             var data = {
                 id:id,
                 title:$scope.vm.title,
@@ -726,7 +727,6 @@
                     common.uploadFiles(file, 2).then(function (result) {
                         var response = JSON.parse(result.response);
                         var file = config.imgServer+response.data.file;
-                        //console.log("file:"+file);
                         $scope.video.isOK = true;
                         $scope.video.file = response.data.file;
                         $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';

miaomiao/www/js/controllers/my.js

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

miaomiao/www/js/services/myservice.js

@@ -202,6 +202,18 @@
                     url:config.server + "api/my/system_info",
                     method:"get"
                 })
+            },
+            sure_meet:function(dream_id,value){
+                return $http({
+                    url:config.server + "api/my/sure_meet?dream_id=" + dream_id + '&value=' + value,
+                    method:"get"
+                })
+            },
+            sure_meet2:function(to_user_id,value){
+                return $http({
+                    url:config.server + "api/my/sure_meet2?to_user_id=" + to_user_id + '&value=' + value,
+                    method:"get"
+                })
             }
 
         };

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

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

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

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

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

@@ -2,9 +2,9 @@
     <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)" class="item item-icon-left">
+            <a ng-click="goMes(sysInfo.is_reply,sysInfo.is_url,sysInfo.dream_id,sysInfo.is_end,sysInfo.message,sysInfo.user_id)" class="item item-icon-left">
                 <i class="icon ion-volume-medium"></i>
-                <em class="fl">{{sysInfo.message}}</em>
+                <p style="white-space: normal">{{sysInfo.message}}</p>
             </a>
         </div>
         <ion-infinite-scroll ng-if="filter.hasMore" on-infinite="load(false)" distance="10%"></ion-infinite-scroll>