YanaDH 7 年之前
父節點
當前提交
3d3e67a519
共有 3 個文件被更改,包括 168 次插入64 次删除
  1. 159 34
      .idea/workspace.xml
  2. 1 29
      miaomiao/www/js/controllers/home.js
  3. 8 1
      miaomiao/www/templates/home/index.html

+ 159 - 34
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -22,14 +22,15 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="true">
+      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.33202356">
-              <caret line="12" column="125" selection-start-line="12" selection-start-column="115" selection-end-line="12" selection-end-column="125" />
+            <state vertical-scroll-proportion="-7.534483">
+              <caret line="23" column="14" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
               <folding>
                 <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#button#0;n#div#2;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -64,11 +65,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
+      <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.6551724">
-              <caret line="2" column="37" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="37" />
+            <state vertical-scroll-proportion="0.18664047">
+              <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
               <folding>
                 <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -88,8 +89,32 @@
         <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/home.js">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="-14.833333">
-              <caret line="179" column="36" selection-start-line="179" selection-start-column="36" selection-end-line="179" selection-end-column="36" />
-              <folding />
+              <caret line="150" column="27" selection-start-line="150" selection-start-column="27" selection-end-line="150" selection-end-column="27" />
+              <folding>
+                <marker date="1502245248354" expanded="true" signature="1004:1056" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="1100:1146" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="1192:1266" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="1308:1374" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="1420:1485" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="1626:1706" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="1742:2233" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="1836:2223" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="1882:2016" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="2045:2209" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="2273:3247" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="2297:2399" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="2518:3173" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="2977:3061" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="3067:3158" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="3192:3235" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="3285:4860" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="3374:3690" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="3729:3850" placeholder="{...}" />
+                <marker date="1502245248354" expanded="true" signature="3852:4831" placeholder="{&quot;preferFrontCamera&quot;: false...}" />
+                <marker date="1502245248354" expanded="true" signature="4307:4425" placeholder="//..." />
+                <marker date="1502245248354" expanded="true" signature="4535:4666" placeholder="//..." />
+                <marker date="1502245248354" expanded="true" signature="4972:5049" placeholder="{...}" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -124,9 +149,9 @@
         <option value="$PROJECT_DIR$/miaomiao/www/css/ionic.app.css" />
         <option value="$PROJECT_DIR$/miaomiao/www/js/filters/filter.js" />
         <option value="$PROJECT_DIR$/miaomiao/www/css/style.css" />
-        <option value="$PROJECT_DIR$/miaomiao/www/templates/home/index.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/home/index.html" />
       </list>
     </option>
   </component>
@@ -297,6 +322,7 @@
           <folding>
             <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#0;n#div#2;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -337,6 +363,7 @@
           <folding>
             <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#0;n#div#2;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -384,6 +411,7 @@
           <folding>
             <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#0;n#div#2;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -428,7 +456,31 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="161" column="51" selection-start-line="161" selection-start-column="51" selection-end-line="161" selection-end-column="51" />
-          <folding />
+          <folding>
+            <marker date="1502245248354" expanded="true" signature="1004:1056" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1100:1146" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1192:1266" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1308:1374" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1420:1485" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1626:1706" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1742:2233" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1836:2223" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1882:2016" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2045:2209" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2273:3247" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2297:2399" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2518:3173" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2977:3061" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3067:3158" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3192:3235" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3285:4860" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3374:3690" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3729:3850" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3852:4831" placeholder="{&quot;preferFrontCamera&quot;: false...}" />
+            <marker date="1502245248354" expanded="true" signature="4307:4425" placeholder="//..." />
+            <marker date="1502245248354" expanded="true" signature="4535:4666" placeholder="//..." />
+            <marker date="1502245248354" expanded="true" signature="4972:5049" placeholder="{...}" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -471,7 +523,31 @@
       <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 />
+          <folding>
+            <marker date="1502245248354" expanded="true" signature="1004:1056" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1100:1146" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1192:1266" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1308:1374" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1420:1485" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1626:1706" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1742:2233" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1836:2223" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1882:2016" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2045:2209" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2273:3247" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2297:2399" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2518:3173" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2977:3061" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3067:3158" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3192:3235" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3285:4860" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3374:3690" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3729:3850" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3852:4831" placeholder="{&quot;preferFrontCamera&quot;: false...}" />
+            <marker date="1502245248354" expanded="true" signature="4307:4425" placeholder="//..." />
+            <marker date="1502245248354" expanded="true" signature="4535:4666" placeholder="//..." />
+            <marker date="1502245248354" expanded="true" signature="4972:5049" placeholder="{...}" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -500,7 +576,31 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
-          <folding />
+          <folding>
+            <marker date="1502245248354" expanded="true" signature="1004:1056" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1100:1146" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1192:1266" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1308:1374" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1420:1485" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1626:1706" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1742:2233" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1836:2223" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1882:2016" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2045:2209" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2273:3247" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2297:2399" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2518:3173" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2977:3061" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3067:3158" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3192:3235" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3285:4860" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3374:3690" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3729:3850" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3852:4831" placeholder="{&quot;preferFrontCamera&quot;: false...}" />
+            <marker date="1502245248354" expanded="true" signature="4307:4425" placeholder="//..." />
+            <marker date="1502245248354" expanded="true" signature="4535:4666" placeholder="//..." />
+            <marker date="1502245248354" expanded="true" signature="4972:5049" placeholder="{...}" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -711,24 +811,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.6551724">
-          <caret line="2" column="37" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="37" />
-          <folding>
-            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#1;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#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>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4021164">
@@ -748,18 +830,43 @@
     <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-14.833333">
-          <caret line="179" column="36" selection-start-line="179" selection-start-column="36" selection-end-line="179" selection-end-column="36" />
-          <folding />
+          <caret line="150" column="27" selection-start-line="150" selection-start-column="27" selection-end-line="150" selection-end-column="27" />
+          <folding>
+            <marker date="1502245248354" expanded="true" signature="1004:1056" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1100:1146" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1192:1266" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1308:1374" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1420:1485" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1626:1706" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1742:2233" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1836:2223" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="1882:2016" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2045:2209" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2273:3247" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2297:2399" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2518:3173" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="2977:3061" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3067:3158" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3192:3235" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3285:4860" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3374:3690" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3729:3850" placeholder="{...}" />
+            <marker date="1502245248354" expanded="true" signature="3852:4831" placeholder="{&quot;preferFrontCamera&quot;: false...}" />
+            <marker date="1502245248354" expanded="true" signature="4307:4425" placeholder="//..." />
+            <marker date="1502245248354" expanded="true" signature="4535:4666" placeholder="//..." />
+            <marker date="1502245248354" expanded="true" signature="4972:5049" placeholder="{...}" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33202356">
-          <caret line="12" column="125" selection-start-line="12" selection-start-column="115" selection-end-line="12" selection-end-column="125" />
+        <state vertical-scroll-proportion="-7.534483">
+          <caret line="23" column="14" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
           <folding>
             <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#0;n#div#2;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -793,5 +900,23 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.18664047">
+          <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
+          <folding>
+            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#1;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#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>
+      </provider>
+    </entry>
   </component>
 </project>

+ 1 - 29
miaomiao/www/js/controllers/home.js

xqd
@@ -19,35 +19,7 @@
         $scope.toggleLeftSideMenu = function () {
             $ionicSideMenuDelegate.toggleLeft();
         };
-        $scope.openFilter = function ($event) {
-             // 一个精心制作的自定义弹窗
-           var myPopup = $ionicPopup.show({
-             template: '请选择<select><option value="opel">性别</option><option value="audi">Audi</option></select>  <br>请选择<select><option value="opel">地区</option><option value="audi">Audi</option></select>',
-             title: '筛选',
-             scope: $scope,
-             buttons: [
-               { text: '取消' },
-               {
-                 text: '<b>提交</b>',
-                 type: 'button-positive',
-                 onTap: function(e) {
-                   if (!$scope.data.wifi) {
-                     //不允许用户关闭,除非他键入wifi密码
-                     e.preventDefault();
-                   } else {
-                     return $scope.data.wifi;
-                   }
-                 }
-               },
-             ]
-           });
-           myPopup.then(function(res) {
-             console.log('Tapped!', res);
-           });
-           $timeout(function() {
-              myPopup.close(); //由于某种原因3秒后关闭弹出
-           }, 3000);
-        };
+
         $scope.openPopover = function ($event) {
             $scope.popover.show($event);
         };

+ 8 - 1
miaomiao/www/templates/home/index.html

xqd
@@ -3,9 +3,16 @@
         <button class="button button-clear" style="height: 30px; width: 30px" ng-click="toggleLeftSideMenu()">
             <img src="img/icon_menu.svg" style="height: 60%; width: 100%;">
         </button>
-        <button class="button button-clear" style="height: 30px; width: 30px" ng-click="openFilter()">
+        <button class="button button-clear" style="height: 30px; width: 30px" ng-click="openPopover($event)">
+        <!--<button class="button button-clear" style="height: 30px; width: 30px" ng-click="openFilter()">-->
             <img src="img/icon_menu.svg" style="height: 60%; width: 100%;">
         </button>
+        <!--<button class="button button-clear homeIcon" ng-click="toggleLeftSideMenu()">
+            <img src="img/icon_menu.svg" style="height: 60%; width: 100%; margin-top: 7px">
+        </button>
+        <button class="button button-clear homeIcon" style="height: 30px; width: 30px" ng-click="openPopover($event)">
+            <img src="img/icon_menu.svg" style="height: 60%; width: 100%;margin-top: 7px">
+        </button>-->
     </ion-nav-buttons>
     <ion-nav-buttons side="right">
         <button class="button button-clear" style="height: 30px; width: 30px; margin-top: 2px" ui-sref="app.home_search">