Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/.idea/.name

@@ -0,0 +1 @@
+miaomiao

miaomiao/.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

miaomiao/.idea/miaomiao.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

miaomiao/.idea/misc.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+</project>

miaomiao/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/miaomiao.iml" filepath="$PROJECT_DIR$/.idea/miaomiao.iml" />
+    </modules>
+  </component>
+</project>

miaomiao/.idea/workspace.xml

@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="522da71b-c215-46b3-a298-a2789e68d287" name="Default" comment="" />
+    <ignored path="miaomiao.iws" />
+    <ignored path=".idea/workspace.xml" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+  <component name="FavoritesManager">
+    <favorites_list name="miaomiao" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="my-message-reply.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
+              <folding>
+                <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="my.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.4650621">
+              <caret line="701" column="40" selection-start-line="701" selection-start-column="40" selection-end-line="701" selection-end-column="40" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/www/templates/my/my-message-reply.html" />
+        <option value="$PROJECT_DIR$/www/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/../server/app/Http/Controllers/Api/V1/MyController.php" />
+        <option value="$PROJECT_DIR$/www/js/controllers/my.js" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" />
+  <component name="JsBuildToolPackageJson" detection-done="true" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <gulpfiles>
+      <GulpfileState>
+        <gulpfile-path>$PROJECT_DIR$/gulpfile.js</gulpfile-path>
+      </GulpfileState>
+    </gulpfiles>
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="1358" />
+    <option name="y" value="-8" />
+    <option name="width" value="2576" />
+    <option name="height" value="1456" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+    <property name="settings.editor.splitter.proportion" value="0.2" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../quanzhouda" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="HbShouldOpenHtmlAsHb" value="" />
+    <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
+      <method />
+    </configuration>
+    <configuration default="true" type="DartTestRunConfigurationType" factoryName="Dart Test">
+      <method />
+    </configuration>
+    <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
+      <method />
+    </configuration>
+    <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" working-dir="">
+      <method />
+    </configuration>
+    <configuration default="true" type="cucumber.js" factoryName="Cucumber.js">
+      <option name="cucumberJsArguments" value="" />
+      <option name="executablePath" />
+      <option name="filePath" />
+      <method />
+    </configuration>
+    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
+      <command value="run-script" />
+      <scripts />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
+      <node-options />
+      <working-directory>$PROJECT_DIR$</working-directory>
+      <pass-parent-env>true</pass-parent-env>
+      <envs />
+      <ui>bdd</ui>
+      <extra-mocha-options />
+      <test-kind>DIRECTORY</test-kind>
+      <test-directory />
+      <recursive>false</recursive>
+      <method />
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false" />
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="522da71b-c215-46b3-a298-a2789e68d287" name="Default" comment="" />
+      <created>1508144012522</created>
+      <option name="number" value="Default" />
+      <updated>1508144012522</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="1358" y="-8" width="2576" height="1456" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Gulp" 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="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16798107" 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="8" 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="9" 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" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" 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="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" 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="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="Vcs.Log.UiProperties">
+    <option name="RECENTLY_FILTERED_USER_GROUPS">
+      <collection />
+    </option>
+    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+      <collection />
+    </option>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/www/js/controllers/my.js</url>
+          <line>680</line>
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="1" />
+    </breakpoint-manager>
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="2" column="74" selection-start-line="2" selection-start-column="74" selection-end-line="2" selection-end-column="74" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/home/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-18.321428">
+          <caret line="75" column="59" selection-start-line="75" selection-start-column="59" selection-end-line="77" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-14.25">
+          <caret line="165" column="92" selection-start-line="165" selection-start-column="20" selection-end-line="165" selection-end-column="92" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.54285717">
+          <caret line="135" column="26" selection-start-line="135" selection-start-column="26" selection-end-line="135" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.77149683">
+          <caret line="298" column="53" selection-start-line="298" selection-start-column="37" selection-end-line="298" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../server/app/Http/Controllers/Api/V1/MyController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.15472312">
+          <caret line="10" column="23" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-5.428571">
+          <caret line="8" column="93" selection-start-line="8" selection-start-column="93" selection-end-line="8" selection-end-column="93" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4650621">
+          <caret line="701" column="40" selection-start-line="701" selection-start-column="40" selection-end-line="701" selection-end-column="40" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>

miaomiao/config.xml

@@ -1,107 +1,107 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="com.miaomiao.app" version="0.0.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>瞄喵</name>
-    <description>
+  <name>瞄喵</name>
+  <description>
         An Ionic Framework and Cordova project.
     </description>
-    <author email="you@example.com" href="http://example.com.com/">
+  <author email="you@example.com" href="http://example.com.com/">
       Mike
   </author>
-    <content src="index.html" />
-    <access origin="*" />
-    <allow-intent href="*" />
-    <allow-navigation href="*" />
-    <preference name="webviewbounce" value="false" />
-    <preference name="UIWebViewBounce" value="false" />
-    <preference name="DisallowOverscroll" value="true" />
-    <preference name="android-minSdkVersion" value="16" />
-    <preference name="BackupWebStorage" value="none" />
-    <preference name="KeepRunning" value="True" />
-    <preference name="ShowTitle" value="True" />
-    <preference name="InAppBrowserStorageEnabled" value="True" />
-    <preference name="SuppressesIncrementalRendering" value="True" />
-    <preference name="windows-target-version" value="10.0" />
-    <preference name="SplashScreen" value="screen" />
-    <preference name="KeyboardDisplayRequiresUserAction" value="false" />
-    <preference name="SplashScreenDelay" value="3000" />
-    <feature name="StatusBar">
-        <param name="ios-package" onload="true" value="CDVStatusBar" />
-    </feature>
-    <platform name="ios">
-        <icon height="57" src="resources/ios/icon/icon.png" width="57" />
-        <icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
-        <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
-        <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80" />
-        <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120" />
-        <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
-        <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100" />
-        <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
-        <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120" />
-        <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180" />
-        <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
-        <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144" />
-        <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
-        <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152" />
-        <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
-        <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58" />
-        <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87" />
-        <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
-        <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
-        <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
-        <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
-        <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
-        <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" />
-        <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
-        <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
-        <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
-        <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
-        <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
-        <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
-    </platform>
-    <platform name="android">
-        <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
-        <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
-        <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
-        <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
-        <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
-        <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
-        <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
-        <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
-        <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
-        <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
-        <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
-        <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
-        <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
-        <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
-        <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
-        <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
-        <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
-        <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
-    </platform>
-    <engine name="android" spec="^6.2.3" />
-    <plugin name="cordova-hot-code-push-plugin" spec="^1.5.3" />
-    <plugin name="cordova-plugin-actionsheet" spec="2.3.3" />
-    <plugin name="cordova-plugin-camera" spec="file:node_modules\cordova-plugin-camera" />
-    <plugin name="cordova-plugin-compat" spec="1.1.0" />
-    <plugin name="cordova-plugin-console" spec="~1.0.2" />
-    <plugin name="cordova-plugin-device" spec="~1.1.1" />
-    <plugin name="cordova-plugin-file" spec="4.3.2" />
-    <plugin name="cordova-plugin-file-transfer" spec="1.6.2" />
-    <plugin name="cordova-plugin-media-capture" spec="1.4.3" />
-    <plugin name="cordova-plugin-offbye-alipay" spec="git+https://github.com/offbye/cordova-plugin-alipay.git">
-        <variable name="PARTNER_ID" value="2088721135315822" />
-    </plugin>
-    <plugin name="cordova-plugin-splashscreen" spec="4.0.3" />
-    <plugin name="cordova-plugin-statusbar" spec="~2.1.0" />
-    <plugin name="cordova-plugin-wechat" spec="^2.0.0">
-        <variable name="WECHATAPPID" value="wxc5181c0d406023e6" />
-    </plugin>
-    <plugin name="cordova-plugin-whitelist" spec="^1.3.2" />
-    <plugin name="ionic-plugin-keyboard" spec="~1.0.9" />
-    <plugin name="jpush-phonegap-plugin" spec="^3.2.3">
-        <variable name="APP_KEY" value="69838317211448192366f9d8" />
-    </plugin>
-    <plugin name="phonegap-plugin-barcodescanner" spec="git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git">
-        <variable name="CAMERA_USAGE_DESCRIPTION" value="请摄像头对准条码" />
-    </plugin>
-</widget>
+  <content src="index.html"/>
+  <access origin="*"/>
+  <allow-intent href="*"/>
+  <allow-navigation href="*"/>
+  <preference name="webviewbounce" value="false"/>
+  <preference name="UIWebViewBounce" value="false"/>
+  <preference name="DisallowOverscroll" value="true"/>
+  <preference name="android-minSdkVersion" value="16"/>
+  <preference name="BackupWebStorage" value="none"/>
+  <preference name="KeepRunning" value="True"/>
+  <preference name="ShowTitle" value="True"/>
+  <preference name="InAppBrowserStorageEnabled" value="True"/>
+  <preference name="SuppressesIncrementalRendering" value="True"/>
+  <preference name="windows-target-version" value="10.0"/>
+  <preference name="SplashScreen" value="screen"/>
+  <preference name="KeyboardDisplayRequiresUserAction" value="false"/>
+  <preference name="SplashScreenDelay" value="3000"/>
+  <feature name="StatusBar">
+    <param name="ios-package" onload="true" value="CDVStatusBar"/>
+  </feature>
+  <platform name="ios">
+    <icon height="57" src="resources/ios/icon/icon.png" width="57"/>
+    <icon height="114" src="resources/ios/icon/icon@2x.png" width="114"/>
+    <icon height="40" src="resources/ios/icon/icon-40.png" width="40"/>
+    <icon height="80" src="resources/ios/icon/icon-40@2x.png" width="80"/>
+    <icon height="120" src="resources/ios/icon/icon-40@3x.png" width="120"/>
+    <icon height="50" src="resources/ios/icon/icon-50.png" width="50"/>
+    <icon height="100" src="resources/ios/icon/icon-50@2x.png" width="100"/>
+    <icon height="60" src="resources/ios/icon/icon-60.png" width="60"/>
+    <icon height="120" src="resources/ios/icon/icon-60@2x.png" width="120"/>
+    <icon height="180" src="resources/ios/icon/icon-60@3x.png" width="180"/>
+    <icon height="72" src="resources/ios/icon/icon-72.png" width="72"/>
+    <icon height="144" src="resources/ios/icon/icon-72@2x.png" width="144"/>
+    <icon height="76" src="resources/ios/icon/icon-76.png" width="76"/>
+    <icon height="152" src="resources/ios/icon/icon-76@2x.png" width="152"/>
+    <icon height="29" src="resources/ios/icon/icon-small.png" width="29"/>
+    <icon height="58" src="resources/ios/icon/icon-small@2x.png" width="58"/>
+    <icon height="87" src="resources/ios/icon/icon-small@3x.png" width="87"/>
+    <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640"/>
+    <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750"/>
+    <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242"/>
+    <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208"/>
+    <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048"/>
+    <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732"/>
+    <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024"/>
+    <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536"/>
+    <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048"/>
+    <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768"/>
+    <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640"/>
+    <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320"/>
+  </platform>
+  <platform name="android">
+    <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png"/>
+    <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png"/>
+    <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png"/>
+    <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png"/>
+    <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png"/>
+    <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png"/>
+    <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png"/>
+    <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png"/>
+    <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png"/>
+    <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png"/>
+    <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png"/>
+    <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png"/>
+    <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png"/>
+    <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png"/>
+    <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png"/>
+    <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png"/>
+    <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png"/>
+    <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png"/>
+  </platform>
+  <engine name="android" spec="^6.2.3"/>
+  <plugin name="cordova-hot-code-push-plugin" spec="^1.5.3"/>
+  <plugin name="cordova-plugin-actionsheet" spec="2.3.3"/>
+  <plugin name="cordova-plugin-camera" spec="file:node_modules\cordova-plugin-camera"/>
+  <plugin name="cordova-plugin-compat" spec="1.1.0"/>
+  <plugin name="cordova-plugin-console" spec="~1.0.2"/>
+  <plugin name="cordova-plugin-device" spec="~1.1.1"/>
+  <plugin name="cordova-plugin-file" spec="4.3.2"/>
+  <plugin name="cordova-plugin-file-transfer" spec="1.6.2"/>
+  <plugin name="cordova-plugin-media-capture" spec="1.4.3"/>
+  <plugin name="cordova-plugin-offbye-alipay" spec="git+https://github.com/offbye/cordova-plugin-alipay.git">
+    <variable name="PARTNER_ID" value="2088721135315822"/>
+  </plugin>
+  <plugin name="cordova-plugin-splashscreen" spec="4.0.3"/>
+  <plugin name="cordova-plugin-statusbar" spec="~2.1.0"/>
+  <plugin name="cordova-plugin-wechat" spec="^2.0.0">
+    <variable name="WECHATAPPID" value="wxc5181c0d406023e6"/>
+  </plugin>
+  <plugin name="cordova-plugin-whitelist" spec="^1.3.2"/>
+  <plugin name="ionic-plugin-keyboard" spec="~1.0.9"/>
+  <plugin name="jpush-phonegap-plugin" spec="^3.2.3">
+    <variable name="APP_KEY" value="69838317211448192366f9d8"/>
+  </plugin>
+  <plugin name="phonegap-plugin-barcodescanner" spec="git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git">
+    <variable name="CAMERA_USAGE_DESCRIPTION" value="请摄像头对准条码"/>
+  </plugin>
+</widget>

miaomiao/www/.idea/workspace.xml

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/js/controllers/home.js" />
-  </component>
   <component name="ChangeListManager">
-    <list default="true" id="c3867151-2190-46c0-8b28-5c1524023ce8" name="Default" comment="" />
+    <list default="true" id="da700f62-8b79-488e-8484-af89b2c5db2d" name="Default" comment="" />
     <ignored path="www.iws" />
     <ignored path=".idea/workspace.xml" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -23,44 +20,30 @@
     <favorites_list name="www" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/home/index.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="-7.133333">
-              <caret line="76" column="95" selection-start-line="76" selection-start-column="87" selection-end-line="76" selection-end-column="95" />
+            <state vertical-scroll-proportion="0.38680783">
+              <caret line="320" column="24" selection-start-line="320" selection-start-column="24" selection-end-line="320" selection-end-column="24" />
               <folding>
-                <element signature="n#style#0;n#ion-slide-box#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#img#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#textarea#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
+      <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.19347134">
-              <caret line="261" column="36" selection-start-line="261" selection-start-column="36" selection-end-line="261" selection-end-column="36" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="homeservice.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-14.75">
-              <caret line="30" column="84" selection-start-line="30" selection-start-column="71" selection-end-line="30" selection-end-column="84" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="router.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/config/router.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-15.78125">
-              <caret line="43" column="45" selection-start-line="43" selection-start-column="32" selection-end-line="43" selection-end-column="45" />
+            <state vertical-scroll-proportion="-8.6875">
+              <caret line="722" column="45" selection-start-line="722" selection-start-column="45" selection-end-line="722" selection-end-column="45" />
               <folding />
             </state>
           </provider>
@@ -68,69 +51,23 @@
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="JavaScript File" />
-        <option value="HTML File" />
-        <option value="CSS File" />
-      </list>
-    </option>
-  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/account.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/registerindex.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/autonym1.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/owner2.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/owner1.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/register.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-setting-password.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/my/my-setting-password.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-index.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/account.js" />
-        <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
-        <option value="$PROJECT_DIR$/js/filters/filter.js" />
-        <option value="$PROJECT_DIR$/templates/account/loginAccount.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/menu.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/directives/filters.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/carservice.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/config/router.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/config/router.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-often-add.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/services/carservice.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-myroute.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/car.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/car/car-order.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/car.js" />
-        <option value="$PROJECT_DIR$/templates/my/my-profile.html" />
-        <option value="$PROJECT_DIR$/../../../test/gulpfile.js" />
-        <option value="$PROJECT_DIR$/../../../test/index.html" />
-        <option value="$PROJECT_DIR$/js/app.js" />
-        <option value="$PROJECT_DIR$/templates/home/shareDream.html" />
-        <option value="$PROJECT_DIR$/js/services/httpinterceptor.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/parts.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-rent.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-usedcar.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/publish.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-sell.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-setting-material.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/my.js" />
-        <option value="$PROJECT_DIR$/../../../51zhupai/css/index.css" />
-        <option value="$PROJECT_DIR$/../../../51zhupai/templates/demo.html" />
-        <option value="$PROJECT_DIR$/../../../51zhupai/css/detail.css" />
-        <option value="$PROJECT_DIR$/../../../51zhupai/templates/detail.html" />
-        <option value="$PROJECT_DIR$/../../../51zhupai/index.html" />
+        <option value="$PROJECT_DIR$/templates/my/my-message-sys.html" />
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
-        <option value="$PROJECT_DIR$/css/style.css" />
-        <option value="$PROJECT_DIR$/templates/home/userDetail.html" />
-        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
-        <option value="$PROJECT_DIR$/templates/home/index.html" />
+        <option value="$PROJECT_DIR$/js/controllers/add.js" />
+        <option value="$PROJECT_DIR$/js/services/myservice.js" />
         <option value="$PROJECT_DIR$/js/services/homeservice.js" />
+        <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
         <option value="$PROJECT_DIR$/js/config/router.js" />
+        <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/templates/home/index.html" />
+        <option value="$PROJECT_DIR$/js/services/msgservice.js" />
+        <option value="$PROJECT_DIR$/templates/add/index.html" />
+        <option value="$PROJECT_DIR$/js/config/config.js" />
         <option value="$PROJECT_DIR$/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
       </list>
     </option>
   </component>
@@ -145,28 +82,6 @@
     <option name="width" value="2576" />
     <option name="height" value="1456" />
   </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" />
@@ -178,7 +93,7 @@
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -191,29 +106,122 @@
       <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes />
+    <panes>
+      <pane id="Scratches" />
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="templates" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="templates" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="my" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="templates" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="home" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="controllers" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+    </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+    <property name="settings.editor.splitter.proportion" value="0.2" />
+    <property name="last_opened_file_path" value="E:/Graduation design/huiwei/www" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <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" 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>
+  <component name="RunManager">
     <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
       <method />
     </configuration>
@@ -237,11 +245,6 @@
       <method />
     </configuration>
     <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
       <method />
     </configuration>
     <configuration default="true" type="js.build_tools.npm" factoryName="npm">
@@ -262,25 +265,14 @@
       <recursive>false</recursive>
       <method />
     </configuration>
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="Gulp.js.default" />
-    </list>
-    <recent_temporary>
-      <list size="1">
-        <item index="0" class="java.lang.String" itemvalue="Gulp.js.default" />
-      </list>
-    </recent_temporary>
   </component>
   <component name="ShelveChangesManager" show_recycled="false" />
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="c3867151-2190-46c0-8b28-5c1524023ce8" name="Default" comment="" />
-      <created>1497407805819</created>
+      <changelist id="da700f62-8b79-488e-8484-af89b2c5db2d" name="Default" comment="" />
+      <created>1508893784149</created>
       <option name="number" value="Default" />
-      <updated>1497407805819</updated>
+      <updated>1508893784149</updated>
     </task>
     <servers />
   </component>
@@ -288,14 +280,14 @@
     <frame x="1358" y="-8" width="2576" height="1456" extended-state="6" />
     <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.16640379" 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.16798107" 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="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="8" 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.3296131" sideWeight="0.5" order="2" side_tool="true" 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="9" 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" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
@@ -306,14 +298,6 @@
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -324,374 +308,193 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="229" column="42" selection-start-line="229" selection-start-column="42" selection-end-line="229" selection-end-column="42" />
+        <state vertical-scroll-proportion="-8.0">
+          <caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-route.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48828828">
-          <caret line="24" column="59" selection-start-line="24" selection-start-column="59" selection-end-line="24" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/car.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.3333335">
-          <caret line="10" column="15" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-profile.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.428571">
-          <caret line="8" column="69" selection-start-line="8" selection-start-column="69" selection-end-line="8" selection-end-column="69" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.13693693">
-          <caret line="4" column="26" selection-start-line="4" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://E:/Work/HPE/homework/Bootstrap/项目实战5/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.34234235">
-          <caret line="10" column="60" selection-start-line="10" selection-start-column="60" selection-end-line="10" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://E:/Work/HPE/homework/Bootstrap/BootStrap后台项目实战/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-14.928572">
-          <caret line="79" column="10" selection-start-line="12" selection-start-column="4" selection-end-line="79" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://E:/E-Business/电子商务作业/Lovers/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.0172415">
-          <caret line="46" column="37" selection-start-line="46" selection-start-column="36" selection-end-line="46" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://E:/E-Business/电子商务作业/Lovers/login.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.26095238">
-          <caret line="86" column="4" selection-start-line="86" selection-start-column="4" selection-end-line="86" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../public/apidoc/css/style.css">
-      <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>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/httpinterceptor.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2607204">
-          <caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/aboutMiao.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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.16587302">
+          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/dreamservice.js">
+    <entry file="file://$PROJECT_DIR$/js/app.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>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-rent.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-12.892858">
-          <caret line="34" column="18" selection-start-line="34" selection-start-column="18" selection-end-line="34" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-usedcar.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-16.285715">
-          <caret line="24" column="20" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-13.933333">
-          <caret line="35" column="14" selection-start-line="16" selection-start-column="14" selection-end-line="34" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-12.678572">
-          <caret line="28" column="20" selection-start-line="15" selection-start-column="16" selection-end-line="28" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <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="1.3910806">
-          <caret line="340" column="9" selection-start-line="340" selection-start-column="9" selection-end-line="340" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/parts/parts-index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.34234235">
-          <caret line="10" column="20" selection-start-line="10" selection-start-column="20" selection-end-line="10" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-sell.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.75">
-          <caret line="26" column="18" selection-start-line="26" selection-start-column="18" selection-end-line="26" selection-end-column="18" />
+        <state vertical-scroll-proportion="0.43869427">
+          <caret line="19" column="14" selection-start-line="19" selection-start-column="14" selection-end-line="19" selection-end-column="14" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-profile.html">
+    <entry file="file://$PROJECT_DIR$/templates/tabs.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/parts.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="44" column="48" selection-start-line="44" selection-start-column="48" selection-end-line="44" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/menu.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.3571428">
-          <caret line="23" column="26" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <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="0.22965641">
-          <caret line="184" column="26" selection-start-line="184" selection-start-column="26" selection-end-line="184" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <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="-4.75">
-          <caret line="7" column="86" selection-start-line="7" selection-start-column="86" selection-end-line="7" selection-end-column="86" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../51zhupai/css/index.css">
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.61621624">
-          <caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
+        <state vertical-scroll-proportion="-8.53125">
+          <caret line="56" column="32" selection-start-line="56" selection-start-column="32" selection-end-line="56" selection-end-column="32" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/app.js">
+    <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.380789">
-          <caret line="51" column="55" selection-start-line="51" selection-start-column="55" selection-end-line="51" selection-end-column="55" />
+        <state vertical-scroll-proportion="-10.333333">
+          <caret line="113" column="12" selection-start-line="113" selection-start-column="1" selection-end-line="113" selection-end-column="12" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../ionic.config.json">
+    <entry file="file://$PROJECT_DIR$/js/services/dreamservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17117117">
-          <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.17701863">
+          <caret line="12" column="35" selection-start-line="12" selection-start-column="35" selection-end-line="12" selection-end-column="35" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/jpushservice.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35849056">
-          <caret line="11" column="55" selection-start-line="0" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
+        <state vertical-scroll-proportion="-2.2857144">
+          <caret line="2" column="91" selection-start-line="2" selection-start-column="91" selection-end-line="2" selection-end-column="91" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/directives/directive.js">
+    <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.13354038">
+          <caret line="724" column="0" selection-start-line="724" selection-start-column="0" selection-end-line="724" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../51zhupai/css/detail.css">
+    <entry file="file://$PROJECT_DIR$/js/config/router.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="17" selection-start-line="0" selection-start-column="17" selection-end-line="0" selection-end-column="17" />
+        <state vertical-scroll-proportion="0.38455415">
+          <caret line="41" column="44" selection-start-line="41" selection-start-column="44" selection-end-line="41" selection-end-column="44" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../51zhupai/templates/detail.html">
+    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="279" column="43" selection-start-line="279" selection-start-column="43" selection-end-line="279" selection-end-column="43" />
+        <state vertical-scroll-proportion="0.31369427">
+          <caret line="28" column="66" selection-start-line="28" selection-start-column="52" selection-end-line="28" selection-end-column="66" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
+    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.418018">
-          <caret line="23" column="38" selection-start-line="23" selection-start-column="38" selection-end-line="23" selection-end-column="38" />
+        <state vertical-scroll-proportion="0.5">
+          <caret line="40" column="38" selection-start-line="40" selection-start-column="34" selection-end-line="40" selection-end-column="38" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/account/loginAccount.html">
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-11.0">
-          <caret line="24" column="18" selection-start-line="24" selection-start-column="18" selection-end-line="24" selection-end-column="18" />
+        <state vertical-scroll-proportion="0.16666667">
+          <caret line="11" column="93" selection-start-line="11" selection-start-column="93" selection-end-line="11" selection-end-column="144" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../51zhupai/index.html">
+    <entry file="file://$PROJECT_DIR$/js/services/userservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-14.535714">
-          <caret line="952" column="10" selection-start-line="952" selection-start-column="10" selection-end-line="952" selection-end-column="10" />
+        <state vertical-scroll-proportion="0.13136943">
+          <caret line="5" column="48" selection-start-line="5" selection-start-column="48" selection-end-line="5" selection-end-column="49" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03259005">
-          <caret line="17" column="45" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-16.0">
-          <caret line="43" column="48" selection-start-line="43" selection-start-column="48" selection-end-line="43" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-recharge.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-24.464285">
-          <caret line="30" column="62" selection-start-line="30" selection-start-column="62" selection-end-line="30" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="413" column="7" selection-start-line="353" selection-start-column="6" selection-end-line="413" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-20.625">
-          <caret line="28" column="14" selection-start-line="21" selection-start-column="14" selection-end-line="28" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.4833333">
-          <caret line="536" column="21" selection-start-line="536" selection-start-column="21" selection-end-line="536" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/shareDream.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.36190477">
-          <caret line="24" column="12" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/ionic/js/ionic.bundle.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3773292">
-          <caret line="34282" column="14" selection-start-line="34282" selection-start-column="14" selection-end-line="34282" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2777778">
-          <caret line="70" column="33" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" />
+        <state vertical-scroll-proportion="0.30745342">
+          <caret line="39" column="55" selection-start-line="39" selection-start-column="43" selection-end-line="39" selection-end-column="55" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-47.57143">
-          <caret line="158" column="104" selection-start-line="158" selection-start-column="104" selection-end-line="158" selection-end-column="104" />
-          <folding>
-            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#video#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <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="false" />
-            <element signature="n#style#0;n#p#0;n#div#0;n#div#1;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#video#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="0.16226707">
+          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/home/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.133333">
-          <caret line="76" column="95" selection-start-line="76" selection-start-column="87" selection-end-line="76" selection-end-column="95" />
+        <state vertical-scroll-proportion="0.3330619">
+          <caret line="117" column="78" selection-start-line="117" selection-start-column="77" selection-end-line="117" selection-end-column="78" />
           <folding>
             <element signature="n#style#0;n#ion-slide-box#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#0;n#ion-slide#0;n#ion-slide-box#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#i#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#span#0;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/router.js">
+    <entry file="file://$PROJECT_DIR$/js/services/commonservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-15.78125">
-          <caret line="43" column="45" selection-start-line="43" selection-start-column="32" selection-end-line="43" selection-end-column="45" />
+        <state vertical-scroll-proportion="0.33280253">
+          <caret line="142" column="18" selection-start-line="142" selection-start-column="12" selection-end-line="142" selection-end-column="18" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-14.75">
-          <caret line="30" column="84" selection-start-line="30" selection-start-column="71" selection-end-line="30" selection-end-column="84" />
+        <state vertical-scroll-proportion="-8.6875">
+          <caret line="722" column="45" selection-start-line="722" selection-start-column="45" selection-end-line="722" selection-end-column="45" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19347134">
-          <caret line="261" column="36" selection-start-line="261" selection-start-column="36" selection-end-line="261" selection-end-column="36" />
-          <folding />
+        <state vertical-scroll-proportion="0.38680783">
+          <caret line="320" column="24" selection-start-line="320" selection-start-column="24" selection-end-line="320" selection-end-column="24" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#1;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#textarea#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

miaomiao/www/css/iconfont.css

@@ -18,4 +18,4 @@
 
 .icon-xiaoxi:before { content: "\e622";  }
 
-.icon-sousuo:before { content: "\e620"; }
+.icon-sousuo:before { content: "\e620" }

miaomiao/www/index.html

@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
     <title></title>
     <link href="css/ionic.app.css" rel="stylesheet" />
     <link href="css/style.css" rel="stylesheet" />

miaomiao/www/js/config/config.js

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

miaomiao/www/js/config/router.js

@@ -31,7 +31,7 @@
             })
             .state('app.my_dreamdetail', {
                 url: '/my/dreamdetail?id=',
-                params:{id:null},
+                params:{id:null,dream_user_id:null,type:null,interaction_id:null},
                 views: {
                     'app-my': {
                         templateUrl: 'templates/home/dream-detail.html',
@@ -41,7 +41,7 @@
             })
             .state('app.home_dreamdetail', {
                 url: '/home/dreamdetail?id=',
-                params:{id:null,dream_user_id:null,type:null},
+                params:{id:null,dream_user_id:null,type:null,interaction_id:null},
                 views: {
                     'app-home': {
                         templateUrl: 'templates/home/dream-detail.html',

miaomiao/www/js/controllers/account.js

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

miaomiao/www/js/controllers/add.js

@@ -26,14 +26,14 @@
                         var response = JSON.parse(result.response);
                         $scope.video.server = response.data.file;
                         var file = config.imgServer+response.data.file;
-                        console.log("file:"+file);
+                        //console.log("file:"+file);
                         $scope.video.isOK = true;
                         $scope.video.file = file;
                         $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
-                        console.log("vpic:"+$scope.video.vpic);
+                        //console.log("vpic:"+$scope.video.vpic);
                     }, function (error) {
                         msg.hide();
-                        msg.error('视频上传失败');
+                        // msg.error('视频上传失败');
                     });
                 }, function (erro) {
                     console.log('选择视频失败');
@@ -46,6 +46,9 @@
                 })
             };
             $scope.add = function () {
+                //if($scope.video.server){
+                //    $scope.imgs=[];
+                //}
                 var data = {
                      //pics: ["https://www.baidu.com/img/bd_logo1.png"],
                     pics: $scope.imgs,

miaomiao/www/js/controllers/home.js

@@ -221,8 +221,9 @@
         , function ($scope,$location, $ionicHistory,$timeout,$state,WechatService,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams,$ionicBackdrop, $timeout, $ionicScrollDelegate, $interval) {
             var dream_user_id = $stateParams.dream_user_id;
             var id = $stateParams.id;
-            $scope.host = config.server
-            $scope.imghost = config.imgServer
+            var interaction_id = $stateParams.interaction_id;
+            $scope.host = config.server;
+            $scope.imghost = config.imgServer;
             var top3user = '';
             if($stateParams.type!=null){
                 $scope.type = $stateParams.type;
@@ -238,9 +239,11 @@
                 });
             };
             // id=5;
+
             $scope.$on('$ionicView.beforeEnter', function () {
+                msg.loading();
                 $ionicTabsDelegate.showBar(false);
-                $scope.load(id,dream_user_id);
+                $scope.load(id,dream_user_id,interaction_id);
                 $scope.thisUser = storage.getObject('user');
                 $scope.vm.payType = 2;
                 homeService.myInfo().then(function(result){
@@ -274,11 +277,22 @@
                 //$scope.type = 3;
                 $scope.changeType(3)
             };
+            $scope.destroyInter = function(id,dream_id){
+                msg.confirm("互动","是否删除该评论").then(function(result){
+                    if(result==true)
+                    {
+                        homeService.destroyInter(id).then(function(result){
+                            msg.text('删除成功');
+                            $scope.load(dream_id);
+                        },function(error){
+                            msg.error(error.data.message);
+                        });
+                    }
+                });
+            };
 
-        $scope.load = function (id,dream_user_id) {
-            msg.loading();
-            homeService.dreamDetail(id,dream_user_id).then(function (result) {
-                msg.hide();
+        $scope.load = function (id,dream_user_id,interaction_id) {
+            homeService.dreamDetail(id,dream_user_id,interaction_id).then(function (result) {
                 console.log(result);
                 $scope.showCode  = function(codeName){
                     $scope.url = codeName;
@@ -288,7 +302,10 @@
                     $scope.code = false;
                 };
                 $scope.dream = result.data.data;
-                if($scope.timer=='已结束'|| 100*$scope.dream.get_coin/$scope.dream.coin>=100){
+                //if($scope.timer=='已结束'|| 100*$scope.dream.get_coin/$scope.dream.coin>=100){
+                //    $scope.codeBtn = true;
+                //}
+                if($scope.timer=='已结束'){
                     $scope.codeBtn = true;
                 }
                 if($scope.dream.video){
@@ -322,6 +339,7 @@
                 if($scope.dream.top3user[1])$scope.sort.second = $scope.dream.top3user[1].avatar;
                 if($scope.dream.top3user[2])$scope.sort.third = $scope.dream.top3user[2].avatar;
                 $scope.calcmultiplier();
+                msg.hide();
             }, function (error) {
                 msg.hide();
             });
@@ -548,7 +566,7 @@
                 });
                 $scope.dream.interactions[index].show = true;
                 $scope.dream.interactions[index].focus = true;
-                $scope.input.placeholder = "评论" + name+":" + to_userid;
+                $scope.input.placeholder = "评论" + name;
                 $scope.to_userid = to_userid;
                 $scope.vm.title='';
                 $scope.vm.comment='';
@@ -559,6 +577,7 @@
                     {
                         homeService.deleteComment($scope.dream.interactions[index].comments[currentindex].id).then(function(result){
                             msg.text("删除成功");
+                            alert('删除成功');
                             $scope.load(id);
                         },function(error){
                             msg.error(error.data.message);
@@ -705,16 +724,17 @@
                 common.deletefile(file).then(function () {
                 })
             };
+
             $scope.addvideo = function () {
                 common.chooseVideo().then(function (file) {
                     common.uploadFiles(file, 2).then(function (result) {
                         var response = JSON.parse(result.response);
                         var file = config.imgServer+response.data.file;
-                        console.log("file:"+file);
+                        //console.log("file:"+file);
                         $scope.video.isOK = true;
                         $scope.video.file = file;
                         $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
-                        console.log("vpic:"+$scope.video.vpic);
+                        //console.log("vpic:"+$scope.video.vpic);
                     }, function (error) {
                         msg.error('视频上传失败');
                     });
@@ -722,6 +742,10 @@
                     console.log('选择视频失败');
                 });
             };
+            $scope.deletevideo = function (file) {
+                common.deletefile(file).then(function () {
+                })
+            };
           $ionicModal.fromTemplateUrl('recharge-modal.html', {
             scope: $scope,
             animation: 'slide-in-up'

miaomiao/www/js/controllers/my.js

@@ -310,7 +310,7 @@
         }]);
     app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
-
+            
         }]);
     app.controller('personalLetterCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
@@ -690,44 +690,70 @@
 
     app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg", "$ionicModal"
        , function ($scope,$ionicTabsDelegate, $state, myService, msg, $ionicModal) {
-            $scope.$on('$ionicView.beforeEnter', function () {
-                myService.replyMy().then(function(result){
-                    $scope.comments = result.data.data;
-                },function(error){
-                });
-            });
+           $scope.$on('$ionicView.beforeEnter', function () {
+               $scope.load();
+           });
+           $scope.load = function () {
+               myService.replyMy().then(function (result) {
+                   $scope.comments = result.data.data;
+               }, function (error) {
+               });
+           };
+           //我的回复
+           $scope.vm = {
+               content: "" 
+           };
             $ionicModal.fromTemplateUrl('my-modal.html', {
                 scope: $scope,
                 animation: 'slide-in-up'
             }).then(function (modal) {
                 $scope.modal = modal;
             });
-            $scope.openModal = function () {
-                $scope.modal.show();
-            };
-            $scope.closeModal = function () {
-                $scope.modal.hide();
+            //$ionicModal.fromTemplateUrl('my-modal.html', {
+            //    scope: $scope,
+            //    animation: 'slide-in-up'
+            //}).then(function (modal) {
+            //    $scope.modal = modal;
+            //});
+            //$scope.openModal = function () {
+            //    $scope.modal.show();
+            //};
+            //$scope.closeModal = function () {
+            //    $scope.modal.hide();
+            //
+            //};
 
+            $scope.goDetail =  function (id,interaction_id){
+                $state.go('app.home_dreamdetail',{id:id,interaction_id:interaction_id,type:2});
             };
 
-
             //我的回复
-            $scope.vm={
-                content:"",
-                comment_id:""
-            };
-            $scope.myReplay = function(){
-                var data = {
-                    content:$scope.vm.content,
-                    comment_id:$scope.vm.id
-                };
-                myService.myReplay(data).then(function(result){
-
-                },function(error){
-
-                });
-                $scope.modal.hide();
-            }
+            //$scope.vm={
+            //    content:"",
+            //    comment_id:""
+            //};
+            //$scope.closeModal = function () {
+            //    var data = {
+            //        content: $scope.vm.content,
+            //        comment_id: $scope.item.id,
+            //        interaction_id: $scope.item.interaction_id
+            //    };
+            //    myService.myReplay(data).then(function (result) {
+            //        msg.success('回复成功');
+            //        $scope.load();
+            //    }, function (error) {
+            //        msg.error('回复失败');
+            //    });
+            //    $scope.vm.content = '';
+            //    $scope.item = null;
+            //    $scope.modal.hide();
+            //};
+            //
+            //$scope.reply = function (item) {
+            //    $scope.item = item;
+            //    $scope.modal.show();
+            //}
+            
        }]);
    
 })(angular.module('app.controllers'));

miaomiao/www/js/services/homeservice.js

@@ -26,9 +26,15 @@
                     method:"get"
                 })
             },
-            dreamDetail: function (id,dream_user_id) {
+            dreamDetail: function (id,dream_user_id,interaction_id) {
                 return $http({
-                    url: config.server + 'api/dream/show?id=' + id + '&dream_user_id=' + dream_user_id,
+                    url: config.server + 'api/dream/show?id=' + id + '&dream_user_id=' + dream_user_id + '&interaction_id=' + interaction_id,
+                    method: "get"
+                })
+            },
+            destroyInter: function(id){
+                return $http({
+                    url: config.server + 'api/interaction/destroy?id=' + id,
                     method: "get"
                 })
             },

miaomiao/www/js/services/msgservice.js

@@ -33,7 +33,7 @@
             },
             loading: function (template) {
                 $ionicLoading.show({
-                    showDelay:3000,
+                    showDelay:0,
                     template: '<ion-spinner class="nerve-loading"></ion-spinner>'
                 });
                 //超时退出

miaomiao/www/js/services/myservice.js

@@ -76,6 +76,13 @@
                   method:"get"
               })
             },
+            replayMes:function(data){
+                return $http({
+                    url:config.server + "api/interaction/comment",
+                    method:"post",
+                    data:data
+                })
+            },
             toprofile:function(){
                 return $http({
                     url:config.server + "api/my/persona",

miaomiao/www/templates/add/index.html

@@ -20,7 +20,9 @@
                     <img src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加图片</em>
                 </a>
-                <video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="72px" width="72px" controls="controls">
+                <!--<video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="100px" width="100px" controls="controls">-->
+                <!--</video>-->
+                <video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="100px" width="100px" style="margin-top: 5px;">
                 </video>
                 <a class="btn-file-up" ng-click="addvideo()" ng-show="!video.isOK">
                     <img src="img/icon_video.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>

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

@@ -1,12 +1,12 @@
 <ion-view view-title="梦想">
     <ion-nav-buttons side="right">
+        <button ng-click="share($event)" class="button button-clear" style="height: 39px; margin-top: -1px">
+            <img src="img/icon_share.svg" style="height: 55%; width: 100%">
+        </button>
         <button class="button button-clear" style="height: 37px; margin-top: 0.6px" ng-click="toMessage()">
             <img ng-if="showMessage==1" src="img/icon_message_h.svg" style="height: 60%; width: 100%">
             <img ng-if="showMessage==0" src="img/icon_message_n.svg" style="height: 55%; width: 100%">
         </button>
-        <button ng-click="share($event)" class="button button-clear" style="height: 39px; margin-top: -1px">
-            <img src="img/icon_share.svg" style="height: 55%; width: 100%">
-        </button>
     </ion-nav-buttons>
     <div ng-if="type==1 && user.id != dream.user_id" style="position: fixed; bottom: -8px; width: 100%; z-index: 5;background: #fff;border-top: 1px solid #ECF2F7;height: 68px">
         <div class="row">
@@ -70,7 +70,7 @@
                                 <video ng-src="{{dream.video | trustUrl}}" poster="{{dream.vpic | trustUrl}}" width="100%" style="height: 350px;" class="centerme" controls="controls" ></video>
                             </div>
                         </ion-slide-page>
-                        <ion-slide-page ng-repeat="img in dream.imgs" >
+                        <ion-slide-page ng-repeat="img in dream.imgs">
                                 <div class="box banner" style="width: 100%"><img ng-src="{{img.pic}}" style="width: 100%;" /></div>
                         </ion-slide-page>
                     </ion-slides>
@@ -163,7 +163,6 @@
                             <!--<span class="utitle kz">{{dream.end_time | lastDate}}</span>-->
                             <span class="utitle kz">{{dream.created_at}}</span>
                             <p class="subtile" style="white-space:normal; color: #666666">{{interaction.title}}</p>
-
                             <div class="picts item">
                                 <img class="slt" ng-click="openCommentPic(interaction.pic1,$event)" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1" />
                                 <img class="slt" ng-click="openCommentPic(interaction.pic2,$event)" ng-src="{{interaction.pic2}}" ng-if="interaction.pic2" />
@@ -198,9 +197,12 @@
                                 </div>
                             </div>
                             <div class="row">
-                                <div class="col-offset-20 col-80">
+                                <div class="col-offset-20 col-60">
                                     <p ng-click="showmore($index)" ng-if="interaction.comments.length>4" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px"> {{interaction.showmore?"只看最近评论":"查看更多评论"}}</p>
                                 </div>
+                                <div class="col-20">
+                                    <p ng-if="user.id == dream.user.id" ng-click="destroyInter(interaction.id,interaction.dream_id)" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px">删除该互动</p>
+                                </div>
                             </div>
                         </div>
                         <!--<p ng-click="replay($event,dream.user.nickname,$index)" style="margin: 10px 0 0 50px; color: #00C3DA">评论</p>-->
@@ -310,13 +312,14 @@
                 <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
                     <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
                 </a>
-                <a class="btn-file-up" ng-click="addpict()" ng-show="imgs.length<9">
+                <a ng-if="!video.isOK&&imgs.length<9" class="btn-file-up" ng-click="addpict()">
                     <img src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
-                    <em style="font-size: 16px">添加图片</em>
+                    <em style="font-size:  16px">添加图片</em>
                 </a>
-                <video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="72px" width="72px" controls="controls">
+                <video ng-src="{{video.file | trustUrl}}" ng-if="video.isOK" poster="{{video.vpic}}" height="100px" width="100px" style="margin-top: 5px" controls="controls">
+                    <em ng-click="deletevideo(video.file)" class="ion-ios-close-outline"></em>
                 </video>
-                <a class="btn-file-up" ng-click="addvideo()" ng-show="!video.isOK">
+                <a ng-if="imgs.length==0" class="btn-file-up" ng-click="addvideo()">
                     <img src="img/icon_video.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加视频</em>
                 </a>

miaomiao/www/templates/home/index.html

@@ -24,17 +24,17 @@
         <!--<button class="button button-clear" style="height: 30px; width: 30px; margin-top: 6px" ui-sref="app.home_search">
             <img src="img/icon_search.svg" style="height: 67%; width: 100%">
         </button>-->
-        <button class="button button-clear" ui-sref="app.home_search">
+        <button class="button button-clear" ui-sref="app.home_search" style="margin-top:-3px">
             <i class="icon iconfont icon-sousuo"></i>
         </button>
-        <!--<button class="button button-clear" style="height: 35px; margin-top:4.8px" ui-sref="app.message">
+        <button class="button button-clear" style="height: 37px; margin-top: 0.6px" ui-sref="app.message">
             <img ng-if="showMessage==1" src="img/icon_message_h.svg" style="height: 60%; width: 100%">
             <img ng-if="showMessage==0" src="img/icon_message_n.svg" style="height: 55%; width: 100%">
-        </button>-->
-        <button class="button button-clear"  ui-sref="app.message">
-            <i class="icon iconfont icon-xiaoxi">
-            </i>
         </button>
+        <!--<button class="button button-clear"  ui-sref="app.message">-->
+            <!--<i class="icon iconfont icon-xiaoxi">-->
+            <!--</i>-->
+        <!--</button>-->
     </ion-nav-buttons>
     <ion-side-menus>
         <ion-side-menu-content drag-content="false">
@@ -62,7 +62,7 @@
                             <!--</ion-slide-page>-->
                         <!--</ion-slides>-->
                         <!--start 轮播图-->
-                        <ion-slide-box style="height: 150px" show-pager="true" auto-play="true" slide-interval="2000"  does-continue="true">
+                        <ion-slide-box style="height: 150px" auto-play="true" slide-interval="2000"  does-continue="true">
                             <ion-slide ng-repeat="banner in index.banners">
                                 <div class="box banner"><img ng-src="{{banner.value}}" style="width: 100%; " /></div>
                             </ion-slide>
@@ -137,7 +137,7 @@
            <ion-checkbox type="checkbox" ng-repeat="age in ages" name="age" ng-value="age.value">{{age.age}}</ion-checkbox>
         </div>
         
-   </div>
+    
   <label class="item item-select item-select-width">
     <span class="input-label">地区</span>
     <select name="city" ng-model="filter.city">
@@ -168,8 +168,7 @@
             确定
         </button>
     </div>
-</div>
-                    </ion-item>
+               </ion-item>
                 </ion-list>
             </ion-content>
         </ion-side-menu>

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

@@ -1,60 +1,25 @@
 <ion-view view-title="回复我的">
     <ion-content>
-        <div class="list list-user-set" ng-repeat="item in comments" style="color: #737373; margin-bottom: 0">
+        <div class="list list-user-set" ng-click="goDetail(item.dreamid,item.interaction_id)" ng-repeat="item in comments" style="color: #737373; margin-bottom: 0">
             <a class="item" style="border-bottom: 1px solid #EAEAEA">
-                来自 <em style="color: #000">瞄喵</em> 的私信
+                <em style="color: #000">{{item.user_nickname}} </em> 回复你：
                 <p>{{item.content}}</p>
             </a>
         </div>
     </ion-content>
-    <!--<ion-content>
-        <div class="list">
-            <div class="item reply-item">
-                <div class="row">
-                    <div class="col">
-                        <img  class="reply-head" src="../../img/demo/head1.jpg" />
-                        <div class="reply-info">
-                            <div>林更新</div>
-                            <div>2016-08-08 11:00</div>
-                        </div>
-                    </div>
-                    <div class="col reply-hf">
-                        <button class="button icon-left ion-ios-redo-outline" ng-click="openModal()">回复</button>
-                    </div>
-                </div>
-                <span class="reply-line">回复<span>@韩庚</span>：你确定是去那里吗？</span>
-                <div class="item item-thumbnail-left reply-content">
-                    &lt;!&ndash;<img ng-src="img/demo/head7.jpg" />&ndash;&gt;
-                    <img ng-src="{{item.dream_pic}}">
-                    <h2>{{item.dream_name}}</h2>
-                    <p>在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得的北欧时光！</p>
-                </div>
-                <div class="reply-bar">
-                    <div style="width: 30%;">
-                    </div>
-                </div> 
-                <div class="reply-sx"><span class="calm">30%</span> 目前实现</div>
-            </div>
-        </div>
-    </ion-content>
     <script id="my-modal.html" type="text/ng-template">
         <ion-modal-view>
             <ion-header-bar class="bar-calm">
-                <button class="button button-clear icon ion-ios-arrow-back" ng-click="closeModal()">返回</button>
-                <h1 class="title">我的回复</h1>
-                <button class="button button-clear" ng-click="myReplay()">确定</button>
+                <h1 class="title">消息回复</h1>
             </ion-header-bar>
             <ion-content>
-                <div class="addmodal">
-                    <textarea placeholder="回复内容" ng-model="vm.content"></textarea>
-                </div>
-                <div class="addfoot">
-                    <img ng-src="img/图片.png" />
-                    <img ng-src="img/相机.png" />
-                    <img ng-src="img/表情.png" />
+                <textarea autofocus rows="5" style="width:100%" ng-model="vm.content" placeholder="请输入回复内容"></textarea>
+                <div class="padding">
+                    <button class="button button-full button-calm" ng-click="closeModal()">
+                        回复
+                    </button>
                 </div>
             </ion-content>
-
         </ion-modal-view>
-    </script>-->
+    </script>
 </ion-view>

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

@@ -1,4 +1,4 @@
-<ion-view view-title="设置">
+<ion-view view-title="系统消息">
     <ion-content>
         <div class="list" ng-repeat="sysInfo in sysInfos">
             <a class="item item-icon-left">

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

@@ -329,7 +329,7 @@ class AuthController extends Controller
 
     public function isLogin()
     {
-        $user = Auth::user();
+        $user = Auth::guard('api')->user();
         $res = true;
         if(!$user) $res = false;
         return $this->api([

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

@@ -265,7 +265,7 @@ class PayController extends Controller
             return $this->validatorError($validator->messages()->all(), ErrorCode::CLIENT_WRONG_PARAMS);
         }
 
-        $user = Auth::user();
+        $user = Auth::guard('api')->user();
         $data['goods_id'] = 1;
         if (!isset($data['goods'])) {//默认充余额
             $data['goods'] = OrderInfoModel::GOODS_TYPE_COIN;