add

miaomiao/www/.idea/workspace.xml

@@ -20,46 +20,39 @@
     <favorites_list name="www" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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="-8.928572">
-              <caret line="85" column="87" selection-start-line="85" selection-start-column="87" selection-end-line="85" selection-end-column="87" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="myservice.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.7169811">
-              <caret line="43" column="30" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="JavaScript File" />
+      </list>
+    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/templates/home/search.html" />
-        <option value="$PROJECT_DIR$/templates/home/index.html" />
         <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/js/services/userservice.js" />
         <option value="$PROJECT_DIR$/templates/add/index.html" />
-        <option value="$PROJECT_DIR$/js/controllers/add.js" />
-        <option value="$PROJECT_DIR$/templates/my/my-profile.html" />
         <option value="$PROJECT_DIR$/templates/my/my-recharge.html" />
-        <option value="$PROJECT_DIR$/templates/my/index.html" />
         <option value="$PROJECT_DIR$/templates/my/my-message.html" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/js/controllers/add.js" />
+        <option value="$PROJECT_DIR$/templates/my/index.html" />
+        <option value="$PROJECT_DIR$/templates/home/index.html" />
         <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
+        <option value="$PROJECT_DIR$/templates/home/user-detail.html" />
+        <option value="$PROJECT_DIR$/js/services/tabsService.js" />
+        <option value="$PROJECT_DIR$/templates/my/my-profile.html" />
         <option value="$PROJECT_DIR$/js/services/myservice.js" />
+        <option value="$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/templates/tabs.html" />
+        <option value="$PROJECT_DIR$/js/controllers/tabs.js" />
+        <option value="$PROJECT_DIR$/templates/home/search.html" />
+        <option value="$PROJECT_DIR$/js/services/homeservice.js" />
+        <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
       </list>
     </option>
   </component>
@@ -85,7 +78,7 @@
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -98,10 +91,23 @@
       <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes />
+    <panes>
+      <pane id="Scope" />
+      <pane id="Scratches" />
+      <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>
+    </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../LikeaCat/merchant/www" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -170,10 +176,10 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
-    <editor active="true" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <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.11309524" 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.1688988" 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" />
@@ -207,222 +213,383 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/js/app.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-1.1183534">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.22813036">
+          <caret line="7" column="12" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
+        </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.0">
-          <caret line="41" column="18" selection-start-line="41" selection-start-column="18" selection-end-line="41" selection-end-column="18" />
-          <folding>
-            <element signature="n#style#0;n#textarea#0;n#div#3;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#b#0;n#a#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="-13.571428">
+          <caret line="24" column="11" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-recharge.html">
       <provider selected="true" editor-type-id="text-editor">
-        <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 />
+        <state vertical-scroll-proportion="-4.892857">
+          <caret line="20" column="60" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-setting.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44504505">
+          <caret line="13" column="32" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/account/login.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.27387387">
+          <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
+        </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="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/services/myservice.js">
+    <entry file="file://$PROJECT_DIR$/js/services/storageservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="19" column="35" selection-start-line="19" selection-start-column="35" selection-end-line="19" selection-end-column="35" />
-          <folding />
+        <state vertical-scroll-proportion="0.16295026">
+          <caret line="5" column="50" selection-start-line="5" selection-start-column="50" selection-end-line="5" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/httpinterceptor.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-0.36878216">
+          <caret line="13" column="26" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.392857">
+          <caret line="5" column="40" selection-start-line="5" selection-start-column="40" selection-end-line="5" selection-end-column="40" />
+        </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.57117116">
+          <caret line="93" column="47" selection-start-line="93" selection-start-column="47" selection-end-line="93" selection-end-column="47" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/js/services/userservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6843911">
+          <caret line="21" column="10" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/user-detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.65045047">
+          <caret line="19" column="46" selection-start-line="19" selection-start-column="46" selection-end-line="19" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../wuliu/wl/www/js/services/carservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="6" column="21" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../wuliu/wl/www/js/services/utilservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
+          <caret line="8" column="34" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../wuliu/wl/www/js/controllers/car.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.034358047">
+          <caret line="136" column="18" selection-start-line="136" selection-start-column="18" selection-end-line="136" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../wuliu/wl/www/js/services/myservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.03259005">
+          <caret line="34" column="33" selection-start-line="34" selection-start-column="33" selection-end-line="34" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/templates/my/activity.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-0.061261263">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/templates/account/register.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-1.8486487">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/templates/account/login.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5891892">
+          <caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/templates/my/setting.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-6.107143">
+          <caret line="9" column="27" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/storageservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="127" column="21" selection-start-line="127" selection-start-column="21" selection-end-line="127" selection-end-column="21" />
-          <folding />
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5540309">
+          <caret line="338" column="40" selection-start-line="338" selection-start-column="40" selection-end-line="338" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/templates/my/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-13.035714">
+          <caret line="85" column="21" selection-start-line="85" selection-start-column="21" selection-end-line="85" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/homeservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33273056">
+          <caret line="12" column="112" selection-start-line="12" selection-start-column="111" selection-end-line="12" selection-end-column="112" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/httpinterceptor.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="36" column="51" selection-start-line="36" selection-start-column="51" selection-end-line="36" selection-end-column="77" />
+          <caret line="0" column="13" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/jpushservice.js">
       <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$/templates/home/search.html">
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/memberservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.464286">
-          <caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
+        <state vertical-scroll-proportion="0.33273056">
+          <caret line="39" column="61" selection-start-line="39" selection-start-column="60" selection-end-line="39" selection-end-column="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/msgservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="127" column="21" selection-start-line="127" selection-start-column="21" selection-end-line="127" selection-end-column="21" />
+          <caret line="0" column="13" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/templates/my/wallet-balance.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-12.214286">
+          <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-profile.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-14.928572">
+          <caret line="22" column="27" selection-start-line="22" selection-start-column="27" selection-end-line="22" selection-end-column="27" />
+          <folding>
+            <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>
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/myservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-10.766666">
+          <caret line="17" column="14" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="14" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/userservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.428571">
-          <caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
+        <state vertical-scroll-proportion="0.33273056">
+          <caret line="45" column="18" selection-start-line="45" selection-start-column="17" selection-end-line="45" selection-end-column="18" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/app.js">
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/commonservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.1183534">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="5.9">
+          <caret line="57" column="22" selection-start-line="57" selection-start-column="22" selection-end-line="57" selection-end-column="22" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/router.js">
+    <entry file="file://$PROJECT_DIR$/../../../wuliu/wl/www/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.22813036">
-          <caret line="7" column="12" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
+        <state vertical-scroll-proportion="0.17152658">
+          <caret line="111" column="48" selection-start-line="111" selection-start-column="48" selection-end-line="111" selection-end-column="48" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/account/login.html">
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27387387">
-          <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="624" column="0" selection-start-line="624" selection-start-column="0" selection-end-line="624" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/filters/filter.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-13.571428">
-          <caret line="24" column="11" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="11" />
-          <folding>
-            <element signature="n#style#0;n#textarea#0;n#div#3;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#b#0;n#a#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="0.7495712">
+          <caret line="44" column="10" selection-start-line="44" selection-start-column="10" selection-end-line="44" selection-end-column="10" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-profile.html">
+    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/templates/my/wallet-credit.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.1027027">
-          <caret line="3" column="58" selection-start-line="3" selection-start-column="53" selection-end-line="3" selection-end-column="58" />
+        <state vertical-scroll-proportion="-8.142858">
+          <caret line="12" column="33" selection-start-line="12" selection-start-column="33" selection-end-line="12" selection-end-column="33" />
           <folding>
-            <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" />
+            <element signature="n#style#0;n#input#0;n#label#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-recharge.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.892857">
-          <caret line="20" column="60" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
+        <state vertical-scroll-proportion="0.30810812">
+          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-message.html">
+    <entry file="file://$PROJECT_DIR$/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5135135">
-          <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
+        <state vertical-scroll-proportion="-8.142858">
+          <caret line="21" column="38" selection-start-line="21" selection-start-column="38" selection-end-line="21" selection-end-column="38" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-setting.html">
+    <entry file="file://$PROJECT_DIR$/templates/tabs.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44504505">
-          <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.37657657">
+          <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$/templates/my/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.1785715">
-          <caret line="47" column="33" selection-start-line="47" selection-start-column="33" selection-end-line="47" selection-end-column="33" />
+        <state vertical-scroll-proportion="-6.107143">
+          <caret line="9" column="55" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+    <entry file="file://$PROJECT_DIR$/js/controllers/tabs.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="6" column="32" selection-start-line="6" selection-start-column="32" selection-end-line="6" selection-end-column="32" />
+        <state vertical-scroll-proportion="0.380789">
+          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/userservice.js">
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5214408">
+          <caret line="16" column="14" selection-start-line="10" selection-start-column="12" selection-end-line="16" selection-end-column="14" />
+          <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.6843911">
-          <caret line="21" column="10" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
+          <caret line="21" column="15" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" />
           <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="0.6089194">
-          <caret line="37" column="17" selection-start-line="37" selection-start-column="17" selection-end-line="37" selection-end-column="17" />
+        <state vertical-scroll-proportion="1.0428816">
+          <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/home/search.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.65045047">
+          <caret line="19" column="25" selection-start-line="19" selection-start-column="25" selection-end-line="19" selection-end-column="25" />
           <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.70668954">
-          <caret line="117" column="14" selection-start-line="117" selection-start-column="14" selection-end-line="117" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.6415094">
+          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
+    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.928572">
-          <caret line="85" column="87" selection-start-line="85" selection-start-column="87" selection-end-line="85" selection-end-column="87" />
+        <state vertical-scroll-proportion="0.81475127">
+          <caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7169811">
-          <caret line="43" column="30" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="30" />
+        <state vertical-scroll-proportion="0.3327616">
+          <caret line="55" column="43" selection-start-line="55" selection-start-column="43" selection-end-line="55" selection-end-column="43" />
           <folding />
         </state>
       </provider>

miaomiao/www/js/controllers/add.js

@@ -13,39 +13,64 @@
             $scope.closeModal = function () {
                 $scope.modal.hide();
             };
-            $scope.$on('$ionicView.beforeEnter', function (viewResult) {
-                $ionicTabsDelegate.showBar(false);
-                $ionicNavBarDelegate.showBackButton(true);
-            });
-            $scope.$on('$ionicView.leave', function () {
-                $ionicTabsDelegate.showBar(true);
-            });
-<<<<<<< HEAD
-            $scope.goback = function () {
-                $ionicHistory.goBack();
-            };
             $scope.vm={
                 dream:'',
                 about:'',
                 money:""
             };
+            $scope.imgs = [];
+            $scope.videos = [];
+            $scope.addpict = function () {
+                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(file);
+                    }, function (error) {
+                        msg.error('图片上传失败');
+                    });
+                }, function (error) {
+                    msg.error('图片选择失败');
+                });
+            }
+            $scope.addvideo = function () {
+                var options = { limit: 1, duration:20};
+                navigator.device.capture.captureVideo(function (videos) {
+                    $scope.videos.push(videos[0].fullPath);
+                    common.uploadFiles(videos[0].fullPath, 2).then(function (result) {
+                        debugger;
+                        var response = JSON.parse(result.response);
+                        var file = response.data.file;
+                        debugger;
+                    }, function (error) {
+                        debugger;
+                        msg.error('视频上传失败');
+                    });
+                }, function (error) {
+                    debugger;
+                }, options);
+            }
            $scope.add=function ()
            {
                var data={
-                   pic:'http://img.taopic.com/uploads/allimg/130103/240435-1301030P33161.jpg',
+                   pic:['http://img.taopic.com/uploads/allimg/130103/240435-1301030P33161.jpg'],
                    dream:$scope.vm.dream,
                    about:$scope.vm.about,
+                   time:21,
                    money:$scope.vm.money
                };
                myService.add(data).then(function(result){
 
-               },function(erro){
-
+               },function(error){
+                   msg.error(error.data.message);
                });
            }
-=======
-           
->>>>>>> 1d310a3a45c853ca8f205ef89ee51539cd5ccf2a
+            $scope.$on('$ionicView.beforeEnter', function (viewResult) {
+                $ionicTabsDelegate.showBar(false);
+                $ionicNavBarDelegate.showBackButton(true);
+            });
+            $scope.$on('$ionicView.leave', function () {
+                $ionicTabsDelegate.showBar(true);
+            });
         }]);
-
 })(angular.module('app.controllers'));

miaomiao/www/js/controllers/home.js

@@ -23,10 +23,10 @@
         });
         $scope.todetail = function () {
             $state.go('app.home_userdetail');
-        }
+        };
         }]);
-    app.controller('userDetailCtrl', ["$scope", "$state", "msg", "$ionicTabsDelegate"
-        , function ($scope, $state, msg, $ionicTabsDelegate) {
+    app.controller('userDetailCtrl', ["$scope", "$state", "msg","homeService", "$ionicTabsDelegate"
+        , function ($scope, $state, msg, homeService, $ionicTabsDelegate) {
             $scope.type = 1;//tab切换
             $scope.tosupport = false;
             $scope.support = function ($event) {
@@ -49,9 +49,24 @@
             $scope.$on('$ionicView.leave', function () {
                 $ionicTabsDelegate.showBar(true);
             });
+
+            $scope.vm = {
+                coin:""
+            }
+            $scope.supportDream = function(data){
+                var data = {
+                    dream_id:"11",
+                    coin:$scope.vm.coin
+                };
+                homeService.supportDream(data).then(function(result){
+
+                },function(erro){
+
+                })
+            }
         }]);
-    app.controller('searchCtrl', ["$scope", "$state", "msg", "$ionicTabsDelegate", "$ionicNavBarDelegate"
-        , function ($scope, $state, msg, $ionicTabsDelegate, $ionicNavBarDelegate) {
+    app.controller('searchCtrl', ["$scope","homeService", "$state", "msg", "$ionicTabsDelegate", "$ionicNavBarDelegate"
+        , function ($scope,homeService, $state, msg, $ionicTabsDelegate, $ionicNavBarDelegate) {
             $scope.index = 0;
             $scope.index1 = 0;
             $scope.vm = {
@@ -81,6 +96,17 @@
             $scope.$on('$ionicView.leave', function () {
                 $ionicTabsDelegate.showBar(true);
             });
+            $scope.searchContent=function ()
+            {
+                var data={
+                    keyword:$scope.vm.keyword
+                };
+                homeService.searchContent($scope.vm.keyword).then(function(result){
+
+                },function(erro){
+
+                });
+            }
         }]);
    
     

miaomiao/www/js/controllers/my.js

@@ -22,45 +22,61 @@
           }).then(function (result) {
               // alert(JSON.stringify(result));
             console.log("attachment upload result:"+JSON.stringify(result));
-          }, function (erro) {
-            console.log("attachment upload erro:"+JSON.stringify(erro));
+          }, function (error) {
+            console.log("attachment upload erro:"+JSON.stringify(error));
               
           })
         }
-        $scope.toprofile = function () {
-            $state.go('app.my_profile');
-        };
+            $scope.toprofile = function () {
+                $state.go('app.my_profile');
+            };
         $scope.setting = function(){
             myService.setting().then(function(result){
 
-            },function(erro){
+            },function(error){
 
             });
-        }
+        };
+            $scope.collect = function(){
+                myService.collect().then(function(result){
+
+                },function(erro){
+
+                });
+            };
+            $scope.myDream = function(){
+                myService.myDream().then(function(result){
+
+                },function(erro){
+
+                });
+            }
+
         }]);
+
     app.controller('profileCtrl', ["$scope", "$state", "storage", "myService", "msg", "common"
       , function ($scope, $state, storage, myService, msg, common) {
-          $scope.setAvator = function () {
-              common.setAvator().then(function (result) {
-                  debugger;
-                  var response = JSON.parse(result.response);
-                  $timeout(function () {
-                      $scope.vm.user.avatar = response.data.md5;
-                  });
-              }, function (erro) {
-                  msg.erro(JSON.stringify(erro));
-              });
-          };
-          $scope.$on('$ionicView.beforeEnter', function () {
-
-          });
+            $scope.setAvator = function () {
+                common.setAvator().then(function (result) {
+                    debugger;
+                    var response = JSON.parse(result.response);
+                    $timeout(function () {
+                        $scope.vm.user.avatar = response.data.md5;
+                    });
+                }, function (error) {
+                    msg.error(JSON.stringify(error));
+                });
+            };
+            $scope.$on('$ionicView.beforeEnter', function () {
+
+            });
             $scope.reset = function(){
                 var data = {
                     pic:'http://img.taopic.com/uploads/allimg/130103/240435-1301030P33161.jpg',
                 };
                 myService.reset(data).then(function(result){
 
-                },function(erro){
+                },function(error){
 
                 });
             }
@@ -100,17 +116,17 @@
             $scope.systemInfo = function(){
                 myService.systemInfo().then(function(result){
 
-                },function(erro){
+                },function(error){
 
                 });
             };
             $scope.replyMy = function(){
                 myService.replyMy().then(function(result){
 
-                },function(erro){
+                },function(error){
 
                 });
-            }
+            };
 
   }]);
     app.controller('dreamCtrl', ["$scope", "$state", "myService", "msg"
@@ -144,12 +160,30 @@
             $scope.openModal = function () {
                 $scope.modal.show();
             };
+
             $scope.closeModal = function () {
                 $scope.modal.hide();
+
             };
            $scope.$on('$ionicView.beforeEnter', function () {
 
            });
+
+            $scope.vm={
+                content:""
+            };
+            $scope.myReplay = function(){
+                var data = {
+                    content:$scope.vm.content,
+                    comment_id:'11'
+                };
+                myService.myReplay(data).then(function(result){
+
+                },function(erro){
+
+                })
+                $scope.modal.hide();
+            }
        }]);
    
 })(angular.module('app.controllers'));

miaomiao/www/js/controllers/tabs.js

@@ -1,8 +1,32 @@
 (function (module) {
-    module.controller('tabsCtrl', ["$scope", "$ionicHistory", "$state", function ($scope, $ionicHistory, $state) {
+    module.controller('tabsCtrl', ["$scope","$http", "myService", "$ionicHistory", "$state", function ($scope,$http, myService, $ionicHistory, $state) {
         $scope.go = function(target) {
           //  $ionicHistory.clearHistory();
             $state.go(target);
         };
+
+        $scope.vm={
+
+        };
+        $scope.userMes = function(){
+            /*var data={
+                user_id:"111"
+            };
+            myService.userMes(data).then(function(result){
+
+            },function(erro){
+
+            });*/
+            $scope.go("app.my")
+        };
+
+        $scope.myIndex = function(){
+           /* myService.userMes().then(function(result){
+
+            },function(erro){
+
+            });*/
+            $scope.go("app.home")
+        };
     }]);
 })(angular.module('app.controllers'));

miaomiao/www/js/services/homeservice.js

@@ -7,6 +7,20 @@
                     method: "get"
                 })
             },
+            supportDream:function(data){
+                return $http({
+                    url:config.server + "api/user/support",
+                    method:"post",
+                    data:data
+                })
+            },
+            searchContent:function (data){
+                return $http({
+                    url:config.server + 'api/index/search',
+                    method:"get",
+                    data:data
+                })
+            }
         };
     }]);
 })(angular.module('app.services'));

miaomiao/www/js/services/myservice.js

@@ -46,7 +46,44 @@
                     method:"get"
                 })
             },
-
+            collect:function(){
+                return $http({
+                    url:config.server + "api/my/collection",
+                    method:"get"
+                })
+            },
+            myDream:function(){
+                return $http({
+                    url:config.server + "api/my/dream",
+                    method:"get"
+                })
+            },
+            myReplay:function(data){
+                return $http({
+                    url: config.server + '/api/my/my_reply',
+                    method: "post",
+                    data: data
+                })
+            },
+            userMes:function(data){
+                return $http({
+                    url:config.server + "api/user/index/",
+                    method:"get",
+                    data:data
+                })
+            },
+            myIndex:function(){
+              return $http({
+                  url:config.server + "api/my/index",
+                  method:"get"
+              })
+            },
+            toprofile:function(){
+                return $http({
+                    url:config.server + "api/my/persona",
+                    method:"get"
+                })
+            }
         };
     }]);
 })(angular.module('app.services'));

miaomiao/www/templates/home/search.html

@@ -1,7 +1,7 @@
 <ion-view view-title="">
     <ion-nav-buttons side="primary">
         <label class="item item-input" style="width:315px">
-            <i class="icon ion-search placeholder-icon"></i>
+            <i class="icon ion-search placeholder-icon" ng-click="searchContent()"></i>
             <input type="text" style="width: 100%" placeholder="搜索内容" ng-change="keychange()" ng-model="vm.keywords">
         </label>
         <button class="button button-calm" style="width: 30%; padding: 0;" ng-click="$ionicGoBack()">取消</button>

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

@@ -227,29 +227,29 @@
     <div class="detail-like" ng-if="tosupport">
         <div>
             <div class="row">
-                <div class="col box {{index==1?'selected':''}}" ng-click="changeindex(1)">
+                <div class="col box {{index==1?'selected':''}}" ng-click="changeindex(1)" ng-model="coin">
                     <h2 class="calm">5个</h2>
                     <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
                 </div>
-                <div class="col box {{index==2?'selected':''}}" ng-click="changeindex(2)">
+                <div class="col box {{index==2?'selected':''}}" ng-click="changeindex(2)" ng-model="coin">
                     <h2 class="calm">10个</h2>
                     <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
                 </div>
-                <div class="col box {{index==3?'selected':''}}" ng-click="changeindex(3)">
+                <div class="col box {{index==3?'selected':''}}" ng-click="changeindex(3)" ng-model="coin">
                     <h2 class="calm">15个</h2>
                     <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
                 </div>
             </div>
             <div class="row">
-                <div class="col box {{index==4?'selected':''}}" ng-click="changeindex(4)">
+                <div class="col box {{index==4?'selected':''}}" ng-click="changeindex(4)" ng-model="coin">
                     <h2 class="calm">20个</h2>
                     <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
                 </div>
-                <div class="col box {{index==5?'selected':''}}" ng-click="changeindex(5)">
+                <div class="col box {{index==5?'selected':''}}" ng-click="changeindex(5)" ng-model="coin">
                     <h2 class="calm">25个</h2>
                     <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
                 </div>
-                <div class="col box {{index==6?'selected':''}}" ng-click="changeindex(6)">
+                <div class="col box {{index==6?'selected':''}}" ng-click="changeindex(6)" ng-model="coin">
                     <h2 class="calm">30个</h2>
                     <p><i class="icon ion-social-codepen-outline calm"></i> 虚拟币</p>
                 </div>
@@ -259,7 +259,7 @@
         <div class="send">
             <span>余额：<i class="calm">20000</i>梦想币</span>
             <span  style="padding:30px" class="calm"><i class="icon ion-card"></i>充值</span>
-            <a class="button button-calm" style="height:100%;border-radius:0;width:80px;font-size:1.2em ">发送</a>
+            <a class="button button-calm" style="height:100%;border-radius:0;width:80px;font-size:1.2em " ng-click="supportDream()">发送</a>
         </div>
     </div>
   

miaomiao/www/templates/my/index.html

@@ -49,12 +49,12 @@
                 <em class="fl">我的资料</em>
           
             </a>
-            <a class="item item-icon-left" ui-sref="app.my_dream">
+            <a class="item item-icon-left" ui-sref="app.my_dream" ng-click="myDream()">
                 <i class="icon ion-ios-lightbulb-outline"></i>
                 <em class="fl">我的梦想</em>
              
             </a>
-            <a class="item item-icon-left" ui-sref="app.my_collect">
+            <a class="item item-icon-left" ui-sref="app.my_collect" ng-click="collect()">
                 <i class="icon ion-ios-star-outline"></i>
                 <em class="fl">我的收藏</em>
                

miaomiao/www/templates/my/my-message-reply.html

@@ -83,7 +83,7 @@
             <ion-header-bar class="bar-calm">
                 <button class="button button-clear icon ion-ios-arrow-back" ng-click="closeModal()">返回</button>
                 <h1 class="title">我的回复</h1>
-                <button class="button button-clear" ng-click="closeModal()">确定</button>
+                <button class="button button-clear" ng-click="myReplay()">确定</button>
             </ion-header-bar>
             <ion-content>
                 <div class="addmodal">

miaomiao/www/templates/my/my-profile.html

@@ -1,32 +1,50 @@
 <ion-view view-title="个人信息" >
     <ion-content>
-     <div class="list">
-<<<<<<< HEAD
-         <a class="item item-avatar-right" ng-click="reset()">
-             <img  src="../../img/demo/head5.jpg" />
-=======
-         <a class="item item-avatar-right" ng-click="setAvator()">
-             <img  src="img/demo/head5.jpg" />
->>>>>>> 1d310a3a45c853ca8f205ef89ee51539cd5ccf2a
-             <h2>头像</h2>
-             <p style="font-size:12px">点击上传</p>
-         </a>
-         <label class="item item-input item-select item-select-width">
+        <div class="list">
+            <a class="item item-avatar-right" ng-click="setAvator()">
+                <img  src="img/demo/head5.jpg" />
+                <h2>头像</h2>
+                <p style="font-size:12px">点击上传</p>
+            </a>
+            <div class="item">
+             <span class="fl">
+                 绑定手机
+             </span>
+                <i style="float:right" class="ng-binding">159****0809</i>
+            </div>
+
+            <label class="item item-input item-select item-select-width">
              <span class="input-label">
                  性别
              </span>
-             <select>
-                 <option>男</option>
-                 <option>女</option>
-             </select>
-         </label>
-         <label class="item item-input ">
-             <input type="text" placeholder="个性签名">
-         </label>
-         <div class="item">
-             159286****0809
-         </div>
-     </div>
+                <select name="sex">
+                    <option>男</option>
+                    <option>女</option>
+                </select>
+            </label>
+            <label class="item item-input ">
+                <span class="input-label">个性签名</span>
+                <input name="signture" type="text" placeholder="请输入">
+            </label>
+            <label class="item item-input item-select item-select-width">
+             <span class="input-label">
+                 情感状态
+             </span>
+                <select name="emotion">
+                    <option>未婚</option>
+                    <option>已婚</option>
+                </select>
+            </label>
+
+            <label class="item item-input ">
+                <span class="input-label">职业</span>
+                <input name="job" type="text" placeholder="请输入">
+            </label>
+            <label class="item item-input ">
+                <span class="input-label">身高</span>
+                <input name="tail" type="text" placeholder="请输入(单位cm)">
+            </label>
+        </div>
         <div class="padding">
             <button class="button button-full button-calm">
                 保存

miaomiao/www/templates/tabs.html

@@ -1,11 +1,11 @@
 <ion-tabs class="tabs-icon-top tabs-color-active-calm">
-    <ion-tab title="首页" icon-off="ion-ios-home-outline" icon-on="ion-ios-home" ng-click="go('app.home')">
+    <ion-tab title="首页" icon-off="ion-ios-home-outline" icon-on="ion-ios-home" ng-click="myIndex()">
         <ion-nav-view name="app-home"></ion-nav-view>
     </ion-tab>
     <ion-tab class="tab-item-add" icon="ion-ios-plus"  ui-sref="app.add" >
         <ion-nav-view name="app-add"></ion-nav-view>
     </ion-tab>
-    <ion-tab title="我的" icon-off="ion-ios-person-outline" icon-on="ion-ios-person" ng-click="go('app.my')">
+    <ion-tab title="我的" icon-off="ion-ios-person-outline" icon-on="ion-ios-person" ng-click="userMes()">
         <ion-nav-view name="app-my"></ion-nav-view>
     </ion-tab>
 </ion-tabs>