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

# Conflicts:
#	miaomiao/www/templates/home/index.html

miaomiao/www/.idea/workspace.xml

@@ -20,55 +20,77 @@
     <favorites_list name="www" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="login.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/account/login.html">
+    <leaf>
+      <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="-1.3571428">
-              <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+            <state vertical-scroll-proportion="0.5473098">
+              <caret line="139" column="68" selection-start-line="139" selection-start-column="67" selection-end-line="139" selection-end-column="68" />
               <folding>
-                <element signature="n#style#0;n#img#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#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#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#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#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#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#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#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#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#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#1;n#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#p#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#input#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#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#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#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#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#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#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#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#2;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#2;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#2;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#0;n#div#2;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#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/home/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-7.172414">
-              <caret line="76" column="88" selection-start-line="76" selection-start-column="80" selection-end-line="76" selection-end-column="88" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="filter.js" pinned="false" current-in-tab="true">
+      <file leaf-file-name="filter.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.5102421">
-              <caret line="73" column="30" selection-start-line="73" selection-start-column="30" selection-end-line="73" selection-end-column="30" />
+            <state vertical-scroll-proportion="-5.9666667">
+              <caret line="46" column="25" selection-start-line="46" selection-start-column="19" selection-end-line="46" selection-end-column="25" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="account.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+      <file leaf-file-name="directive.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/directives/directive.js">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="20" column="63" selection-start-line="20" selection-start-column="63" selection-end-line="20" selection-end-column="63" />
-              <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="0.0">
-              <caret line="541" column="34" selection-start-line="541" selection-start-column="34" selection-end-line="541" selection-end-column="34" />
+              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -79,56 +101,66 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="HTML File" />
         <option value="JavaScript File" />
+        <option value="CSS File" />
+        <option value="HTML File" />
       </list>
     </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/templates/my/my-message.html" />
-        <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
-        <option value="$PROJECT_DIR$/templates/home/user-detail.html" />
-        <option value="$PROJECT_DIR$/js/services/tabsService.js" />
-        <option value="$PROJECT_DIR$/js/services/myservice.js" />
-        <option value="$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/controllers/my.js" />
-        <option value="$PROJECT_DIR$/templates/tabs.html" />
-        <option value="$PROJECT_DIR$/js/controllers/tabs.js" />
-        <option value="$PROJECT_DIR$/js/services/homeservice.js" />
-        <option value="$PROJECT_DIR$/templates/home/search.html" />
-        <option value="$PROJECT_DIR$/templates/my/index.html" />
-        <option value="$PROJECT_DIR$/js/config/config.js" />
-        <option value="$PROJECT_DIR$/templates/my/my-recharge.html" />
-        <option value="$PROJECT_DIR$/templates/home/userDetail.html" />
-        <option value="$PROJECT_DIR$/templates/add/index.html" />
-        <option value="$PROJECT_DIR$/templates/my/my-account.html" />
-        <option value="$PROJECT_DIR$/templates/my/attention.html" />
-        <option value="$PROJECT_DIR$/templates/home/oldDream.html" />
-        <option value="$PROJECT_DIR$/templates/my/my-collect.html" />
-        <option value="E:/Graduation design/huiwei/js/index.js" />
-        <option value="$PROJECT_DIR$/templates/home/index.html" />
-        <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
-        <option value="$PROJECT_DIR$/templates/my/my-profile.html" />
-        <option value="E:/Graduation design/huiwei/css/index.css" />
-        <option value="$PROJECT_DIR$/js/controllers/add.js" />
-        <option value="E:/Graduation design/huiwei/index.html" />
-        <option value="$PROJECT_DIR$/templates/account/loginAccount.html" />
-        <option value="E:/Graduation design/huiwei/package.json" />
-        <option value="E:/Graduation design/huiwei/gulpfile.js" />
-        <option value="E:/Graduation design/lala/package.json" />
-        <option value="E:/Graduation design/lala/a.js" />
-        <option value="E:/Graduation design/lala/index.html" />
-        <option value="E:/Graduation design/lala/gulpfile.js" />
-        <option value="$PROJECT_DIR$/js/controllers/home.js" />
-        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
         <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/templates/account/login.html" />
-        <option value="$PROJECT_DIR$/js/config/router.js" />
+        <option value="$PROJECT_DIR$/templates/home/index.html" />
+        <option value="$PROJECT_DIR$/js/services/homeservice.js" />
+        <option value="$PROJECT_DIR$/js/filters/filter.js" />
+        <option value="$PROJECT_DIR$/js/services/commonservice.js" />
+        <option value="$PROJECT_DIR$/templates/account/loginAccount.html" />
+        <option value="$PROJECT_DIR$/js/directives/directive.js" />
         <option value="$PROJECT_DIR$/js/services/userservice.js" />
+        <option value="$PROJECT_DIR$/js/config/config.js" />
+        <option value="$PROJECT_DIR$/js/services/httpinterceptor.js" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/validationEngine_jquery.css" />
+        <option value="$PROJECT_DIR$/../../../honest/css/validationEngine_jquery.css" />
+        <option value="$PROJECT_DIR$/../../../honest/css/dashicons_min.css" />
+        <option value="$PROJECT_DIR$/../../../honest/css/elusive-css.html" />
+        <option value="$PROJECT_DIR$/../../../honest/index.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/css/style.css" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/car/car-index.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/car/car-route.html" />
+        <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/autonym1.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/forgetpassword.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/owner1.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/owner2.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/register.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/registerindex.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/js/controllers/account.js" />
+        <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" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/my/my-account-add.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/my/my-setting-mobile.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-setting-mobile.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
-        <option value="$PROJECT_DIR$/js/filters/filter.js" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-mine.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/publish.js" />
+        <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/templates/menu.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/menu.js" />
+        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
       </list>
     </option>
   </component>
@@ -138,10 +170,32 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="500" />
-    <option name="width" value="876" />
+    <option name="x" value="369" />
+    <option name="width" value="996" />
     <option name="height" value="728" />
   </component>
+  <component name="ProjectInspectionProfilesVisibleTreeState">
+    <entry key="Project Default">
+      <profile-state>
+        <expanded-state>
+          <State>
+            <id />
+          </State>
+          <State>
+            <id>Data flow issuesJavaScript</id>
+          </State>
+          <State>
+            <id>JavaScript</id>
+          </State>
+        </expanded-state>
+        <selected-state>
+          <State>
+            <id>CoffeeScript</id>
+          </State>
+        </selected-state>
+      </profile-state>
+    </entry>
+  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
@@ -167,7 +221,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -178,6 +231,7 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="Scratches" />
     </panes>
   </component>
@@ -187,8 +241,21 @@
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
     <property name="DefaultHtmlFileTemplate" value="HTML File" />
+    <property name="settings.editor.selected.configurable" value="liveEdit" />
+    <property name="settings.editor.splitter.proportion" value="0.2" />
+    <property name="list.type.of.created.stylesheet" value="CSS" />
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Gulp.js.default">
+    <configuration default="false" name="default" type="js.build_tools.gulp" factoryName="Gulp.js" temporary="true">
+      <node-options />
+      <gulpfile>E:/Graduation design/lala/gulpfile.js</gulpfile>
+      <tasks>
+        <task>default</task>
+      </tasks>
+      <arguments />
+      <envs />
+      <method />
+    </configuration>
     <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
       <method />
     </configuration>
@@ -237,6 +304,14 @@
       <recursive>false</recursive>
       <method />
     </configuration>
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="Gulp.js.default" />
+    </list>
+    <recent_temporary>
+      <list size="1">
+        <item index="0" class="java.lang.String" itemvalue="Gulp.js.default" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="ShelveChangesManager" show_recycled="false" />
   <component name="SvnConfiguration">
@@ -252,14 +327,14 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="500" y="0" width="876" height="728" extended-state="0" />
+    <frame x="369" y="0" width="996" height="728" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16871509" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16815476" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32885906" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24916202" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -289,393 +364,492 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/js/app.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/register.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.1183534">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="-5.428571">
+          <caret line="8" column="64" selection-start-line="8" selection-start-column="64" selection-end-line="8" selection-end-column="64" />
+          <folding>
+            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-setting.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/registerindex.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44504505">
-          <caret line="13" column="32" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        <state vertical-scroll-proportion="-4.75">
+          <caret line="7" column="64" selection-start-line="7" selection-start-column="64" selection-end-line="7" selection-end-column="64" />
+          <folding>
+            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/storageservice.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/account/forgetpassword.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.16295026">
-          <caret line="5" column="50" selection-start-line="5" selection-start-column="50" selection-end-line="5" selection-end-column="50" />
+        <state vertical-scroll-proportion="-4.75">
+          <caret line="7" column="64" selection-start-line="7" selection-start-column="64" selection-end-line="7" selection-end-column="64" />
+          <folding>
+            <element signature="n#style#0;n#h1#0;n#ion-header-bar#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#button#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/httpinterceptor.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/account/register.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.36878216">
-          <caret line="13" column="26" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        <state vertical-scroll-proportion="-10.178572">
+          <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
+          <folding>
+            <element signature="n#style#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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-message.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/account/login.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.392857">
-          <caret line="5" column="40" selection-start-line="5" selection-start-column="40" selection-end-line="5" selection-end-column="40" />
+        <state vertical-scroll-proportion="-12.214286">
+          <caret line="18" column="18" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
+          <folding>
+            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#input#0;n#label#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#input#0;n#label#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/select.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.57117116">
-          <caret line="93" column="47" selection-start-line="93" selection-start-column="47" selection-end-line="93" selection-end-column="47" />
+        <state vertical-scroll-proportion="-7.5">
+          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
+          <folding>
+            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
+    <entry file="file://$PROJECT_DIR$/../scss/ionic.app.scss">
       <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../wuliu/wl/www/js/services/carservice.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="6" column="21" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
+        <state vertical-scroll-proportion="-4.0666666">
+          <caret line="35" column="28" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../wuliu/wl/www/js/services/utilservice.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/withdraw.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="8" column="34" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="34" />
+        <state vertical-scroll-proportion="-7.464286">
+          <caret line="11" column="44" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
+          <folding>
+            <element signature="n#style#0;n#input#0;n#label#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../wuliu/wl/www/js/controllers/car.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/my/my-wallet-deposit.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.034358047">
-          <caret line="136" column="18" selection-start-line="136" selection-start-column="18" selection-end-line="136" selection-end-column="18" />
+        <state vertical-scroll-proportion="0.3877551">
+          <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../wuliu/wl/www/js/services/myservice.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/commonservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03259005">
-          <caret line="34" column="33" selection-start-line="34" selection-start-column="33" selection-end-line="34" selection-end-column="33" />
+        <state vertical-scroll-proportion="-5.9666667">
+          <caret line="142" column="33" selection-start-line="142" selection-start-column="28" selection-end-line="142" selection-end-column="33" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../wuliu/wl/www/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/httpinterceptor.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17152658">
-          <caret line="111" column="48" selection-start-line="111" selection-start-column="48" selection-end-line="111" selection-end-column="48" />
+        <state vertical-scroll-proportion="-5.9666667">
+          <caret line="34" column="35" selection-start-line="34" selection-start-column="30" selection-end-line="34" selection-end-column="35" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/index.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/lib/ionic/css/ionic.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.142858">
-          <caret line="21" column="38" selection-start-line="21" selection-start-column="38" selection-end-line="21" selection-end-column="38" />
+        <state vertical-scroll-proportion="-0.26129666">
+          <caret line="23" column="38" selection-start-line="23" selection-start-column="38" selection-end-line="23" selection-end-column="38" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/tabs.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.37657657">
-          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.38899803">
+          <caret line="25" column="21" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/forgetpassword.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-5.321429">
+          <caret line="12" column="134" selection-start-line="12" selection-start-column="77" selection-end-line="12" selection-end-column="134" />
+          <folding>
+            <element signature="n#style#0;n#h1#0;n#ion-header-bar#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#h2#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <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="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/tabs.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-setting-mobile.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.380789">
-          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        <state vertical-scroll-proportion="0.4935065">
+          <caret line="14" column="107" selection-start-line="14" selection-start-column="107" selection-end-line="14" selection-end-column="107" />
+          <folding>
+            <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/search.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/my/my-setting-mobile.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6742857">
-          <caret line="110" column="35" selection-start-line="110" selection-start-column="35" selection-end-line="110" selection-end-column="35" />
+        <state vertical-scroll-proportion="0.4935065">
+          <caret line="14" column="59" selection-start-line="14" selection-start-column="59" selection-end-line="14" selection-end-column="59" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-recharge.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/my/my-account-add.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-10.178572">
-          <caret line="34" column="55" selection-start-line="34" selection-start-column="55" selection-end-line="34" selection-end-column="55" />
+        <state vertical-scroll-proportion="-1.3571428">
+          <caret line="2" column="33" selection-start-line="1" selection-start-column="14" selection-end-line="2" selection-end-column="33" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/addExplain.html">
+    <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.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/attention.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.3571428">
-          <caret line="2" column="33" selection-start-line="2" selection-start-column="33" selection-end-line="2" selection-end-column="33" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-account.html">
+    <entry file="file://$PROJECT_DIR$/templates/account/loginAccount.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.21150278">
-          <caret line="6" column="36" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
+        <state vertical-scroll-proportion="0.118738405">
+          <caret line="12" column="84" selection-start-line="12" selection-start-column="84" selection-end-line="12" selection-end-column="84" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
+    <entry file="file://$PROJECT_DIR$/templates/account/login.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.107143">
-          <caret line="78" column="48" selection-start-line="78" selection-start-column="38" selection-end-line="78" selection-end-column="48" />
+        <state vertical-scroll-proportion="0.14100185">
+          <caret line="4" column="42" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/oldDream.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-12.892858">
-          <caret line="38" column="100" selection-start-line="34" selection-start-column="15" selection-end-line="38" selection-end-column="100" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-collect.html">
+    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-12.107142">
-          <caret line="44" column="80" selection-start-line="33" selection-start-column="0" selection-end-line="44" selection-end-column="80" />
+        <state vertical-scroll-proportion="0.3015873">
+          <caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/publish.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.428571">
-          <caret line="20" column="40" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="40" />
+        <state vertical-scroll-proportion="-6.9666667">
+          <caret line="71" column="42" selection-start-line="71" selection-start-column="31" selection-end-line="71" selection-end-column="42" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3015873">
-          <caret line="9" column="57" selection-start-line="9" selection-start-column="57" selection-end-line="9" selection-end-column="57" />
+        <state vertical-scroll-proportion="0.3172542">
+          <caret line="196" column="27" selection-start-line="196" selection-start-column="27" selection-end-line="196" selection-end-column="27" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-mine.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.142858">
-          <caret line="12" column="40" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" />
+        <state vertical-scroll-proportion="-1.5689656">
+          <caret line="122" column="22" selection-start-line="122" selection-start-column="22" selection-end-line="122" selection-end-column="22" />
+          <folding>
+            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-profile.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.7">
-          <caret line="65" column="18" selection-start-line="65" selection-start-column="12" selection-end-line="65" selection-end-column="18" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/templates/tabs.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="14.566667">
-          <caret line="12" column="48" selection-start-line="12" selection-start-column="48" selection-end-line="12" selection-end-column="48" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-profile.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.6827458">
-          <caret line="65" column="14" selection-start-line="65" selection-start-column="14" selection-end-line="65" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.33333334">
+          <caret line="10" column="37" selection-start-line="10" selection-start-column="36" selection-end-line="10" selection-end-column="37" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-rentDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.7">
-          <caret line="79" column="24" selection-start-line="79" selection-start-column="12" selection-end-line="79" selection-end-column="24" />
+        <state vertical-scroll-proportion="0.30810812">
+          <caret line="24" column="19" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../package.json">
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
       <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" />
+        <state vertical-scroll-proportion="0.65180105">
+          <caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../gulpfile.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-profile.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4691358">
-          <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="27" selection-end-column="5" />
+        <state vertical-scroll-proportion="0.37657657">
+          <caret line="23" column="50" selection-start-line="23" selection-start-column="50" selection-end-line="23" selection-end-column="50" />
           <folding>
-            <element signature="n#!!doc" expanded="false" />
+            <element signature="n#style#0;n#input#0;n#label#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/huiwei/index.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-setting-material.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.10575139">
-          <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" />
+        <state vertical-scroll-proportion="-3.392857">
+          <caret line="5" column="27" selection-start-line="5" selection-start-column="27" selection-end-line="5" selection-end-column="27" />
+          <folding>
+            <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#input#0;n#div#2;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#input#0;n#div#3;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#input#1;n#div#3;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/account/loginAccount.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.7142856">
-          <caret line="4" column="14" selection-start-line="1" selection-start-column="38" selection-end-line="4" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.5255732">
+          <caret line="174" column="54" selection-start-line="174" selection-start-column="54" selection-end-line="174" selection-end-column="54" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/huiwei/package.json">
+    <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.7050093">
-          <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="5" column="46" selection-start-line="5" selection-start-column="46" selection-end-line="5" selection-end-column="46" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/huiwei/gulpfile.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.16754851">
-          <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+        <state vertical-scroll-proportion="-5.9666667">
+          <caret line="13" column="27" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/lala/package.json">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/menu.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="5" column="14" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.10018553">
+          <caret line="26" column="54" selection-start-line="26" selection-start-column="54" selection-end-line="26" selection-end-column="54" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/lala/gulpfile.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2680776">
-          <caret line="8" column="36" selection-start-line="8" selection-start-column="36" selection-end-line="8" selection-end-column="36" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/lala/a.js">
+    <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.0">
-          <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/lala/index.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/menu.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.428571">
-          <caret line="8" column="8" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="1" column="153" selection-start-line="1" selection-start-column="153" selection-end-line="1" selection-end-column="153" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17625232">
-          <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="-7.6">
+          <caret line="12" column="65" selection-start-line="12" selection-start-column="65" selection-end-line="12" selection-end-column="65" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/msgservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5102421">
-          <caret line="40" column="14" selection-start-line="34" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
+        <state vertical-scroll-proportion="-2.4333334">
+          <caret line="61" column="47" selection-start-line="61" selection-start-column="47" selection-end-line="61" selection-end-column="47" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/userservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6306483">
-          <caret line="523" column="22" selection-start-line="523" selection-start-column="22" selection-end-line="523" selection-end-column="22" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/storageservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29469547">
-          <caret line="428" column="14" selection-start-line="428" selection-start-column="14" selection-end-line="428" selection-end-column="14" />
-          <folding>
-            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#img#1;n#div#2;n#div#1;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#div#1;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#2;n#div#1;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#2;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="0.2774674">
+          <caret line="8" column="58" selection-start-line="8" selection-start-column="58" selection-end-line="8" selection-end-column="58" />
+          <folding />
         </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.33509701">
-          <caret line="10" column="54" selection-start-line="10" selection-start-column="48" selection-end-line="10" selection-end-column="54" />
+        <state vertical-scroll-proportion="-1.2666667">
+          <caret line="2" column="37" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/router.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.38919926">
-          <caret line="11" column="37" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
+        <state vertical-scroll-proportion="-9.766666">
+          <caret line="32" column="10" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.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.0">
-          <caret line="20" column="63" selection-start-line="20" selection-start-column="63" selection-end-line="20" selection-end-column="63" />
+        <state vertical-scroll-proportion="-10.178572">
+          <caret line="24" column="46" selection-start-line="24" selection-start-column="45" selection-end-line="24" selection-end-column="46" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/js/directives/directive.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="541" column="34" selection-start-line="541" selection-start-column="34" selection-end-line="541" selection-end-column="34" />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/account/login.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.3571428">
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-          <folding>
-            <element signature="n#style#0;n#img#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.172414">
-          <caret line="76" column="88" selection-start-line="76" selection-start-column="80" selection-end-line="76" selection-end-column="88" />
+        <state vertical-scroll-proportion="-5.9666667">
+          <caret line="46" column="25" selection-start-line="46" selection-start-column="19" selection-end-line="46" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5102421">
-          <caret line="73" column="30" selection-start-line="73" selection-start-column="30" selection-end-line="73" selection-end-column="30" />
-          <folding />
+        <state vertical-scroll-proportion="0.5473098">
+          <caret line="139" column="68" selection-start-line="139" selection-start-column="67" selection-end-line="139" selection-end-column="68" />
+          <folding>
+            <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#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#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#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#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#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#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#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#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#1;n#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#p#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#input#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#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#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#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#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#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#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#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#2;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#2;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#2;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#0;n#div#2;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#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

miaomiao/www/.project

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

miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao",
-  "release": "2017.08.23-18.23.45"
+  "release": "2017.08.24-18.40.21"
 }

miaomiao/www/chcp.manifest

@@ -13,7 +13,7 @@
   },
   {
     "file": ".idea/workspace.xml",
-    "hash": "0ca83fcf6e1f13fc63df3fbf698ca565"
+    "hash": "210b8584491c81a232e780073afb48c4"
   },
   {
     "file": ".idea/www.iml",
@@ -29,7 +29,7 @@
   },
   {
     "file": "css/style.css",
-    "hash": "a756d7e02ed8e14f4b56de9ea23412ce"
+    "hash": "31b444c02568e09999f96319c1e0c401"
   },
   {
     "file": "img/alipay.png",
@@ -111,6 +111,10 @@
     "file": "img/emoticon.png",
     "hash": "47c618360e462e57e7246abcbfa14dca"
   },
+  {
+    "file": "img/friends.svg",
+    "hash": "53c2b915c069dbc97f415d1e3da43536"
+  },
   {
     "file": "img/haoyou.png",
     "hash": "69c9dc354fc78ccc222e1934e03bf64d"
@@ -327,6 +331,10 @@
     "file": "img/king.png",
     "hash": "7a74235775e6b25d90e496bea37b3d2b"
   },
+  {
+    "file": "img/Moments.svg",
+    "hash": "64f414ca3d27e4b453f10dd2a50cf300"
+  },
   {
     "file": "img/nan.png",
     "hash": "bf9f107acb8fbd90992efcd92a7a7e60"
@@ -369,11 +377,11 @@
   },
   {
     "file": "js/config/router.js",
-    "hash": "e5fae9284235efb500d94ace6ec81f86"
+    "hash": "d46342ba91814d876d1f6363ec01d803"
   },
   {
     "file": "js/controllers/account.js",
-    "hash": "fe3ef2c90e4b2caa1208b2c672dc54b9"
+    "hash": "66b3cf6b86a8768db44c4a8999c00cf9"
   },
   {
     "file": "js/controllers/add.js",
@@ -381,7 +389,7 @@
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "3f2f9d1aec9286050dbb523a76e40eb0"
+    "hash": "d26d0c77be3f7f68014fb49af5af1731"
   },
   {
     "file": "js/controllers/my.js",
@@ -393,11 +401,11 @@
   },
   {
     "file": "js/directives/directive.js",
-    "hash": "367e98933d90b42be32ab7da68af9adc"
+    "hash": "d7a3cab12d6df7b0bdd75273b193a702"
   },
   {
     "file": "js/filters/filter.js",
-    "hash": "85292a7deef8d136aa06e31d1533ac8b"
+    "hash": "1d8e1b2e57bc381c3e8bb48aa0f4e5f2"
   },
   {
     "file": "js/platformOverrides.js",
@@ -413,7 +421,7 @@
   },
   {
     "file": "js/services/homeservice.js",
-    "hash": "6c4903ba1b134dcca60a67627174c0bc"
+    "hash": "6dab0d50b06b07f1a61d5c8072dba3ec"
   },
   {
     "file": "js/services/httpinterceptor.js",
@@ -437,7 +445,7 @@
   },
   {
     "file": "js/services/userservice.js",
-    "hash": "8e00d462cf35b59f9f682b60db10d83b"
+    "hash": "133aeffa93550f16a20a238935e1ba5e"
   },
   {
     "file": "js/services/utilservice.js",
@@ -711,13 +719,17 @@
     "file": "lib/ionic/version.json",
     "hash": "721aa5850970a96f989a738432b910fe"
   },
+  {
+    "file": "manifest.json",
+    "hash": "cec6607f6cc8f6a2dfb9ad4773926ec7"
+  },
   {
     "file": "templates/account/login.html",
-    "hash": "d7ec097c6b4560a23ce5c5b19d953406"
+    "hash": "12230625b514919df06b4aad59bcb310"
   },
   {
     "file": "templates/account/loginAccount.html",
-    "hash": "77c0e041f70b3c9bb3954f5973bcf991"
+    "hash": "c42b621513548233e6d9e2e552420663"
   },
   {
     "file": "templates/add/addExplain.html",
@@ -729,11 +741,11 @@
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "d620451043f133f2bb98b3ed84f637a1"
+    "hash": "6842b9976094aab85e99f52f62ccdce2"
   },
   {
     "file": "templates/home/index.html",
-    "hash": "935146196b3ff3dceb761e5db0618d33"
+    "hash": "05e7de1aeb3097a3af063ef606554945"
   },
   {
     "file": "templates/home/oldDream.html",

miaomiao/www/js/controllers/account.js

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

miaomiao/www/js/controllers/home.js

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

miaomiao/www/js/directives/directive.js

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

miaomiao/www/js/services/homeservice.js

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

miaomiao/www/manifest.json

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

miaomiao/www/templates/account/login.html

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

miaomiao/www/templates/account/loginAccount.html

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

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

@@ -97,21 +97,21 @@
                 <div class="detail-head" style="height: 130px" ng-if="dream.top3user.length>0">
                     <div class="row" ng-if="dream.top3user.length<2">
                         <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 }}" /><br>
+                            <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%;" 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 }}" /><br>
+                            <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" 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 }}" /><br>
+                            <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" 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 }}" /><br>
+                            <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%;" 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 }}" /><br>
+                            <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[2].avatar | avator }}" /><br>
                         </div>
                     </div>
                 </div>
@@ -137,7 +137,7 @@
                         </a>
                     </div>
                     <div class="item" style="border-bottom:15px solid #F2F2F2;" ng-click="add_comment()" ng-repeat="interaction in dream.interactions">
-                        <img  class="head" ng-src="{{dream.user.avatar}}" />
+                        <img  class="head" ng-src="{{dream.user.avatar | avator}}" />
                         <span  class="utitle">{{dream.user.nickname}}</span>
                         <!--<span class="utitle kz">{{dream.end_time | lastDate}}</span>-->
                         <span class="utitle kz">{{dream.created_at}}</span>
@@ -179,36 +179,36 @@
             <div class="detail-head" style="height: 180px" ng-if="dream.top3user.length>0">
                 <div class="row" ng-if="dream.top3user.length<2">
                     <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 }}" /><br>
+                        <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%;" 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 }}" /><br>
+                        <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" 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>
                     </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%;">
-                        <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[1].avatar }}" /><br>
+                    <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>
                         {{ 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 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 }}" /><br>
+                        <img style="width: 75px; height: 75px; margin: 25px 0 8px 0; border-radius: 100%;" 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%;">
-                        <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" ng-src="{{ dream.top3user[2].avatar }}" /><br>
+                    <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>
                         {{ dream.top3user[2].nickname }}<br>
-                        <img ng-src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
-                        <em style="font-size: 18px">{{ dream.top3user[2].score }}</em>
+                        <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>
                     </div>
                 </div>
             </div>
@@ -226,7 +226,7 @@
                     </div>
                     <div style="padding-left:20px; float:left;">
                         <div style="float:left;">
-                            <img style="width:40px;border-radius:100%" ng-src="{{user.avatar}}" />
+                            <img style="width:40px;border-radius:100%" ng-src="{{user.avatar | avator}}" />
                         </div>
                         <div style="float:left; margin-left: 10px">
                             <div style="font-size: 16px">{{user.nickname}}</div>
@@ -433,11 +433,11 @@
         </div>
     <div class="detail-like" ng-if="toshare">
         <div class="row">
-            <div class="col" ng-click="shareDream(1)">
+            <div class="col" ng-click="share(0)">
                 <img ng-src="img/friends.svg" ><br>
                 分享给朋友
             </div>
-            <div class="col" ng-click="shareDream(2)">
+            <div class="col" ng-click="share(1)">
                 <img ng-src="img/Moments.svg" ><br>
                 分享到朋友圈
             </div>

miaomiao/www/templates/home/index.html

@@ -115,7 +115,59 @@
            <ion-radio ng-model="filter.age" ng-value="'5'">34-37</ion-radio>
            <ion-radio ng-model="filter.age" ng-value="'6'">>38</ion-radio>
        </div>
+<<<<<<< .mine
       
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+       <div class="row">
+           <div class="col">
+               <button class="button button-stable {{filter.age==3?'button-calm':''}}" ng-click="changeFilter('26-29')" style="min-width:3rem">
+                   26-29
+               </button>
+           </div>
+           <div class="col">
+               <button class="button button-stable  {{filter.age==4?'button-calm':''}}" ng-click="changeFilter('30-33')" style="min-width:3rem">
+                   30-33
+               </button>
+           </div> 
+          
+       </div>
+       <div class="row">
+           <div class="col">
+               <button class="button button-stable {{filter.age==5?'button-calm':''}}" ng-click="changeFilter('34-37')" style="min-width:3rem">
+                   34-37
+               </button>
+           </div>
+           <div class="col">
+               <button class="button button-stable  {{filter.age==6?'button-calm':''}}" ng-click="changeFilter('>37')" style="min-width:3rem">
+                   >37
+               </button>
+           </div> 
+       </div>       
+>>>>>>> .theirs
    </div>
   <label class="item item-select item-select-width">
     <span class="input-label">地区</span>

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

@@ -24,7 +24,6 @@
              <select name="sex" ng-model="vm.sex">
                  <option value="0">男</option>
                  <option value="1">女</option>
-
              </select>
          </label>
          <label class="item item-input ">

miaomiao/www/unpackage/.confirmed_dependencies

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

server/app/Http/Controllers/Api/V1/AuthController.php

@@ -30,7 +30,7 @@ class AuthController extends Controller
      * @apiPermission none
      * @apiVersion 0.1.0
      * @apiParam {string}  phone    手机号码
-     * @apiParam {string}  [wechat]    微信openid
+     * @apiParam {string}  wechat   微信openid
      * @apiParam {String}  verify_code  手机验证码
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
@@ -70,10 +70,12 @@ class AuthController extends Controller
     public function login(Request $request) {
         $validator = Validator::make($request->all(),
             [
+//                'wechat'      => 'required',
                 'phone'         => 'required|regex:/^1[34578]\d{9}$/',
                 'verify_code'      => 'required',
             ],
             [
+//                'wechat.required'      => '请先绑定微信',
                 'phone.required'        => '请输入手机号码',
                 'phone.regex'           => '手机号码格式不正确',
                 'verify_code.required'      => '短信验证码必填',
@@ -82,7 +84,6 @@ class AuthController extends Controller
 
         if ($validator->fails())
             return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-
         $phone = $request->phone;
         $wechat = $request->wechat;
         $key = $this->keySmsCode . $phone;
@@ -91,17 +92,22 @@ class AuthController extends Controller
         if ($request->verify_code != $code) return $this->error(ErrorCode::SERVICE_CODE_FAILED);
         $user = UserInfoModel::where('phone',$phone)->first();
         if (empty($user)) {
-            $user = UserInfoModel::create(['phone'=>$phone,'password'=>bcrypt(123456)]);
+            $user = UserInfoModel::create([
+                'phone'=>$phone,
+                'wechat'=>$wechat,
+                'password'=>bcrypt(123456)
+            ]);
             $user->status=1;
+            $user->save();
         }
         $status =empty($user) ? 0 : $user->status;
         if ($status == 0) return $this->error(ErrorCode::LOCK_USER);
         if (Auth::attempt(['phone'=>$phone,'password'=>$password])) {
             $user = Auth::user();
-            if (!empty($wechat)) {
+         /*   if (!empty($wechat)) {
                 $user->wechat =$wechat;
                 $user->save();
-            }
+            }*/
             \Log::info($user);
             $token = $user->createToken($user->phone)->accessToken;
             return $this->api(compact( 'user', 'code','token'));

server/app/Http/Controllers/Api/V1/DreamController.php

@@ -729,4 +729,37 @@ class DreamController extends Controller
         }
     }
 
+    /**
+     * @api {get} /api/dream/share 分享
+     * @apiDescription 分享
+     * @apiParam {int}  id          梦想id
+     * @apiGroup Dream
+     * @apiPermission Passport
+     * @apiVersion 0.1.0
+     */
+//    分享梦想
+    public function share(Request $request)
+    {
+        $validator = \Validator::make($request->all(),
+            [
+                'id'  => 'required',
+            ],
+            [
+                'id.required'  => '梦想id不存在',
+            ]
+        );
+        if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
+        $url = env('APP_URL').'/api/dream/show?id='.$request->id;
+        $dream = DreamInfoModel::with('img')->find($request->id);
+        $img = !empty($dream->img) ? $dream->img->pic : '';
+        $html =
+            "<div style='text-align: center'>
+                <a href='$url'>
+                    <h1>$dream->name</h1>
+                    <img src=\"$img\" style='width: 20px;height: 20px;' alt=''>
+                </a>
+            </div>";
+        return $html;
+    }
+
 }

server/app/Http/Controllers/Api/V1/IndexController.php

@@ -313,4 +313,116 @@ class IndexController extends Controller
 
     }
 
+    /**
+     * @api {get}  /api/index/filter 筛选
+     * @apiDescription 筛选
+     * @apiGroup Index
+     * @apiPermission none
+     * @apiVersion 0.1.0
+     * @apiParam {string}  [sex]   性别   //1男,2女,0:全部,
+     * @apiParam {string}  [age]   年龄段  0:全部,1:18-21,2:22-25,3:26-29,4:30-33,5:34-37,6:>37,
+     * @apiParam {string}  [area]   地区   例：成都
+     * @apiSuccessExample {json} Success-Response:
+     * HTTP/1.1 200 OK
+     *{
+     *    "status": true,
+     *    "status_code": 0,
+     *    "message": "",
+     *    "data":[
+     *      {
+     *         "nickname": "ha",  昵称
+     *         "pic": "",    头像
+     *          ...
+     *      },
+     *   ]
+     *}
+     * @apiErrorExample {json} Error-Response:
+     * HTTP/1.1 400 Bad Request
+     */
+    public function filter(Request $request)
+    {
+        $sex = $request->sex;
+        $age = $request->age;
+        $area = $request->area;
+        $login_user = $this->getUser();
+        $id = $login_user->id;
+        $query = new DreamInfoModel();
+        if (($sex) == 1) {
+            $query = $query->whereHas('user', function ($select) use ($sex) {
+                $select->where('sex',0);
+            });
+        }
+        if (($sex) == 2) {
+            $query = $query->whereHas('user', function ($select) use ($sex) {
+                $select->where('sex',1);
+            });
+        }
+        if ($age == 1) {
+            $query = $query->whereHas('user', function ($select) use ($age) {
+                $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-21)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-18)));
+            });
+        }
+        if ($age == 2) {
+            $query = $query->whereHas('user', function ($select) use ($age) {
+                $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-25)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-22)));
+            });
+        }
+        if ($age == 3) {
+            $query = $query->whereHas('user', function ($select) use ($age) {
+                $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-29)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-26)));
+            });
+        }
+        if ($age == 4) {
+            $query = $query->whereHas('user', function ($select) use ($age) {
+                $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-33)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-30)));
+            });
+        }
+        if ($age == 5) {
+            $query = $query->whereHas('user', function ($select) use ($age) {
+                $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-37)))->where('birthday','<=',date('Y-m-d',strtotime(date('Y')-34)));
+            });
+        }
+        if ($age == 6) {
+            $query = $query->whereHas('user', function ($select) use ($age) {
+                $select->where('birthday','>=',date('Y-m-d',strtotime(date('Y')-38)));
+            });
+        }
+
+        if (!empty($area)) {
+            $query = $query->whereHas('user', function ($select) use ($area) {
+                $select->where('city','like','%'.$area.'%');
+            });
+        }
+        $arr1 =DreamInfoModel::limit(20)->select('id')->get()->toArray();
+        $id_arr1 = array_column($arr1,'id');
+        $arr2 =DreamInfoModel::orderBy('score','desc')->limit(120)->select('id')->get()->toArray();
+        $id_arr2 = array_column($arr2,'id');
+        $dtusers =UserCareUser::where('user_id',$id)->with('other_user')->
+        where('dream_number','>',0)->orderBy('created_at')->get()->toArray();
+        $hdusers = CommentInfoModel::where(function ($query) use ($id) {
+            $query->where('user_id',$id)->orWhere('to_user_id',$id);
+        })->where('is_read',0)->with('to_user')->orderBy('created_at')->get()->toArray();
+        $users = [] ;
+        foreach ($dtusers as $k => $v){
+            $users[] = $v['other_user'];
+        }
+        foreach ($hdusers as $k => $v){
+            $users[] = $v['to_user'];
+        }
+        $type = $request->type;
+        if ($type == 'trend') {
+            $dreams = $query->orderBy('score','desc')->with('user')->whereNotIn('id', $id_arr1)->limit(100)->paginate(20);
+            $this->dreams($dreams);
+            return $this->api(compact('users','dreams'));
+        } elseif ($type == 'news') {
+            $dreams = $query->orderBy('score','desc')->orderBy('created_at','desc')->with('user')->whereNotIn('id', $id_arr2)->limit(500)->paginate(20);
+            $this->dreams($dreams);
+            return $this->api(compact('users','dreams'));
+        } else{
+            $banners = $this->getBanner();
+            $dreams = $query->orderBy('score','desc')->with('user')->limit(20)->paginate(20);
+            $this->dreams($dreams);
+            return $this->api(compact('banners','users','dreams'));
+        }
+    }
 }

server/app/Http/Controllers/Api/V1/MyController.php

@@ -628,14 +628,9 @@ class MyController extends Controller
     {
         $user = $this->getUser();
         $dreams = $user->dreams;
-
-        if (count($dreams) == 0)
-            return $this->error(ErrorCode::DREAM_NOT_EXIST);
-
         foreach ($dreams as $dream){
             $dream->pic = count($dream->img) > 0 ? $dream->img->pic : '';
         }
-
         return $this->api($dreams);
     }
 

server/app/Models/UserInfoModel.php

@@ -53,6 +53,7 @@ class UserInfoModel extends Authenticatable
                            'status',
                            'remember_token',
                            'birthday',
+                           'wechat',
                           ];
 
     protected $hidden = ['password'];

server/routes/api.php

@@ -97,6 +97,10 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'index.home',
         'uses' => 'IndexController@home',
     ]);
+    $api->get('index/filter', [
+        'as' => 'index.filter',
+        'uses' => 'IndexController@filter',
+    ]);
     $api->get('index/search', [
         'as' => 'index.search',
         'uses' => 'IndexController@search',
@@ -225,6 +229,10 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'dream.show',
         'uses' => 'DreamController@show',
     ]);
+    $api->get('dream/share', [
+        'as' => 'dream.share',
+        'uses' => 'DreamController@share',
+    ]);
     $api->get('dream/search', [
         'as' => 'dream.search',
         'uses' => 'DreamController@search',