add

miaomiao/www/.idea/workspace.xml

@@ -24,21 +24,11 @@
       <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="-6.87931">
-              <caret line="21" column="64" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="64" />
+            <state vertical-scroll-proportion="-6.293103">
+              <caret line="301" column="39" selection-start-line="301" selection-start-column="39" selection-end-line="301" selection-end-column="39" />
               <folding>
-                <element signature="n#style#0;n#button#0;n#div#2;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#0;n#div#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#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#p#1;n#div#1;n#div#0;n#div#0;n#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#p#0;n#div#0;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#div#0;n#div#1;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#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#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -47,18 +37,31 @@
       <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.19529837">
-              <caret line="256" column="74" selection-start-line="256" selection-start-column="74" selection-end-line="256" selection-end-column="74" />
+            <state vertical-scroll-proportion="0.5732369">
+              <caret line="543" column="63" selection-start-line="543" selection-start-column="63" selection-end-line="543" selection-end-column="63" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="account.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/add/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="46" column="57" selection-start-line="46" selection-start-column="57" selection-end-line="46" selection-end-column="57" />
+            <state vertical-scroll-proportion="-12.678572">
+              <caret line="28" column="20" selection-start-line="15" selection-start-column="16" selection-end-line="28" selection-end-column="20" />
+              <folding>
+                <element signature="n#style#0;n#img#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#em#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="add.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-13.933333">
+              <caret line="34" column="14" selection-start-line="16" selection-start-column="14" selection-end-line="34" selection-end-column="14" />
               <folding />
             </state>
           </provider>
@@ -78,14 +81,10 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-index.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/my/my-setting-material.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/menu.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/menu.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/menu.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-rent.html" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/publish.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/registerindex.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/account/autonym1.html" />
@@ -104,7 +103,6 @@
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/carservice.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/config/router.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/config/router.js" />
-        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/parts.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-often-add.html" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/services/carservice.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-myroute.html" />
@@ -116,7 +114,6 @@
         <option value="$PROJECT_DIR$/../../../test/gulpfile.js" />
         <option value="$PROJECT_DIR$/../../../test/index.html" />
         <option value="$PROJECT_DIR$/js/app.js" />
-        <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/js/config/router.js" />
         <option value="$PROJECT_DIR$/js/services/homeservice.js" />
         <option value="$PROJECT_DIR$/../../../51zhupai/templates/demo.html" />
@@ -125,10 +122,16 @@
         <option value="$PROJECT_DIR$/../../../51zhupai/css/index.css" />
         <option value="$PROJECT_DIR$/../../../51zhupai/index.html" />
         <option value="$PROJECT_DIR$/templates/home/index.html" />
-        <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/templates/home/userDetail.html" />
-        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/parts.js" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-sell.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-rent.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-usedcar.html" />
+        <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/publish.js" />
+        <option value="$PROJECT_DIR$/js/controllers/account.js" />
+        <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
       </list>
     </option>
   </component>
@@ -138,8 +141,8 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="449" />
-    <option name="width" value="919" />
+    <option name="x" value="429" />
+    <option name="width" value="939" />
     <option name="height" value="744" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
@@ -295,7 +298,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="449" y="0" width="919" height="744" extended-state="0" />
+    <frame x="429" y="0" width="939" height="744" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16753927" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -334,34 +337,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/utilservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.054249547">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/menu.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.464286">
-          <caret line="17" column="33" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/directives/filters.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="31" column="25" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/templates/car/car-route.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.590991">
-          <caret line="43" column="42" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../../../quanzhouda/receive/receive/www/js/services/carservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.8625678">
@@ -383,13 +358,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/parts/parts-index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.464286">
-          <caret line="50" column="43" selection-start-line="50" selection-start-column="38" selection-end-line="50" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-order.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.857143">
@@ -397,13 +365,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/parts.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.45027125">
-          <caret line="53" column="30" selection-start-line="53" selection-start-column="30" selection-end-line="53" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-often-add.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-8.821428">
@@ -502,20 +463,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-12.892858">
-          <caret line="28" column="20" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
-        </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="44" column="46" selection-start-line="44" selection-start-column="19" selection-end-line="44" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/app.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -541,7 +488,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5111492">
           <caret line="422" column="21" selection-start-line="422" selection-start-column="21" selection-end-line="422" selection-end-column="21" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -573,13 +519,6 @@
         </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.0651801">
-          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/services/httpinterceptor.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2607204">
@@ -636,21 +575,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="607" column="15" selection-start-line="608" selection-start-column="4" selection-end-line="608" selection-end-column="16" />
-          <folding>
-            <marker date="1504094407066" expanded="true" signature="705:706" placeholder="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33273056">
           <caret line="12" column="32" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="32" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -658,7 +586,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 />
         </state>
       </provider>
     </entry>
@@ -666,7 +593,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.36708862">
           <caret line="664" column="28" selection-start-line="664" selection-start-column="28" selection-end-line="664" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -674,43 +600,124 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.39108062">
           <caret line="60" column="29" selection-start-line="60" selection-start-column="29" selection-end-line="60" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/parts.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="58" column="10" selection-start-line="6" selection-start-column="8" selection-end-line="58" selection-end-column="10" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-sell.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-2.7142856">
+          <caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
+          <folding>
+            <element signature="n#style#0;n#div#5;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#b#0;n#a#0;n#div#5;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#input#0;n#div#7;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-rent.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-12.892858">
+          <caret line="34" column="18" selection-start-line="34" selection-start-column="18" selection-end-line="34" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/publish/publish-usedcar.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-16.285715">
+          <caret line="24" column="20" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/publish.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-11.2">
+          <caret line="285" column="34" selection-start-line="285" selection-start-column="34" selection-end-line="285" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/parts/parts-index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6846847">
+          <caret line="39" column="26" selection-start-line="30" selection-start-column="24" selection-end-line="39" selection-end-column="26" />
+          <folding>
+            <element signature="n#style#0;n#div#1;n#div#1;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#button#0;n#div#2;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="46" column="57" selection-start-line="46" selection-start-column="57" selection-end-line="46" selection-end-column="57" />
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39108062">
+          <caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/css/style.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-14.25">
+          <caret line="615" column="6" selection-start-line="615" selection-start-column="6" selection-end-line="615" selection-end-column="6" />
+          <folding>
+            <marker date="1504147298062" expanded="true" signature="705:706" placeholder="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-13.933333">
+          <caret line="34" column="14" selection-start-line="16" selection-start-column="14" selection-end-line="34" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-12.678572">
+          <caret line="28" column="20" selection-start-line="15" selection-start-column="16" selection-end-line="28" selection-end-column="20" />
+          <folding>
+            <element signature="n#style#0;n#img#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#em#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.87931">
-          <caret line="21" column="64" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="64" />
+        <state vertical-scroll-proportion="-6.293103">
+          <caret line="301" column="39" selection-start-line="301" selection-start-column="39" selection-end-line="301" selection-end-column="39" />
           <folding>
-            <element signature="n#style#0;n#button#0;n#div#2;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#0;n#div#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#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#p#1;n#div#1;n#div#0;n#div#0;n#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#p#0;n#div#0;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#div#0;n#div#1;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#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#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19529837">
-          <caret line="256" column="74" selection-start-line="256" selection-start-column="74" selection-end-line="256" selection-end-column="74" />
+        <state vertical-scroll-proportion="0.5732369">
+          <caret line="543" column="63" selection-start-line="543" selection-start-column="63" selection-end-line="543" selection-end-column="63" />
           <folding />
         </state>
       </provider>

miaomiao/www/css/style.css

@@ -599,14 +599,14 @@ a:visited,a:link{
 /*dreamDetail*/
 .popover-backdrop{
     background: rgba(50, 50, 50, 0.5);
-    height: 250%;
+    height: 200%;
 }
 .popover-backdrop img{
     position: absolute;
     z-index: 11;
     display: block;
     width: 80%;
-    height: 45%;
+    height: 30%;
     margin: 28% 10%;
 }
 .popover-backdrop .code{

miaomiao/www/js/controllers/account.js

@@ -3,7 +3,7 @@
         function ($scope,userService,$ionicNavBarDelegate, storage, $state, msg, $http, util) {
              //$ionicNavBarDelegate.showBackButton(false);
             $scope.wechat_login = function(){
-                var scope = "snsapi_userinfo", state = "_" + (+new Date());
+               /* var scope = "snsapi_userinfo", state = "_" + (+new Date());
                 Wechat.auth(scope, state, function (response) {
                     // alert("response:"+JSON.stringify(response));
                     // var response={code:1231};
@@ -28,8 +28,8 @@
                     }
                 }, function (error) {
                     console.log("Failed: " + JSON.stringify(error));
-                });
-                //$state.go("loginAccount");
+                });*/
+                $state.go("loginAccount");
             };
     }]);
     app.controller('loginCtrl', ["$scope", "userService","$stateParams","$ionicNavBarDelegate", "storage", "$state", "msg", "$http", "util","$timeout",

miaomiao/www/js/controllers/home.js

@@ -257,13 +257,12 @@
                 if($scope.dream.top3user[1])$scope.sort.second = $scope.dream.top3user[1].avatar;
                 if($scope.dream.top3user[2])$scope.sort.third = $scope.dream.top3user[2].avatar;
                 $scope.calcmultiplier();
-                if($scope.timer=='已结束'|| 100*$scope.dream.get_coin/$scope.dream.coin>=100 && dream.top3user[0].id==user.id){
+                if($scope.timer=='已结束'|| 100*$scope.dream.get_coin/$scope.dream.coin>=100 && $scope.dream.top3user[0].id==$scope.user.id){
                     $scope.codeBtn = true;
                 }
                 else {
                     $scope.codeBtn = false;
                 }
-                debugger;
             }, function (error) {
                 msg.hide();
             });
@@ -550,7 +549,6 @@
                     console.log('选择视频失败');
                 });
             };
-
           $ionicModal.fromTemplateUrl('recharge-modal.html', {
             scope: $scope,
             animation: 'slide-in-up'
@@ -674,7 +672,6 @@
                     msg.hide();
                     console.log(result);
                     $scope.dream = result.data.data;
-                    debugger;
                     if($scope.dream.video){
                         $scope.dream.vpic = config.server+'upload/vpic/'+$scope.dream.video+'.jpg';
                         $scope.dream.video = config.imgServer+$scope.dream.video;

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

@@ -173,6 +173,10 @@
                             <img class="slt" ng-src="{{interaction.pic7}}" ng-if="interaction.pic7"/>
                             <img class="slt" ng-src="{{interaction.pic8}}" ng-if="interaction.pic8"/>
                         </div>
+                        <div>
+                            <video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="72px" width="72px" controls="controls">
+                            </video>
+                        </div>
                         <div class="list" style="margin-left:50px">
                             <div class="item" ng-repeat="c in interaction.comments">
                                 {{c.content}}
@@ -293,7 +297,6 @@
                     <em style="font-size: 16px">添加视频</em>
                 </a>
             </div>
-
         </div>
         <div class="padding">
             <button type="submit"  class="button button-full button-calm" ng-click="add()">
@@ -481,7 +484,7 @@
                 <button class="button button-clear" ng-click="closeCode()">关闭</button>
             </ion-header-bar>
             <ion-content>
-                <div style="width: 200px; margin: 0 auto" ng-if="dream.code && user.id == dream.user_id">
+                <div style="width: 200px; margin: 0 auto">
                     <img ng-src="{{dream.code}}" style="width: 200px; height: 200px; margin-top: 60%">
                 </div>
             </ion-content>