Ben 7 gadi atpakaļ
vecāks
revīzija
f7d0531c03

BIN
.vs/miaomiao/v14/.suo


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 3 - 0
miaomiao/www/css/iconfont.css


BIN
miaomiao/www/font/iconfont.eot


+ 45 - 0
miaomiao/www/font/iconfont.svg

xqd
@@ -0,0 +1,45 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    ascent="896"
+    descent="-128"
+  />
+    <missing-glyph />
+    
+    <glyph glyph-name="x" unicode="x" horiz-adv-x="1001"
+d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
+t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
+t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
+    
+
+    
+    <glyph glyph-name="sousuo" unicode="&#58912;" d="M868.720448-18.833559 659.373489 190.524656c37.947264 48.080042 60.780295 108.650559 60.780295 174.649715 0 155.99689-126.451994 282.459117-282.45707 282.459117-155.966191 0-282.418184-126.462227-282.418184-282.459117 0-155.974377 126.451994-282.436604 282.418184-282.436604 75.296917 0 143.555533 29.652344 194.190771 77.6935L839.923588-47.632465 868.720448-18.833559zM196.010209 365.174372c0 133.294842 108.412129 241.727437 241.686505 241.727437 133.292795 0 241.72539-108.432595 241.72539-241.727437 0-133.272329-108.432595-241.704924-241.72539-241.704924C304.422338 123.469448 196.010209 231.902042 196.010209 365.174372z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tubiaozhizuomoban" unicode="&#58913;" d="M931.9 193c-15 0-27.1-12.1-27.1-27.1v-174.3H730.5c-15 0-27.1-12.1-27.1-27.1 0-15 12.1-27.1 27.1-27.1h201.4c15 0 27.1 12.1 27.1 27.1V165.9c0 15-12.1 27.1-27.1 27.1z m0 0M292.5-8.4H118.2V165.9c0 15-12.1 27.1-27.1 27.1-15 0-27.1-12.1-27.1-27.1v-201.4c0-15 12.1-27.1 27.1-27.1h201.4c15 0 27.1 12.1 27.1 27.1 0 14.9-12.1 27.1-27.1 27.1z m0 0M932.1 411.8H91.2c-15 0-27.1-12.1-27.1-27.1 0-15 12.1-27.1 27.1-27.1h840.9c15 0 27.1 12.1 27.1 27.1 0 15-12.1 27.1-27.1 27.1z m0 0M118.2 603.6V777.9h174.4c15 0 27.1 12.1 27.1 27.1 0 15-12.1 27.1-27.1 27.1H91.1C76.1 832.1 64 820 64 805v-201.4c0-15 12.1-27.1 27.1-27.1 14.9 0 27.1 12.1 27.1 27.1z m0 0M730.2 777.9h174.3v-174.4c0-15 12.1-27.1 27.1-27.1 15 0 27.1 12.1 27.1 27.1V805c0 15-12.1 27.1-27.1 27.1H730.2c-15 0-27.1-12.1-27.1-27.1 0-14.9 12.1-27.1 27.1-27.1z m0 0"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="xiaoxi" unicode="&#58914;" d="M513.1 317.2c-1 0-1.9 0.1-2.9 0.2-6.8 0.9-17 2.2-414.7 279.8-10.1 7.1-12.6 21-5.5 31.2 7.1 10.1 21 12.6 31.2 5.5 132-92.1 341.2-236.9 390.8-268l394 268.2c10.2 6.9 24.2 4.3 31.1-5.9 7-10.2 4.3-24.1-5.9-31.1l-405.4-276c-3.8-2.5-8.2-3.9-12.7-3.9zM833 675.4c45.8 0 83.1-37.3 83.1-83.1v-415.9c0-45.8-37.3-83.1-83.1-83.1H193.2c-45.8 0-83.1 37.3-83.1 83.1v416c0 45.8 37.3 83.1 83.1 83.1H833m0 44.7H193.2c-70.3 0-127.9-57.5-127.9-127.9v-415.9c0-70.3 57.5-127.9 127.9-127.9H833c70.3 0 127.9 57.5 127.9 127.9v416c-0.1 70.3-57.6 127.8-127.9 127.8z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shaixuan" unicode="&#59038;" d="M603.677-59.145c-11.972 0-21.659 9.688-21.659 21.659v480.68c0 29.57 15.272 68.194 35.514 89.853l234.385 250.779h-679.952l234.385-250.779c20.242-21.617 35.514-60.283 35.514-89.917v-245.532l64.429-85.327c7.213-9.539 5.309-23.12-4.23-30.332-9.582-7.213-23.14-5.309-30.332 4.23l-68.807 91.122c-2.732 3.588-4.377 8.132-4.379 13.060l0 252.779c0 18.571-11.126 46.767-23.817 60.326l-238.806 255.494c-19.904 21.279-15.272 39.195-12.352 45.921 2.898 6.684 12.797 22.273 41.817 22.273h693.13c29.021 0 38.919-15.568 41.817-22.273 3.617-8.334 6.832-25.382-12.374-45.921l-238.785-255.474c-12.691-13.601-23.838-41.754-23.838-60.283v-480.68c-0.001-11.972-9.689-21.659-21.66-21.659z"  horiz-adv-x="1024" />
+
+    
+
+
+  </font>
+</defs></svg>

BIN
miaomiao/www/font/iconfont.ttf


BIN
miaomiao/www/font/iconfont.woff


+ 1 - 0
miaomiao/www/index.html

xqd
@@ -7,6 +7,7 @@
     <link href="css/ionic.app.css" rel="stylesheet" />
     <link href="css/style.css" rel="stylesheet" />
     <link href="lib/ionic/style.css" rel="stylesheet" />
+    <link href="css/iconfont.css" rel="stylesheet" />
     <script src="js/platformOverrides.js"></script>
     <script src="lib/ionic/js/ionic.bundle.min.js"></script>
 

+ 19 - 5
miaomiao/www/templates/home/index.html

xqd
@@ -6,20 +6,34 @@
         <!--<button class="button button-clear" style="height: 30px; width: 30px;font-size: 25px; margin-top: 0.5px" ng-click="toggleLeftSideMenu()">-->
             <!--<img src="img/btn_filter.svg" style="height: 63%; width: 100%;">-->
         <!--</button>-->
-        <button class="button button-clear" style="height: 30px; width: 30px; margin-top: 6px" ui-sref="app.home_search">
+        <!--<button class="button button-clear" style="height: 30px; width: 30px; margin-top: 6px" ui-sref="app.home_search">
             <img src="img/qr-scanner.svg" style="height: 67%; width: 100%">
-        </button>
-        <button class="button button-clear" style="height: 35px; margin-top:4px" ui-sref="app.message">
+        </button>-->
+
+        <!--<button class="button button-clear" style="height: 35px; margin-top:4px" ui-sref="app.message">
             <img src="img/btn_filter.svg" style="height: 55%; width: 100%">
+        </button>-->
+        <button class="button button-clear"  ng-click="qrscan()">
+            <i class="icon iconfont icon-tubiaozhizuomoban"></i>  
+        </button>
+        <button class="button button-clear" ng-click="toggleLeftSideMenu()">
+            <i class="icon iconfont icon-shaixuan"></i>
         </button>
     </ion-nav-buttons>
     <ion-nav-buttons side="right">
-        <button class="button button-clear" style="height: 30px; width: 30px; margin-top: 6px" ui-sref="app.home_search">
+        <!--<button class="button button-clear" style="height: 30px; width: 30px; margin-top: 6px" ui-sref="app.home_search">
             <img src="img/icon_search.svg" style="height: 67%; width: 100%">
+        </button>-->
+        <button class="button button-clear" ui-sref="app.home_search">
+            <i class="icon iconfont icon-sousuo"></i>
         </button>
-        <button class="button button-clear" style="height: 35px; margin-top:4.8px" ui-sref="app.message">
+        <!--<button class="button button-clear" style="height: 35px; margin-top:4.8px" ui-sref="app.message">
             <img ng-if="showMessage==1" src="img/icon_message_h.svg" style="height: 60%; width: 100%">
             <img ng-if="showMessage==0" src="img/icon_message_n.svg" style="height: 55%; width: 100%">
+        </button>-->
+        <button class="button button-clear"  ui-sref="app.message">
+            <i class="icon iconfont icon-xiaoxi">
+            </i>
         </button>
     </ion-nav-buttons>
     <ion-side-menus>

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels