add

miaomiao/www/.idea/workspace.xml

@@ -20,7 +20,34 @@
     <favorites_list name="www" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+    <leaf>
+      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="1.7722223">
+              <caret line="170" column="98" selection-start-line="170" selection-start-column="98" selection-end-line="170" selection-end-column="98" />
+              <folding>
+                <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="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#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#0;n#div#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#video#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+              </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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-10.9375">
+              <caret line="10" column="28" selection-start-line="10" selection-start-column="28" selection-end-line="10" selection-end-column="28" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -63,7 +90,6 @@
         <option value="$PROJECT_DIR$/../../../test/index.html" />
         <option value="$PROJECT_DIR$/js/app.js" />
         <option value="$PROJECT_DIR$/js/config/router.js" />
-        <option value="$PROJECT_DIR$/js/services/homeservice.js" />
         <option value="$PROJECT_DIR$/templates/home/shareDream.html" />
         <option value="$PROJECT_DIR$/js/services/httpinterceptor.js" />
         <option value="$PROJECT_DIR$/../../../quanzhouda/send/send/www/js/controllers/parts.js" />
@@ -78,13 +104,14 @@
         <option value="$PROJECT_DIR$/../../../51zhupai/css/detail.css" />
         <option value="$PROJECT_DIR$/../../../51zhupai/templates/detail.html" />
         <option value="$PROJECT_DIR$/../../../51zhupai/index.html" />
-        <option value="$PROJECT_DIR$/css/style.css" />
-        <option value="$PROJECT_DIR$/templates/home/index.html" />
+        <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/js/services/homeservice.js" />
+        <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/templates/home/userDetail.html" />
-        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
-        <option value="$PROJECT_DIR$/js/controllers/account.js" />
+        <option value="$PROJECT_DIR$/templates/home/index.html" />
         <option value="$PROJECT_DIR$/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
       </list>
     </option>
   </component>
@@ -94,10 +121,10 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
+    <option name="x" value="1358" />
     <option name="y" value="-8" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="width" value="2576" />
+    <option name="height" value="1456" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -132,7 +159,7 @@
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -145,10 +172,23 @@
       <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes />
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="Scratches" />
+    </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="E:/Graduation design/huiwei" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -239,25 +279,25 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="false" />
+    <frame x="1358" y="-8" width="2576" height="1456" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16648169" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16640379" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32885906" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24916202" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296131" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="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.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -278,14 +318,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <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="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -298,7 +330,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -323,13 +354,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/Graduation design/huiwei/index.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="8" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.13693693">
@@ -386,13 +410,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33273056">
-          <caret line="131" column="25" selection-start-line="131" selection-start-column="20" selection-end-line="131" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/services/dreamservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -400,13 +417,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
-      <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/templates/publish/publish-rent.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-12.892858">
@@ -554,13 +564,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.62095237">
-          <caret line="607" column="15" selection-start-line="607" selection-start-column="15" selection-end-line="607" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/config/router.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-6.133333">
@@ -582,65 +585,118 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/shareDream.html">
+    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8216216">
-          <caret line="24" column="22" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
+        <state vertical-scroll-proportion="0.03259005">
+          <caret line="17" column="45" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-16.0">
+          <caret line="43" column="48" selection-start-line="43" selection-start-column="48" selection-end-line="43" selection-end-column="48" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-recharge.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-24.464285">
+          <caret line="30" column="62" selection-start-line="30" selection-start-column="62" selection-end-line="30" selection-end-column="62" />
+          <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.44596913">
-          <caret line="380" column="17" selection-start-line="380" selection-start-column="17" selection-end-line="380" selection-end-column="17" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="413" column="7" selection-start-line="353" selection-start-column="6" selection-end-line="413" selection-end-column="7" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4108108">
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
+        <state vertical-scroll-proportion="-20.625">
+          <caret line="28" column="14" selection-start-line="21" selection-start-column="14" selection-end-line="28" selection-end-column="14" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
+    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7676191">
-          <caret line="100" column="47" selection-start-line="100" selection-start-column="47" selection-end-line="100" selection-end-column="47" />
+        <state vertical-scroll-proportion="-27.53125">
+          <caret line="115" column="14" selection-start-line="115" selection-start-column="14" selection-end-line="115" selection-end-column="14" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80274445">
-          <caret line="605" column="21" selection-start-line="605" selection-start-column="21" selection-end-line="605" selection-end-column="21" />
+        <state vertical-scroll-proportion="-1.4833333">
+          <caret line="536" column="21" selection-start-line="536" selection-start-column="21" selection-end-line="536" selection-end-column="21" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/shareDream.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.034234233">
-          <caret line="13" column="32" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        <state vertical-scroll-proportion="0.36190477">
+          <caret line="24" column="12" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
+    <entry file="file://$PROJECT_DIR$/lib/ionic/js/ionic.bundle.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03259005">
-          <caret line="60" column="23" selection-start-line="60" selection-start-column="12" selection-end-line="60" selection-end-column="23" />
+        <state vertical-scroll-proportion="0.3773292">
+          <caret line="34282" column="14" selection-start-line="34282" selection-start-column="14" selection-end-line="34282" selection-end-column="14" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03259005">
-          <caret line="17" column="45" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" />
+        <state vertical-scroll-proportion="0.2777778">
+          <caret line="70" column="33" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" />
+          <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="-10.9375">
+          <caret line="10" column="28" selection-start-line="10" selection-start-column="28" selection-end-line="10" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-12.714286">
+          <caret line="53" column="52" selection-start-line="53" selection-start-column="52" selection-end-line="53" selection-end-column="52" />
+          <folding>
+            <element signature="n#style#0;n#img#0;n#div#0;n#ion-slide#0;n#ion-slide-box#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+          </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="1.7722223">
+          <caret line="170" column="98" selection-start-line="170" selection-start-column="98" selection-end-line="170" selection-end-column="98" />
+          <folding>
+            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="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#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#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#video#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

miaomiao/www/css/style.css

@@ -136,9 +136,9 @@ overflow:auto;
     margin-top: 2px;
     margin-right: 5px;
 }
-.defaultClass{
-    border: 2px solid #fff;
-}
+/*.defaultClass{*/
+    /*border: 2px solid #fboxff;*/
+/*}*/
 .chosenClass{
     border: 2px solid #FE3939;
 }
@@ -545,8 +545,8 @@ a:visited,a:link{
     margin:5px;
 }
     .hdcontent .slt {
-        width:30%;
-        max-height:95px;
+        width:40%;
+        /*max-height:95px;*/
         float:left;
         border: 1px solid #B5B5B5;
         margin:5px 5px 5px 0;

miaomiao/www/img/qr-scanner.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1506737165227" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1850" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M85.333333 341.333333V150.954667C85.333333 114.773333 114.816 85.333333 151.168 85.333333H341.333333a42.666667 42.666667 0 1 0 0-85.333333H151.168A151.082667 151.082667 0 0 0 0 150.954667V341.333333a42.666667 42.666667 0 1 0 85.333333 0z m597.333334-256h190.378666C909.226667 85.333333 938.666667 114.816 938.666667 151.168V341.333333a42.666667 42.666667 0 1 0 85.333333 0V151.168A151.082667 151.082667 0 0 0 873.045333 0H682.666667a42.666667 42.666667 0 1 0 0 85.333333z m256 597.333334v190.378666C938.666667 909.226667 909.184 938.666667 872.832 938.666667H682.666667a42.666667 42.666667 0 1 0 0 85.333333h190.165333A151.082667 151.082667 0 0 0 1024 873.045333V682.666667a42.666667 42.666667 0 1 0-85.333333 0zM341.333333 938.666667H150.954667A65.792 65.792 0 0 1 85.333333 872.832V682.666667a42.666667 42.666667 0 1 0-85.333333 0v190.165333A151.082667 151.082667 0 0 0 150.954667 1024H341.333333a42.666667 42.666667 0 1 0 0-85.333333z m-64-384h512a42.666667 42.666667 0 1 0 0-85.333334h-512a42.666667 42.666667 0 1 0 0 85.333334z" fill="#ffffff" p-id="1851"></path></svg>

miaomiao/www/js/controllers/home.js

@@ -5,6 +5,11 @@
             $ionicTabsDelegate.showBar(true);
             $scope.load(true);
             $ionicSlideBoxDelegate.start();
+            //$scope.options = {
+            //    loop: true,
+            //    effect: 'fade',
+            //    speed: 500
+            //};
             homeService.messageInfo().then(function(result){
                 $scope.infos = result.data.data;
                 if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){
@@ -548,22 +553,6 @@
             }
 
         };
-            $scope.testcharge = function(number){
-                if (!number) {
-                    msg.text('请输入充值金额');
-                    return;
-                }
-                homeService.testcharge(number,2).then(function (result) {
-                    msg.text("充值成功");
-                    $scope.vm.coin = parseInt($scope.vm.coin) + parseInt(number);
-                    $timeout(function () {
-                        $scope.closeRechargeModal();
-                    }, 500);
-                    homeService.myInfo().then(function (result) {
-                        $scope.user = result.data.data;
-                    });
-                });
-            };
             //充值
             $scope.charge = function(number){
                 if (!number) {
@@ -573,18 +562,18 @@
                 homeService.charge(number,2).then(function (result) {
                     //todo:result需要返回支付宝或者微信的签名信息
                     console.log("result: " + JSON.stringify(result));
-                    var payInfo = result.data;
+                    var payInfo = result.data.data;
                     if ($scope.vm.payType == 1) { //支付宝
                         cordova.plugins.AliPay.pay(payInfo, function success(e) {
-                            //e.resultStatus  状态代码  e.result  本次操作返回的结果数据 e.memo 提示信息
-                            //e.resultStatus  9000  订单支付成功 ;8000 正在处理中  调用function success
-                            //e.resultStatus  4000  订单支付失败 ;6001  用户中途取消 ;6002 网络连接出错  调用function error
-                            //当e.resultStatus为9000时，请去服务端验证支付结果
                             $scope.clicksub = false;
                             if (e.resultStatus == '9000') {
                                 alert(orderID);
-                                //支付成功
-                                // $state.go('app.my');
+                                $timeout(function () {
+                                    $scope.closeRechargeModal();
+                                }, 500);
+                                homeService.myInfo().then(function (result) {
+                                    $scope.user = result.data.data;
+                                });
                             } else {
                                 msg.error("支付失败");
                                 // msg.error("支付失败:" + JSON.stringify(e));
@@ -596,7 +585,9 @@
                         });
                     }
                     if ($scope.vm.payType == 2) { //微信
-                        var obj = JSON.parse(payInfo);
+                        // var obj = JSON.parse(payInfo);
+                        var obj = payInfo.orderString;
+                        // console.log("obj: " + JSON.stringify(obj));
                         var params = {
                             partnerid: obj.partnerid, // merchant id
                             prepayid: obj.prepayid, // prepay id
@@ -604,22 +595,24 @@
                             timestamp: obj.timestamp, // timestamp
                             sign: obj.sign, // signed string
                         };
+                        // console.log("result: " + JSON.stringify(params));
                         Wechat.sendPaymentRequest(params, function (r) {
                             $scope.clicksub = false;
                             courseService.orderStatus(orderID, $scope.paytype).then(function (result) {
-                                //  alert(result);
-                                //支付成功
-                                //  $state.go('app.my');
+                                $timeout(function () {
+                                    $scope.closeRechargeModal();
+                                }, 500);
+                                homeService.myInfo().then(function (result) {
+                                    $scope.user = result.data.data;
+                                });
                             }, function (erro) {
-                                msg.alert("支付反馈失败:" + JSON.stringify(erro));
+                                // msg.alert("支付反馈失败:" + JSON.stringify(erro));
                             });
                         }, function (reason) {
                             $scope.clicksub = false;
-                            msg.alert("支付失败:" + JSON.stringify(reason));
+                            // msg.alert("支付失败:" + JSON.stringify(reason));
                         });
                     }
-                    // msg.text("充值成功");
-                    //   $state.go('app.my');
                 });
             };
         $scope.submitComment = function (index,to_userid) {
@@ -682,9 +675,8 @@
                 common.chooseImage().then(function (img) {
                     common.uploadFiles(img,1).then(function (result) {
                         var response = JSON.parse(result.response);
-                        var file = response.data.file;
-                        $scope.imgs.push(config.imgServer+file);
-                        console.log(JSON.stringify(config.imgServer+file));
+                        var file = config.imgServer + response.data.file;
+                        $scope.imgs.push(file);
                     }, function (error) {
                         msg.error('图片上传失败');
                     });
@@ -787,13 +779,36 @@
                 }
             };
             $scope.bigImage = false;
-            $scope.showBigImage  = function(imageName){
+            $scope.showBigImage  = function(imageName,imageIndex){
                 $scope.url = imageName;
+                $scope.imageIndex = imageIndex;
                 $scope.bigImage = true;
             };
             $scope.hideBigImage = function(){
                 $scope.bigImage = false;
             };
+            $scope.swipeLeft = function (imageIndex) {
+                if ($scope.imageIndex < $scope.items.imgs.length - 1 && $scope.imageIndex >= 0)
+                    $scope.imageIndex = $scope.imageIndex + 1;
+                else {
+                    //如果图片已经是最后一张图片了，则取index = 0
+                    $scope.imageIndex = 0;
+                }
+                //替换url，展示图片
+                $scope.url = $scope.items.imgs[$scope.imageIndex].pic;                   //$scope定义一个变量Url，这里会在大图出现后再次点击隐藏大图使用
+                $scope.bigImage = true;                   //显示大图
+            };
+            $scope.swipeRight = function (imageIndex) {
+                if ($scope.imageIndex <= $scope.items.imgs.length - 1 && $scope.imageIndex > 0)
+                    $scope.imageIndex = $scope.imageIndex - 1;
+                else {
+                    //如果图片已经是第一张图片了，则取index = Images.length-1
+                    $scope.imageIndex = $scope.items.imgs.length - 1;
+                }
+                //替换url，展示图片
+                $scope.url = $scope.items.imgs[$scope.imageIndex].pic;                   //$scope定义一个变量Url，这里会在大图出现后再次点击隐藏大图使用
+                $scope.bigImage = true;                   //显示大图
+            };
             $scope.cancelSupport = function () {
                 $scope.tosupport = false;
                 $scope.toshare = false;

miaomiao/www/js/controllers/my.js

@@ -350,7 +350,7 @@
             //     $ionicHistory.goBack();
             // },500)
         });
-      }
+      };
       //充值
       $scope.charge = function(number){
           if (!number) {

miaomiao/www/templates/add/index.html

@@ -16,7 +16,6 @@
                 <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
                     <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
                 </a>
-                <!--<a class="btn-file-up" ng-click="addpict()"><i class="ion-image"></i>添加图片</a>-->
                 <a class="btn-file-up" ng-click="addpict()" ng-show="imgs.length<9">
                     <img src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加图片</em>

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

@@ -67,7 +67,7 @@
                     <ion-slides slider="data.slider">
                         <ion-slide-page ng-if="dream.video">
                             <div class="box banner">
-                                <video ng-src="{{dream.video | trustUrl}}" poster="{{dream.vpic}}" width="100%" style="max-height: 400px" class="centerme" controls="controls" ></video>
+                                <video ng-src="{{dream.video | trustUrl}}" width="100%" style="height: 350px;" class="centerme" controls="controls" ></video>
                             </div>
                         </ion-slide-page>
                         <ion-slide-page ng-repeat="img in dream.imgs" >
@@ -163,6 +163,7 @@
                             <!--<span class="utitle kz">{{dream.end_time | lastDate}}</span>-->
                             <span class="utitle kz">{{dream.created_at}}</span>
                             <p class="subtile" style="white-space:normal; color: #666666">{{interaction.title}}</p>
+
                             <div class="picts item">
                                 <img class="slt" ng-click="openCommentPic(interaction.pic1,$event)" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1" />
                                 <img class="slt" ng-click="openCommentPic(interaction.pic2,$event)" ng-src="{{interaction.pic2}}" ng-if="interaction.pic2" />
@@ -174,8 +175,8 @@
                                 <img class="slt" ng-click="openCommentPic(interaction.pic8,$event)" ng-src="{{interaction.pic8}}" ng-if="interaction.pic8" />
                                 <img class="slt" ng-click="openCommentPic(interaction.pic9,$event)" ng-src="{{interaction.pic9}}" ng-if="interaction.pic9" />
                             </div>
-                            <div>
-                                <video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="72px" width="72px" controls="controls"></video>
+                            <div class="box banner" ng-if="interaction.video">
+                                <video ng-src="{{ interaction.video | trustUrl}}" width="100%" style="max-height: 400px;" class="centerme" controls="controls"></video>
                             </div>
                         </div>
                         <div class="list">
@@ -309,13 +310,13 @@
                 <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
                     <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
                 </a>
-                <a class="btn-file-up" ng-click="addpict()" ng-show="!video.isOK&&imgs.length<9">
-                    <img ng-src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
+                <a class="btn-file-up" ng-click="addpict()" ng-show="imgs.length<9">
+                    <img src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加图片</em>
                 </a>
                 <video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="72px" width="72px" controls="controls">
                 </video>
-                <a class="btn-file-up" ng-click="addvideo()" ng-show="!video.isOK&&imgs.length==0">
+                <a class="btn-file-up" ng-click="addvideo()" ng-show="!video.isOK">
                     <img src="img/icon_video.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加视频</em>
                 </a>
@@ -367,7 +368,7 @@
                 </ion-list>
             </div>
             <div class="padding">
-                <button  class="button button-block button-calm" ng-click="testcharge(vm.number)">
+                <button  class="button button-block button-calm" ng-click="charge(vm.number)">
                     支付
                 </button>
             </div>

miaomiao/www/templates/home/index.html

@@ -1,8 +1,16 @@
 <ion-view view-title="瞄瞄">
     <ion-nav-buttons side="left">
-        <i class="icon ion-qr-scanner" style="margin-top: 8px; font-size: 22px; margin-right: 4px;" ng-click="qrscan()"></i>
-        <button class="button button-clear" style="height: 30px; width: 30px;font-size: 25px; margin-top: 0.5px" ng-click="toggleLeftSideMenu()">
-            <img src="img/btn_filter.svg" style="height: 63%; width: 100%;">
+        <!--<button class="button button-clear" style="height: 30px; width: 30px; margin-top: 3px" ng-click="qrscan()">-->
+            <!--<img src="img/qr-scanner.svg" style="height: 63%; width: 100%;">-->
+        <!--</button>-->
+        <!--<button class="button button-clear" style="height: 30px; width: 30px;font-size: 25px; margin-top: 0.5px" ng-click="toggleLeftSideMenu()">-->
+            <!--<img src="img/btn_filter.svg" style="height: 63%; width: 100%;">-->
+        <!--</button>-->
+        <button class="button button-clear" style="height: 30px; width: 30px; margin-top: 6px" ui-sref="app.home_search">
+            <img src="img/qr-scanner.svg" style="height: 67%; width: 100%">
+        </button>
+        <button class="button button-clear" style="height: 35px; margin-top:4px" ui-sref="app.message">
+            <img src="img/btn_filter.svg" style="height: 55%; width: 100%">
         </button>
     </ion-nav-buttons>
     <ion-nav-buttons side="right">
@@ -38,12 +46,12 @@
                         <!--<ion-slides options="options" slider="data.slider">-->
                             <!--<ion-slide-page ng-repeat="banner in index.banners">-->
                                 <!--<div class="box banner" style="height: 150px"><img ng-src="{{banner.value}}" style="width: 100%; height: 100%" /></div>-->
-                        <!--</ion-slide-page>-->
+                            <!--</ion-slide-page>-->
                         <!--</ion-slides>-->
-                        <!-- start 轮播图-->
-                        <ion-slide-box ng-if="index.banners" auto-play="true" slide-interval="3000" does-continue="true">
+                         <!--start 轮播图-->
+                        <ion-slide-box show-pager="false" auto-play="true" slide-interval="2000"  does-continue="true">
                             <ion-slide ng-repeat="banner in index.banners">
-                                <div class="box banner" style="height: 150px"><img ng-src="{{banner.value}}" style="width: 100%; height: 100%" /></div>
+                                <div class="box banner"><img ng-src="{{banner.value}}" style="width: 100%; height: 100%" /></div>
                             </ion-slide>
                         </ion-slide-box>
                         <!-- end 轮播图-->
@@ -53,7 +61,7 @@
                             </div>
                             <div class="col" style="overflow: hidden;padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
                                 <span class="subcontent" ng-repeat="user in index.users">
-                                    <img ng-click="clickAvatar(user.other_user_id,user.dream_id)" ng-if="$index<4" ng-src="{{user.other_user.avatar |avator}}" ng-class="{'defaultClass':user.dream_number<1,'chosenClass':user.dream_number>0}" style="padding: 0.5%;" />
+                                    <img ng-click="clickAvatar(user.other_user_id,user.dream_id)" ng-if="$index<4" ng-src="{{user.other_user.avatar |avator}}" ng-class="{'chosenClass':user.dream_number>0}" style="padding: 0.5%;" />
                                 </span>
                             </div>
                             <div class="col col-10" style="margin-top: 7%; text-align: right" ng-click="next(2)">

miaomiao/www/templates/home/userDetail.html

@@ -1,9 +1,4 @@
 <ion-view view-title="瞄喵">
-<!--     <ion-nav-buttons side="right">
-        <button ng-click="share($event)" class="button button-clear" style="height: 37px; margin-top: 0.5px">
-            <img src="img/icon_share.svg" style="height: 55%; width: 100%">
-        </button>
-    </ion-nav-buttons> -->
     <ion-content ng-click="cancelSupport()">
         <div class="user-box">
             <div class="myinfo">
@@ -46,7 +41,7 @@
             </div>
             <div class="col" style="overflow: hidden;padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
                 <span class="userdetail" ng-repeat="item in items.imgs">
-                    <img ng-click="showBigImage('{{item.pic}}')" ng-if="$index<4" ng-src="{{item.pic}}" style="padding: 0.5%;" />
+                    <img ng-click="showBigImage('{{item.pic}}',$index)" ng-if="$index<4" ng-src="{{item.pic}}" style="padding: 0.5%;" />
                 </span>
             </div>
             <div class="col col-10" style="margin-top: 6%; text-align: right" ng-click="next(2)">
@@ -97,7 +92,7 @@
         </div>
     </div>
     <!--点击看大图-->
-    <div ng-if="bigImage" ng-click="hideBigImage()" class="popover-backdrop">
+    <div ng-if="bigImage" ng-click="hideBigImage()" on-swipe-left="swipeLeft({{imageIndex}})" on-swipe-right="swipeRight({{imageIndex}})" class="popover-backdrop">
         <img src="{{url}}">
     </div>
 </ion-view>