Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/.idea/workspace.xml

@@ -34,8 +34,8 @@
       <file leaf-file-name="account.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/www/js/controllers/account.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.42881945">
-              <caret line="29" column="70" selection-start-line="29" selection-start-column="70" selection-end-line="29" selection-end-column="70" />
+            <state vertical-scroll-proportion="0.3628472">
+              <caret line="27" column="23" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
               <folding />
             </state>
           </provider>
@@ -159,7 +159,7 @@
   <component name="PropertiesComponent">
     <property name="settings.editor.selected.configurable" value="preferences.keymap" />
     <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="E:/Graduation design/huiwei/www" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -616,8 +616,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/www/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.42881945">
-          <caret line="29" column="70" selection-start-line="29" selection-start-column="70" selection-end-line="29" selection-end-column="70" />
+        <state vertical-scroll-proportion="0.3628472">
+          <caret line="27" column="23" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
           <folding />
         </state>
       </provider>

miaomiao/www/.idea/workspace.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/js/controllers/my.js" line="899" mnemonic="1" />
+    <bookmark url="file://$PROJECT_DIR$/js/controllers/my.js" line="902" mnemonic="1" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="da700f62-8b79-488e-8484-af89b2c5db2d" name="Default" comment="" />
@@ -23,119 +23,67 @@
     <favorites_list name="www" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.40536278">
-      <split-first>
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file leaf-file-name="my-message-sys.html" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
-              <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.0">
-                  <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
-                  <folding>
-                    <element signature="n#style#0;n#p#0;n#a#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="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="0.0">
-                  <caret line="202" column="52" selection-start-line="202" selection-start-column="52" selection-end-line="202" selection-end-column="52" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="my-dream.html" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
-              <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.58759123">
-                  <caret line="38" column="25" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="25" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="my-message-reply.html" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
-              <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.0">
-                  <caret line="2" column="131" selection-start-line="2" selection-start-column="131" selection-end-line="2" selection-end-column="131" />
-                  <folding>
-                    <element signature="n#style#0;n#a#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#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <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="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-first>
-      <split-second>
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
-              <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.0">
-                  <caret line="739" column="31" selection-start-line="739" selection-start-column="31" selection-end-line="740" selection-end-column="46" />
-                  <folding>
-                    <marker date="1509532224162" expanded="true" signature="35281:35306" placeholder="..." />
-                    <marker date="1509532224162" expanded="true" signature="35553:35617" placeholder="..." />
-                    <marker date="1509532224162" expanded="true" signature="35669:35685" placeholder="..." />
-                    <marker date="1509532224162" expanded="true" signature="35881:35945" placeholder="..." />
-                    <marker date="1509532224162" expanded="true" signature="35997:36012" placeholder="..." />
-                    <marker date="1509532224162" expanded="true" signature="36212:36243" placeholder="..." />
-                    <marker date="1509532224162" expanded="true" signature="36475:36493" placeholder="..." />
-                    <marker date="1509532224162" expanded="true" signature="38640:38658" placeholder="..." />
-                    <marker date="1509532224162" expanded="true" signature="40953:40971" placeholder="..." />
-                    <marker date="1509532224162" expanded="true" signature="41032:41051" placeholder="..." />
-                    <marker date="1509532224162" expanded="true" signature="41314:41332" placeholder="..." />
-                    <marker date="1509532224162" expanded="true" signature="41393:41412" placeholder="..." />
-                    <marker date="1509532224162" expanded="true" signature="41708:41726" placeholder="..." />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="myservice.js" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
-              <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.0">
-                  <caret line="211" column="48" selection-start-line="211" selection-start-column="48" selection-end-line="211" selection-end-column="48" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <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.42881945">
-                  <caret line="300" column="21" selection-start-line="300" selection-start-column="21" selection-end-line="300" selection-end-column="22" />
-                  <folding>
-                    <element signature="e#10842#11161#0" expanded="false" />
-                    <element signature="e#11426#11513#0" expanded="false" />
-                    <element signature="e#14849#14965#0" expanded="false" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-second>
-    </splitter>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="config.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/config/config.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="6" column="42" selection-start-line="6" selection-start-column="42" selection-end-line="6" selection-end-column="42" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="0.35749185">
+              <caret line="95" column="30" selection-start-line="95" selection-start-column="30" selection-end-line="95" selection-end-column="30" />
+              <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="-3.8125">
+              <caret line="760" column="31" selection-start-line="760" selection-start-column="31" selection-end-line="760" selection-end-column="31" />
+              <folding>
+                <marker date="1509691797885" expanded="true" signature="31929:31954" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="32237:32301" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="32353:32369" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="32601:32665" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="32717:32732" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="32932:32963" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="33195:33213" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="33404:33431" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="35345:35363" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="37657:37675" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="37740:37765" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="37984:38003" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="38004:38198" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="38064:38083" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="38064:38110" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="38309:38327" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="39099:39117" placeholder="..." />
+                <marker date="1509691797885" expanded="true" signature="40110:40128" placeholder="..." />
+              </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="-12.75">
+              <caret line="751" column="26" selection-start-line="751" selection-start-column="19" selection-end-line="751" selection-end-column="26" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -154,25 +102,25 @@
         <option value="$PROJECT_DIR$/templates/my/care.html" />
         <option value="$PROJECT_DIR$/templates/my/letterDetailCtrl.html" />
         <option value="$PROJECT_DIR$/templates/my/letterDetail.html" />
-        <option value="$PROJECT_DIR$/templates/add/index.html" />
         <option value="$PROJECT_DIR$/templates/home/index.html" />
-        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
-        <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
-        <option value="$PROJECT_DIR$/js/config/config.js" />
         <option value="$PROJECT_DIR$/templates/my/my-message.html" />
         <option value="$PROJECT_DIR$/js/config/router.js" />
-        <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/templates/my/personalLetter.html" />
         <option value="$PROJECT_DIR$/js/controllers/add.js" />
-        <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/js/services/msgservice.js" />
         <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/templates/my/my-message-sys.html" />
         <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
         <option value="$PROJECT_DIR$/js/services/myservice.js" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/js/filters/filter.js" />
         <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
+        <option value="$PROJECT_DIR$/js/config/config.js" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/js/controllers/account.js" />
+        <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
+        <option value="$PROJECT_DIR$/templates/add/index.html" />
+        <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
       </list>
     </option>
   </component>
@@ -182,10 +130,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="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -286,25 +234,25 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <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.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="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.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">
@@ -321,11 +269,6 @@
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/js/controllers/account.js</url>
-          <line>32</line>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="javascript">
           <url>file://$PROJECT_DIR$/js/config/config.js</url>
           <line>8</line>
@@ -348,11 +291,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="372" column="38" selection-start-line="372" selection-start-column="38" selection-end-line="372" selection-end-column="38" />
-          <folding>
-            <element signature="e#10842#11161#0" expanded="false" />
-            <element signature="e#11426#11513#0" expanded="false" />
-            <element signature="e#14849#14965#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -374,11 +313,7 @@
       <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>
-            <element signature="e#10842#11161#0" expanded="false" />
-            <element signature="e#11426#11513#0" expanded="false" />
-            <element signature="e#14849#14965#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -428,11 +363,7 @@
       <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>
-            <element signature="e#10842#11161#0" expanded="false" />
-            <element signature="e#11426#11513#0" expanded="false" />
-            <element signature="e#14849#14965#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -482,11 +413,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="722" column="45" selection-start-line="722" selection-start-column="45" selection-end-line="722" selection-end-column="45" />
-          <folding>
-            <element signature="e#10842#11161#0" expanded="false" />
-            <element signature="e#11426#11513#0" expanded="false" />
-            <element signature="e#14849#14965#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -539,13 +466,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.357143">
-          <caret line="6" column="35" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="35" />
-        </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="-0.96666664">
@@ -567,13 +487,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/services/commonservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.24363057">
@@ -609,22 +522,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.16226707">
-          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27018633">
-          <caret line="45" column="39" selection-start-line="45" selection-start-column="39" selection-end-line="45" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/personalLetter.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.10714286">
@@ -653,96 +550,136 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+          <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
+          <folding>
+            <element signature="n#style#0;n#p#0;n#a#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6329618">
+          <caret line="76" column="18" selection-start-line="76" selection-start-column="18" selection-end-line="76" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.2563492">
+          <caret line="17" column="21" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="21" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state vertical-scroll-proportion="0.03015873">
           <caret line="2" column="131" selection-start-line="2" selection-start-column="131" selection-end-line="2" selection-end-column="131" />
           <folding>
-            <element signature="n#style#0;n#a#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#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#p#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
-          <folding>
-            <element signature="n#style#0;n#p#0;n#a#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="0.6754658">
+          <caret line="211" column="14" selection-start-line="211" selection-start-column="14" selection-end-line="211" selection-end-column="14" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+    <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="202" column="52" selection-start-line="202" selection-start-column="52" selection-end-line="202" selection-end-column="52" />
+        <state vertical-scroll-proportion="0.45574534">
+          <caret line="59" column="85" selection-start-line="59" selection-start-column="57" selection-end-line="59" selection-end-column="85" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="211" column="48" selection-start-line="211" selection-start-column="48" selection-end-line="211" selection-end-column="48" />
+        <state vertical-scroll-proportion="0.14444445">
+          <caret line="7" column="22" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="739" column="31" selection-start-line="739" selection-start-column="31" selection-end-line="740" selection-end-column="46" />
+        <state vertical-scroll-proportion="0.17142858">
+          <caret line="8" column="26" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
           <folding>
-            <marker date="1509532224162" expanded="true" signature="35281:35306" placeholder="..." />
-            <marker date="1509532224162" expanded="true" signature="35553:35617" placeholder="..." />
-            <marker date="1509532224162" expanded="true" signature="35669:35685" placeholder="..." />
-            <marker date="1509532224162" expanded="true" signature="35881:35945" placeholder="..." />
-            <marker date="1509532224162" expanded="true" signature="35997:36012" placeholder="..." />
-            <marker date="1509532224162" expanded="true" signature="36212:36243" placeholder="..." />
-            <marker date="1509532224162" expanded="true" signature="36475:36493" placeholder="..." />
-            <marker date="1509532224162" expanded="true" signature="38640:38658" placeholder="..." />
-            <marker date="1509532224162" expanded="true" signature="40953:40971" placeholder="..." />
-            <marker date="1509532224162" expanded="true" signature="41032:41051" placeholder="..." />
-            <marker date="1509532224162" expanded="true" signature="41314:41332" placeholder="..." />
-            <marker date="1509532224162" expanded="true" signature="41393:41412" placeholder="..." />
-            <marker date="1509532224162" expanded="true" signature="41708:41726" placeholder="..." />
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <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="false" />
+            <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="false" />
+            <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="false" />
+            <element signature="n#style#0;n#div#1;n#div#1;n#div#0;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/filters/filter.js">
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6329618">
-          <caret line="76" column="18" selection-start-line="76" selection-start-column="18" selection-end-line="76" selection-end-column="18" />
+        <state vertical-scroll-proportion="0.5985401">
+          <caret line="19" column="79" selection-start-line="19" selection-start-column="68" selection-end-line="19" selection-end-column="79" />
+          <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="6" column="42" selection-start-line="6" selection-start-column="42" selection-end-line="6" selection-end-column="42" />
+          <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.42881945">
-          <caret line="300" column="21" selection-start-line="300" selection-start-column="21" selection-end-line="300" selection-end-column="22" />
+        <state vertical-scroll-proportion="-12.75">
+          <caret line="751" column="26" selection-start-line="751" selection-start-column="19" selection-end-line="751" selection-end-column="26" />
+          <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="-3.8125">
+          <caret line="760" column="31" selection-start-line="760" selection-start-column="31" selection-end-line="760" selection-end-column="31" />
           <folding>
-            <element signature="e#10842#11161#0" expanded="false" />
-            <element signature="e#11426#11513#0" expanded="false" />
-            <element signature="e#14849#14965#0" expanded="false" />
+            <marker date="1509691797885" expanded="true" signature="31929:31954" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="32237:32301" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="32353:32369" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="32601:32665" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="32717:32732" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="32932:32963" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="33195:33213" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="33404:33431" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="35345:35363" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="37657:37675" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="37740:37765" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="37984:38003" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="38004:38198" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="38064:38083" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="38064:38110" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="38309:38327" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="39099:39117" placeholder="..." />
+            <marker date="1509691797885" expanded="true" signature="40110:40128" placeholder="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.58759123">
-          <caret line="38" column="25" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="25" />
+        <state vertical-scroll-proportion="0.35749185">
+          <caret line="95" column="30" selection-start-line="95" selection-start-column="30" selection-end-line="95" selection-end-column="30" />
           <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

@@ -384,7 +384,7 @@
                     Wechat.share({
                         message: {
                             title: $scope.dream.name,
-                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '+\n+' + $scope.dream.about,
+                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '\n' + $scope.dream.about,
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                                 type: Wechat.Type.WEBPAGE,
@@ -402,7 +402,7 @@
                     Wechat.share({
                         message: {
                             title: $scope.dream.name,
-                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '+\n+' + $scope.dream.about,
+                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '\n' + $scope.dream.about,
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                                 type: Wechat.Type.WEBPAGE,

miaomiao/www/js/controllers/my.js

@@ -767,11 +767,11 @@
                     var myPopup = $ionicPopup.show({
                         template : '<div>' +
                             '<textarea autofocus style="border: 1px solid #D0D0D0" name="" id="" cols="30" rows="8"  ng-model="vm.content" placeholder="对他的好意给予感谢的回复"></textarea onf>' +
-                            '<a class="btn-file-up" ng-click="addpict()">' +
+                            '<a ng-if="!video.isOK&&imgs.length==0" class="btn-file-up" ng-click="addpict()">' +
                             '<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>' +
-                            '<a class="btn-file-up" ng-click="addvideo()">' +
+                            '<a ng-if="imgs.length==0&&!video.isOK" class="btn-file-up" ng-click="addvideo()">' +
                             '<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>' +
@@ -786,7 +786,6 @@
                             '</div>' +
                             '</div>',
                         title: message,
-                        //subTitle: 'Please use normal things',
                         scope: $scope,
                         buttons: [
                             { text: '取消' },
@@ -799,7 +798,7 @@
                                         content:$scope.vm.content,
                                         video:$scope.video.file,
                                         image:$scope.imgs,
-                                        //image:['http://img0.imgtn.bdimg.com/it/u=2398075737,160631337&fm=214&gp=0.jpg']
+                                        //image:['http://img0.imgtn.bdimg.com/it/u=2398075737,160631337&fm=214&gp=0.jpg'],
                                     };
                                     myService.sendLetter(data).then(function(result){
                                         if(result.data.status_code==0){
@@ -872,14 +871,18 @@
                 if(attr_id==7){
                     if(video!=null){
                         var letterTemplate = '<div style="text-align: center">' +
-                            '<img src="'+img+'" style="border-radius: 100%">' +
-                            '<video src="'+video+'"></video>' +
+                            '<video src="'+video+'" style="width: 100%; height: 100%"></video>' +
+                            '<p>'+info+'</p>' +
+                            '</div>';
+                    }
+                    else if(img!='') {
+                        var letterTemplate = '<div style="text-align: center;">' +
+                            '<img src="'+img+'" style="border-radius: 100%; width:100%; height: 100%;">' +
                             '<p>'+info+'</p>' +
                             '</div>';
                     }
                     else {
                         var letterTemplate = '<div style="text-align: center">' +
-                            '<img src="'+img+'" style="border-radius: 100%">' +
                             '<p>'+info+'</p>' +
                             '</div>';
                     }

miaomiao/www/templates/add/index.html

@@ -13,11 +13,11 @@
             </div>
             <div class="item" style="color: #7B7B7B">上传图片或视频，让别人更好地了解你</div>
             <div class="item itemjs">
-                <a class="btn-file-up" ng-click="addpict()" ng-show="imgs.length<9">
+                <a class="btn-file-up" ng-click="addpict()" ng-if="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>
-                <a class="btn-file-up" ng-click="addvideo()" ng-show="!video.isOK">
+                <a class="btn-file-up" ng-click="addvideo()" ng-if="!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>

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

@@ -91,7 +91,7 @@
                             <p>剩余时间</p>
                         </div>
                         <div ng-if="user.id == dream.user.id" class="col" style="text-align:right">
-                            <h2>{{dream.score}}</h2>
+                            <h2>{{dream.score/100000000000000}}</h2>
                             <p>当前获得梦想分数</p>
                         </div>
                     </div>
@@ -313,7 +313,7 @@
                     <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>
-                <a ng-if="imgs.length==0" class="btn-file-up" ng-click="addvideo()">
+                <a ng-if="imgs.length==0&&!video.isOK" class="btn-file-up" ng-click="addvideo()">
                     <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>

miaomiao/www/templates/my/payExplain.html

@@ -8,12 +8,14 @@
                         <img style="width: 45px; height: 45px;border-radius: 100%; border: 1px solid #D8D8D8" ng-src="{{item.avatar}}" />
                     </div>
                     <div style="float:left; width: 83%; margin-left: 10px; height: 60px; overflow: hidden">
-                        <h2> {{item.channel}} </h2>
+                        <h2> {{item.from_name}} </h2>
                         <div>
                             <div class="fl">{{item.created_at}}</div>
-                            <div class="fr" 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 style="clear:both;"> 交易号：{{item.transaction_id}} </div>
+                        <div ng-if="item.transaction_id!=null" style="clear:both;"> 交易号：{{item.transaction_id}} </div>
                     </div>
                 </div>
             </div>

server/app/Helper/LogHelper.php

@@ -52,7 +52,7 @@ trait LogHelper
 //        ]);
 //    }
 
-    private function logAccount($fromType, $fromId, $fromName, $fromAmount,  $op, $toType, $toId, $toName, $toAmount) {
+    private function logAccount($fromType, $fromId, $fromName, $fromAmount,  $op, $toType, $toId, $toName, $toAmount,$transactionId='',$avatar='') {
         return AccountLog::create([
             'from_type'     => $fromType,
             'from_id'       => $fromId,
@@ -63,6 +63,9 @@ trait LogHelper
             'to_id'         => $toId,
             'to_name'       => $toName,
             'to_amount'     => $toAmount,
+            'transaction_id'  => $transactionId,
+            'avatar'        => $avatar,
+
         ]);
     }
 

server/app/Http/Controllers/Api/V1/PayController.php

@@ -167,9 +167,9 @@ class PayController extends Controller
                     $order->save();
 
                     //记日志
-                    $this->logAccount($tp, $u->id, $u->name,
-                        AccountLog::OP_CHARGE, $cType, $master_amount,
-                        AccountLog::DIRECTION_INC, $cType == AccountLog::TYPE_BALANCE ? $u->balance : $u->credit, AccountLog::CHANNEL_WECHATPAY);
+                    $this->logAccount(AccountLog::TYPE_CASH, $u->id, $u->name,$order->price,
+                        AccountLog::OP_CHARGE,
+                        AccountLog::TYPE_COIN, $u->id,$u->name,$order->price,$out_trade_no,$u->avatar);
 
                     \Log::info('支付完成');