add

miaomiao/www/.idea/workspace.xml

@@ -21,68 +21,54 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+      <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="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="1510042840166" expanded="true" signature="32141:33901" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="32202:32227" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="32510:32574" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="32626:32642" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="32874:32938" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="32990:33005" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="33205:33236" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="33422:33862" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="33468:33486" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="33487:33823" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="33677:33731" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="33691:33704" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="35645:35663" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="37973:37991" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="38092:38106" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="38363:38382" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="38443:38489" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="38688:38706" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="39478:39496" placeholder="..." />
-                <marker date="1510042840166" expanded="true" signature="40489:40507" placeholder="..." />
-              </folding>
+            <state vertical-scroll-proportion="-9.0625">
+              <caret line="541" column="25" selection-start-line="541" selection-start-column="25" selection-end-line="541" selection-end-column="25" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+      <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="-4.0625">
-              <caret line="428" column="25" selection-start-line="428" selection-start-column="25" selection-end-line="429" selection-end-column="0" />
-              <folding />
+            <state vertical-scroll-proportion="-7.9166665">
+              <caret line="195" column="37" selection-start-line="195" selection-start-column="37" selection-end-line="195" selection-end-column="37" />
+              <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#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="config.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/js/config/config.js">
+      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
+        <entry file="file://E:/Graduation design/huiwei/www/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.13276398">
-              <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
+            <state vertical-scroll-proportion="-12.321428">
+              <caret line="253" column="29" selection-start-line="253" selection-start-column="29" selection-end-line="253" selection-end-column="29" />
               <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">
+      <file leaf-file-name="productDetail.html" pinned="false" current-in-tab="true">
+        <entry file="file://E:/Graduation design/huiwei/www/templates/productDetail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-4.142857">
-              <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#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.18095239">
+              <caret line="12" column="33" selection-start-line="12" selection-start-column="33" selection-end-line="12" selection-end-column="33" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -119,7 +105,6 @@
         <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$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/templates/home/share.html" />
         <option value="$PROJECT_DIR$/templates/home/index.html" />
         <option value="$PROJECT_DIR$/templates/home/shareDream.html" />
@@ -130,8 +115,9 @@
         <option value="$PROJECT_DIR$/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/templates/home/userDetail.html" />
         <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
-        <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
         <option value="$PROJECT_DIR$/js/config/config.js" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
       </list>
     </option>
   </component>
@@ -175,7 +161,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="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="E:/Graduation design/huiwei/www/index.html" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -252,18 +238,18 @@
       <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="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="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" />
       <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.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" />
+      <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">
@@ -291,40 +277,81 @@
     <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#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" />
+        </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>
-            <marker date="1510042840166" expanded="true" signature="32141:33901" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32202:32227" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32510:32574" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32626:32642" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32874:32938" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32990:33005" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33205:33236" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33422:33862" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33468:33486" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33487:33823" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33677:33731" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33691:33704" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="35645:35663" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="37973:37991" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="38092:38106" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="38363:38382" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="38443:38489" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="38688:38706" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="39478:39496" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="40489:40507" placeholder="..." />
+            <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>
+    <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>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="20" column="43" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -340,10 +367,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#video#0;n#div#0;n#div#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -352,13 +375,17 @@
         <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#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>
@@ -367,28 +394,6 @@
       <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="1510042840166" expanded="true" signature="32141:33901" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32202:32227" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32510:32574" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32626:32642" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32874:32938" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32990:33005" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33205:33236" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33422:33862" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33468:33486" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33487:33823" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33677:33731" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33691:33704" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="35645:35663" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="37973:37991" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="38092:38106" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="38363:38382" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="38443:38489" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="38688:38706" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="39478:39496" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="40489:40507" placeholder="..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -436,160 +441,120 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../miao2/miaomiao/package.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="10" column="41" selection-start-line="10" selection-start-column="41" selection-end-line="11" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../miao2/miaomiao/config.xml">
+    <entry file="file://$PROJECT_DIR$/templates/account/login.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" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../miao2/miaomiao/config.xml">
+    <entry file="file://$PROJECT_DIR$/templates/my/letterDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.45714286">
-          <caret line="77" column="103" selection-start-line="77" selection-start-column="103" selection-end-line="77" selection-end-column="103" />
+        <state vertical-scroll-proportion="-3.392857">
+          <caret line="5" column="37" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../miao2/miaomiao/package.json">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.015079365">
-          <caret line="10" column="41" selection-start-line="10" selection-start-column="41" selection-end-line="11" selection-end-column="43" />
+        <state vertical-scroll-proportion="0.03015873">
+          <caret line="2" column="36" selection-start-line="2" selection-start-column="36" selection-end-line="2" selection-end-column="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../miao2/miaomiao/www/css/ionic.app.css">
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.8166666">
-          <caret line="9079" column="0" selection-start-line="9079" selection-start-column="0" selection-end-line="9080" selection-end-column="21" />
+        <state vertical-scroll-proportion="0.21111111">
+          <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../miao2/miaomiao/www/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.04641694">
-          <caret line="213" column="26" selection-start-line="213" selection-start-column="26" selection-end-line="213" selection-end-column="26" />
+        <state vertical-scroll-proportion="-10.821428">
+          <caret line="72" column="16" selection-start-line="72" selection-start-column="16" selection-end-line="72" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../miao2/miaomiao/www/css/style.css">
+    <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3330619">
-          <caret line="499" column="11" selection-start-line="499" selection-start-column="4" selection-end-line="499" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="7" column="46" selection-start-line="7" selection-start-column="46" selection-end-line="7" selection-end-column="47" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/account/login.html">
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.16587302">
+        <state vertical-scroll-proportion="0.0">
           <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/my/letterDetail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.392857">
-          <caret line="5" column="37" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
+    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03015873">
-          <caret line="2" column="36" selection-start-line="2" selection-start-column="36" selection-end-line="2" selection-end-column="36" />
+        <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://$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="1510042840166" expanded="true" signature="32141:33901" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32202:32227" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32510:32574" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32626:32642" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32874:32938" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="32990:33005" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33205:33236" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33422:33862" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33468:33486" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33487:33823" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33677:33731" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="33691:33704" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="35645:35663" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="37973:37991" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="38092:38106" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="38363:38382" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="38443:38489" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="38688:38706" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="39478:39496" placeholder="..." />
-            <marker date="1510042840166" expanded="true" signature="40489:40507" placeholder="..." />
-          </folding>
+        <state vertical-scroll-proportion="-11.4375">
+          <caret line="771" column="41" selection-start-line="771" selection-start-column="41" selection-end-line="771" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+    <entry file="file://E:/Graduation design/huiwei/www/js/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.21111111">
-          <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
+        <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#style#0;n#div#0;n#div#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#video#0;n#div#0;n#div#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#!!doc" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
+    <entry file="file://E:/Graduation design/huiwei/www/css/index.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-10.821428">
-          <caret line="72" column="16" selection-start-line="72" selection-start-column="16" selection-end-line="72" selection-end-column="16" />
+        <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>
-    <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
+    <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="7" column="46" selection-start-line="7" selection-start-column="46" selection-end-line="7" selection-end-column="47" />
+        <state vertical-scroll-proportion="-9.0625">
+          <caret line="541" column="25" selection-start-line="541" selection-start-column="25" selection-end-line="541" selection-end-column="25" />
           <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.09690554">
-          <caret line="10" column="176" selection-start-line="10" selection-start-column="176" selection-end-line="10" selection-end-column="176" />
+        <state vertical-scroll-proportion="-7.9166665">
+          <caret line="195" column="37" selection-start-line="195" selection-start-column="37" selection-end-line="195" selection-end-column="37" />
           <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#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/home.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.0625">
-          <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$/templates/my/payExplain.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.142857">
-          <caret line="4" column="68" selection-start-line="3" selection-start-column="68" selection-end-line="4" selection-end-column="68" />
+        <state vertical-scroll-proportion="0.10714286">
+          <caret line="5" column="88" selection-start-line="5" selection-start-column="88" selection-end-line="5" selection-end-column="88" />
           <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#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" />
@@ -599,10 +564,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+    <entry file="file://E:/Graduation design/huiwei/www/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-12.321428">
+          <caret line="253" column="29" selection-start-line="253" selection-start-column="29" selection-end-line="253" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://E:/Graduation design/huiwei/www/templates/productDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.13276398">
-          <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
+        <state vertical-scroll-proportion="0.18095239">
+          <caret line="12" column="33" selection-start-line="12" selection-start-column="33" selection-end-line="12" selection-end-column="33" />
           <folding />
         </state>
       </provider>

miaomiao/www/js/config/config.js

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

miaomiao/www/js/controllers/home.js

@@ -386,7 +386,7 @@
                         message: {
                             title: $scope.dream.name,
                             description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '\n' + $scope.dream.about,
-                            thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
+                            thumb: $scope.dream.imgs[0].pic,
                             media: {
                                 type: Wechat.Type.WEBPAGE,
                                 webpageUrl: config.server + "/admin/share/view?id=" + id + '&user_id = ' + $scope.user.id
@@ -394,9 +394,9 @@
                         },
                         scene: Wechat.Scene.SESSION
                     }, function () {
-                        alert("分享成功");
+                        msg.success('分享成功');
                     }, function (reason) {
-                        alert("分享失败");
+                        msg.error('分享失败');
                     });
                 }
                 if(type==1){
@@ -404,7 +404,7 @@
                         message: {
                             title: $scope.dream.name,
                             description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '\n' + $scope.dream.about,
-                            thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
+                            thumb: $scope.dream.imgs[0].pic,
                             media: {
                                 type: Wechat.Type.WEBPAGE,
                                 webpageUrl: config.server + "/admin/share/view?id=" + id
@@ -412,9 +412,9 @@
                         },
                         scene: Wechat.Scene.TIMELINE
                     }, function () {
-                        alert("分享","分享成功");
+                        msg.success('分享成功');
                     }, function (reason) {
-                        alert("分享","分享失败");
+                        msg.error('分享失败');
                     });
                 }
             };

miaomiao/www/templates/my/payExplain.html

@@ -11,10 +11,14 @@
                         <h2> {{item.op}} </h2>
                         <div>
                             <div class="fl">{{item.created_at}}</div>
-                            <div class="fr" ng-if="item.from_id==item.to_id&&item.op!='提现'" style="font-weight: bolder; font-size: 16px">+<span ng-if="item.from_type=='梦想币'">{{item.to_amount}}</span><span ng-if="item.from_type!='梦想币'">{{item.to_amount}}</span></div>
-                            <div class="fr" ng-if="item.from_id==item.to_id&&item.op=='提现'" style="font-weight: bolder; font-size: 16px">-<span ng-if="item.from_type=='梦想币'">{{item.to_amount}}</span><span ng-if="item.from_type!='梦想币'">{{item.to_amount}}</span></div>
-                            <div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.to_id" style="font-weight: bolder; font-size: 16px">+<span ng-if="item.from_type=='梦想币'">{{item.to_amount}}</span><span ng-if="item.from_type!='梦想币'">{{item.to_amount}}</span></div>
-                            <div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.from_id" style="font-weight: bolder; font-size: 16px">-<span ng-if="item.from_type=='梦想币'">{{item.to_amount}}</span><span ng-if="item.from_type!='梦想币'">{{item.to_amount}}</span></div>
+                            <!--<div class="fr" ng-if="item.from_id==item.to_id&&item.op!='提现'" style="font-weight: bolder; font-size: 16px">+<span ng-if="item.from_type=='梦想币'">{{item.to_amount}}</span><span ng-if="item.from_type!='梦想币'">{{item.to_amount}}</span></div>-->
+                            <!--<div class="fr" ng-if="item.from_id==item.to_id&&item.op=='提现'" style="font-weight: bolder; font-size: 16px">-<span ng-if="item.from_type=='梦想币'">{{item.to_amount}}</span><span ng-if="item.from_type!='梦想币'">{{item.to_amount}}</span></div>-->
+                            <!--<div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.to_id" style="font-weight: bolder; font-size: 16px">+<span ng-if="item.from_type=='梦想币'">{{item.to_amount}}</span><span ng-if="item.from_type!='梦想币'">{{item.to_amount}}</span></div>-->
+                            <!--<div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.from_id" style="font-weight: bolder; font-size: 16px">-<span ng-if="item.from_type=='梦想币'">{{item.to_amount}}</span><span ng-if="item.from_type!='梦想币'">{{item.to_amount}}</span></div>-->
+                            <div class="fr" ng-if="item.from_id==item.to_id&&item.op=='充值'" style="font-weight: bolder; font-size: 16px">+</div>
+                            <div class="fr" ng-if="item.from_id==item.to_id&&item.op=='提现'" style="font-weight: bolder; font-size: 16px">-</div>
+                            <div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.to_id" style="font-weight: bolder; font-size: 16px">+</div>
+                            <div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.from_id" style="font-weight: bolder; font-size: 16px">-</div>
                         </div>
                         <div ng-if="item.transaction_id!=null" style="clear:both;"> 交易号：{{item.transaction_id}} </div>
                     </div>