add

miaomiao/www/.idea/workspace.xml

@@ -23,59 +23,7 @@
     <favorites_list name="www" />
   </component>
   <component name="FileEditorManager">
-    <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="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
-              <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="-16.375">
-              <caret line="842" column="59" selection-start-line="842" selection-start-column="59" selection-end-line="842" selection-end-column="59" />
-              <folding>
-                <marker date="1510626452277" expanded="true" signature="32196:33956" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="32257:32282" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="32565:32629" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="32681:32697" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="32929:32993" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="33045:33060" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="33260:33291" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="33477:33917" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="33523:33541" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="33542:33878" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="33732:33786" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="33746:33759" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="35700:35718" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="38033:38051" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="38152:38166" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="38423:38442" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="38503:38549" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="38748:38766" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="39538:39556" placeholder="..." />
-                <marker date="1510626452277" expanded="true" signature="40549:40567" placeholder="..." />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="msgservice.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.4156051">
-              <caret line="18" column="55" selection-start-line="18" selection-start-column="55" selection-end-line="18" selection-end-column="55" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -171,7 +119,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$/index.html" />
+    <property name="last_opened_file_path" value="D:/HPE/phpstudy/install/WWW/aserver" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -241,8 +189,8 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1358" y="-8" width="2576" height="1456" extended-state="6" />
-    <editor active="true" />
+    <frame x="1358" y="-8" width="2576" height="1456" extended-state="7" />
+    <editor active="false" />
     <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" />
@@ -336,7 +284,7 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="318" column="63" selection-start-line="318" selection-start-column="63" selection-end-line="318" selection-end-column="63" />
           <folding>
-            <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#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" />
           </folding>
         </state>
       </provider>
@@ -657,7 +605,7 @@
         <state vertical-scroll-proportion="0.14250815">
           <caret line="64" column="63" selection-start-line="64" selection-start-column="63" selection-end-line="64" selection-end-column="63" />
           <folding>
-            <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#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" />
           </folding>
         </state>
       </provider>
@@ -725,8 +673,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4156051">
-          <caret line="18" column="55" selection-start-line="18" selection-start-column="55" selection-end-line="18" selection-end-column="55" />
+        <state vertical-scroll-proportion="0.18471338">
+          <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
           <folding />
         </state>
       </provider>

miaomiao/www/js/config/router.js

@@ -30,7 +30,7 @@
                 }
             })
             .state('app.my_dreamdetail', {
-                url: '/my/dreamdetail?id=',
+                url: '/my/dreamdetail',
                 params:{id:null,dream_user_id:null,type:null,interaction_id:null},
                 views: {
                     'app-my': {
@@ -40,7 +40,7 @@
                 }
             })
             .state('app.home_dreamdetail', {
-                url: '/home/dreamdetail?id=',
+                url: '/home/dreamdetail',
                 params:{id:null,dream_user_id:null,type:null,interaction_id:null},
                 views: {
                     'app-home': {

miaomiao/www/js/controllers/home.js

@@ -178,7 +178,7 @@
                             }).then(function (res) {
                                 msg.success('扫码成功');
                             }, function (erro) {
-                                alert(JSON.stringify(erro));
+                                //alert(JSON.stringify(erro));
                                 msg.error('扫码失败:'+erro.data.message);
                             });
                         }