add

miaomiao/www/.idea/workspace.xml

@@ -20,56 +20,61 @@
     <favorites_list name="www" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.4378981">
-              <caret line="463" column="17" selection-start-line="463" selection-start-column="17" selection-end-line="463" selection-end-column="17" />
-              <folding>
-                <element signature="e#9926#10781#0" expanded="false" />
-                <element signature="e#10832#11151#0" expanded="false" />
-                <element signature="e#11208#11375#0" expanded="false" />
-                <element signature="e#11416#11503#0" expanded="false" />
-                <element signature="e#12114#14707#0" expanded="false" />
-                <element signature="e#14839#14955#0" expanded="false" />
-                <element signature="e#17716#18619#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="-3.21875">
-              <caret line="467" column="16" selection-start-line="467" selection-start-column="16" selection-end-line="467" selection-end-column="16" />
-              <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="-6.214286">
-              <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
-              <folding>
-                <element signature="n#style#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#div#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#div#1;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#div#2;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#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <splitter split-orientation="horizontal" split-proportion="0.5">
+      <split-first>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <file leaf-file-name="my-message-sys.html" pinned="false" current-in-tab="true">
+            <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" />
+                  <folding>
+                    <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf>
+          <file leaf-file-name="my.js" pinned="false" current-in-tab="true">
+            <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" />
+                  <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="..." />
+                  </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="-18.53125">
+                  <caret line="866" column="21" selection-start-line="861" selection-start-column="20" selection-end-line="866" selection-end-column="21" />
+                  <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>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -81,29 +86,30 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/templates/my/my-message-sys.html" />
         <option value="$PROJECT_DIR$/js/services/homeservice.js" />
-        <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
         <option value="$PROJECT_DIR$/js/services/msgservice.js" />
         <option value="$PROJECT_DIR$/templates/my/index.html" />
         <option value="$PROJECT_DIR$/templates/my/attention.html" />
         <option value="$PROJECT_DIR$/templates/home/search.html" />
         <option value="$PROJECT_DIR$/js/controllers/add.js" />
         <option value="$PROJECT_DIR$/templates/my/care.html" />
-        <option value="$PROJECT_DIR$/js/services/myservice.js" />
         <option value="$PROJECT_DIR$/templates/my/letterDetailCtrl.html" />
-        <option value="$PROJECT_DIR$/templates/my/personalLetter.html" />
-        <option value="$PROJECT_DIR$/js/config/router.js" />
         <option value="$PROJECT_DIR$/templates/my/letterDetail.html" />
         <option value="$PROJECT_DIR$/templates/add/index.html" />
         <option value="$PROJECT_DIR$/templates/home/index.html" />
-        <option value="$PROJECT_DIR$/css/style.css" />
-        <option value="$PROJECT_DIR$/js/config/config.js" />
-        <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
+        <option value="$PROJECT_DIR$/js/config/config.js" />
+        <option value="$PROJECT_DIR$/templates/my/my-message.html" />
+        <option value="$PROJECT_DIR$/js/config/router.js" />
         <option value="$PROJECT_DIR$/js/controllers/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$/templates/my/my-message-sys.html" />
+        <option value="$PROJECT_DIR$/js/controllers/my.js" />
       </list>
     </option>
   </component>
@@ -147,7 +153,7 @@
   <component name="PropertiesComponent">
     <property name="settings.editor.selected.configurable" value="preferences.keymap" />
     <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="E:/Graduation design/huiwei/www" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -268,26 +274,16 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/css/style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="113" column="79" selection-start-line="113" selection-start-column="79" selection-end-line="113" selection-end-column="79" />
-          <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.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#9926#10781#0" expanded="false" />
-            <element signature="e#10832#11151#0" expanded="false" />
-            <element signature="e#11208#11375#0" expanded="false" />
-            <element signature="e#11416#11503#0" expanded="false" />
-            <element signature="e#12114#14707#0" expanded="false" />
-            <element signature="e#14839#14955#0" expanded="false" />
-            <element signature="e#17716#18619#0" expanded="false" />
+            <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>
@@ -296,23 +292,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#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#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#3;n#div#0;n#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#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#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#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#textarea#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -321,13 +300,11 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="372" column="38" selection-start-line="372" selection-start-column="38" selection-end-line="372" selection-end-column="38" />
           <folding>
-            <element signature="e#9926#10781#0" expanded="false" />
-            <element signature="e#10832#11151#0" expanded="false" />
-            <element signature="e#11208#11375#0" expanded="false" />
-            <element signature="e#11416#11503#0" expanded="false" />
-            <element signature="e#12114#14707#0" expanded="false" />
-            <element signature="e#14839#14955#0" expanded="false" />
-            <element signature="e#17716#18619#0" expanded="false" />
+            <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>
@@ -336,23 +313,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#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#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#3;n#div#0;n#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#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#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#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#textarea#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -368,13 +328,11 @@
         <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="e#9926#10781#0" expanded="false" />
-            <element signature="e#10832#11151#0" expanded="false" />
-            <element signature="e#11208#11375#0" expanded="false" />
-            <element signature="e#11416#11503#0" expanded="false" />
-            <element signature="e#12114#14707#0" expanded="false" />
-            <element signature="e#14839#14955#0" expanded="false" />
-            <element signature="e#17716#18619#0" expanded="false" />
+            <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>
@@ -426,13 +384,11 @@
         <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="e#9926#10781#0" expanded="false" />
-            <element signature="e#10832#11151#0" expanded="false" />
-            <element signature="e#11208#11375#0" expanded="false" />
-            <element signature="e#11416#11503#0" expanded="false" />
-            <element signature="e#12114#14707#0" expanded="false" />
-            <element signature="e#14839#14955#0" expanded="false" />
-            <element signature="e#17716#18619#0" expanded="false" />
+            <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>
@@ -484,24 +440,15 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="722" column="45" selection-start-line="722" selection-start-column="45" selection-end-line="722" selection-end-column="45" />
           <folding>
-            <element signature="e#9926#10781#0" expanded="false" />
-            <element signature="e#10832#11151#0" expanded="false" />
-            <element signature="e#11208#11375#0" expanded="false" />
-            <element signature="e#11416#11503#0" expanded="false" />
-            <element signature="e#12114#14707#0" expanded="false" />
-            <element signature="e#14839#14955#0" expanded="false" />
-            <element signature="e#17716#18619#0" expanded="false" />
+            <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/my/my-message-sys.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.16587302">
-          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/app.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -523,13 +470,6 @@
         </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.33280253">
-          <caret line="142" column="18" selection-start-line="142" selection-start-column="12" selection-end-line="142" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/aboutMiao.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.07539683">
@@ -558,211 +498,198 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/letterDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.25">
-          <caret line="7" column="14" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="4" column="76" selection-start-line="4" selection-start-column="76" selection-end-line="4" selection-end-column="76" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="73" column="24" selection-start-line="73" selection-start-column="12" selection-end-line="73" selection-end-column="24" />
+        <state vertical-scroll-proportion="-5.357143">
+          <caret line="6" column="35" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/letterDetail.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-recharge.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="4" column="76" selection-start-line="4" selection-start-column="76" selection-end-line="4" selection-end-column="76" />
+        <state vertical-scroll-proportion="-0.96666664">
+          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/personalLetter.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/care.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.06031746">
-          <caret line="4" column="31" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
+        <state vertical-scroll-proportion="0.10714286">
+          <caret line="6" column="42" selection-start-line="6" selection-start-column="42" selection-end-line="6" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+    <entry file="file://$PROJECT_DIR$/templates/tabs.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.04761905">
+          <caret line="2" column="53" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="26" column="46" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" />
-          <folding>
-            <element signature="n#style#0;n#img#0;n#a#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#em#0;n#a#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#img#0;n#a#1;n#div#5;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#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#b#0;n#a#2;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+          <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2969745">
-          <caret line="28" column="66" selection-start-line="28" selection-start-column="52" selection-end-line="28" selection-end-column="66" />
-          <folding />
+        <state vertical-scroll-proportion="0.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$/templates/my/my-message.html">
+    <entry file="file://$PROJECT_DIR$/js/services/commonservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-10.607142">
-          <caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
-          <folding />
+        <state vertical-scroll-proportion="0.24363057">
+          <caret line="72" column="59" selection-start-line="72" selection-start-column="53" selection-end-line="72" selection-end-column="59" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
+    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.357143">
-          <caret line="6" column="35" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="35" />
-          <folding />
+        <state vertical-scroll-proportion="0.28582802">
+          <caret line="51" column="25" selection-start-line="51" selection-start-column="25" selection-end-line="51" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-13.0625">
-          <caret line="43" column="17" selection-start-line="43" selection-start-column="12" selection-end-line="43" selection-end-column="17" />
-          <folding />
+        <state vertical-scroll-proportion="-21.75">
+          <caret line="30" column="35" selection-start-line="30" selection-start-column="24" selection-end-line="30" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/router.js">
+    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.014751553">
-          <caret line="333" column="27" selection-start-line="333" selection-start-column="27" selection-end-line="333" selection-end-column="27" />
-          <folding />
+        <state vertical-scroll-proportion="0.39171976">
+          <caret line="89" column="18" selection-start-line="89" selection-start-column="18" selection-end-line="89" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <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="-2.9">
+          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.24442676">
+          <caret line="265" column="14" selection-start-line="265" selection-start-column="14" selection-end-line="266" selection-end-column="38" />
           <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.06921824">
-          <caret line="85" column="22" selection-start-line="85" selection-start-column="22" selection-end-line="85" selection-end-column="22" />
-          <folding>
-            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#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#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#3;n#div#0;n#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#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#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#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#textarea#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.57491857">
-          <caret line="104" column="96" selection-start-line="104" selection-start-column="96" selection-end-line="104" selection-end-column="96" />
-          <folding>
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.06758957">
-          <caret line="258" column="24" selection-start-line="258" selection-start-column="24" selection-end-line="258" selection-end-column="24" />
+        <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$/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33540374">
-          <caret line="42" column="38" selection-start-line="42" selection-start-column="38" selection-end-line="42" selection-end-column="38" />
+        <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/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.21875">
-          <caret line="467" column="16" selection-start-line="467" selection-start-column="16" selection-end-line="467" selection-end-column="16" />
-          <folding />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-recharge.html">
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.96666664">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
+        <state 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" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/care.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/personalLetter.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.10714286">
-          <caret line="6" column="42" selection-start-line="6" selection-start-column="42" selection-end-line="6" selection-end-column="42" />
+          <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
           <folding>
-            <element signature="n#style#0;n#div#2;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#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" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/tabs.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.04761905">
-          <caret line="2" column="53" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="53" />
+        <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" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.214286">
-          <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
+        <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" />
           <folding>
-            <element signature="n#style#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#div#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#div#1;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#div#2;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#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;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="0.4378981">
-          <caret line="463" column="17" selection-start-line="463" selection-start-column="17" selection-end-line="463" selection-end-column="17" />
+        <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" />
+          <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$/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" />
           <folding>
-            <element signature="e#9926#10781#0" expanded="false" />
-            <element signature="e#10832#11151#0" expanded="false" />
-            <element signature="e#11208#11375#0" expanded="false" />
-            <element signature="e#11416#11503#0" expanded="false" />
-            <element signature="e#12114#14707#0" expanded="false" />
-            <element signature="e#14839#14955#0" expanded="false" />
-            <element signature="e#17716#18619#0" expanded="false" />
+            <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="..." />
           </folding>
         </state>
       </provider>

miaomiao/www/css/style.css

@@ -822,3 +822,12 @@ 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%
+}

miaomiao/www/js/config/config.js

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

miaomiao/www/js/config/router.js

@@ -259,20 +259,20 @@
                 url: '/home/message',
                 views: {
                     'app-home': {
-                        templateUrl: 'templates/my/my-message.html',
-                        controller: 'homeMessageCtrl'
-                    }
-                }
-            })
-            .state('app.dream_message', {
-                url: '/my/message',
-                views: {
-                    'app-my': {
                         templateUrl: 'templates/my/my-message.html',
                         controller: 'messageCtrl'
                     }
                 }
             })
+            //.state('app.dream_message', {
+            //    url: '/my/message',
+            //    views: {
+            //        'app-my': {
+            //            templateUrl: 'templates/my/my-message.html',
+            //            controller: 'messageCtrl'
+            //        }
+            //    }
+            //})
         .state('app.my_message_sys', {
                 url: '/my/message/sys',
                 views: {

miaomiao/www/js/controllers/account.js

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

miaomiao/www/js/controllers/home.js

@@ -12,7 +12,7 @@
             //};
             homeService.messageInfo().then(function(result){
                 $scope.infos = result.data.data;
-                if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){
+                if($scope.infos.dream_info.number==0 && $scope.infos.sup_info.number==0 && $scope.infos.system_info.number==0){
                     $scope.showMessage=0;
                 }
                 else {
@@ -244,7 +244,7 @@
                 });
                 homeService.messageInfo().then(function(result){
                     $scope.infos = result.data.data;
-                    if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){
+                    if($scope.infos.dream_info.number==0 && $scope.infos.sup_info.number==0 && $scope.infos.system_info.number==0){
                         $scope.showMessage=0;
                     }
                     else {
@@ -730,7 +730,6 @@
                         $scope.video.isOK = true;
                         $scope.video.file = response.data.file;
                         $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
-                        //console.log("vpic:"+$scope.video.vpic);
                     }, function (error) {
                         msg.error('视频上传失败');
                     });
@@ -739,7 +738,9 @@
                 });
             };
             $scope.deletevideo = function (file) {
-                common.deletefile(file).then(function () {
+                common.deletefile(file).then(function (res) {
+                },function(erro){
+                    alert(JSON.stringify(erro));
                 })
             };
           $ionicModal.fromTemplateUrl('recharge-modal.html', {
@@ -933,48 +934,48 @@
                 $scope.hideAbout = false;
             };
         }]);
-    app.controller('homeMessageCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
-        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
-            $scope.$on('$ionicView.beforeEnter', function () {
-                $ionicTabsDelegate.showBar(false);
-                myService.messageInfo().then(function(result){
-                    $scope.infos = result.data.data;
-                },function(error){
-
-                });
-            });
-            $scope.notRead = function(){
-                myService.notRead().then(function(result){
-                    myService.messageInfo().then(function(result){
-                        $scope.infos = result.data.data;
-                    },function(error){
-
-                    });
-                },function(error){
-
-                })
-            };
-            //系统消息
-            $scope.systemInfo = function(){
-                $state.go("app.message_sys");
-                myService.systemInfo().then(function(result){
-                },function(error){
-
-                });
-            };
-            //回复我的
-            $scope.replyMy = function(){
-                $state.go("app.message_reply");
-                myService.replyMy().then(function(result){
-
-                },function(error){
-
-                });
-            };
-            $scope.personalLetter = function(){
-                $state.go("app.letter");
-            }
-        }]);
+    //app.controller('homeMessageCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
+    //    , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+    //        $scope.$on('$ionicView.beforeEnter', function () {
+    //            $ionicTabsDelegate.showBar(false);
+    //            myService.messageInfo().then(function(result){
+    //                $scope.infos = result.data.data;
+    //            },function(error){
+    //
+    //            });
+    //        });
+    //        $scope.notRead = function(){
+    //            myService.notRead().then(function(result){
+    //                myService.messageInfo().then(function(result){
+    //                    $scope.infos = result.data.data;
+    //                },function(error){
+    //
+    //                });
+    //            },function(error){
+    //
+    //            })
+    //        };
+    //        //系统消息
+    //        $scope.systemInfo = function(){
+    //            $state.go("app.message_sys");
+    //            myService.systemInfo().then(function(result){
+    //            },function(error){
+    //
+    //            });
+    //        };
+    //        //回复我的
+    //        $scope.replyMy = function(){
+    //            $state.go("app.message_reply");
+    //            myService.replyMy().then(function(result){
+    //
+    //            },function(error){
+    //
+    //            });
+    //        };
+    //        $scope.personalLetter = function(){
+    //            $state.go("app.letter");
+    //        }
+    //    }]);
     app.controller('oldDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
             var user_id = $stateParams.user_id;

miaomiao/www/js/controllers/my.js

@@ -359,10 +359,10 @@
                 $state.go("app.attention_Detail",{user_id:user_id,items:$scope.items})
             };
         }]);
-    app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
-        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
-            
-        }]);
+    //app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
+    //    , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
+    //
+    //    }]);
     app.controller('personalLetterCtrl', ["$scope","$ionicTabsDelegate", '$location',"$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate,$location, $state,myService, msg, storage) {
             $scope.$on('$ionicView.beforeEnter', function () {
@@ -662,8 +662,8 @@
             }
 
         }]);
-    app.controller('messageCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
-        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+    app.controller('messageCtrl', ["$scope", "$location","$ionicTabsDelegate","$state", "myService", "msg"
+        , function ($scope,$location,$ionicTabsDelegate, $state, myService, msg) {
             $scope.$on('$ionicView.beforeEnter', function () {
                 $ionicTabsDelegate.showBar(false);
                 myService.messageInfo().then(function(result){
@@ -672,10 +672,6 @@
 
                 });
             });
-            //系统消息
-            $scope.systemInfo = function(){
-                $state.go("app.my_message_sys");
-            };
 
             $scope.notRead = function(){
                 myService.notRead().then(function(result){
@@ -688,14 +684,37 @@
 
                 })
             };
-            //回复我的
+            //梦想消息
+            $scope.systemInfo = function(){
+                if($location.path()=='/app/my/message'){
+                    $state.go("app.my_message_sys");
+                }
+                else {
+                    $state.go("app.message_sys");
+                    //myService.systemInfo().then(function(result){
+                    //},function(error){
+                    //
+                    //});
+                }
+            };
+            //支持消息
             $scope.replyMy = function(){
-                $state.go("app.my_message_reply");
+                if($location.path()=='/app/my/message'){
+                    $state.go("app.my_message_reply");
+                }
+                else {
+                    $state.go("app.message_reply");
+                }
             };
+            //通知
             $scope.personalLetter = function(){
-                $state.go("app.personalLetter");
-            }
-
+                if($location.path()=='/app/my/message'){
+                    $state.go("app.personalLetter");
+                }
+                else {
+                    $state.go("app.letter");
+                }
+            };
         }]);
     app.controller('dreamCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
   , function ($scope, $ionicTabsDelegate,$state, myService, msg) {
@@ -749,14 +768,47 @@
           $state.go('app.my_dreamdetail',{id:id});
       };
     }]);
-    app.controller('messageSysCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
-       , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+    app.controller('messageSysCtrl', ["$scope","$location", "$ionicTabsDelegate","$state", "myService", "msg"
+       , function ($scope,$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){
+                if(is_reply==1){
+                    msg.confirm('Brian向你的梦想支持了300梦想币！',template)
+                }
+                if(is_url==1){
+                    if($location.path()=="/app/home/message/sys"){
+                        $state.go('app.home_dreamdetail',{id:dream_id,type:2});
+                    }
+                    else {
+                        $state.go('app.my_dreamdetail',{id:dream_id,type:2});
+                    }
+                }
+            }
        }]);
 
     app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg", "$ionicModal"

miaomiao/www/js/services/myservice.js

@@ -35,13 +35,13 @@
             },
             systemInfo:function(){
                 return $http({
-                    url:config.server + "api/my/system_info",
+                    url:config.server + "api/my/dream_info",
                     method:"get"
                 })
             },
             replyMy:function(){
                 return $http({
-                    url:config.server + "api/my/reply",
+                    url:config.server + "api/my/sup_info",
                     method:"get"
                 })
             },
@@ -199,7 +199,7 @@
             },
             letter:function(){
                 return $http({
-                    url:config.server + "api/my/letter",
+                    url:config.server + "api/my/system_info",
                     method:"get"
                 })
             }

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

@@ -1,9 +1,8 @@
-<ion-view view-title="回复我的">
+<ion-view view-title="支持消息">
     <ion-content>
         <div class="list list-user-set" ng-click="goDetail(item.dreamid,item.interaction_id)" ng-repeat="item in comments" style="color: #737373; margin-bottom: 0">
             <a class="item" style="border-bottom: 1px solid #EAEAEA">
-                <em style="color: #000">{{item.user_nickname}} </em> 回复你：
-                <p>{{item.content}}</p>
+                <em style="color: #000">{{item.message}} </em>
             </a>
         </div>
     </ion-content>

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

@@ -1,7 +1,8 @@
-<ion-view view-title="系统消息">
+<ion-view view-title="梦想消息">
     <ion-content>
+        <div style="color: #B3B3B3" ng-if="sysInfos==''">暂时还没有梦想消息哦</div>
         <div class="list" ng-repeat="sysInfo in sysInfos">
-            <a class="item item-icon-left">
+            <a ng-click="goMes(sysInfo.is_reply,sysInfo.is_url,sysInfo.dream_id)" class="item item-icon-left">
                 <i class="icon ion-volume-medium"></i>
                 <em class="fl">{{sysInfo.message}}</em>
             </a>

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

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

miaomiao/www/templates/my/personalLetter.html

@@ -1,8 +1,8 @@
-<ion-view view-title="私信">
+<ion-view view-title="通知">
     <ion-content>
         <div class="list list-user-set" ng-repeat="item in items" style="color: #737373">
-            <a ng-click="toLetter(item.touser.id)" class="item" style="border-bottom: 1px solid #EAEAEA">
-                <em style="color: #000">{{item.touser.nickname}}</em> 给你发了个私信哦，点击去看看!
+            <a class="item" style="border-bottom: 1px solid #EAEAEA">
+                <em style="color: #000">{{item.message}}</em>
             </a>
         </div>
     </ion-content>