Home Explore Help
Register Sign In
usoft
/
mall-web-ssr
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	components/provider/Carousel.vue
#	pages/provider/factories.vue
#	pages/provider/home.vue
hangb 8 years ago
parent
514fffdcf4 25bf048415
commit
7746d07c3b
6 changed files with 0 additions and 111 deletions
Split View Show Diff Stats
  1. 0 4
      app.html
  2. 0 47
      assets/font/iconfont.css
  3. BIN
      assets/font/iconfont.eot
  4. 0 60
      assets/font/iconfont.svg
  5. BIN
      assets/font/iconfont.ttf
  6. BIN
      assets/font/iconfont.woff

+ 0 - 4
app.html
View File 

@@ -2,10 +2,6 @@
 
 <html {{ HTML_ATTRS }}>
 
 <head>
 
   {{ HEAD }}
 
-  <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css">
 
-  <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css">
 
-  <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/element-ui/1.3.7/theme-default/index.css">
 
-  <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_0d1jjt5tukcblnmi.css">
 
   <script>
 
     (function (w, d) {
 
       if (/(MSIE)|(Trident)/.test(w.navigator.userAgent)) {

+ 0 - 47
assets/font/iconfont.css
View File 

@@ -1,47 +0,0 @@
 
-@font-face {font-family: "iconfont";
 
-  src: url('iconfont.eot?t=1499494715499'); /* IE9*/
 
-  src: url('iconfont.eot?t=1499494715499#iefix') format('embedded-opentype'), /* IE6-IE8 */
 
-  url('iconfont.woff?t=1499494715499') format('woff'), /* chrome, firefox */
 
-  url('iconfont.ttf?t=1499494715499') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
 
-  url('iconfont.svg?t=1499494715499#iconfont') format('svg'); /* iOS 4.1- */
 
-}
 
-
 
-.iconfont {
 
-  font-family:"iconfont" !important;
 
-  font-size:14px;
 
-  font-style:normal;
 
-  -webkit-font-smoothing: antialiased;
 
-  -moz-osx-font-smoothing: grayscale;
 
-}
 
-
 
-.icon-sm {
 
-  font-size: 12px;
 
-}
 
-
 
-.icon-lg {
 
-  font-size: 18px;
 
-}
 
-
 
-.icon-xlg {
 
-  font-size: 20px;
 
-}
 
-
 
-.iconfont.pull-right {
 
-  margin-left: .3em;
 
-}
 
-
 
-.icon-shopping-cart:before { content: "\e600"; }
 
-
 
-.icon-zuji:before { content: "\e604"; }
 
-
 
-.icon-kefu:before { content: "\e6f9"; }
 
-
 
-.icon-arrow-up:before { content: "\e64a"; }
 
-
 
-.icon-arrow-left:before { content: "\e601"; }
 
-
 
-.icon-liuyan:before { content: "\e6b6"; }
 
-
 
-.icon-arrow-right:before { content: "\e621"; }
 
-
 
-.icon-chuyidong:before { content: "\e617"; }

BIN
assets/font/iconfont.eot
View File


+ 0 - 60
assets/font/iconfont.svg
View File 

@@ -1,60 +0,0 @@
 
-<?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" >
 
-<svg xmlns="http://www.w3.org/2000/svg">
 
-<metadata>
 
-Created by FontForge 20120731 at Sat Jul  8 14:18:35 2017
 
- By admin
 
-</metadata>
 
-<defs>
 
-<font id="iconfont" horiz-adv-x="1024" >
 
-  <font-face 
-    font-family="iconfont"
 
-    font-weight="500"
 
-    font-stretch="normal"
 
-    units-per-em="1024"
 
-    panose-1="2 0 6 3 0 0 0 0 0 0"
 
-    ascent="896"
 
-    descent="-128"
 
-    x-height="792"
 
-    bbox="8 -123.308 1018.54 896"
 
-    underline-thickness="0"
 
-    underline-position="0"
 
-    unicode-range="U+0078-E6F9"
 
-  />
 
-<missing-glyph 
- />
 
-    <glyph glyph-name=".notdef" 
- />
 
-    <glyph glyph-name=".notdef" 
- />
 
-    <glyph glyph-name=".null" horiz-adv-x="0" 
- />
 
-    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="341" 
- />
 
-    <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="shopping-cart" unicode="&#xe600;" 
-d="M347 113q20 0 37 -7.5t30.5 -20t20.5 -30t7 -37t-7 -37t-20.5 -30t-30.5 -20.5t-37 -8t-37 8t-30.5 20.5t-20.5 30t-7 37t7 37t20.5 30t30.5 20t37 7.5zM773.5 111q19.5 0 37 -7.5t30.5 -20t20.5 -30t7.5 -37t-7.5 -37t-20.5 -30t-30.5 -20.5t-37 -8t-37 8t-30.5 20.5
 
-t-20.5 30t-7.5 37t7.5 37t20.5 30t30.5 20t37 7.5zM945 692q29 0 45 -7.5t22.5 -19t6 -24t-3.5 -22t-13 -38t-22 -63t-24 -68t-18 -53.5q-13 -41 -33.5 -56.5t-50.5 -15.5h-35h-66h-87h-96h-254l16 -93h516q49 0 49 -42q0 -20 -9.5 -35t-38.5 -15h-49h-95h-118h-120h-98h-57
 
-q-20 0 -34 9.5t-23 24t-15 32t-9 33.5q-1 6 -5.5 29.5t-11 58.5t-15 79t-16.5 88q-19 103 -44 230h-77q-15 0 -25 7.5t-17 18.5t-9.5 23t-2.5 23q0 20 14 33.5t37 13.5h23h20h26h35q20 0 32.5 -6.5t19.5 -15.5t10 -19t5 -18t4.5 -23t4.5 -30q3 -18 6 -39h700z" />
 
-    <glyph glyph-name="zuji" unicode="&#xe604;" 
-d="M839 701q-20 0 -34.5 14.5t-14.5 34.5t14.5 34.5t34.5 14.5t34.5 -14.5t14.5 -34.5t-14.5 -34.5t-34.5 -14.5zM714 772q-19 0 -33 13.5t-14 33t14 33t33 13.5t32.5 -13.5t13.5 -33t-13.5 -33t-32.5 -13.5zM580.5 793q-21.5 0 -36.5 15t-15 36.5t15 36.5t36.5 15t36.5 -15
 
-t15 -36.5t-15 -36.5t-36.5 -15zM443.5 779q-24.5 0 -41.5 17t-17 41.5t17 41.5t41.5 17t41.5 -17t17 -41.5t-17 -41.5t-41.5 -17zM241 667q-43 0 -74 31t-31 74t31 73.5t74 30.5t73.5 -30.5t30.5 -73.5t-30.5 -74t-73.5 -31zM592 715q10 0 20 -2q88 -14 140.5 -58t80.5 -114
 
-q22 -53 23 -115q3 -124 -10.5 -219.5t-42 -159t-68 -103t-91.5 -58.5q-59 -22 -114 8q-115 66 -75 209q3 14 4 26q2 27 2 47q0 48 -32 88q-50 62 -82 123q-36 68 -10 141q33 89 93 137.5t162 49.5z" />
 
-    <glyph glyph-name="kefu" unicode="&#xe6f9;" 
-d="M151 32q22 50 63 89q32 31 78 55q3 2 6 -1q46 -41 105 -62q40 -14 83 -17q73 -6 141 20q54 21 96 59q3 3 7 1q44 -23 76 -53q62 -57 83 -142q3 -13 6 -42q1 -10 -6.5 -18t-18.5 -8h-717q-11 0 -18.5 8t-6.5 19q6 51 23 92zM511 159q-122 5 -185 102q-27 42 -31 95
 
-q-6 77 40 140t122 81q112 27 198 -48q59 -51 69 -127q16 -119 -78 -196q-44 -35 -103 -44q-2 0 -32 -3v0zM253 486h7v-178q0 -7 -6 -12t-13 -4q-5 1 -10 3q-42 13 -61 51q-14 29 -7.5 61t30.5 53q2 2 8 6t8 6q3 2 4 5q41 107 142 164q52 30 112 38q111 14 205 -41
 
-q96 -56 135 -160q2 -5 6 -7q45 -27 47.5 -78.5t-39.5 -82.5q-12 -8 -40 -15q-8 -2 -14 3t-6 13v175h7q-31 69 -100.5 116t-157.5 47q-90 0 -158.5 -47.5t-98.5 -115.5v0zM253 486z" />
 
-    <glyph glyph-name="arrow-up" unicode="&#xe64a;" 
-d="M512 496l-292 -292q-9 -9 -22 -9t-22.5 9.5t-9.5 22.5t10 22l314 314q9 9 22 9t22 -9l315 -314q9 -9 9 -22t-9 -22.5t-22.5 -9.5t-22.5 9z" />
 
-    <glyph glyph-name="arrow-left" unicode="&#xe601;" 
-d="M643 722q8 0 13 -5.5t5 -13.5t-5 -13l-291 -291l311 -310q5 -5 5 -13t-5.5 -13.5t-13 -5.5t-13.5 6l-336 336l317 317q5 6 13 6z" />
 
-    <glyph glyph-name="liuyan" unicode="&#xe6b6;" 
-d="M131 765h584q28 0 47.5 -19.5t19.5 -47.5v-373q0 -27 -19.5 -47t-47.5 -20h-303l-170 -153v153h-111q-28 0 -47.5 20t-19.5 47v373q0 28 19.5 47.5t47.5 19.5zM831 292v326h62q28 0 47.5 -18.5t19.5 -46.5v-326q0 -27 -19 -43t-48 -16h-111v-153l-168 153h-129
 
-q-67 0 -67 45h327q29 0 57.5 28.5t28.5 50.5zM831 292z" />
 
-    <glyph glyph-name="arrow-right" unicode="&#xe621;" 
-d="M343 728l364 -343l-364 -345l-23 23l340 322l-340 320z" />
 
-  </font>
 
-</defs></svg>

BIN
assets/font/iconfont.ttf
View File


BIN
assets/font/iconfont.woff
View File