add

miaomiao/www/.idea/workspace.xml

@@ -24,11 +24,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+      <file leaf-file-name="config.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/config/config.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-23.0625">
-              <caret line="748" column="35" selection-start-line="748" selection-start-column="35" selection-end-line="748" selection-end-column="35" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
               <folding />
             </state>
           </provider>
@@ -37,95 +37,44 @@
       <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-10.53125">
-              <caret line="500" column="24" selection-start-line="500" selection-start-column="24" selection-end-line="500" selection-end-column="24" />
+            <state vertical-scroll-proportion="-16.375">
+              <caret line="842" column="59" selection-start-line="842" selection-start-column="59" selection-end-line="842" selection-end-column="59" />
               <folding>
-                <marker date="1510559173022" expanded="true" signature="32196:33956" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="32257:32282" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="32565:32629" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="32681:32697" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="32929:32993" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="33045:33060" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="33260:33291" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="33477:33917" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="33523:33541" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="33542:33878" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="33732:33786" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="33746:33759" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="35700:35718" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="38028:38046" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="38147:38161" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="38418:38437" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="38498:38544" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="38743:38761" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="39533:39551" placeholder="..." />
-                <marker date="1510559173022" expanded="true" signature="40544:40562" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="32196:33956" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="32257:32282" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="32565:32629" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="32681:32697" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="32929:32993" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="33045:33060" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="33260:33291" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="33477:33917" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="33523:33541" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="33542:33878" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="33732:33786" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="33746:33759" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="35700:35718" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="38033:38051" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="38152:38166" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="38423:38442" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="38503:38549" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="38748:38766" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="39538:39556" placeholder="..." />
+                <marker date="1510626452277" expanded="true" signature="40549:40567" placeholder="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="account.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+      <file leaf-file-name="msgservice.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="19" column="56" selection-start-line="19" selection-start-column="56" selection-end-line="19" selection-end-column="56" />
+            <state vertical-scroll-proportion="0.4156051">
+              <caret line="18" column="55" selection-start-line="18" selection-start-column="55" selection-end-line="18" selection-end-column="55" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="config.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/js/config/config.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.2562112">
-              <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>
-      </file>
-      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-7.366667">
-              <caret line="97" column="30" selection-start-line="97" selection-start-column="30" selection-end-line="97" selection-end-column="30" />
-              <folding>
-                <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#video#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#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#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#em#0;n#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="payExplain.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-8.571428">
-              <caret line="8" column="26" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
-              <folding>
-                <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#3;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -156,7 +105,6 @@
         <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/templates/my/withdraw.html" />
-        <option value="$PROJECT_DIR$/js/services/msgservice.js" />
         <option value="$PROJECT_DIR$/templates/my/my-collect.html" />
         <option value="$PROJECT_DIR$/templates/home/share.html" />
         <option value="$PROJECT_DIR$/templates/home/index.html" />
@@ -171,11 +119,15 @@
         <option value="E:/Graduation design/huiwei/www/css/care.css" />
         <option value="E:/Graduation design/huiwei/www/js/buy.js" />
         <option value="E:/Graduation design/huiwei/www/js/detail.js" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
-        <option value="$PROJECT_DIR$/js/controllers/home.js" />
-        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
         <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
+        <option value="E:/Graduation design/huiwei/www/templates/detail.html" />
+        <option value="D:/HPE/phpstudy/install/WWW/aserver/public/assets/css/login.css" />
         <option value="$PROJECT_DIR$/js/config/config.js" />
+        <option value="$PROJECT_DIR$/js/services/utilservice.js" />
+        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/js/services/msgservice.js" />
+        <option value="$PROJECT_DIR$/js/controllers/my.js" />
       </list>
     </option>
   </component>
@@ -219,7 +171,7 @@
   <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="E:/Graduation design/huiwei/www/index.html" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/index.html" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -295,7 +247,6 @@
       <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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297953" sideWeight="0.5" order="1" 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" />
@@ -307,6 +258,7 @@
       <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="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.3297953" 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" />
     </layout>
   </component>
@@ -328,119 +280,31 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="202" column="49" selection-start-line="202" selection-start-column="49" selection-end-line="202" selection-end-column="49" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#video#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#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#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#em#0;n#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="732" column="37" selection-start-line="732" selection-start-column="37" selection-end-line="732" selection-end-column="37" />
-          <folding>
-            <marker date="1510559173022" expanded="true" signature="32196:33956" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32257:32282" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32565:32629" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32681:32697" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32929:32993" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33045:33060" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33260:33291" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33477:33917" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33523:33541" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33542:33878" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33732:33786" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33746:33759" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="35700:35718" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38028:38046" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38147:38161" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38418:38437" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38498:38544" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38743:38761" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="39533:39551" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="40544:40562" placeholder="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="428" column="25" selection-start-line="428" selection-start-column="25" selection-end-line="429" selection-end-column="0" />
-          <folding />
-        </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="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="4" column="68" selection-start-line="3" selection-start-column="68" selection-end-line="4" selection-end-column="68" />
-          <folding>
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#3;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/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>
-            <marker date="1510559173022" expanded="true" signature="32196:33956" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32257:32282" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32565:32629" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32681:32697" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32929:32993" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33045:33060" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33260:33291" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33477:33917" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33523:33541" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33542:33878" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33732:33786" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33746:33759" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="35700:35718" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38028:38046" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38147:38161" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38418:38437" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38498:38544" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38743:38761" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="39533:39551" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="40544:40562" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32196:33956" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32257:32282" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32565:32629" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32681:32697" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32929:32993" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33045:33060" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33260:33291" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33477:33917" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33523:33541" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33542:33878" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33732:33786" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33746:33759" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="35700:35718" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38033:38051" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38152:38166" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38423:38442" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38503:38549" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38748:38766" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="39538:39556" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="40549:40567" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -472,20 +336,7 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="318" column="63" selection-start-line="318" selection-start-column="63" selection-end-line="318" selection-end-column="63" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#video#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#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#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#em#0;n#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -495,26 +346,26 @@
         <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>
-            <marker date="1510559173022" expanded="true" signature="32196:33956" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32257:32282" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32565:32629" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32681:32697" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32929:32993" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33045:33060" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33260:33291" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33477:33917" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33523:33541" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33542:33878" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33732:33786" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33746:33759" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="35700:35718" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38028:38046" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38147:38161" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38418:38437" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38498:38544" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38743:38761" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="39533:39551" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="40544:40562" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32196:33956" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32257:32282" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32565:32629" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32681:32697" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32929:32993" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33045:33060" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33260:33291" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33477:33917" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33523:33541" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33542:33878" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33732:33786" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33746:33759" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="35700:35718" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38033:38051" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38152:38166" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38423:38442" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38503:38549" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38748:38766" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="39538:39556" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="40549:40567" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -605,20 +456,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-17.71875">
-          <caret line="21" column="17" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://E:/Graduation design/huiwei/www/js/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="53" selection-end-column="1" />
-          <folding>
-            <element signature="n#!!doc" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -626,7 +467,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.18412699">
           <caret line="8" column="6" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -634,7 +474,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-26.125">
           <caret line="73" column="21" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="21" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -642,7 +481,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3377329">
           <caret line="15" column="5" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -650,7 +488,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.38694268">
           <caret line="24" column="50" selection-start-line="24" selection-start-column="50" selection-end-line="24" selection-end-column="50" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -662,31 +499,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/huiwei/www/js/detail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4848726">
-          <caret line="30" column="11" selection-start-line="30" selection-start-column="4" selection-end-line="30" selection-end-column="11" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://E:/Graduation design/huiwei/www/templates/detail-intro.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.34934855">
           <caret line="11" column="10" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
-          <folding>
-            <element signature="n#style#0;n#div#1;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://E:/Graduation design/huiwei/www/templates/detail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.026058631">
-          <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>
@@ -694,9 +510,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.47142857">
           <caret line="25" column="12" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -704,104 +517,216 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2563492">
           <caret line="17" column="53" selection-start-line="17" selection-start-column="53" selection-end-line="17" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-8.571428">
+          <caret line="8" column="26" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
+        </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="19" column="56" selection-start-line="19" selection-start-column="56" selection-end-line="19" selection-end-column="56" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://E:/Graduation design/huiwei/www/templates/detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.14285715">
+          <caret line="321" column="39" selection-start-line="321" selection-start-column="39" selection-end-line="321" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../xcxWeb/xcx/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-9.5">
+          <caret line="14" column="3" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../xcxWeb/xcx/templates/my/my.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-14.357142">
+          <caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://D:/HPE/phpstudy/install/WWW/aserver/public/assets/css/login.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.27142859">
+          <caret line="18" column="27" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://E:/Graduation design/huiwei/www/js/detail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.32453415">
+          <caret line="36" column="29" selection-start-line="36" selection-start-column="29" selection-end-line="36" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://E:/Graduation design/huiwei/www/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27380952">
-          <caret line="253" column="29" selection-start-line="253" selection-start-column="29" selection-end-line="253" selection-end-column="29" />
+        <state vertical-scroll-proportion="0.015079365">
+          <caret line="233" column="29" selection-start-line="233" selection-start-column="29" selection-end-line="233" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/../../../xcxWeb/xcx/templates/my/myTemplate.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.015079365">
+          <caret line="41" column="17" selection-start-line="41" selection-start-column="17" selection-end-line="41" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://D:/HPE/phpstudy/install/WWW/aserver/resources/views/web/layout.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.015079365">
+          <caret line="9" column="16" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://D:/HPE/phpstudy/install/WWW/aserver/public/assets/css/plugin/bootstrap.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.015079365">
+          <caret line="5613" column="3" selection-start-line="5613" selection-start-column="3" selection-end-line="5613" selection-end-column="3" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://D:/HPE/phpstudy/install/WWW/aserver/resources/views/web/pc/info.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.13571429">
+          <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-11.535714">
+          <caret line="17" column="49" selection-start-line="17" selection-start-column="49" selection-end-line="17" selection-end-column="49" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/jpushservice.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$/js/services/utilservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/userservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-1.1875">
+          <caret line="2" column="16" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-23.0625">
-          <caret line="748" column="35" selection-start-line="748" selection-start-column="35" selection-end-line="748" selection-end-column="35" />
+        <state vertical-scroll-proportion="-16.90625">
+          <caret line="43" column="42" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="42" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.366667">
-          <caret line="97" column="30" selection-start-line="97" selection-start-column="30" selection-end-line="97" selection-end-column="30" />
+        <state vertical-scroll-proportion="0.14250815">
+          <caret line="64" column="63" selection-start-line="64" selection-start-column="63" selection-end-line="64" selection-end-column="63" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#video#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#span#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#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#em#0;n#div#0;n#div#0;n#div#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.571428">
-          <caret line="8" column="26" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#3;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="0.0">
+          <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-10.53125">
-          <caret line="500" column="24" selection-start-line="500" selection-start-column="24" selection-end-line="500" selection-end-column="24" />
-          <folding>
-            <marker date="1510559173022" expanded="true" signature="32196:33956" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32257:32282" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32565:32629" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32681:32697" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="32929:32993" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33045:33060" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33260:33291" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33477:33917" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33523:33541" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33542:33878" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33732:33786" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="33746:33759" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="35700:35718" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38028:38046" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38147:38161" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38418:38437" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38498:38544" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="38743:38761" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="39533:39551" placeholder="..." />
-            <marker date="1510559173022" expanded="true" signature="40544:40562" placeholder="..." />
-          </folding>
+        <state vertical-scroll-proportion="-9.4375">
+          <caret line="392" column="20" selection-start-line="392" selection-start-column="20" selection-end-line="392" selection-end-column="20" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+    <entry file="file://$PROJECT_DIR$/js/services/commonservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="19" column="56" selection-start-line="19" selection-start-column="56" selection-end-line="19" selection-end-column="56" />
+          <caret line="16" column="64" selection-start-line="16" selection-start-column="64" selection-end-line="16" selection-end-column="64" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2562112">
-          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-16.375">
+          <caret line="842" column="59" selection-start-line="842" selection-start-column="59" selection-end-line="842" selection-end-column="59" />
+          <folding>
+            <marker date="1510626452277" expanded="true" signature="32196:33956" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32257:32282" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32565:32629" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32681:32697" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="32929:32993" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33045:33060" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33260:33291" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33477:33917" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33523:33541" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33542:33878" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33732:33786" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="33746:33759" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="35700:35718" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38033:38051" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38152:38166" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38423:38442" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38503:38549" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="38748:38766" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="39538:39556" placeholder="..." />
+            <marker date="1510626452277" expanded="true" signature="40549:40567" placeholder="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4156051">
+          <caret line="18" column="55" selection-start-line="18" selection-start-column="55" selection-end-line="18" selection-end-column="55" />
           <folding />
         </state>
       </provider>

miaomiao/www/js/config/config.js

@@ -1,11 +1,11 @@
 (function (app) {
     //全局配置 
     app.constant("config", {
-         //server: 'http://q8.9026.com/',
-         // imgServer: 'http://q8.9026.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/'
+        //server: 'http://miao.beiyuesi.com/',
+        //imgServer: 'http://miao.beiyuesi.com/attachment/'
     });
 })(angular.module('app'));

miaomiao/www/js/controllers/home.js

@@ -313,8 +313,15 @@
                     $scope.codeBtn = true;
                 }
                 if($scope.dream.video){
-                    $scope.dream.vpic = config.server+'upload/vpic/'+$scope.dream.video+'.jpg';
-                    $scope.dream.video = config.imgServer+$scope.dream.video;
+                    if($scope.dream.video.indexOf('http')<0){
+                        $scope.dream.vpic = config.server+'upload/vpic/'+$scope.dream.video+'.jpg';
+                        $scope.dream.video = config.imgServer+$scope.dream.video;
+                    }
+                    else {
+                        //$scope.dream.vpic = $scope.dream.video+'upload/vpic/'+'.jpg';
+                        $scope.dream.vpic = $scope.dream.video.replace(/attachment/,'upload/vpic/')+'.jpg';
+                        $scope.dream.video = $scope.dream.video;
+                    }
                 }
                 var reg = new RegExp("\n", "g");
                 $scope.dream.about = $scope.dream.about.replace(reg, "<br/>");
@@ -394,9 +401,11 @@
                         },
                         scene: Wechat.Scene.SESSION
                     }, function () {
-                        msg.alert('分享','分享成功');
+                        //msg.alert('分享','分享成功');
+                        msg.success('分享成功');
                     }, function (reason) {
-                        msg.alert('分享','分享失败');
+                        //msg.alert('分享','分享失败');
+                        msg.error('分享失败');
                     });
                 }
                 if(type==1){

miaomiao/www/js/controllers/my.js

@@ -838,7 +838,7 @@
                         '<p>如果你觉得不合适，你可以点击《取消》,但是《梦主》的资金会被退还给他</p>' +
                         '<p>你以后创建梦想也会比较难</p>' +
                         '</div>';
-                    msg.confirm('恭喜你！',endTemplate).then(function(result){
+                    msg.confirm('恭喜你！',endTemplate,'拒绝').then(function(result){
                         if(result==true){
                             myService.sure_meet(dream_id,1).then(function(res){
                                 if(res.data.status_code==0){
@@ -854,7 +854,7 @@
                         else {
                             myService.sure_meet(dream_id,0).then(function(res){
                                 if(res.data.status_code==0){
-                                    msg.success('已取消见面！');
+                                    msg.success('已拒绝见面！');
                                 }
                             })
                         }

miaomiao/www/js/services/msgservice.js

@@ -54,10 +54,10 @@
                 }
                 $ionicPopup.alert(o)
             },
-            confirm: function (title, template, okText) {
+            confirm: function (title, template, cancelText, okText) {
                 var n = {
                     okText: okText || "确定",
-                    cancelText: "取消"
+                    cancelText: cancelText || "取消"
                 };
                 if (title && template) {
                     n["title"] = title;