YanaDH 7 年之前
父节点
当前提交
fbdde92b7a

+ 390 - 295
miaomiao/www/.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd
@@ -21,41 +21,103 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="car.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/car.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="-9.3">
-              <caret line="274" column="33" selection-start-line="274" selection-start-column="33" selection-end-line="274" selection-end-column="33" />
+            <state vertical-scroll-proportion="-13.1">
+              <caret line="222" column="17" selection-start-line="222" selection-start-column="17" selection-end-line="222" selection-end-column="17" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
+      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-2.689655">
-              <caret line="428" column="46" selection-start-line="428" selection-start-column="46" selection-end-line="428" selection-end-column="46" />
-              <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="-140.4">
-              <caret line="338" column="26" selection-start-line="338" selection-start-column="26" selection-end-line="338" selection-end-column="26" />
-              <folding />
+            <state vertical-scroll-proportion="0.81904763">
+              <caret line="197" column="103" selection-start-line="197" selection-start-column="103" selection-end-line="197" selection-end-column="103" />
+              <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#img#1;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#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#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#video#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#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#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#i#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#i#1;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#0;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#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#p#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#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#1;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#1;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#4;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#4;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#0;n#div#4;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#4;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#1;n#div#0;n#div#4;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#4;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#1;n#div#1;n#div#4;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#2;n#div#1;n#div#4;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#5;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#5;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#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#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#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#img#0;n#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#1;n#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#em#0;n#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#div#1;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#1;n#div#1;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#em#0;n#div#1;n#div#0;n#div#0;n#div#2;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#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#1;n#div#0;n#div#1;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#em#0;n#div#0;n#div#1;n#div#0;n#div#2;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#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#1;n#div#1;n#div#1;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#em#0;n#div#1;n#div#1;n#div#0;n#div#2;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#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#div#2;n#div#1;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <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="true" />
+                <element signature="n#style#0;n#em#0;n#div#2;n#div#1;n#div#0;n#div#2;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#1;n#div#2;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#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;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#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;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#div#1;n#div#2;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#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#1;n#div#2;n#div#0;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#div#1;n#div#2;n#div#0;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#1;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#1;n#div#2;n#div#1;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#div#1;n#div#2;n#div#1;n#div#0;n#div#1;n#div#2;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#2;n#ion-view#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="account.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+      <file leaf-file-name="style.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/css/style.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.78216124">
-              <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+            <state vertical-scroll-proportion="-4.0">
+              <caret line="476" column="20" selection-start-line="476" selection-start-column="20" selection-end-line="476" selection-end-column="20" />
               <folding />
             </state>
           </provider>
@@ -66,21 +128,15 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="JavaScript File" />
         <option value="CSS File" />
         <option value="HTML File" />
+        <option value="JavaScript File" />
       </list>
     </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/index.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/login.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/forgetpassword.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/select.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/account/forgetpassword.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/account/login.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/account/register.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/my/my-wallet-deposit.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/my.js" />
@@ -89,14 +145,12 @@
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-setting-mobile.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-mine.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-index.html" />
-        <option value="$PROJECT_DIR$/templates/my/my-profile.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-setting-material.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/menu.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/menu.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/menu.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-rent.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/parts.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/publish.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/registerindex.html" />
@@ -106,26 +160,34 @@
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/register.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-setting-password.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/my/my-setting-password.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-often-add.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-index.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
         <option value="$PROJECT_DIR$/js/filters/filter.js" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/templates/account/loginAccount.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/menu.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/directives/filters.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/carservice.js" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/config/router.js" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/config/router.js" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/parts.js" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-often-add.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/services/carservice.js" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-myroute.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/car.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/car/car-order.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-myroute.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/config/router.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/config/router.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/car.js" />
-        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
-        <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
+        <option value="$PROJECT_DIR$/templates/my/my-profile.html" />
+        <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/templates/home/userDetail.html" />
+        <option value="$PROJECT_DIR$/templates/home/shareDream.html" />
+        <option value="$PROJECT_DIR$/../../../test/gulpfile.js" />
+        <option value="$PROJECT_DIR$/../../../test/index.html" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/templates/home/index.html" />
+        <option value="$PROJECT_DIR$/css/style.css" />
+        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
       </list>
     </option>
   </component>
@@ -135,8 +197,8 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="347" />
-    <option name="width" value="1025" />
+    <option name="x" value="135" />
+    <option name="width" value="1232" />
     <option name="height" value="744" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
@@ -279,7 +341,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="347" y="0" width="1025" height="744" extended-state="0" />
+    <frame x="135" y="0" width="1232" height="744" 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.16815476" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -312,489 +374,522 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager />
+    <breakpoint-manager>
+      <option name="time" value="1" />
+    </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/register.html">
+    <entry file="file://$PROJECT_DIR$/js/services/dreamservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3837838">
-          <caret line="35" column="91" selection-start-line="35" selection-start-column="91" selection-end-line="35" selection-end-column="91" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/autonym1.html">
+    <entry file="file://$PROJECT_DIR$/js/services/userservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.78018016">
-          <caret line="26" column="18" selection-start-line="26" selection-start-column="18" selection-end-line="26" selection-end-column="18" />
+        <state vertical-scroll-proportion="0.380789">
+          <caret line="17" column="45" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/registerindex.html">
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6234234">
-          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.21783876">
+          <caret line="109" column="35" selection-start-line="109" selection-start-column="35" selection-end-line="109" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/owner1.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/menu.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8648649">
-          <caret line="45" column="18" selection-start-line="45" selection-start-column="18" selection-end-line="45" selection-end-column="18" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="12" column="34" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/my/my-account-add.html">
+    <entry file="file://$PROJECT_DIR$/js/directives/directive.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.5">
-          <caret line="69" column="70" selection-start-line="69" selection-start-column="70" selection-end-line="69" selection-end-column="70" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#0;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="-0.054249547">
+          <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$/../../../quanzhouda/receive/receive/www/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/js/services/utilservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.47016275">
-          <caret line="117" column="41" selection-start-line="117" selection-start-column="41" selection-end-line="117" selection-end-column="41" />
-          <folding />
+        <state vertical-scroll-proportion="0.32368898">
+          <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/forgetpassword.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.57117116">
-          <caret line="20" column="43" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
-          <folding>
-            <element signature="n#style#0;n#h1#0;n#ion-header-bar#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#h2#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="0.37657657">
+          <caret line="11" column="57" selection-start-line="11" selection-start-column="57" selection-end-line="11" selection-end-column="57" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/userservice.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29331046">
-          <caret line="9" column="14" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.42367068">
+          <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/account.js">
+    <entry file="file://$PROJECT_DIR$/js/config/router.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.2857143">
-          <caret line="326" column="43" selection-start-line="326" selection-start-column="43" selection-end-line="326" selection-end-column="43" />
-          <folding />
+        <state vertical-scroll-proportion="0.6415094">
+          <caret line="427" column="16" selection-start-line="427" selection-start-column="16" selection-end-line="427" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/my/my-setting-password.html">
+    <entry file="file://$PROJECT_DIR$/js/controllers/tabs.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.06846847">
-          <caret line="2" column="26" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="26" />
-          <folding>
-            <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="0.0">
+          <caret line="4" column="11" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-setting-password.html">
+    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2054054">
-          <caret line="9" column="134" selection-start-line="9" selection-start-column="134" selection-end-line="9" selection-end-column="134" />
-          <folding>
-            <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="0.78216124">
+          <caret line="24" column="34" selection-start-line="24" selection-start-column="34" selection-end-line="24" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-setting-mobile.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.0">
-          <caret line="3" column="43" selection-start-line="3" selection-start-column="43" selection-end-line="3" selection-end-column="43" />
-          <folding>
-            <element signature="n#style#0;n#div#3;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="0.5790476">
+          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-often-add.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.464286">
-          <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" />
-          <folding>
-            <element signature="n#style#0;n#span#0;n#div#4;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="-4.2586207">
+          <caret line="28" column="57" selection-start-line="28" selection-start-column="50" selection-end-line="28" selection-end-column="57" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/goods.js">
+    <entry file="file://$PROJECT_DIR$/templates/account/loginAccount.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="51" column="72" selection-start-line="51" selection-start-column="72" selection-end-line="51" selection-end-column="297" />
-          <folding />
+        <state vertical-scroll-proportion="0.6738739">
+          <caret line="26" column="27" selection-start-line="26" selection-start-column="27" selection-end-line="26" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/goods/goods-index.html">
+    <entry file="file://$PROJECT_DIR$/templates/account/login.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.46551725">
-          <caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
-          <folding>
-            <element signature="n#style#0;n#span#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#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#span#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="0.06846847">
+          <caret line="2" column="29" selection-start-line="2" selection-start-column="29" selection-end-line="2" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/dreamservice.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/car/car-index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.5657143">
+          <caret line="21" column="58" selection-start-line="21" selection-start-column="52" selection-end-line="21" selection-end-column="58" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/userservice.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/utilservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.380789">
-          <caret line="17" column="45" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" />
-          <folding />
+        <state vertical-scroll-proportion="-0.054249547">
+          <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$/js/services/myservice.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/menu.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.21783876">
-          <caret line="109" column="35" selection-start-line="109" selection-start-column="35" selection-end-line="109" selection-end-column="35" />
-          <folding />
+        <state vertical-scroll-proportion="-7.464286">
+          <caret line="17" column="33" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/menu.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/directives/filters.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="12" column="34" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" />
-          <folding />
+          <caret line="31" column="25" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/directives/directive.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/car/car-route.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.054249547">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.590991">
+          <caret line="43" column="42" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/utilservice.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/carservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.32368898">
-          <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
-          <folding />
+        <state vertical-scroll-proportion="0.8625678">
+          <caret line="83" column="14" selection-start-line="77" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-index.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/config/router.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.37657657">
-          <caret line="11" column="57" selection-start-line="11" selection-start-column="57" selection-end-line="11" selection-end-column="57" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#0;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#0;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="-6.133333">
+          <caret line="146" column="23" selection-start-line="146" selection-start-column="18" selection-end-line="146" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/account.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/config/router.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.42367068">
-          <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
+        <state vertical-scroll-proportion="-11.2">
+          <caret line="104" column="33" selection-start-line="104" selection-start-column="33" selection-end-line="104" selection-end-column="33" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/router.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/parts/parts-index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6415094">
-          <caret line="427" column="16" selection-start-line="427" selection-start-column="16" selection-end-line="427" selection-end-column="16" />
-          <folding />
+        <state vertical-scroll-proportion="-7.464286">
+          <caret line="50" column="43" selection-start-line="50" selection-start-column="38" selection-end-line="50" selection-end-column="43" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-order.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29331046">
-          <caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
-          <folding />
+        <state vertical-scroll-proportion="-3.857143">
+          <caret line="28" column="41" selection-start-line="28" selection-start-column="41" selection-end-line="28" selection-end-column="41" />
+          <folding>
+            <element signature="n#style#0;n#a#1;n#div#2;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/tabs.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/parts.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="4" column="11" selection-start-line="4" selection-start-column="11" selection-end-line="4" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.45027125">
+          <caret line="53" column="30" selection-start-line="53" selection-start-column="30" selection-end-line="53" selection-end-column="30" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-often-add.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.78216124">
-          <caret line="24" column="34" selection-start-line="24" selection-start-column="34" selection-end-line="24" selection-end-column="34" />
+        <state vertical-scroll-proportion="-8.821428">
+          <caret line="32" column="91" selection-start-line="32" selection-start-column="78" selection-end-line="32" selection-end-column="91" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/services/carservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5790476">
-          <caret line="25" column="25" selection-start-line="25" selection-start-column="25" selection-end-line="25" selection-end-column="25" />
-          <folding>
-            <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#3;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="-13.366667">
+          <caret line="84" column="24" selection-start-line="84" selection-start-column="12" selection-end-line="84" selection-end-column="24" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/car.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.51724136">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="2.1">
+          <caret line="118" column="17" selection-start-line="118" selection-start-column="17" selection-end-line="118" selection-end-column="17" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-message.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-myroute.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.2586207">
-          <caret line="28" column="57" selection-start-line="28" selection-start-column="50" selection-end-line="28" selection-end-column="57" />
+        <state vertical-scroll-proportion="-4.137931">
+          <caret line="90" column="20" selection-start-line="90" selection-start-column="20" selection-end-line="90" selection-end-column="20" />
           <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#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#i#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#i#0;n#p#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#button#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#p#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#a#0;n#p#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#i#0;n#a#0;n#p#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#i#0;n#p#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#i#1;n#p#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#i#2;n#p#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#button#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#p#0;n#div#5;n#ion-content#0;n#ion-view#0;n#!!top" 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="-3.6">
-          <caret line="581" column="0" selection-start-line="581" selection-start-column="0" selection-end-line="581" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/account/loginAccount.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/car/car-order.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6738739">
-          <caret line="26" column="27" selection-start-line="26" selection-start-column="27" selection-end-line="26" selection-end-column="27" />
+        <state vertical-scroll-proportion="0.51428574">
+          <caret line="33" column="42" selection-start-line="33" selection-start-column="42" selection-end-line="33" selection-end-column="42" />
           <folding>
-            <element signature="n#style#0;n#i#0;n#span#2;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#1;n#div#2;n#div#1;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/account/login.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.06846847">
-          <caret line="2" column="29" selection-start-line="2" selection-start-column="29" selection-end-line="2" selection-end-column="29" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/car/car-index.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-route.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5657143">
-          <caret line="21" column="58" selection-start-line="21" selection-start-column="52" selection-end-line="21" selection-end-column="58" />
+        <state vertical-scroll-proportion="0.48828828">
+          <caret line="24" column="59" selection-start-line="24" selection-start-column="59" selection-end-line="24" selection-end-column="59" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/utilservice.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/car.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.054249547">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="-6.3333335">
+          <caret line="10" column="15" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/menu.html">
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.464286">
-          <caret line="17" column="33" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/directives/filters.js">
+    <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="31" column="25" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" />
+          <caret line="21" column="27" selection-start-line="21" selection-start-column="27" selection-end-line="21" selection-end-column="27" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/car/car-route.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-profile.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.590991">
-          <caret line="43" column="42" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="42" />
+        <state vertical-scroll-proportion="-5.428571">
+          <caret line="8" column="69" selection-start-line="8" selection-start-column="69" selection-end-line="8" selection-end-column="69" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#select#0;n#div#3;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#h2#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#p#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$/../../../quanzhouda/send/send/www/templates/car/car-route.html">
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.392857">
-          <caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
+        <state vertical-scroll-proportion="-8.233334">
+          <caret line="13" column="38" selection-start-line="13" selection-start-column="38" selection-end-line="13" selection-end-column="38" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-order.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.810345">
-          <caret line="37" column="37" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="37" />
+        <state vertical-scroll-proportion="0.13693693">
+          <caret line="4" column="32" selection-start-line="4" selection-start-column="32" selection-end-line="4" selection-end-column="32" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/services/carservice.js">
+    <entry file="file://E:/Graduation design/huiwei/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="80" column="112" selection-start-line="80" selection-start-column="112" selection-end-line="80" selection-end-column="112" />
+        <state vertical-scroll-proportion="-0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="8" selection-end-column="6" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-myroute.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5790476">
-          <caret line="16" column="57" selection-start-line="16" selection-start-column="57" selection-end-line="16" selection-end-column="57" />
-          <folding>
-            <element signature="n#style#0;n#p#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#p#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#0;n#p#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#1;n#p#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#2;n#p#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#button#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#1;n#p#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#2;n#p#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#p#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#a#0;n#p#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#0;n#a#0;n#p#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#0;n#p#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#1;n#p#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#button#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#a#0;n#p#0;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#0;n#a#0;n#p#0;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#0;n#p#0;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#1;n#p#0;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#2;n#p#0;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#a#0;n#p#0;n#div#4;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#0;n#a#0;n#p#0;n#div#4;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#0;n#p#0;n#div#4;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#1;n#p#0;n#div#4;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="-2.1724138">
+          <caret line="44" column="46" selection-start-line="44" selection-start-column="46" selection-end-line="44" selection-end-column="46" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/carservice.js">
+    <entry file="file://$PROJECT_DIR$/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8625678">
-          <caret line="83" column="14" selection-start-line="77" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.13693693">
+          <caret line="4" column="26" selection-start-line="4" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/car/car-order.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/shareDream.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.4827585">
-          <caret line="175" column="51" selection-start-line="175" selection-start-column="50" selection-end-line="175" selection-end-column="51" />
+        <state vertical-scroll-proportion="-6.928571">
+          <caret line="62" column="21" selection-start-line="62" selection-start-column="21" selection-end-line="62" selection-end-column="21" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#a#1;n#div#2;n#div#1;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#2;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#2;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#a#0;n#div#2;n#div#2;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#a#1;n#div#2;n#div#2;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#3;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#4;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#4;n#div#3;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#h4#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#1;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#1;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#1;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#3;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#3;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#3;n#body#0;n#html#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/config/router.js">
+    <entry file="file://$PROJECT_DIR$/../../../test/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.133333">
-          <caret line="146" column="23" selection-start-line="146" selection-start-column="18" selection-end-line="146" selection-end-column="23" />
+        <state vertical-scroll-proportion="-0.6785714">
+          <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/config/router.js">
+    <entry file="file://$PROJECT_DIR$/../../../test/gulpfile.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-11.2">
-          <caret line="104" column="33" selection-start-line="104" selection-start-column="33" selection-end-line="104" selection-end-column="33" />
+        <state vertical-scroll-proportion="0.35849056">
+          <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$/../../../quanzhouda/send/send/www/js/controllers/car.js">
+    <entry file="file://$PROJECT_DIR$/../../../test/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.133333">
-          <caret line="454" column="45" selection-start-line="454" selection-start-column="0" selection-end-line="455" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.44504505">
+          <caret line="13" column="23" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/car.js">
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.3">
-          <caret line="274" column="33" selection-start-line="274" selection-start-column="33" selection-end-line="274" selection-end-column="33" />
+        <state vertical-scroll-proportion="-12.892858">
+          <caret line="28" column="20" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.689655">
-          <caret line="428" column="46" selection-start-line="428" selection-start-column="46" selection-end-line="428" selection-end-column="46" />
+        <state vertical-scroll-proportion="-2.636036">
+          <caret line="52" column="105" selection-start-line="52" selection-start-column="105" selection-end-line="52" selection-end-column="105" />
+          <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#img#0;n#span#0;n#div#1;n#div#0;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$/js/controllers/add.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.32590052">
+          <caret line="34" column="14" selection-start-line="16" selection-start-column="14" selection-end-line="34" selection-end-column="14" />
           <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="-140.4">
-          <caret line="338" column="26" selection-start-line="338" selection-start-column="26" selection-end-line="338" selection-end-column="26" />
+        <state vertical-scroll-proportion="-13.1">
+          <caret line="222" column="17" selection-start-line="222" selection-start-column="17" selection-end-line="222" selection-end-column="17" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+    <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.78216124">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        <state vertical-scroll-proportion="-4.0">
+          <caret line="476" column="20" selection-start-line="476" selection-start-column="20" selection-end-line="476" selection-end-column="20" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.81904763">
+          <caret line="197" column="103" selection-start-line="197" selection-start-column="103" selection-end-line="197" selection-end-column="103" />
+          <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#img#1;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#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#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#video#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#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#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#i#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#i#1;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#0;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#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#p#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#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#1;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#1;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#4;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#4;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#0;n#div#4;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#4;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#1;n#div#0;n#div#4;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#4;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#1;n#div#1;n#div#4;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#2;n#div#1;n#div#4;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#5;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#5;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#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#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#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#img#0;n#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#1;n#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#em#0;n#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#1;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#1;n#div#1;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#em#0;n#div#1;n#div#0;n#div#0;n#div#2;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#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#1;n#div#0;n#div#1;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#em#0;n#div#0;n#div#1;n#div#0;n#div#2;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#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#1;n#div#1;n#div#1;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#em#0;n#div#1;n#div#1;n#div#0;n#div#2;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#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#2;n#div#1;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <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="true" />
+            <element signature="n#style#0;n#em#0;n#div#2;n#div#1;n#div#0;n#div#2;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#1;n#div#2;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#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;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#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;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#div#1;n#div#2;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#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#2;n#div#0;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#1;n#div#2;n#div#0;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#1;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#2;n#div#1;n#div#0;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#1;n#div#2;n#div#1;n#div#0;n#div#1;n#div#2;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#2;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 7 - 5
miaomiao/www/css/style.css

xqd xqd
@@ -475,7 +475,6 @@ a:visited,a:link{
     width:80px;
     border-radius:100%;
     margin-top: 5px;
-
 }
 .detail-like {
     position:absolute;
@@ -600,16 +599,19 @@ a:visited,a:link{
 /*dreamDetail*/
 .popover-backdrop{
     background: rgba(50, 50, 50, 0.5);
-    height: -webkit-fill-available;
-    /*height: 100%;*/
+    height: 250%;
 }
 .popover-backdrop img{
     position: absolute;
     z-index: 11;
     display: block;
     width: 80%;
-    height: 55%;
-    margin: 30% 10%;
+    height: 45%;
+    margin: 28% 10%;
+}
+.popover-backdrop .code{
+    margin: 130% 10%;
+    height: 13%;
 }
 .top2{
     margin-top: 15px; text-align: center; float:left; height: 100px; width: 100px;color: #6B6B6B;font-size: 16px;

+ 2 - 1
miaomiao/www/js/controllers/account.js

xqd xqd
@@ -5,7 +5,7 @@
             $scope.loginbywx = function(){
                 var scope = "snsapi_userinfo", state = "_" + (+new Date());
                 Wechat.auth(scope, state, function (response) {
-                    alert("response:"+JSON.stringify(response));
+                    alert("response:"+JSON.stringify(response.code));
                      //response.code;
                     if(response.code){
                         userService.loginbywx(response.code).then(function(result){
@@ -40,6 +40,7 @@
             $scope.login = function () {
                 msg.loading('登录中...');
                 userService.login($scope.vm.mobile, $scope.vm.verify_code,$scope.wechat).then(function (result) {
+                //userService.login($scope.vm.mobile, $scope.vm.verify_code,124).then(function (result) {
                     msg.hide();
                     storage.setObject('user', result.data.data.user);
                     storage.set('token', result.data.data.token);

+ 136 - 53
miaomiao/www/js/controllers/home.js

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -19,10 +19,15 @@
         $scope.type = 'hot';//tab切换
 
             $scope.chosedIndex = 0;
-           $scope.clickAvatar = function(index){
+           $scope.clickAvatar = function(index,id){
+               homeService.toUserDetail(id).then(function(result){
+                   $scope.items = result.data.data;
+                   $state.go('app.home_userDetail',{id:id,items:$scope.items});
+               },function(error){
+                       //msg.error(msg.data.error)
+               });
                $scope.chosedIndex = index;
            };
-
         $ionicPopover.fromTemplateUrl('my-popover.html', {
             scope: $scope
         }).then(function (popover) {
@@ -175,6 +180,7 @@
             $scope.chosedIndex = 0;
             $scope.clickAvatar = function(index){
                 $scope.chosedIndex = index;
+
             };
         // id=5;
             $scope.$on('$ionicView.beforeEnter', function () {
@@ -200,6 +206,10 @@
                 if($scope.multi.promise)$interval.cancel($scope.multi.promise);
                 if($scope.leftTimer)$interval.cancel($scope.leftTimer);
             });
+            $scope.toSort = function(){
+                //$scope.type = 3;
+                $scope.changeType(3)
+            };
 
         $scope.load = function (id) {
             msg.loading();
@@ -246,17 +256,6 @@
         $scope.openSupport = function () {
             msg.alert("支持乘数说明","支持乘数支持乘数支持乘数支持乘数");
         };
-         // $ionicModal.fromTemplateUrl('supportExplain.html', {
-         //     scope: $scope
-         // }).then(function(modal) {
-         //     $scope.supportmodal = modal;
-         // });
-         // $scope.openSupportmodal = function() {
-         //     $scope.supportmodal.show();
-         // };
-         // $scope.closeSupportmodal = function() {
-         //     $scope.supportmodal.hide();
-         // };
         $scope.multi = {
             a: '',
             b: '',
@@ -285,53 +284,37 @@
             $scope.share = function (type,$event) {
                 $scope.toshare = true;
                 if (type==0) {//分享给朋友
-                    Wechat.share({
+                   /* Wechat.share({
                         text: "分享的文字",
                         scene: Wechat.Scene.SESSION    // share to 好友
                     }, 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
-                    var args = {};
-                    args.text = '微博文字分享';
-                    WeiboSDK.shareTextToWeibo(function () {
-                        alert('share success');
-                    }, function (failReason) {
-                        alert(failReason);
-                    }, args);
-                }*/
-                if(type==1){
-                    /*Wechat.share({
+                    });*/
+                    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"
+                            title:"瞄瞄",
+                            description:"HELLO,这是我的梦想,快来围观吧!",
+                            thumb:"img/icon_cat_h.png",
+                            media: {
+                                type: Wechat.Type.WEBPAGE,
+                                webpageUrl: "https://www.baidu.com/"
+                            }
                         },
-                        scene: Wechat.Scene.SESSION   // share to Timeline
+                        scene: Wechat.Scene.SESSION
                     }, function () {
                         alert("Success");
                     }, function (reason) {
                         alert("Failed: " + reason);
-                    });*/
+                    });
+                }
+                if(type==1){
                     Wechat.share({
                         message: {
                             title:"瞄瞄",
-                            description:"这是瞄瞄",
-                            thumb:"https://ss0.bdstatic.com/5aV1bjqh_Q23odCf/static/superman/img/logo/bd_logo1_31bdc765.png",
+                            description:"HELLO,这是我的梦想,快来围观吧!",
+                            thumb:"img/icon_cat_h.png",
                             media: {
                                 type: Wechat.Type.WEBPAGE,
                                 webpageUrl: "https://www.baidu.com/"
@@ -499,6 +482,14 @@
             $scope.hideBigImage = function(){
                 $scope.bigImage = false;
             };
+            $scope.code = false;
+            $scope.showCode  = function(codeName){
+                $scope.url = codeName;
+                $scope.code = true;
+            };
+            $scope.hideCode = function(){
+                $scope.code = false;
+            };
             $scope.addpict = function () {
                 common.chooseImage().then(function (img) {
                     common.uploadFiles(img,1).then(function (result) {
@@ -519,16 +510,17 @@
                 common.deletefile(file).then(function () {
                 })
             };
-
             $scope.addvideo = function () {
                 common.chooseVideo().then(function (file) {
                     common.uploadFiles(file, 2).then(function (result) {
                         var response = JSON.parse(result.response);
                         $scope.video.server = response.data.file;
                         var file = config.imgServer+response.data.file;
+                        console.log("file:"+file);
                         $scope.video.isOK = true;
                         $scope.video.file = file;
                         $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
+                        console.log("vpic:"+$scope.video.vpic);
                     }, function (error) {
                         msg.error('视频上传失败');
                     });
@@ -606,7 +598,54 @@
                 if($scope.multi.promise)$interval.cancel($scope.multi.promise);
                 if($scope.leftTimer)$interval.cancel($scope.leftTimer);
             });
-
+            $scope.share = function (type,$event) {
+                $scope.toshare = true;
+                if (type==0) {//分享给朋友
+                    /* Wechat.share({
+                     text: "分享的文字",
+                     scene: Wechat.Scene.SESSION    // share to 好友
+                     }, function () {
+                     alert("Success");
+                     }, function (reason) {
+                     alert("Failed: " + reason);
+                     });*/
+                    Wechat.share({
+                        message: {
+                            title:"瞄瞄",
+                            description:"HELLO,这是我的梦想,快来围观吧!",
+                            thumb:"img/icon_cat_h.png",
+                            media: {
+                                type: Wechat.Type.WEBPAGE,
+                                webpageUrl: "https://www.baidu.com/"
+                            }
+                        },
+                        scene: Wechat.Scene.SESSION
+                    }, function () {
+                        alert("Success");
+                    }, function (reason) {
+                        alert("Failed: " + reason);
+                    });
+                }
+                if(type==1){
+                    Wechat.share({
+                        message: {
+                            title:"瞄瞄",
+                            description:"HELLO,这是我的梦想,快来围观吧!",
+                            thumb:"img/icon_cat_h.png",
+                            media: {
+                                type: Wechat.Type.WEBPAGE,
+                                webpageUrl: "https://www.baidu.com/"
+                            }
+                        },
+                        scene: Wechat.Scene.TIMELINE
+                    }, function () {
+                        alert("Success");
+                    }, function (reason) {
+                        alert("Failed: " + reason);
+                    });
+                }
+                //   $state.go("app.shareDream",{item:$scope.dream});
+            };
             $scope.load = function (id) {
                 msg.loading();
                 homeService.dreamDetail(id).then(function (result) {
@@ -685,10 +724,6 @@
 
             };
             $scope.toshare = false;
-            $scope.share = function ($event) {
-                $event.stopPropagation();
-                $scope.toshare = true;
-            };
             $scope.toRecharge = function(){
                 $state.go("app.recharge")
             };
@@ -940,9 +975,57 @@
 
             };
             $scope.toshare = false;
-            $scope.share = function ($event) {
-                $event.stopPropagation();
+            $scope.toshare = false;
+            $scope.toRecharge = function(){
+                $state.go("app.recharge")
+            };
+            $scope.share = function (type,$event) {
                 $scope.toshare = true;
+                if (type==0) {//分享给朋友
+                    /* Wechat.share({
+                     text: "分享的文字",
+                     scene: Wechat.Scene.SESSION    // share to 好友
+                     }, function () {
+                     alert("Success");
+                     }, function (reason) {
+                     alert("Failed: " + reason);
+                     });*/
+                    Wechat.share({
+                        message: {
+                            title:"瞄瞄",
+                            description:"HELLO,这是我的个人资料,快来围观吧!",
+                            thumb:"img/icon_cat_h.png",
+                            media: {
+                                type: Wechat.Type.WEBPAGE,
+                                webpageUrl: "https://www.baidu.com/"
+                            }
+                        },
+                        scene: Wechat.Scene.SESSION
+                    }, function () {
+                        alert("Success");
+                    }, function (reason) {
+                        alert("Failed: " + reason);
+                    });
+                }
+                if(type==1){
+                    Wechat.share({
+                        message: {
+                            title:"瞄瞄",
+                            description:"HELLO,这是我的个人资料,快来围观吧!",
+                            thumb:"img/icon_cat_h.png",
+                            media: {
+                                type: Wechat.Type.WEBPAGE,
+                                webpageUrl: "https://www.baidu.com/"
+                            }
+                        },
+                        scene: Wechat.Scene.TIMELINE
+                    }, function () {
+                        alert("Success");
+                    }, function (reason) {
+                        alert("Failed: " + reason);
+                    });
+                }
+                //   $state.go("app.shareDream",{item:$scope.dream});
             };
             $scope.shareDream = function(){
                 $state.go("app.shareDream",{item:$scope.user});

+ 40 - 30
miaomiao/www/templates/home/dream-detail.html

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -4,7 +4,7 @@
             <img ng-if="showMessage==1" src="img/icon_message_h.svg" style="height: 60%; width: 100%">
             <img ng-if="showMessage==0" src="img/icon_message_n.svg" style="height: 55%; width: 100%">
         </button>
-        <button ng-click="share($event)" class="button button-clear" style="height: 37px; margin-top: 0.5px">
+        <button ng-click="share($event)" class="button button-clear" style="height: 39px; margin-top: -1px">
             <img src="img/icon_share.svg" style="height: 55%; width: 100%">
         </button>
     </ion-nav-buttons>
@@ -95,23 +95,23 @@
                     </div>
                 </div>
                 <div class="detail-head" style="height: 130px" ng-if="dream.top3user.length>0">
-                    <div class="row" ng-if="dream.top3user.length<2">
+                    <div class="row" ng-if="dream.top3user.length<3">
                         <div class="col top1" ng-if="dream.top3user.length>0" style="background: url('img/img_No1.svg') no-repeat; background-size: 100% 100%;">
-                            <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[0].avatar | avator }}" /><br>
+                            <img ng-click="toSort()" style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[0].avatar | avator }}" /><br>
                         </div>
                         <div class="col top2" ng-if="dream.top3user.length>1" style="margin-top: 10px; background: url('img/img_No2.svg') no-repeat; background-size: 100% 100%;">
-                            <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[1].avatar | avator }}" /><br>
+                            <img ng-click="toSort()" style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[1].avatar | avator }}" /><br>
                         </div>
                     </div>
                     <div class="row" ng-if="dream.top3user.length>2">
                         <div class="col top2" ng-if="dream.top3user.length>1" style="margin-top: 10px; background: url('img/img_No2.svg') no-repeat; background-size: 100% 100%;">
-                            <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[1].avatar | avator }}" /><br>
+                            <img ng-click="toSort()" style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[1].avatar | avator }}" /><br>
                         </div>
                         <div class="col top1" ng-if="dream.top3user.length>0" style="background: url('img/img_No1.svg') no-repeat; background-size: 100% 100%;">
-                            <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[0].avatar | avator }}" /><br>
+                            <img ng-click="toSort()" style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[0].avatar | avator }}" /><br>
                         </div>
                         <div class="col top2" ng-if="dream.top3user.length>2" style="margin-top: 10px; background: url('img/img_No3.svg') no-repeat; background-size: 100% 100%;">
-                            <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[2].avatar | avator }}" /><br>
+                            <img ng-click="toSort()" style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[2].avatar | avator }}" /><br>
                         </div>
                     </div>
                 </div>
@@ -121,10 +121,13 @@
                             <img ng-src="img/pic_leaves.png">
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="col" style="text-align: center">孤独的我还被支持呢。。。亲,帮个忙?</div>
+                    </div>
                 </div>
             </div>
-            <div style="width: 152px; margin: 0 auto" ng-if="dream.code">
-                <img ng-src="{{dream.code}}" style="width: 150px; height: 150px">
+            <div style="width: 100px; margin: 0 auto" ng-if="dream.code && user.id == dream.user_id">
+                <img ng-click="showCode('{{dream.code}}')" ng-src="{{dream.code}}" style="width: 100px; height: 100px">
             </div>
         </div>
         <div ng-if="type==2" class="hdcontent">
@@ -170,35 +173,35 @@
         </div>
         <div ng-if="type==3" class="phbcontent">
             <div class="detail-head" style="height: 180px" ng-if="dream.top3user.length>0">
-                <div class="row" ng-if="dream.top3user.length<2">
+                <div class="row" ng-if="dream.top3user.length<3">
                     <div class="col top1" ng-if="dream.top3user.length>0" style="background: url('img/img_No1.svg') no-repeat; background-size: 100% 100%;">
-                        <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[0].avatar | avator }}" /><br>
+                        <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[0].avatar | avator }}" /><br>
                         {{ dream.top3user[0].nickname }}<br>
                         <img ng-src="img/icon_gongxian.svg" style="height: 18px; width: 18px; margin-top: 5px" />
                         <em style="font-size: 16px">{{ dream.top3user[0].score }}</em>
                     </div>
                     <div class="col top2" ng-if="dream.top3user.length>1" style="background: url('img/img_No2.svg') no-repeat; background-size: 100% 100%;">
-                        <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[1].avatar | avator }}" /><br>
+                        <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[1].avatar | avator }}" /><br>
                         {{ dream.top3user[1].nickname }}<br>
-                        <img ng-src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
-                        <em style="font-size: 18px">{{ dream.top3user[1].score }}</em>
+                        <img ng-src="img/icon_gongxian.svg" style="height: 18px; width: 18px; margin-top: 5px" />
+                        <em style="font-size: 16px">{{ dream.top3user[1].score }}</em>
                     </div>
                 </div>
                 <div class="row" ng-if="dream.top3user.length>2">
                     <div class="col top2" ng-if="dream.top3user.length>1" style="background: url('img/img_No2.svg') no-repeat; background-size: 100% 100%; margin-top: 10px">
-                        <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[1].avatar | avator }}" /><br>
+                        <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[1].avatar | avator }}" /><br>
                         {{ dream.top3user[1].nickname }}<br>
                         <img ng-src="img/icon_gongxian.svg" style="height: 18px; width: 18px; margin-top: 5px" />
                         <em style="font-size: 16px">{{ dream.top3user[1].score }}</em>
                     </div>
                     <div class="col top1" ng-if="dream.top3user.length>0" style="background: url('img/img_No1.svg') no-repeat; background-size: 100% 100%;">
-                        <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[0].avatar | avator }}" /><br>
+                        <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[0].avatar | avator }}" /><br>
                         {{ dream.top3user[0].nickname }}<br>
                         <img ng-src="img/icon_gongxian.svg" style="height: 18px; width: 18px; margin-top: 5px" />
                         <em style="font-size: 16px">{{ dream.top3user[0].score }}</em>
                     </div>
                     <div class="col top2" ng-if="dream.top3user.length>2" style="background: url('img/img_No3.svg') no-repeat; background-size: 100% 100%; margin-top: 10px">
-                        <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[2].avatar | avator }}" /><br>
+                        <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%; background: #C6D3E2;" ng-src="{{ dream.top3user[2].avatar | avator }}" /><br>
                         {{ dream.top3user[2].nickname }}<br>
                         <img ng-src="img/icon_gongxian.svg" style="height: 18px; width: 18px; margin-top: 5px" />
                         <em style="font-size: 16px">{{ dream.top3user[2].score }}</em>
@@ -211,6 +214,9 @@
                         <img ng-src="img/pic_leaves.png">
                     </div>
                 </div>
+                <div class="row">
+                    <div class="col" style="text-align: center; color: #191919">孤独的我还被支持呢。。。亲,帮个忙?</div>
+                </div>
             </div>
             <div class="list padding">
                 <div class="item" ng-if="$index > 2 " ng-repeat="user in dream.topuser" style="border-bottom: 1px solid #DFDFDF">
@@ -235,6 +241,10 @@
             
         </div>
         <!--点击看大图-->
+        <div ng-if="code && type==1" ng-click="hideCode()" class="popover-backdrop">
+            <img class="code" ng-src="{{url}}">
+
+        </div>
         <div ng-if="bigImage && type==2" ng-click="hideBigImage()" class="popover-backdrop">
             <img ng-src="{{url}}">
         </div>
@@ -337,8 +347,8 @@
                             <div style="float:left; width: 35%;  margin-top: 2%; margin-left: 5%">
                                 <img ng-src="img/icon_kiss.png" style="width: 100%;">
                             </div>
-                            <div style="float:right; width: 20%; margin-top: 5%; margin-right: 5px">
-                                <img ng-src="img/icon_gold.svg" style="width: 100%">
+                            <div style="float:right; width: 20%; margin-top: 4.8%; margin-right: 5px">
+                                <img ng-src="img/icon_gold.svg" style="width: 80%">
                             </div>
                             <div style="float:right; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
                                 20
@@ -348,8 +358,8 @@
                             <div style="float:left; width: 35%;  margin-top: 2%; margin-left: 5%">
                                 <img ng-src="img/icon_candy.png" style="width: 100%;">
                             </div>
-                            <div style="float:right; width: 20%; margin-top: 5%; margin-right: 5px">
-                                <img ng-src="img/icon_gold.svg" style="width: 100%">
+                            <div style="float:right; width: 20%; margin-top: 4.8%; margin-right: 5px">
+                                <img ng-src="img/icon_gold.svg" style="width: 80%">
                             </div>
                             <div style="float:right; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
                                 50
@@ -359,8 +369,8 @@
                             <div style="float:left; width: 35%;  margin-top: 2%; margin-left: 5%">
                                 <img ng-src="img/icon_balloon.png" style="width: 100%;">
                             </div>
-                            <div style="float:right; width: 20%; margin-top: 5%; margin-right: 5px">
-                                <img ng-src="img/icon_gold.svg" style="width: 100%">
+                            <div style="float:right; width: 20%; margin-top: 4.8%; margin-right: 5px">
+                                <img ng-src="img/icon_gold.svg" style="width: 80%">
                             </div>
                             <div style="float:right; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
                                 100
@@ -372,8 +382,8 @@
                             <div style="float:left; width: 35%; margin-top: 2%; margin-left: 5%">
                                 <img ng-src="img/icon_rose.png" style="width: 100%;">
                             </div>
-                            <div style="float:right; width: 20%; margin-top: 5%; margin-right: 5px">
-                                <img ng-src="img/icon_gold.svg" style="width: 100%">
+                            <div style="float:right; width: 20%; margin-top: 4.8%; margin-right: 5px">
+                                <img ng-src="img/icon_gold.svg" style="width: 80%">
                             </div>
                             <div style="float:right; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
                                 200
@@ -383,8 +393,8 @@
                             <div style="float:left; width: 35%; margin-top: 3%; margin-left: 5%">
                                 <img ng-src="img/icon_haert.png" style="width: 100%;">
                             </div>
-                            <div style="float:right; width: 20%; margin-top: 5%; margin-right: 5px">
-                                <img ng-src="img/icon_gold.svg" style="width: 100%">
+                            <div style="float:right; width: 20%; margin-top: 4.8%; margin-right: 5px">
+                                <img ng-src="img/icon_gold.svg" style="width: 80%">
                             </div>
                             <div style="float:right; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
                                 300
@@ -394,8 +404,8 @@
                             <div style="float:left; width: 35%; margin-top: 2%; margin-left: 5%">
                                 <img ng-src="img/icon_diamond.png" style="width: 100%;">
                             </div>
-                            <div style="float:right; width: 20%; margin-top: 5%; margin-right: 5px">
-                                <img ng-src="img/icon_gold.svg" style="width: 100%">
+                            <div style="float:right; width: 20%; margin-top: 4.8%; margin-right: 5px">
+                                <img ng-src="img/icon_gold.svg" style="width: 80%">
                             </div>
                             <div style="float:right; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
                                 500
@@ -419,7 +429,7 @@
                         <em>&nbsp;充值</em>
                     </div>
                     <span style="height:100%;float: right;">
-                        <a style="border-radius:90px; min-width: 60px; height: 30px; min-height: 30px; font-size:1.1em; padding: 0; line-height: 28px; margin-top: 9px" class="button button-calm"  ng-click="supportDream()">发送</a>
+                        <a style="border-radius:90px; min-width: 60px; height: 30px; min-height: 30px; font-size:1.1em; line-height: 30px; margin-top: 9px" class="button button-calm"  ng-click="supportDream()">发送</a>
                     </span>
                 </div>
             </div>

+ 4 - 4
miaomiao/www/templates/home/index.html

xqd xqd
@@ -1,15 +1,15 @@
 <ion-view view-title="瞄喵">
     <ion-nav-buttons side="left">
-        <button class="button button-clear" style="height: 30px; width: 30px;margin-top: 1.6px;margin-left: 8px;" ng-click="openPopover($event)">
+        <button class="button button-clear" style="height: 30px; width: 30px;margin-top: 1.6px;margin-left: 2px;" ng-click="openPopover($event)">
             <img src="img/icon_menu.svg" style="height: 60%; width: 100%;">
         </button>
         <button class="button button-clear" style="height: 30px; width: 30px;font-size: 25px;" ng-click="toggleLeftSideMenu()">
-            <img src="img/btn_filter.svg" style="height: 60%; width: 100%;">
+            <img src="img/btn_filter.svg" style="height: 63%; width: 100%;">
         </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">
-            <img src="img/icon_search.svg" style="height: 65%; width: 100%">
+            <img src="img/icon_search.svg" style="height: 67%; width: 100%">
         </button>
         <button class="button button-clear" style="height: 37px; margin-top: 0.8px" ui-sref="app.message">
             <img ng-if="showMessage==1" src="img/icon_message_h.svg" style="height: 60%; width: 100%">
@@ -47,7 +47,7 @@
                             </div>
                             <div class="col" style="overflow: hidden;padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
                                 <span class="subcontent" ng-repeat="user in index.users">
-                                    <img ng-click="clickAvatar($index)" ng-if="$index<4" ng-src="{{user.avatar |avator}}" ng-class="{'defaultClass':$index !=chosedIndex,'chosenClass':$index ==chosedIndex}" style="padding: 0.5%;" />
+                                    <img ng-click="clickAvatar($index,user.id)" ng-if="$index<4" ng-src="{{user.avatar |avator}}" ng-class="{'defaultClass':$index !=chosedIndex,'chosenClass':$index ==chosedIndex}" style="padding: 0.5%;" />
                                 </span>
                             </div>
                             <div class="col col-10" style="margin-top: 7%; text-align: right" ng-click="next(2)">

+ 77 - 54
miaomiao/www/templates/home/shareDream.html

xqd
@@ -1,55 +1,78 @@
-<ion-view view-title="分享梦想页">
-    <ion-content>
-        <div class="list detail-list">
-            <div class="item" style="padding: 0">
-                <ion-slides slider="data.slider">
-                    <ion-slide-page ng-if="dream.video">
-                        <div class="box banner">
-                            <video ng-src="{{dream.video | trustUrl}}" height="170px" width="100%"  class="centerme" controls="controls" ></video>
-                        </div>
-                    </ion-slide-page>
-                    <ion-slide-page ng-repeat="img in dream.imgs" >
-                        <div class="box banner" style="height: 170px; width: 100%"><img ng-src="{{img.pic}}" style="width: 100%" /></div>
-                    </ion-slide-page>
-                </ion-slides>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>分享梦想页</title>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
+    <style>
+        body{
+            padding: 0;
+            margin: 0;
+        }
+        p{
+            -webkit-margin-before: 0.1em;
+            -webkit-margin-after: 0.1em;
+        }
+    </style>
+</head>
+<body>
+    <h4 style="text-align: center; font-weight: normal; width: 100%; border-bottom: 1px solid #DEDEDE; padding-bottom: 15px">分享梦想页</h4>
+    <img style="width: 100%; height: 100%;" src="https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=2010773385,221812410&fm=26&gp=0.jpg">
+    <p style="font-size: 17px; padding: 0 10px">标题</p>
+    <div style="border-bottom: 1px solid #DEDEDE">
+        <p style="font-size: 13px; padding: 0 10px; color: #919191">
+            等你, 在雨中, 在造虹的雨中
+            蝉声沉落, 蛙声升起
+           <!-- 一池的红莲如红焰, 在雨中
+            你来不来都一样, 竟感觉
+            每朵莲都像你
+            尤其隔着黄昏, 隔着这样的细雨
+            永恒, 刹那, 刹那, 永恒
+            等你, 在时间之外在时间之内,
+            等你, 在刹那, 在永恒
+            如果你的手在我的手里, 此刻
+            如果你的清芬
+            在我的鼻孔, 我会说, 小情人
+            诺, 这只手应该采莲, 在吴宫
+            这只手应该
+            摇一柄桂浆, 在木兰舟中
+            一颗星悬在科学馆的飞檐
+            耳坠子一般的悬着
+            瑞士表说都七点了 忽然你走来
+            步雨后的红莲, 翩翩, 你走来
+            像一首小令
+            从一则爱情的典故里你走来
+            从姜白石的词里, 有韵地, 你走来-->
+        </p>
+        <p style="text-align: center">
+            箭头
+        </p>
+    </div>
+    <div style="border-bottom: 1px solid #DEDEDE; height: 50px; padding: 5px 10px;">
+        <div style="float:left;">
+            <p>20天</p>
+            <p style="font-size: 13px; color: #919191">剩余时间</p>
+        </div>
+        <div style="float:right;">
+            <p style="text-align: right">158730</p>
+            <p style="font-size: 13px;; color: #919191">当前获得梦想分数</p>
+        </div>
+    </div>
+    <div style="clear:both; height: 50px; padding: 5px 10px;">
+        <div style="float:left;">
+            <p>20</p>
+            <p style="font-size: 13px; color: #919191">目前已获梦想币</p>
+        </div>
+        <div style="float:right;">
+            <p style="text-align: right">158730</p>
+            <p style="font-size: 13px; color: #919191">我要求的梦想币</p>
+        </div>
+    </div>
+    <div style="padding: 0 10px">
+        <div style="background-color:#E6E6E6; width: 100%;">
+            <div style="width: 20%; background: #FF6600; height: 5px">
             </div>
-            <div class="item">
-                <p>{{dream.name}}</p>
-                <p style="font-size: 13px" ng-style="aboutStyle">
-                    {{dream.about}}
-                </p>
-                <div style="text-align: center">
-                    <i class="icon ion-chevron-down" ng-if="showAbout" ng-style="aboutStyle" style="color: #00C3DA;" ng-click="showText()"></i>
-                    <i class="icon ion-chevron-up" ng-if="hideAbout" ng-style="aboutStyle" style="color: #00C3DA" ng-click="hideText()"></i>
-                </div>
-            </div>
-            <div class="item detail-item2" style="padding:5px; border-top: 1px solid #E6E6E6;">
-                <div class="row">
-                    <div class="col" style="text-align:left">
-                        <h2>{{timer}}</h2>
-                        <p>剩余时间</p>
-                    </div>
-                    <div class="col" style="text-align:right">
-                        <h2>{{dream.score}}</h2>
-                        <p>当前获得梦想分数</p>
-                    </div>
-                </div>
-            </div>
-            <div class="item" style="padding:5px; border-top: 1px solid #E6E6E6;">
-                <div class="row">
-                    <div class="col" style="text-align:left">
-                        <p style="color: #FF6600; font-size: 16px">{{dream.get_coin}}</p>
-                        <p>目前已获梦想币</p>
-                    </div>
-                    <div class="col" style="text-align:right">
-                        <h2>{{dream.coin}}</h2>
-                        <p>我要求的梦想币</p>
-                    </div>
-                </div>
-                <div class="reply-bar">
-                    <div style="width: {{100*dream.get_coin/dream.coin}}%;">
-                    </div>
-                </div>
-            </div>
-    </ion-content>
-</ion-view>
+        </div>
+    </div>
+</body>
+</html>