add

miaomiao/www/.idea/workspace.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="BookmarkManager">
+    <bookmark url="file://E:/Graduation design/huiwei/www/css/care.css" line="99" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="da700f62-8b79-488e-8484-af89b2c5db2d" name="Default" comment="" />
     <ignored path="www.iws" />
@@ -24,8 +27,59 @@
       <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-9.0625">
-              <caret line="541" column="25" selection-start-line="541" selection-start-column="25" selection-end-line="541" selection-end-column="25" />
+            <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" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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" />
+              <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>
+      </file>
+      <file leaf-file-name="account.js" pinned="false" current-in-tab="false">
+        <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>
+      </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>
@@ -34,8 +88,8 @@
       <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.9166665">
-              <caret line="195" column="37" selection-start-line="195" selection-start-column="37" selection-end-line="195" selection-end-column="37" />
+            <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" />
@@ -44,6 +98,9 @@
                 <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" />
@@ -53,22 +110,18 @@
           </provider>
         </entry>
       </file>
-      <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="-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="productDetail.html" pinned="false" current-in-tab="true">
-        <entry file="file://E:/Graduation design/huiwei/www/templates/productDetail.html">
+      <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="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 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>
@@ -112,12 +165,17 @@
         <option value="$USER_HOME$/Desktop/shareDream.html" />
         <option value="$PROJECT_DIR$/../../../miao2/miaomiao/config.xml" />
         <option value="$PROJECT_DIR$/templates/add/index.html" />
-        <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$/js/config/config.js" />
+        <option value="E:/Graduation design/huiwei/www/templates/buy.html" />
+        <option value="E:/Graduation design/huiwei/www/js/addAddress.js" />
+        <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="$PROJECT_DIR$/js/config/config.js" />
       </list>
     </option>
   </component>
@@ -237,19 +295,19 @@
       <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" />
       <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">
@@ -265,13 +323,6 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/js/config/config.js</url>
-          <line>8</line>
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-      </breakpoints>
       <option name="time" value="5" />
     </breakpoint-manager>
     <watches-manager />
@@ -297,6 +348,9 @@
             <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" />
@@ -309,6 +363,28 @@
       <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>
@@ -334,7 +410,6 @@
           <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>
@@ -345,6 +420,28 @@
       <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="..." />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -382,6 +479,9 @@
             <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" />
@@ -394,6 +494,28 @@
       <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="..." />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -483,58 +605,129 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+    <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="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="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>
+    <entry file="file://E:/Graduation design/huiwei/www/css/index.css">
+      <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>
-    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
+    <entry file="file://E:/Graduation design/huiwei/www/js/productDetail.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 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>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+    <entry file="file://E:/Graduation design/huiwei/www/js/addAddress.js">
       <provider selected="true" editor-type-id="text-editor">
-        <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 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>
-    <entry file="file://E:/Graduation design/huiwei/www/js/index.js">
+    <entry file="file://E:/Graduation design/huiwei/www/js/buy.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" />
+        <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>
+    <entry file="file://E:/Graduation design/huiwei/www/css/care.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-6.8">
+          <caret line="98" column="19" selection-start-line="98" selection-start-column="1" selection-end-line="98" selection-end-column="19" />
+          <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.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/css/index.css">
+    <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.18412699">
-          <caret line="8" column="6" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
+        <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>
+    <entry file="file://E:/Graduation design/huiwei/www/templates/buy.html">
+      <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>
+    <entry file="file://E:/Graduation design/huiwei/www/templates/productDetail.html">
+      <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" />
+          <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" />
           <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="-9.0625">
-          <caret line="541" column="25" selection-start-line="541" selection-start-column="25" selection-end-line="541" selection-end-column="25" />
+        <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" />
           <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.9166665">
-          <caret line="195" column="37" selection-start-line="195" selection-start-column="37" selection-end-line="195" selection-end-column="37" />
+        <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" />
@@ -543,6 +736,9 @@
             <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" />
@@ -553,9 +749,10 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <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" />
@@ -564,18 +761,47 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/huiwei/www/index.html">
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
       <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" />
+        <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>
+      </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/productDetail.html">
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <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>

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

@@ -394,9 +394,9 @@
                         },
                         scene: Wechat.Scene.SESSION
                     }, function () {
-                        msg.success('分享成功');
+                        msg.alert('分享','分享成功');
                     }, function (reason) {
-                        msg.error('分享失败');
+                        msg.alert('分享','分享失败');
                     });
                 }
                 if(type==1){

miaomiao/www/js/controllers/my.js

@@ -763,7 +763,7 @@
                 $scope.video = {};
                 common.deletefile(file).then(function (res) {
                 },function(erro){
-                    alert(JSON.stringify(erro));
+                    //alert(JSON.stringify(erro));
                 })
             };
             $scope.goMes = function(is_reply,is_url,dream_id,is_end,message,user_id,info,attr_id){

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

@@ -92,7 +92,7 @@
                             <h2>{{timer}}</h2>
                             <p>剩余时间</p>
                         </div>
-                        <div ng-if="user.id == dream.user.id" class="col" style="text-align:right">
+                        <div class="col" style="text-align:right">
                             <h2>{{dream.mark}}</h2>
                             <p>当前获得梦想分数</p>
                         </div>

miaomiao/www/templates/my/payExplain.html

@@ -15,10 +15,10 @@
                             <!--<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 class="fr" ng-if="item.from_id==item.to_id&&item.op=='充值'" style="font-weight: bolder; font-size: 16px">+{{item.to_amount}}</div>
+                            <div class="fr" ng-if="item.from_id==item.to_id" style="font-weight: bolder; font-size: 16px">-{{item.to_amount}}</div>
+                            <div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.to_id" style="font-weight: bolder; font-size: 16px">+{{item.to_amount}}</div>
+                            <div class="fr" ng-if="item.from_id!=item.to_id&&user.id==item.from_id" style="font-weight: bolder; font-size: 16px">-{{item.to_amount}}</div>
                         </div>
                         <div ng-if="item.transaction_id!=null" style="clear:both;"> 交易号：{{item.transaction_id}} </div>
                     </div>