Selaa lähdekoodia

Merge remote-tracking branch 'origin/master'

xkwg 4 vuotta sitten
vanhempi
commit
ef8589f105

+ 191 - 13
src/assets/styles/symbol_no_color/demo_index.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8"/>
-  <title>IconFont Demo</title>
+  <title>iconfont Demo</title>
   <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
   <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
   <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
@@ -13,10 +13,33 @@
   <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
   <!-- 代码高亮 -->
   <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
 </head>
 <body>
   <div class="main">
-    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">&#xe86b;</a></h1>
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
     <div class="nav-tabs">
       <ul id="tabs" class="dib-box">
         <li class="dib active"><span>Unicode</span></li>
@@ -32,6 +55,48 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe655;</span>
+                <div class="name">开票</div>
+                <div class="code-name">&amp;#xe655;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe631;</span>
+                <div class="name">移动端_tabbar:收票</div>
+                <div class="code-name">&amp;#xe631;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe606;</span>
+                <div class="name">收款</div>
+                <div class="code-name">&amp;#xe606;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe680;</span>
+                <div class="name">付款</div>
+                <div class="code-name">&amp;#xe680;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe628;</span>
+                <div class="name">收起</div>
+                <div class="code-name">&amp;#xe628;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe622;</span>
+                <div class="name">收起</div>
+                <div class="code-name">&amp;#xe622;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe61a;</span>
+                <div class="name">提示</div>
+                <div class="code-name">&amp;#xe61a;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe638;</span>
                 <div class="name">日期</div>
                 <div class="code-name">&amp;#xe638;</div>
@@ -194,24 +259,20 @@
 
           <p>Unicode 是字体在网页端最原始的应用方式,特点是:</p>
           <ul>
-            <li>兼容性最好,支持 IE6+,及所有现代浏览器。</li>
             <li>支持按字体的方式去动态调整图标大小,颜色等等。</li>
-            <li>但是因为是字体,所以不支持多色。只能使用平台里单色的图标,就算项目里有多色图标也会自动去色。</li>
+            <li>默认情况下不支持多色,直接添加多色图标会自动去色。</li>
           </ul>
           <blockquote>
-            <p>注意:新版 iconfont 支持多色图标,这些多色图标在 Unicode 模式下将不能使用,如果有需求建议使用symbol 的引用方式</p>
+            <p>注意:新版 iconfont 支持两种方式引用多色图标:SVG symbol 引用方式和彩色字体图标模式。(使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。)</p>
           </blockquote>
           <p>Unicode 使用步骤如下:</p>
           <h3 id="-font-face">第一步:拷贝项目下面生成的 <code>@font-face</code></h3>
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.eot');
-  src: url('iconfont.eot?#iefix') format('embedded-opentype'),
-      url('iconfont.woff2') format('woff2'),
-      url('iconfont.woff') format('woff'),
-      url('iconfont.ttf') format('truetype'),
-      url('iconfont.svg#iconfont') format('svg');
+  src: url('iconfont.woff2?t=1620111040685') format('woff2'),
+       url('iconfont.woff?t=1620111040685') format('woff'),
+       url('iconfont.ttf?t=1620111040685') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
@@ -238,6 +299,69 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-kaipiao"></span>
+            <div class="name">
+              开票
+            </div>
+            <div class="code-name">.icon-kaipiao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yidongduan_tabbarshoupiao"></span>
+            <div class="name">
+              移动端_tabbar:收票
+            </div>
+            <div class="code-name">.icon-yidongduan_tabbarshoupiao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shoukuan"></span>
+            <div class="name">
+              收款
+            </div>
+            <div class="code-name">.icon-shoukuan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fukuan"></span>
+            <div class="name">
+              付款
+            </div>
+            <div class="code-name">.icon-fukuan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shouqi1"></span>
+            <div class="name">
+              收起
+            </div>
+            <div class="code-name">.icon-shouqi1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shouqi2"></span>
+            <div class="name">
+              收起
+            </div>
+            <div class="code-name">.icon-shouqi2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-tishi"></span>
+            <div class="name">
+              提示
+            </div>
+            <div class="code-name">.icon-tishi
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-riqi"></span>
             <div class="name">
               日期
@@ -479,10 +603,8 @@
         <p>font-class 是 Unicode 使用方式的一种变种,主要是解决 Unicode 书写不直观,语意不明确的问题。</p>
         <p>与 Unicode 使用方式相比,具有如下特点:</p>
         <ul>
-          <li>兼容性良好,支持 IE8+,及所有现代浏览器。</li>
           <li>相比于 Unicode 语意明确,书写更直观。可以很容易分辨这个 icon 是什么。</li>
           <li>因为使用 class 来定义图标,所以当要替换图标时,只需要修改 class 里面的 Unicode 引用。</li>
-          <li>不过因为本质上还是使用的字体,所以多色图标还是不支持的。</li>
         </ul>
         <p>使用步骤如下:</p>
         <h3 id="-fontclass-">第一步:引入项目下面生成的 fontclass 代码:</h3>
@@ -502,6 +624,62 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-kaipiao"></use>
+                </svg>
+                <div class="name">开票</div>
+                <div class="code-name">#icon-kaipiao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yidongduan_tabbarshoupiao"></use>
+                </svg>
+                <div class="name">移动端_tabbar:收票</div>
+                <div class="code-name">#icon-yidongduan_tabbarshoupiao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shoukuan"></use>
+                </svg>
+                <div class="name">收款</div>
+                <div class="code-name">#icon-shoukuan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fukuan"></use>
+                </svg>
+                <div class="name">付款</div>
+                <div class="code-name">#icon-fukuan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shouqi1"></use>
+                </svg>
+                <div class="name">收起</div>
+                <div class="code-name">#icon-shouqi1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shouqi2"></use>
+                </svg>
+                <div class="name">收起</div>
+                <div class="code-name">#icon-shouqi2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tishi"></use>
+                </svg>
+                <div class="name">提示</div>
+                <div class="code-name">#icon-tishi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-riqi"></use>
                 </svg>
                 <div class="name">日期</div>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 3
src/assets/styles/symbol_no_color/iconfont.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
src/assets/styles/symbol_no_color/iconfont.js


+ 49 - 0
src/assets/styles/symbol_no_color/iconfont.json

@@ -6,6 +6,55 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "1868200",
+      "name": "开票",
+      "font_class": "kaipiao",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "2872353",
+      "name": "移动端_tabbar:收票",
+      "font_class": "yidongduan_tabbarshoupiao",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    },
+    {
+      "icon_id": "9802247",
+      "name": "收款",
+      "font_class": "shoukuan",
+      "unicode": "e606",
+      "unicode_decimal": 58886
+    },
+    {
+      "icon_id": "16522161",
+      "name": "付款",
+      "font_class": "fukuan",
+      "unicode": "e680",
+      "unicode_decimal": 59008
+    },
+    {
+      "icon_id": "9506964",
+      "name": "收起",
+      "font_class": "shouqi1",
+      "unicode": "e628",
+      "unicode_decimal": 58920
+    },
+    {
+      "icon_id": "11178905",
+      "name": "收起",
+      "font_class": "shouqi2",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    },
+    {
+      "icon_id": "18927695",
+      "name": "提示",
+      "font_class": "tishi",
+      "unicode": "e61a",
+      "unicode_decimal": 58906
+    },
+    {
       "icon_id": "1204268",
       "name": "日期",
       "font_class": "riqi",

BIN
src/assets/styles/symbol_no_color/iconfont.ttf


BIN
src/assets/styles/symbol_no_color/iconfont.woff


BIN
src/assets/styles/symbol_no_color/iconfont.woff2


+ 45 - 0
src/views/information/goods/components/rightSpot/index.vue

@@ -11,6 +11,33 @@
             <a-button class="redBtn">停用</a-button>
         </div>
     </div>
+    <div class="spotCont">
+        <a-collapse class="spotCollapse" :bordered="false">
+            <template #expandIcon>
+                <!-- <svg class="icon svg-icon" aria-hidden="true">
+                    <use xlink:href="#icon-shouqi1"></use>
+                </svg> -->
+            </template>
+            <a-collapse-panel key="1" header="This is panel header 1">
+                <a-collapse default-active-key="4">
+                    <template #expandIcon>
+                        <!-- <svg class="icon svg-icon" aria-hidden="true">
+                            <use xlink:href="#icon-shouqi1"></use>
+                        </svg> -->
+                    </template>
+                    <a-collapse-panel key="4" header="This is panel nest panel">
+                        <p>A dog is a type of domesticated animal.Known for its loyalty and faithfulness,it can be found as a welcome guest in many households across the world</p>
+                    </a-collapse-panel>
+                </a-collapse>
+            </a-collapse-panel>
+            <a-collapse-panel key="2" header="This is panel header 2" :disabled="false">
+                <p>A dog is a type of domesticated animal.Known for its loyalty and faithfulness,it can be found as a welcome guest in many households across the world</p>
+            </a-collapse-panel>
+            <a-collapse-panel key="3" header="This is panel header 3">
+                <p>A dog is a type of domesticated animal.Known for its loyalty and faithfulness,it can be found as a welcome guest in many households across the world</p>
+            </a-collapse-panel>
+        </a-collapse>
+    </div>
   </div>
 </template>
 
@@ -58,6 +85,10 @@ export default defineComponent({
         }
 
     }
+    .spotCont {
+        width: 100%;
+        padding: 0 30px;
+    }
 }
 .blue {
     color: @m-blue0;
@@ -96,4 +127,18 @@ export default defineComponent({
          color: @m-white0-hover;
     }
 }
+.ant-collapse.spotCollapse.ant-collapse-borderless {
+    margin-top: 10px;
+    background-color: transparent;
+    .ant-collapse-item {
+        border-bottom: 0;
+        .ant-collapse-header {
+            color: @m-grey17;
+            font-size: 14px;
+        }
+        .ant-collapse-content {
+
+        }
+    }
+}
 </style>;

+ 1 - 1
src/views/information/goods/list/spot-variety/index.vue

@@ -8,7 +8,7 @@
       <div class="leftSpot">
        <leftMenu></leftMenu>
       </div>
-      <div class="rightCon@/common/methods
+      <div class="rightCont">
         <rightSpot></rightSpot>
       </div>
     </div>

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä