Merge branch 'master' of http://git.9026.com/roobe/miao

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="902" mnemonic="1" />
+    <bookmark url="file://$PROJECT_DIR$/js/controllers/my.js" line="905" mnemonic="1" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="da700f62-8b79-488e-8484-af89b2c5db2d" name="Default" comment="" />
@@ -24,46 +24,72 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="config.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/js/config/config.js">
+      <file leaf-file-name="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.044392522">
-              <caret line="3" column="44" selection-start-line="3" selection-start-column="44" selection-end-line="3" selection-end-column="44" />
-              <folding />
+            <state vertical-scroll-proportion="0.60987264">
+              <caret line="752" column="35" selection-start-line="752" selection-start-column="35" selection-end-line="752" selection-end-column="35" />
+              <folding>
+                <element signature="e#16009#17788#0" expanded="false" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+      <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="-13.5">
-              <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+            <state vertical-scroll-proportion="-16.3125">
+              <caret line="746" column="32" selection-start-line="746" selection-start-column="28" selection-end-line="746" selection-end-column="32" />
               <folding>
-                <element signature="n#style#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
+                <marker date="1509787362313" expanded="true" signature="32047:32072" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="32355:32419" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="32471:32487" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="32719:32783" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="32835:32850" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="33050:33081" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="33313:33331" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="33522:33549" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="35463:35481" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="37775:37793" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="37858:37883" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="38102:38121" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="38122:38316" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="38182:38201" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="38182:38228" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="38427:38445" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="39217:39235" placeholder="..." />
+                <marker date="1509787362313" expanded="true" signature="40228:40246" placeholder="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="my-collect.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/my/my-collect.html">
+      <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.14285715">
-              <caret line="4" column="3" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
-              <folding>
-                <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="0.0">
+              <caret line="6" column="29" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="29" />
+              <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="-8.821428">
+              <caret line="13" column="76" selection-start-line="13" selection-start-column="76" selection-end-line="13" selection-end-column="76" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="my-dream.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
+      <file leaf-file-name="add.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-25.357143">
-              <caret line="32" column="25" selection-start-line="26" selection-start-column="19" selection-end-line="32" selection-end-column="25" />
+            <state vertical-scroll-proportion="-25.75">
+              <caret line="34" column="35" selection-start-line="34" selection-start-column="35" selection-end-line="34" selection-end-column="35" />
               <folding />
             </state>
           </provider>
@@ -101,14 +127,14 @@
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/templates/add/index.html" />
         <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/templates/my/withdraw.html" />
         <option value="$PROJECT_DIR$/js/services/msgservice.js" />
-        <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
         <option value="$PROJECT_DIR$/templates/home/index.html" />
         <option value="$PROJECT_DIR$/templates/my/my-collect.html" />
         <option value="$PROJECT_DIR$/js/config/config.js" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/js/controllers/my.js" />
       </list>
     </option>
   </component>
@@ -121,7 +147,7 @@
     <option name="x" value="1358" />
     <option name="y" value="-8" />
     <option name="width" value="2576" />
-    <option name="height" value="1452" />
+    <option name="height" value="1456" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -222,25 +248,25 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1358" y="-8" width="2576" height="1452" extended-state="0" />
+    <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.3297953" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -501,13 +527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.46195653">
-          <caret line="47" column="25" selection-start-line="47" selection-start-column="23" selection-end-line="47" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-6.516667">
@@ -550,40 +569,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5985401">
-          <caret line="19" column="79" selection-start-line="19" selection-start-column="68" selection-end-line="19" selection-end-column="79" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-15.21875">
-          <caret line="121" column="36" selection-start-line="121" selection-start-column="27" selection-end-line="121" selection-end-column="36" />
-          <folding>
-            <marker date="1509699203504" expanded="true" signature="31938:31963" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="32246:32310" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="32362:32378" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="32610:32674" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="32726:32741" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="32941:32972" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="33204:33222" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="33413:33440" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="35354:35372" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="37666:37684" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="37749:37774" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="37993:38012" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="38013:38207" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="38073:38092" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="38073:38119" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="38318:38336" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="39108:39126" placeholder="..." />
-            <marker date="1509699203504" expanded="true" signature="40119:40137" placeholder="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/withdraw.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-17.142857">
@@ -609,19 +594,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="14" column="150" selection-start-line="14" selection-start-column="150" selection-end-line="15" selection-end-column="154" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </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">
-          <caret line="488" column="32" selection-start-line="488" selection-start-column="32" selection-end-line="488" selection-end-column="32" />
-          <folding>
-            <element signature="e#16009#17788#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -629,30 +601,23 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="324" column="44" selection-start-line="324" selection-start-column="44" selection-end-line="324" selection-end-column="44" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <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="false" />
-            <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="false" />
-          </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="-13.5">
+        <state vertical-scroll-proportion="0.0">
           <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
           <folding>
-            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </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="-25.357143">
+        <state vertical-scroll-proportion="0.0">
           <caret line="32" column="25" selection-start-line="26" selection-start-column="19" selection-end-line="32" selection-end-column="25" />
           <folding />
         </state>
@@ -660,21 +625,74 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/my-collect.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.14285715">
+        <state vertical-scroll-proportion="0.0">
           <caret line="4" column="3" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#3;n#div#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/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.044392522">
-          <caret line="3" column="44" selection-start-line="3" selection-start-column="44" selection-end-line="3" selection-end-column="44" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="6" column="29" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-8.821428">
+          <caret line="13" column="76" selection-start-line="13" selection-start-column="76" selection-end-line="13" selection-end-column="76" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-25.75">
+          <caret line="34" column="35" selection-start-line="34" selection-start-column="35" selection-end-line="34" selection-end-column="35" />
+          <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="-16.3125">
+          <caret line="746" column="32" selection-start-line="746" selection-start-column="28" selection-end-line="746" selection-end-column="32" />
+          <folding>
+            <marker date="1509787362313" expanded="true" signature="32047:32072" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="32355:32419" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="32471:32487" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="32719:32783" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="32835:32850" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="33050:33081" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="33313:33331" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="33522:33549" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="35463:35481" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="37775:37793" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="37858:37883" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="38102:38121" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="38122:38316" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="38182:38201" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="38182:38228" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="38427:38445" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="39217:39235" placeholder="..." />
+            <marker date="1509787362313" expanded="true" signature="40228:40246" placeholder="..." />
+          </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.60987264">
+          <caret line="752" column="35" selection-start-line="752" selection-start-column="35" selection-end-line="752" selection-end-column="35" />
+          <folding>
+            <element signature="e#16009#17788#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

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://localhost:8092/',
-      //  imgServer: 'http://localhost:8092/attachment/',
-      server: 'http://miao.beiyuesi.com/',
-      imgServer: 'http://miao.beiyuesi.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/'
     });
 })(angular.module('app'));

miaomiao/www/js/controllers/home.js

@@ -740,7 +740,9 @@
 
             $scope.addvideo = function () {
                 common.chooseVideo().then(function (file) {
+                    msg.loading();
                     common.uploadFiles(file, 2).then(function (result) {
+                        msg.hide();
                         var response = JSON.parse(result.response);
                         $scope.video.server = response.data.file;
                         var file = config.imgServer+response.data.file;
@@ -748,7 +750,8 @@
                         $scope.video.file = response.data.file;
                         $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
                     }, function (error) {
-                        msg.error('视频上传失败');
+                        //msg.error('视频上传失败');
+                        msg.hide();
                     });
                 }, function (erro) {
                     console.log('选择视频失败');

miaomiao/www/js/controllers/my.js

@@ -742,14 +742,17 @@
             };
             $scope.addvideo = function () {
                 common.chooseVideo().then(function (file) {
+                    msg.loading();
                     common.uploadFiles(file, 2).then(function (result) {
+                        msg.hide();
                         var response = JSON.parse(result.response);
                         var file = config.imgServer+response.data.file;
                         $scope.video.isOK = true;
                         $scope.video.file = response.data.file;
                         $scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
                     }, function (error) {
-                        msg.error('视频上传失败');
+                        //msg.error('视频上传失败');
+                        msg.hide();
                     });
                 }, function (erro) {
                     console.log('选择视频失败');