add

miaomiao/www/.idea/workspace.xml

@@ -21,54 +21,41 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="login.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/account/login.html">
+      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-1.3571428">
-              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-              <folding>
-                <element signature="n#style#0;n#img#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#div#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/home/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-7.172414">
-              <caret line="76" column="88" selection-start-line="76" selection-start-column="80" selection-end-line="76" selection-end-column="88" />
+            <state vertical-scroll-proportion="-7.357143">
+              <caret line="436" column="42" selection-start-line="436" selection-start-column="42" selection-end-line="436" selection-end-column="42" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="filter.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
+      <file leaf-file-name="login.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/account/login.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.5102421">
-              <caret line="73" column="30" selection-start-line="73" selection-start-column="30" selection-end-line="73" selection-end-column="30" />
+            <state vertical-scroll-proportion="-5.428571">
+              <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="account.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+      <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="0.0">
-              <caret line="20" column="63" selection-start-line="20" selection-start-column="63" selection-end-line="20" selection-end-column="63" />
+              <caret line="335" column="37" selection-start-line="335" selection-start-column="37" selection-end-line="335" selection-end-column="37" />
               <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">
+      <file leaf-file-name="account.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="541" column="34" selection-start-line="541" selection-start-column="34" selection-end-line="541" selection-end-column="34" />
+            <state vertical-scroll-proportion="0.36860672">
+              <caret line="11" column="19" selection-start-line="6" selection-start-column="15" selection-end-line="11" selection-end-column="19" />
               <folding />
             </state>
           </provider>
@@ -81,6 +68,7 @@
       <list>
         <option value="HTML File" />
         <option value="JavaScript File" />
+        <option value="CSS File" />
       </list>
     </option>
   </component>
@@ -95,7 +83,6 @@
         <option value="$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/templates/tabs.html" />
         <option value="$PROJECT_DIR$/js/controllers/tabs.js" />
-        <option value="$PROJECT_DIR$/js/services/homeservice.js" />
         <option value="$PROJECT_DIR$/templates/home/search.html" />
         <option value="$PROJECT_DIR$/templates/my/index.html" />
         <option value="$PROJECT_DIR$/js/config/config.js" />
@@ -107,28 +94,34 @@
         <option value="$PROJECT_DIR$/templates/home/oldDream.html" />
         <option value="$PROJECT_DIR$/templates/my/my-collect.html" />
         <option value="E:/Graduation design/huiwei/js/index.js" />
-        <option value="$PROJECT_DIR$/templates/home/index.html" />
         <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
         <option value="$PROJECT_DIR$/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/templates/my/my-profile.html" />
         <option value="E:/Graduation design/huiwei/css/index.css" />
         <option value="$PROJECT_DIR$/js/controllers/add.js" />
         <option value="E:/Graduation design/huiwei/index.html" />
-        <option value="$PROJECT_DIR$/templates/account/loginAccount.html" />
         <option value="E:/Graduation design/huiwei/package.json" />
         <option value="E:/Graduation design/huiwei/gulpfile.js" />
-        <option value="E:/Graduation design/lala/package.json" />
         <option value="E:/Graduation design/lala/a.js" />
+        <option value="$PROJECT_DIR$/js/config/router.js" />
+        <option value="$PROJECT_DIR$/js/services/userservice.js" />
         <option value="E:/Graduation design/lala/index.html" />
+        <option value="E:/Graduation design/lala/src/index.html" />
+        <option value="$PROJECT_DIR$/style.css" />
         <option value="E:/Graduation design/lala/gulpfile.js" />
-        <option value="$PROJECT_DIR$/js/controllers/home.js" />
-        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
+        <option value="E:/Graduation design/lala/package.json" />
+        <option value="E:/Graduation design/lala/src/css/style.css" />
         <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/templates/account/login.html" />
-        <option value="$PROJECT_DIR$/js/config/router.js" />
-        <option value="$PROJECT_DIR$/js/services/userservice.js" />
-        <option value="$PROJECT_DIR$/js/controllers/account.js" />
+        <option value="$PROJECT_DIR$/templates/home/index.html" />
+        <option value="$PROJECT_DIR$/js/services/homeservice.js" />
         <option value="$PROJECT_DIR$/js/filters/filter.js" />
+        <option value="$PROJECT_DIR$/js/services/commonservice.js" />
+        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/templates/account/loginAccount.html" />
+        <option value="$PROJECT_DIR$/js/directives/directive.js" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/js/controllers/account.js" />
       </list>
     </option>
   </component>
@@ -138,10 +131,32 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="500" />
-    <option name="width" value="876" />
+    <option name="x" value="407" />
+    <option name="width" value="958" />
     <option name="height" value="728" />
   </component>
+  <component name="ProjectInspectionProfilesVisibleTreeState">
+    <entry key="Project Default">
+      <profile-state>
+        <expanded-state>
+          <State>
+            <id />
+          </State>
+          <State>
+            <id>Data flow issuesJavaScript</id>
+          </State>
+          <State>
+            <id>JavaScript</id>
+          </State>
+        </expanded-state>
+        <selected-state>
+          <State>
+            <id>CoffeeScript</id>
+          </State>
+        </selected-state>
+      </profile-state>
+    </entry>
+  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
@@ -167,6 +182,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -178,7 +194,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -187,8 +202,21 @@
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
+    <property name="settings.editor.selected.configurable" value="liveEdit" />
+    <property name="settings.editor.splitter.proportion" value="0.2" />
+    <property name="list.type.of.created.stylesheet" value="CSS" />
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Gulp.js.default">
+    <configuration default="false" name="default" type="js.build_tools.gulp" factoryName="Gulp.js" temporary="true">
+      <node-options />
+      <gulpfile>E:/Graduation design/lala/gulpfile.js</gulpfile>
+      <tasks>
+        <task>default</task>
+      </tasks>
+      <arguments />
+      <envs />
+      <method />
+    </configuration>
     <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
       <method />
     </configuration>
@@ -237,6 +265,14 @@
       <recursive>false</recursive>
       <method />
     </configuration>
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="Gulp.js.default" />
+    </list>
+    <recent_temporary>
+      <list size="1">
+        <item index="0" class="java.lang.String" itemvalue="Gulp.js.default" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="ShelveChangesManager" show_recycled="false" />
   <component name="SvnConfiguration">
@@ -252,14 +288,14 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="500" y="0" width="876" height="728" extended-state="0" />
+    <frame x="407" y="0" width="958" height="728" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16871509" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16825776" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32885906" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24916202" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -289,13 +325,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/js/app.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.1183534">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/my-setting.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.44504505">
@@ -310,13 +339,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/httpinterceptor.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.36878216">
-          <caret line="13" column="26" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/my-message.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.392857">
@@ -492,13 +514,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.7">
-          <caret line="79" column="24" selection-start-line="79" selection-start-column="12" selection-end-line="79" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../package.json">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -523,158 +538,175 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/account/loginAccount.html">
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.7142856">
-          <caret line="4" column="14" selection-start-line="1" selection-start-column="38" selection-end-line="4" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.17625232">
+          <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/huiwei/package.json">
+    <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7050093">
-          <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.5102421">
+          <caret line="40" column="14" selection-start-line="34" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/huiwei/gulpfile.js">
+    <entry file="file://E:/Graduation design/lala/src/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.16754851">
-          <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.070500925">
+          <caret line="2" column="1" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/lala/package.json">
+    <entry file="file://$PROJECT_DIR$/js/services/userservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="5" column="14" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.33509701">
+          <caret line="10" column="54" selection-start-line="10" selection-start-column="48" selection-end-line="10" selection-end-column="54" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/lala/gulpfile.js">
+    <entry file="file://E:/Graduation design/lala/src/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2680776">
-          <caret line="8" column="36" selection-start-line="8" selection-start-column="36" selection-end-line="8" selection-end-column="36" />
+        <state vertical-scroll-proportion="0.2820037">
+          <caret line="8" column="6" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/lala/a.js">
+    <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+        <state vertical-scroll-proportion="-2.586207">
+          <caret line="45" column="20" selection-start-line="45" selection-start-column="20" selection-end-line="45" selection-end-column="20" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/lala/index.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.428571">
-          <caret line="8" column="8" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
+        <state vertical-scroll-proportion="-10.810345">
+          <caret line="162" column="52" selection-start-line="162" selection-start-column="52" selection-end-line="162" selection-end-column="52" />
+          <folding>
+            <element signature="n#style#0;n#img#0;n#a#0;n#div#0;n#div#0;n#ion-item#0;n#ion-list#0;n#ion-content#0;n#ion-side-menu#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#a#1;n#div#0;n#div#0;n#ion-item#0;n#ion-list#0;n#ion-content#0;n#ion-side-menu#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#ion-item#0;n#ion-list#0;n#ion-content#0;n#ion-side-menu#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="104" column="30" selection-start-line="104" selection-start-column="30" selection-end-line="104" selection-end-column="30" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17625232">
-          <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="-5.9666667">
+          <caret line="130" column="25" selection-start-line="130" selection-start-column="20" selection-end-line="130" selection-end-column="25" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
+    <entry file="file://$PROJECT_DIR$/js/config/router.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5102421">
-          <caret line="40" column="14" selection-start-line="34" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
+    <entry file="file://$PROJECT_DIR$/js/directives/directive.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6306483">
-          <caret line="523" column="22" selection-start-line="523" selection-start-column="22" selection-end-line="523" selection-end-column="22" />
+        <state vertical-scroll-proportion="3.5027933">
+          <caret line="186" column="22" selection-start-line="186" selection-start-column="22" selection-end-line="186" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/js/platformOverrides.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29469547">
-          <caret line="428" column="14" selection-start-line="428" selection-start-column="14" selection-end-line="428" selection-end-column="14" />
-          <folding>
-            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#img#1;n#div#2;n#div#1;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#div#1;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#2;n#div#1;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/userservice.js">
+    <entry file="file://$PROJECT_DIR$/js/app.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33509701">
-          <caret line="10" column="54" selection-start-line="10" selection-start-column="48" selection-end-line="10" selection-end-column="54" />
+        <state vertical-scroll-proportion="-0.48603353">
+          <caret line="52" column="24" selection-start-line="52" selection-start-column="19" selection-end-line="52" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/router.js">
+    <entry file="file://$PROJECT_DIR$/js/services/commonservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.38919926">
-          <caret line="11" column="37" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
+        <state vertical-scroll-proportion="0.5400372">
+          <caret line="276" column="27" selection-start-line="276" selection-start-column="22" selection-end-line="276" selection-end-column="27" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+    <entry file="file://$PROJECT_DIR$/js/services/httpinterceptor.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="20" column="63" selection-start-line="20" selection-start-column="63" selection-end-line="20" selection-end-column="63" />
+        <state vertical-scroll-proportion="0.33333334">
+          <caret line="38" column="28" selection-start-line="38" selection-start-column="23" selection-end-line="38" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/js/services/utilservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="541" column="34" selection-start-line="541" selection-start-column="34" selection-end-line="541" selection-end-column="34" />
+        <state vertical-scroll-proportion="0.33333334">
+          <caret line="19" column="49" selection-start-line="19" selection-start-column="47" selection-end-line="19" selection-end-column="49" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/account/login.html">
+    <entry file="file://$PROJECT_DIR$/templates/account/loginAccount.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.3571428">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        <state vertical-scroll-proportion="0.35250464">
+          <caret line="10" column="23" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
           <folding>
-            <element signature="n#style#0;n#img#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#div#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="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/templates/account/login.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.172414">
-          <caret line="76" column="88" selection-start-line="76" selection-start-column="80" selection-end-line="76" selection-end-column="88" />
+        <state vertical-scroll-proportion="-5.428571">
+          <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5102421">
-          <caret line="73" column="30" selection-start-line="73" selection-start-column="30" selection-end-line="73" selection-end-column="30" />
+        <state vertical-scroll-proportion="-7.357143">
+          <caret line="436" column="42" selection-start-line="436" selection-start-column="42" selection-end-line="436" selection-end-column="42" />
+          <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="335" column="37" selection-start-line="335" selection-start-column="37" selection-end-line="335" selection-end-column="37" />
+          <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.36860672">
+          <caret line="11" column="19" selection-start-line="6" selection-start-column="15" selection-end-line="11" selection-end-column="19" />
           <folding />
         </state>
       </provider>

miaomiao/www/.project

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>www</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.pandora.projects.ui.MKeyBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.pandora.projects.ui.MKeyNature</nature>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1503566028021</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

miaomiao/www/js/controllers/account.js

@@ -1,6 +1,6 @@
 (function (app) {
-    app.controller('wechatLoginCtrl', ["$scope", "userService","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","$timeout",
-        function ($scope, userService,$ionicNavBarDelegate, storage, $state, msg, $http, util, $timeout) {
+    app.controller('wechatLoginCtrl', ["$scope","$timeout", "userService","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","$timeout",
+        function ($scope,$timeout, userService,$ionicNavBarDelegate, storage, $state, msg, $http, util, $timeout) {
              //$ionicNavBarDelegate.showBackButton(false);
             $scope.loginbywx = function(){
                 var scope = "snsapi_userinfo", state = "_" + (+new Date());
@@ -18,7 +18,11 @@
                     $scope.user=storage.getObject('user');
                     $state.go('app.home');
                 },function(error){
-                    $state.go("loginAccount",{wechat:$scope.wecaht})
+                    alert("Failed: " + error);
+                    $timeout(function(){
+                        $state.go("loginAccount",{wechat:$scope.wecaht})
+                    },2000);
+                    //window.location.href="#/account/loginAccount?wechat=$scope.wecaht";
                 });
             };
     }]);
@@ -26,7 +30,6 @@
         function ($scope, userService,$stateParams,$ionicNavBarDelegate, storage, $state, msg, $http, util, $timeout) {
             //$ionicNavBarDelegate.showBackButton(false);
             $scope.wecaht = $stateParams.wechat;
-            debugger;
             $scope.vm = {
                 mobile: '',
                 verify_code: '',
@@ -46,15 +49,6 @@
                     // msg.error(error.data.message);
                 });
             };
-            /*     $scope.loginbywx = function () {
-             var scope = "snsapi_userinfo", state = "_" + (+new Date());
-             Wechat.auth(scope, state, function (response) {
-
-             alert(JSON.stringify(response));
-             }, function (reason) {
-             alert("Failed: " + reason);
-             });
-             };*/
 
             //获取验证码
             $scope.getVerifyCode = function () {

miaomiao/www/js/controllers/home.js

@@ -32,10 +32,6 @@
             $ionicSideMenuDelegate.toggleLeft();
         };
 
-        $scope.doFilter = function () {
-            $ionicSideMenuDelegate.toggleRight();
-        };
-
         $scope.openPopover = function ($event) {
             $scope.popover.show($event);
         };
@@ -108,7 +104,7 @@
                         $scope.filter.age = 5;
                     }
                     break;
-                case '>38':
+                case '>37':
                     if ($scope.filter.age == 6) {
                         $scope.filter.age = 0;
                     } else {
@@ -128,6 +124,14 @@
             age: 0,//0:全部,1:18-21,2:22-25,3:26-29,4:30-33,5:34-37,6:>38,
             city:''
         };
+            $scope.doFilter = function () {
+                homeService.doFilter($scope.filter.sex,$scope.filter.age,$scope.filter.city).then(function(result){
+                    $scope.index.dreams = result.data.data.dreams.data;
+                },function(error){
+                    msg.error(data.error.message);
+                });
+                //$ionicSideMenuDelegate.toggleRight();
+            };
         $scope.index = {
             banner: [],
             users: [],
@@ -208,8 +212,8 @@
         });
     }]);
 
-    app.controller('dreamDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams","$ionicBackdrop", "$timeout", "$ionicScrollDelegate", "$interval"
-        , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams,$ionicBackdrop, $timeout, $ionicScrollDelegate, $interval) {
+    app.controller('dreamDetailCtrl', ["$scope", "$state", "WechatService","$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams","$ionicBackdrop", "$timeout", "$ionicScrollDelegate", "$interval"
+        , function ($scope, $state,WechatService,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams,$ionicBackdrop, $timeout, $ionicScrollDelegate, $interval) {
         var id = $stateParams.id;
         var top3user = '';
             $scope.chosedIndex = 0;
@@ -326,47 +330,25 @@
             $scope.toRecharge = function(){
                 $state.go("app.recharge")
             };
-            $scope.shareDream = function (type) {
-                if (type==1) {//微信
+            $scope.share = function (type) {
+                if (type==0) {//分享给朋友
                     Wechat.share({
-                        text: "微信分享",
+                        text: "微信分享瞄瞄",
                         scene: Wechat.Scene.TIMELINE   // share to Timeline
                     }, function () {
                         alert("Success");
                     }, function (reason) {
                         alert("Failed: " + reason);
                     });
-                    //Wechat.share({
-                    //    message: {
-                    //        title: "微信分享",
-                    //        description: "This is description.",
-                    //        thumb: "www/img/thumbnail.png",
-                    //        mediaTagName: "TEST-TAG-001",
-                    //        messageExt: "这是第三方带的测试字段",
-                    //        messageAction: "<action>dotalist</action>",
-                    //        media: "YOUR_MEDIA_OBJECT_HERE"
-                    //    },
-                    //    scene: Wechat.Scene.TIMELINE   // share to Timeline
-                    //}, function () {
-                    //    alert("Success");
-                    //}, function (reason) {
-                    //    alert("Failed: " + reason);
-                    //});
-                    //Wechat.share({
-                    //    message: {
-                    //        media: {
-                    //            type: Wechat.Type.WEBPAGE,
-                    //            webpageUrl: "http://tech.qq.com/zt2012/tmtdecode/252.htm"
-                    //        }
-                    //    },
-                    //    scene: Wechat.Scene.TIMELINE   // share to Timeline
-                    //}, function () {
-                    //    alert("Success");
-                    //}, function (reason) {
-                    //    alert("Failed: " + reason);
-                    //});
+
+                    homeService.share($scope.dream.id).then(function(result){
+
+                    },function(error){
+
+                    });
+
                 }
-                if (type == 2) {//微博  https://github.com/iVanPan/cordova_weibo/blob/master/README_ZH.md
+                /*if (type == 2) {//微博  https://github.com/iVanPan/cordova_weibo/blob/master/README_ZH.md
                     var args = {};
                     args.text = '微博文字分享';
                     WeiboSDK.shareTextToWeibo(function () {
@@ -374,6 +356,38 @@
                     }, function (failReason) {
                         alert(failReason);
                     }, args);
+                }*/
+                if(type==1){
+                    /*Wechat.share({
+                        message: {
+                            title: "微信分享",
+                            description: "This is description.",
+                            thumb: "www/img/thumbnail.png",
+                            mediaTagName: "TEST-TAG-001",
+                            messageExt: "这是第三方带的测试字段",
+                            messageAction: "<action>dotalist</action>",
+                            media: "YOUR_MEDIA_OBJECT_HERE"
+                        },
+                        scene: Wechat.Scene.SESSION   // share to Timeline
+                    }, function () {
+                        alert("Success");
+                    }, function (reason) {
+                        alert("Failed: " + reason);
+                    });*/
+                    Wechat.share({
+                        message: {
+                            title:"瞄瞄",
+                            media: {
+                                type: Wechat.Type.WEBPAGE,
+                                webpageUrl: "http://tech.qq.com/zt2012/tmtdecode/252.htm"
+                            }
+                        },
+                        scene: Wechat.Scene.SESSION
+                    }, function () {
+                        alert("Success");
+                    }, function (reason) {
+                        alert("Failed: " + reason);
+                    });
                 }
              //   $state.go("app.shareDream",{item:$scope.dream});
             };

miaomiao/www/js/directives/directive.js

@@ -14,6 +14,26 @@
             }
         };
     });
+    module.factory('WechatService', [ function () {
+        function share(params) {
+            if (typeof Wechat === "undefined") {
+                alert("手机尚未安装微信");
+                return false;
+            }
+
+            var json = {};
+            Wechat.share(params, function () {
+                alert(分享成功);
+            }, function (reason) {
+                alert('Failed'+ reason);
+            });
+            return true;
+        }
+
+        return {
+            share: share
+        }
+    }]);
     module.directive('vidDir', [function () {
         return {
             restrict: 'A',
@@ -164,7 +184,7 @@
                             unbindBackButtonAction();
                             unbindBackButtonAction = null;
                         }
-                    }
+                    };
 
                     element.bind('click', onClick);
                     element.bind('touchend', onClick);

miaomiao/www/js/services/homeservice.js

@@ -89,15 +89,21 @@
                     method:"get"
                 })
             },
-       /*     collectionDream:function(id,is_collection){
+            messageInfo:function(){
                 return $http({
-                    url:config.server + "api/dream/collection?id=" + id+"&is_collection="+is_collection,
+                    url:config.server + "api/my/info",
                     method:"get"
                 })
-            },*/
-            messageInfo:function(){
+            },
+            doFilter:function(sex,age,area){
                 return $http({
-                    url:config.server + "api/my/info",
+                    url:config.server + "api/index/filter?sex=" + sex+"&age="+age + "&area="+area,
+                    method:"get"
+                })
+            },
+            share:function(id){
+                return $http({
+                    url:config.server + "api/dream/share?id=" + id,
                     method:"get"
                 })
             }

miaomiao/www/manifest.json

@@ -0,0 +1,425 @@
+{
+    "@platforms": ["android", "iPhone", "iPad"],
+    "id": "H59104B13",/*应用的标识，创建应用时自动生成，勿手动修改*/
+    "name": "www",/*应用名称，程序桌面图标名称*/
+    "version": {
+        "name": "1.0",/*应用版本名称*/
+        "code": ""
+    },
+    "description": "",/*应用描述信息*/
+    "icons": {
+        "72": "icon.png"
+    },
+    "launch_path": "index.html",/*应用的入口页面，默认为根目录下的index.html；支持网络地址，必须以http://或https://开头*/
+    "developer": {
+        "name": "",/*开发者名称*/
+        "email": "",/*开发者邮箱地址*/
+        "url": ""/*开发者个人主页地址*/
+    },
+    "permissions": {
+        "Accelerometer": {
+            "description": "访问加速度感应器"
+        },
+        "Audio": {
+            "description": "访问麦克风"
+        },
+        "Messaging":{
+        	"description": "短彩邮件插件"
+        },
+        "Cache": {
+            "description": "管理应用缓存"
+        },
+        "Camera": {
+            "description": "访问摄像头"
+        },
+        "Console": {
+            "description": "跟踪调试输出日志"
+        },
+        "Contacts": {
+            "description": "访问系统联系人信息"
+        },
+        "Device": {
+            "description": "访问设备信息"
+        },
+        "Downloader": {
+            "description": "文件下载管理"
+        },
+        "Events": {
+            "description": "应用扩展事件"
+        },
+        "File": {
+            "description": "访问本地文件系统"
+        },
+        "Gallery": {
+            "description": "访问系统相册"
+        },
+        "Geolocation": {
+            "description": "访问位置信息"
+        },
+        "Invocation": {
+            "description": "使用Native.js能力"
+        },
+        "Orientation": {
+            "description": "访问方向感应器"
+        },
+        "Proximity": {
+            "description": "访问距离感应器"
+        },
+        "Storage": {
+            "description": "管理应用本地数据"
+        },
+        
+        "Uploader": {
+            "description": "管理文件上传任务"
+        },
+        "Runtime": {
+            "description": "访问运行期环境"
+        },
+        "XMLHttpRequest": {
+            "description": "跨域网络访问"
+        },
+        "Zip": {
+            "description": "文件压缩与解压缩"
+        },
+        "Barcode": {
+            "description": "管理二维码扫描插件"
+        },
+        "Maps": {
+            "description": "管理地图插件"
+        },
+        "Speech": {
+            "description": "管理语音识别插件"
+        },
+        "Webview":{
+        	"description": "窗口管理"
+        },
+        "NativeUI":{
+        	"description": "原生UI控件"
+        },
+        "Navigator":{
+        	"description": "浏览器信息"
+        },
+        "NativeObj":{
+        	"description": "原生对象"
+        }
+    },
+    "plus": {
+        "splashscreen": {
+            "autoclose": true,/*是否自动关闭程序启动界面，true表示应用加载应用入口页面后自动关闭；false则需调plus.navigator.closeSplashscreen()关闭*/
+            "waiting": true/*是否在程序启动界面显示等待雪花，true表示显示，false表示不显示。*/
+        },
+        "popGesture": "close",/*设置应用默认侧滑返回关闭Webview窗口，"none"为无侧滑返回功能，"hide"为侧滑隐藏Webview窗口。参考http://ask.dcloud.net.cn/article/102*/
+        "runmode": "normal",/*应用的首次启动运行模式，可取liberate或normal，liberate模式在第一次启动时将解压应用资源（Android平台File API才可正常访问_www目录）*/
+        "signature": "Sk9JTiBVUyBtYWlsdG86aHIyMDEzQGRjbG91ZC5pbw==",/*可选，保���给应用签名，暂不使用*/
+        "distribute": {
+            "apple": {
+                "appid": "",/*iOS应用标识，苹果开发网站申请的appid，如io.dcloud.HelloH5*/
+                "mobileprovision": "",/*iOS应用打包配置文件*/
+                "password": "",/*iOS应用打包个人证书导入密码*/
+                "p12": "",/*iOS应用打包个人证书，打包配置文件关联的个人证书*/
+                "devices": "universal",/*iOS应用支持的设备类型，可取值iphone/ipad/universal*/
+                "frameworks":[
+                ]/*调用Native.js调用原生Objective-c API需要引用的FrameWork，如需调用GameCenter，则添加"GameKit.framework"*/
+            },
+            "google": {
+                "packagename": "",/*Android应用包名，如io.dcloud.HelloH5*/
+                "keystore": "",/*Android应用打包使用的密钥库文件*/
+                "password": "",/*Android应用打包使用密钥库中证书的密码*/
+                "aliasname": "",/*Android应用打包���用密钥库中证书的别名*/
+               "permissions": ["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]
+				/*使用Native.js调用原生安卓API需要使用到的系统权限*/
+            },
+            "orientation": [
+                "portrait-primary"
+            ],/*应用支持的方向，portrait-primary：竖屏正方向；portrait-secondary：竖屏反方向；landscape-primary：横屏正方向；landscape-secondary：横屏反方向*/
+            "icons": {
+                "ios": {
+                    "prerendered": true, /*应用图标是否已经高亮处理，在iOS6及以下设备上有效*/
+                    "auto": "", /*应用图标，分辨率：512x512，用于自动生成各种尺寸程序图标*/
+                    "iphone": {
+                        "normal": "", /*iPhone3/3GS程序图标，分辨率：57x57*/
+                        "retina": "", /*iPhone4程序图标，分辨率：114x114*/
+                        "retina7": "", /*iPhone4S/5/6程序图标，分辨率：120x120*/
+			"retina8": "", /*iPhone6 Plus程序图标，分辨率：180x180*/
+                        "spotlight-normal": "", /*iPhone3/3GS Spotlight搜索程序图标，分辨率：29x29*/
+                        "spotlight-retina": "", /*iPhone4 Spotlight搜索程序图标，分辨率：58x58*/
+                        "spotlight-retina7": "", /*iPhone4S/5/6 Spotlight搜索程序图标，分辨率：80x80*/
+                        "settings-normal": "", /*iPhone4设置页面程序图标，分辨率：29x29*/
+                        "settings-retina": "", /*iPhone4S/5/6设置页面程序图标，分辨率：58x58*/
+			"settings-retina8": "" /*iPhone6Plus设置页面程序图标，分辨率：87x87*/
+                    },
+                    "ipad": {
+                        "normal": "", /*iPad普通屏幕程序图标，分辨率：72x72*/
+                        "retina": "", /*iPad高分屏程序图标，分辨率：144x144*/
+                        "normal7": "", /*iPad iOS7程序图标，分辨率：76x76*/
+                        "retina7": "", /*iPad iOS7高分屏程序图标，分辨率：152x152*/
+                        "spotlight-normal": "", /*iPad Spotlight搜索程序图标，分辨率：50x50*/
+                        "spotlight-retina": "", /*iPad高分屏Spotlight搜索程序图标，分辨率：100x100*/
+                        "spotlight-normal7": "",/*iPad iOS7 Spotlight搜索程序图标，分辨率：40x40*/
+                        "spotlight-retina7": "",/*iPad iOS7高分屏Spotlight搜索程序图标，分辨率：80x80*/
+                        "settings-normal": "",/*iPad设置页面程序图标，分辨率：29x29*/
+                        "settings-retina": "" /*iPad高分屏设置页面程序图标，分辨率：58x58*/
+                    }
+                },
+                "android": {
+                    "mdpi": "", /*普通屏程序图标，分辨率：48x48*/
+                    "ldpi": "", /*大屏程序图标，分辨率：48x48*/
+                    "hdpi": "", /*高分屏程序图标，分辨率：72x72*/
+                    "xhdpi": "",/*720P高分屏程序图标，分辨率：96x96*/
+                    "xxhdpi": ""/*1080P 高分屏程序图标，分辨率：144x144*/
+                }
+            },
+            "splashscreen": {
+                "ios": {
+                    "iphone": {
+                        "default": "", /*iPhone3启动图片选，分辨率：320x480*/
+                        "retina35": "",/*3.5英寸设备(iPhone4)启动图片，分辨率：640x960*/
+                        "retina40": "",/*4.0 英寸设备(iPhone5/iPhone5s)启动图片，分辨率：640x1136*/
+                        "retina47": "",/*4.7 英寸设备(iPhone6)启动图片，分辨率：750x1334*/
+                        "retina55": "",/*5.5 英寸设备(iPhone6 Plus)启动图片，分辨率：1242x2208*/
+                        "retina55l": ""/*5.5 英寸设备(iPhone6 Plus)横屏启动图片，分辨率：2208x1242*/
+                    },
+                    "ipad": {
+                        "portrait": "", /*iPad竖屏启动图片，分辨率：768x1004*/
+                        "portrait-retina": "",/*iPad高分屏竖屏图片，分辨率：1536x2008*/
+                        "landscape": "", /*iPad横屏启动图片，分辨率：1024x748*/
+                        "landscape-retina": "", /*iPad高分屏横屏启动图片，分辨率：2048x1496*/
+                        "portrait7": "", /*iPad iOS7竖屏启动图��，分辨率：768x1024*/
+                        "portrait-retina7": "",/*iPad iOS7高分屏竖屏图片，分辨率：1536x2048*/
+                        "landscape7": "", /*iPad iOS7横屏启动图片，分辨率：1024x768*/
+                        "landscape-retina7": ""/*iPad iOS7高分屏横屏启动图片，分辨率：2048x1536*/
+                    }
+                },
+                "android": {
+                    "mdpi": "", /*普通屏启动图片，分辨率：240x282*/
+                    "ldpi": "", /*大屏启动图片，分辨率：320x442*/
+                    "hdpi": "", /*高分屏启动图片，分辨率：480x762*/
+                    "xhdpi": "", /*720P高分屏启动图片，分辨率：720x1242*/
+                    "xxhdpi": ""/*1080P高分屏启动图片，分辨率：1080x1882*/
+                }
+            }
+        }
+    },
+	"dependencies": {
+		"pages": {
+			"index.html": {
+				"resources": [
+					"js/controllers/my.js",
+					"lib/ionic/style.css",
+					"js/controllers/add.js",
+					"js/services/userservice.js",
+					"lib/ionic/js/ionic.bundle.min.js",
+					"js/services/utilservice.js",
+					"js/config/router.js",
+					"js/services/homeservice.js",
+					"js/services/commonservice.js",
+					"js/services/dreamservice.js",
+					"js/controllers/account.js",
+					"js/services/storageservice.js",
+					"css/ionic.app.css",
+					"js/config/config.js",
+					"js/controllers/home.js",
+					"js/app.js",
+					"css/style.css",
+					"js/filters/filter.js",
+					"templates/my/my-message-sys.html",
+					"js/services/msgservice.js",
+					"templates/my/my-message.html",
+					"js/services/httpinterceptor.js",
+					"js/platformOverrides.js",
+					"js/controllers/tabs.js",
+					"js/services/jpushservice.js",
+					"js/directives/directive.js",
+					"js/services/myservice.js"
+				],
+				"refer": [],
+				"priority": 0
+			}
+		},
+		"idle": {
+			"resources": [
+				"lib/ionic/js/angular/angular.min.js",
+				"img/icon_me_n.svg",
+				"lib/ionic/fonts/ionicons.woff",
+				"lib/angular-animate/README.md",
+				"img/pic_leaves.png",
+				"lib/angular-ui-router/src/view.js",
+				"img/icon_cat_h.svg",
+				"img/heart.png",
+				"lib/angular-animate/angular-animate.min.js.map",
+				"img/demo/head1.jpg",
+				"img/icon_gongxian.svg",
+				"templates/my/my-dream.html",
+				"lib/ionic/js/angular/angular.js",
+				"lib/angular/angular.min.js",
+				"img/icon_ recharge.svg",
+				"lib/angular-animate/angular-animate.min.js",
+				"img/image.png",
+				"lib/ionic/fonts/ionicons.svg",
+				"img/icon_mymessage.svg",
+				"img/icon_account.svg",
+				"lib/ionic/js/ionic-angular.min.js",
+				"templates/home/dream-detail.html",
+				"lib/angular-ui-router/src/viewScroll.js",
+				"lib/angular-ui-router/src/common.js",
+				"templates/my/my-recharge.html",
+				"templates/my/my-account-add.html",
+				"lib/ionic/js/angular/angular-animate.js",
+				"lib/angular-ui-router/src/urlMatcherFactory.js",
+				"lib/angular-ui-router/release/angular-ui-router.min.js",
+				"img/icon_haert.png",
+				"img/weixin.png",
+				"templates/add/index.html",
+				"img/img_No2.svg",
+				"lib/angular/angular.js",
+				"img/icon_home_h.svg",
+				"img/haoyou.png",
+				"lib/ionic/js/angular-ui/angular-ui-router.js",
+				"lib/ionic/css/ionic.css",
+				"img/demo/banner2.jpg",
+				"templates/my/contact.html",
+				"lib/angular-ui-router/src/stateDirectives.js",
+				"lib/angular/bower.json",
+				"img/demo/pict.png",
+				"lib/ionic/js/angular-ui/angular-ui-router.min.js",
+				"img/icon_mydream.svg",
+				"img/nan.png",
+				"img/icon_rose.png",
+				"img/demo/banner1.jpg",
+				"img/icon_select.svg",
+				"img/icon_gold.svg",
+				"lib/angular-ui-router/src/urlRouter.js",
+				"img/weibo.png",
+				"img/demo/head5.jpg",
+				"img/icon_follow2.svg",
+				"lib/ionic/js/angular/angular-animate.min.js",
+				"lib/angular-ui-router/bower.json",
+				"templates/my/aboutMiao.html",
+				"img/icon_candy.png",
+				"lib/ionic/js/ionic-angular.js",
+				"templates/my/my-message-reply.html",
+				"img/icon_wechat.svg",
+				"img/demo/head7.jpg",
+				"img/icon_ WeChat Pay.svg",
+				"templates/my/my-setting.html",
+				"templates/my/payExplain.html",
+				"img/pengyouquan.png",
+				"img/Moments.svg",
+				"templates/add/addExplain.html",
+				"img/icon_login.svg",
+				"img/demo/photo_default_user.png",
+				"lib/ionic/js/ionic.bundle.js",
+				"templates/my/my-account.html",
+				"templates/tabs.html",
+				"lib/angular-sanitize/bower.json",
+				"chcp.manifest",
+				"img/icon_balance.svg",
+				"img/icon_fans.svg",
+				"img/emoticon.png",
+				"img/img_miao.png",
+				"img/weixinpay.png",
+				"css/ionic.app.min.css",
+				"lib/angular-ui-router/src/resolve.js",
+				"img/icon_weibo.svg",
+				"img/img_No1.svg",
+				"lib/ionic/version.json",
+				"lib/ionic/fonts/thsfont.svg",
+				"lib/angular-ui-router/api/angular-ui-router.d.ts",
+				"img/demo/head6.jpg",
+				"templates/account/login.html",
+				"lib/angular-ui-router/src/stateFilters.js",
+				"img/icon_diamond.png",
+				"img/icon_back.svg",
+				"img/btn_right.svg",
+				"lib/angular-sanitize/angular-sanitize.min.js",
+				"lib/angular-animate/index.js",
+				"img/icon_arrows.svg",
+				"lib/angular-ui-router/CHANGELOG.md",
+				"templates/my/my-collect.html",
+				"lib/angular/angular.min.js.map",
+				"lib/angular-ui-router/src/templateFactory.js",
+				"img/icon_photo.svg",
+				"img/demo/head2.jpg",
+				"templates/my/withdraw.html",
+				"img/icon_balloon.png",
+				"img/icon_kiss.png",
+				"img/icon_collect.svg",
+				"img/icon_dream.svg",
+				"img/btn_filter.svg",
+				"img/img_No3.svg",
+				"lib/angular/README.md",
+				"templates/home/search.html",
+				"img/btn_left.svg",
+				"templates/home/shareDream.html",
+				"lib/angular-sanitize/angular-sanitize.js",
+				"img/icon_share.svg",
+				"lib/ionic/fonts/thsfont.woff",
+				"img/icon_information.svg",
+				"lib/ionic/fonts/thsfont.ttf",
+				"img/icon_cat_n.png",
+				"templates/my/my-profile.html",
+				"img/icon_ recharge.png",
+				"img/icon_menu.svg",
+				"lib/ionic/js/angular/angular-sanitize.min.js",
+				"templates/home/supportDream.html",
+				"img/icon_home_n.svg",
+				"img/icon_setting.svg",
+				"lib/angular-animate/package.json",
+				"lib/ionic/fonts/thsfont.eot",
+				"img/icon_message_n.svg",
+				"lib/angular-ui-router/CONTRIBUTING.md",
+				"img/icon_me_h.svg",
+				"img/icon_vip.svg",
+				"lib/ionic/js/angular/angular-resource.min.js",
+				"lib/angular-ui-router/release/angular-ui-router.js",
+				"img/alipay.png",
+				"lib/angular-sanitize/package.json",
+				"lib/ionic/fonts/ionicons.ttf",
+				"lib/angular-sanitize/README.md",
+				"img/demo/head3.jpg",
+				"img/demo/banner3.jpg",
+				"lib/angular-sanitize/index.js",
+				"img/icon_cat_n.svg",
+				"img/icon_search.svg",
+				"img/camera.png",
+				"templates/my/personalLetter.html",
+				"chcp.json",
+				"lib/angular-ui-router/src/state.js",
+				"lib/angular/angular-csp.css",
+				"img/friends.svg",
+				"templates/my/attention.html",
+				"lib/angular-animate/angular-animate.js",
+				"img/btn_add.svg",
+				"img/icon_video.svg",
+				"lib/angular-animate/bower.json",
+				"img/king.png",
+				"lib/ionic/js/ionic.min.js",
+				"img/icon_follow.svg",
+				"img/demo/photo_default_user.svg",
+				"lib/angular-ui-router/LICENSE",
+				"lib/angular/package.json",
+				"img/icon_cat_h.png",
+				"lib/angular-sanitize/angular-sanitize.min.js.map",
+				"lib/ionic/js/angular/angular-resource.js",
+				"lib/ionic/fonts/ionicons.eot",
+				"lib/angular/index.js",
+				"lib/angular/angular.min.js.gzip",
+				"lib/angular-ui-router/README.md",
+				"lib/ionic/js/angular/angular-sanitize.js",
+				"img/demo/head4.jpg",
+				"lib/ionic/css/ionic.min.css",
+				"lib/angular-ui-router/src/viewDirective.js",
+				"lib/ionic/js/ionic.js",
+				"img/icon_message.svg",
+				"img/icon_ Alipay.svg",
+				"templates/account/loginAccount.html",
+				"templates/my/index.html",
+				"templates/home/index.html",
+				"img/icon_message_h.svg",
+				"img/nv.png",
+				"templates/home/oldDream.html",
+				"templates/home/userDetail.html"
+			]
+		}
+	}
+}

miaomiao/www/templates/account/login.html

@@ -1,5 +1,5 @@
 <ion-view view-title="瞄喵">
-    <ion-content>
+    <ion-content overflow-scroll="true" style="overflow: hidden">
         <div class="lglogin">
             <img ng-src="img/icon_login.svg"  style="margin:0 auto;display:block;width:100px;border-radius:50px"/>
             <span style="font-size: 15px; color: #E1E1E1; margin-top: 30px">- 微信登录 -</span>

miaomiao/www/templates/account/loginAccount.html

@@ -1,5 +1,5 @@
 <ion-view view-title="瞄喵">
-    <ion-content style="padding: 10%">
+    <ion-content style="padding: 10%;overflow: hidden" overflow-scroll="true">
         <div  style="padding:0 0 30px 0">
             <img ng-src="img/icon_login.svg"  style="margin:0 auto;display:block;width:100px;border-radius:50px"/>
         </div>
@@ -25,7 +25,7 @@
             </div>
         </div>
         <button type="submit" ng-click="login()" class="button button-block button-calm" style="border-radius: 50px;">
-            登 录
+            注 册
         </button>
     </ion-content>
 </ion-view>

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

@@ -429,11 +429,11 @@
         </div>
     <div class="detail-like" ng-if="toshare">
         <div class="row">
-            <div class="col" ng-click="shareDream(1)">
+            <div class="col" ng-click="share(0)">
                 <img ng-src="img/friends.svg" ><br>
                 分享给朋友
             </div>
-            <div class="col" ng-click="shareDream(2)">
+            <div class="col" ng-click="share(1)">
                 <img ng-src="img/Moments.svg" ><br>
                 分享到朋友圈
             </div>

miaomiao/www/templates/home/index.html

@@ -154,8 +154,8 @@
                </button>
            </div>
            <div class="col">
-               <button class="button button-stable  {{filter.age==6?'button-calm':''}}" ng-click="changeFilter('>38')" style="min-width:3rem">
-                   >38
+               <button class="button button-stable  {{filter.age==6?'button-calm':''}}" ng-click="changeFilter('>37')" style="min-width:3rem">
+                   >37
                </button>
            </div> 
        </div>       

miaomiao/www/unpackage/.confirmed_dependencies

@@ -0,0 +1,33 @@
+{
+	"index.html": {
+		"resources": [
+			"js/controllers/my.js",
+			"lib/ionic/style.css",
+			"js/controllers/add.js",
+			"js/services/userservice.js",
+			"lib/ionic/js/ionic.bundle.min.js",
+			"js/services/utilservice.js",
+			"js/config/router.js",
+			"js/services/homeservice.js",
+			"js/services/commonservice.js",
+			"js/services/dreamservice.js",
+			"js/controllers/account.js",
+			"js/services/storageservice.js",
+			"css/ionic.app.css",
+			"js/config/config.js",
+			"js/controllers/home.js",
+			"js/app.js",
+			"css/style.css",
+			"js/filters/filter.js",
+			"templates/my/my-message-sys.html",
+			"js/services/msgservice.js",
+			"templates/my/my-message.html",
+			"js/services/httpinterceptor.js",
+			"js/platformOverrides.js",
+			"js/controllers/tabs.js",
+			"js/services/jpushservice.js",
+			"js/directives/directive.js",
+			"js/services/myservice.js"
+		]
+	}
+}