From 23f9d945d58dc3208f4dcd98495cbf7915f8c86e Mon Sep 17 00:00:00 2001
From: hulinneil <1289739946@qq.com>
Date: Sun, 18 Nov 2018 16:48:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=20icon.css=E5=92=8Cuni.css?=
=?UTF-8?q?=EF=BC=9Bload-more=E6=94=B9=E4=B8=BA=20uni-load-more?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
examples/hello-uniapp/common/icon.css | 377 -----------------
examples/hello-uniapp/common/uni.css | 376 ++++++++++++++++-
.../components/im-chat/chatinput.vue | 2 -
examples/hello-uniapp/components/uni-icon.vue | 5 +-
.../{load-more.vue => uni-load-more.vue} | 382 +++++++++---------
.../pages/component/icon/icon.vue | 2 -
.../pages/component/input/input.vue | 1 -
.../pages/template/load-more/load-more.vue | 10 +-
.../pages/template/qrcode/qrcode.vue | 3 -
.../pages/template/sbanner/sbanner.vue | 1 -
.../pages/template/tabbar/tabbar.vue | 6 +-
.../platforms/app-plus/tabbar/tabbar.vue | 6 +-
12 files changed, 578 insertions(+), 593 deletions(-)
delete mode 100644 examples/hello-uniapp/common/icon.css
rename examples/hello-uniapp/components/{load-more.vue => uni-load-more.vue} (94%)
diff --git a/examples/hello-uniapp/common/icon.css b/examples/hello-uniapp/common/icon.css
deleted file mode 100644
index 0773cfb34f3..00000000000
--- a/examples/hello-uniapp/common/icon.css
+++ /dev/null
@@ -1,377 +0,0 @@
-@font-face {
- font-family: uniicons;
- font-weight: normal;
- font-style: normal;
- src: url('https://img-cdn-qiniu.dcloud.net.cn/fonts/uni.ttf?t=1536565627510') format('truetype');
-}
-
-.uni-icon {
- font-family: uniicons;
- font-size: 24px;
- font-weight: normal;
- font-style: normal;
- line-height: 1;
- display: inline-block;
- text-decoration: none;
- -webkit-font-smoothing: antialiased;
-}
-
-.uni-icon.uni-active {
- color: #007aff;
-}
-
-.uni-icon-contact:before {
- content: '\e100';
-}
-
-.uni-icon-person:before {
- content: '\e101';
-}
-
-.uni-icon-personadd:before {
- content: '\e102';
-}
-
-.uni-icon-contact-filled:before {
- content: '\e130';
-}
-
-.uni-icon-person-filled:before {
- content: '\e131';
-}
-
-.uni-icon-personadd-filled:before {
- content: '\e132';
-}
-
-.uni-icon-phone:before {
- content: '\e200';
-}
-
-.uni-icon-email:before {
- content: '\e201';
-}
-
-.uni-icon-chatbubble:before {
- content: '\e202';
-}
-
-.uni-icon-chatboxes:before {
- content: '\e203';
-}
-
-.uni-icon-phone-filled:before {
- content: '\e230';
-}
-
-.uni-icon-email-filled:before {
- content: '\e231';
-}
-
-.uni-icon-chatbubble-filled:before {
- content: '\e232';
-}
-
-.uni-icon-chatboxes-filled:before {
- content: '\e233';
-}
-
-.uni-icon-weibo:before {
- content: '\e260';
-}
-
-.uni-icon-weixin:before {
- content: '\e261';
-}
-
-.uni-icon-pengyouquan:before {
- content: '\e262';
-}
-
-.uni-icon-chat:before {
- content: '\e263';
-}
-
-.uni-icon-qq:before {
- content: '\e264';
-}
-
-.uni-icon-videocam:before {
- content: '\e300';
-}
-
-.uni-icon-camera:before {
- content: '\e301';
-}
-
-.uni-icon-mic:before {
- content: '\e302';
-}
-
-.uni-icon-location:before {
- content: '\e303';
-}
-
-.uni-icon-mic-filled:before,
-.uni-icon-speech:before {
- content: '\e332';
-}
-
-.uni-icon-location-filled:before {
- content: '\e333';
-}
-
-.uni-icon-micoff:before {
- content: '\e360';
-}
-
-.uni-icon-image:before {
- content: '\e363';
-}
-
-.uni-icon-map:before {
- content: '\e364';
-}
-
-.uni-icon-compose:before {
- content: '\e400';
-}
-
-.uni-icon-trash:before {
- content: '\e401';
-}
-
-.uni-icon-upload:before {
- content: '\e402';
-}
-
-.uni-icon-download:before {
- content: '\e403';
-}
-
-.uni-icon-close:before {
- content: '\e404';
-}
-
-.uni-icon-redo:before {
- content: '\e405';
-}
-
-.uni-icon-undo:before {
- content: '\e406';
-}
-
-.uni-icon-refresh:before {
- content: '\e407';
-}
-
-.uni-icon-star:before {
- content: '\e408';
-}
-
-.uni-icon-plus:before {
- content: '\e409';
-}
-
-.uni-icon-minus:before {
- content: '\e410';
-}
-
-.uni-icon-circle:before,
-.uni-icon-checkbox:before {
- content: '\e411';
-}
-
-.uni-icon-close-filled:before,
-.uni-icon-clear:before {
- content: '\e434';
-}
-
-.uni-icon-refresh-filled:before {
- content: '\e437';
-}
-
-.uni-icon-star-filled:before {
- content: '\e438';
-}
-
-.uni-icon-plus-filled:before {
- content: '\e439';
-}
-
-.uni-icon-minus-filled:before {
- content: '\e440';
-}
-
-.uni-icon-circle-filled:before {
- content: '\e441';
-}
-
-.uni-icon-checkbox-filled:before {
- content: '\e442';
-}
-
-.uni-icon-closeempty:before {
- content: '\e460';
-}
-
-.uni-icon-refreshempty:before {
- content: '\e461';
-}
-
-.uni-icon-reload:before {
- content: '\e462';
-}
-
-.uni-icon-starhalf:before {
- content: '\e463';
-}
-
-.uni-icon-spinner:before {
- content: '\e464';
-}
-
-.uni-icon-spinner-cycle:before {
- content: '\e465';
-}
-
-.uni-icon-search:before {
- content: '\e466';
-}
-
-.uni-icon-plusempty:before {
- content: '\e468';
-}
-
-.uni-icon-forward:before {
- content: '\e470';
-}
-
-.uni-icon-back:before,
-.uni-icon-left-nav:before {
- content: '\e471';
-}
-
-.uni-icon-checkmarkempty:before {
- content: '\e472';
-}
-
-.uni-icon-home:before {
- content: '\e500';
-}
-
-.uni-icon-navigate:before {
- content: '\e501';
-}
-
-.uni-icon-gear:before {
- content: '\e502';
-}
-
-.uni-icon-paperplane:before {
- content: '\e503';
-}
-
-.uni-icon-info:before {
- content: '\e504';
-}
-
-.uni-icon-help:before {
- content: '\e505';
-}
-
-.uni-icon-locked:before {
- content: '\e506';
-}
-
-.uni-icon-more:before {
- content: '\e507';
-}
-
-.uni-icon-flag:before {
- content: '\e508';
-}
-
-.uni-icon-home-filled:before {
- content: '\e530';
-}
-
-.uni-icon-gear-filled:before {
- content: '\e532';
-}
-
-.uni-icon-info-filled:before {
- content: '\e534';
-}
-
-.uni-icon-help-filled:before {
- content: '\e535';
-}
-
-.uni-icon-more-filled:before {
- content: '\e537';
-}
-
-.uni-icon-settings:before {
- content: '\e560';
-}
-
-.uni-icon-list:before {
- content: '\e562';
-}
-
-.uni-icon-bars:before {
- content: '\e563';
-}
-
-.uni-icon-loop:before {
- content: '\e565';
-}
-
-.uni-icon-paperclip:before {
- content: '\e567';
-}
-
-.uni-icon-eye:before {
- content: '\e568';
-}
-
-.uni-icon-arrowup:before {
- content: '\e580';
-}
-
-.uni-icon-arrowdown:before {
- content: '\e581';
-}
-
-.uni-icon-arrowleft:before {
- content: '\e582';
-}
-
-.uni-icon-arrowright:before {
- content: '\e583';
-}
-
-.uni-icon-arrowthinup:before {
- content: '\e584';
-}
-
-.uni-icon-arrowthindown:before {
- content: '\e585';
-}
-
-.uni-icon-arrowthinleft:before {
- content: '\e586';
-}
-
-.uni-icon-arrowthinright:before {
- content: '\e587';
-}
-
-.uni-icon-pulldown:before {
- content: '\e588';
-}
-
-.uni-icon-scan:before {
- content: "\e612";
-}
diff --git a/examples/hello-uniapp/common/uni.css b/examples/hello-uniapp/common/uni.css
index d965250e9e4..180bc835d1d 100644
--- a/examples/hello-uniapp/common/uni.css
+++ b/examples/hello-uniapp/common/uni.css
@@ -1051,4 +1051,378 @@ radio-group label, checkbox-group label{
/* 自定义节点颜色 */
.uni-timeline-last-item .uni-timeline-item-divider{
background-color: #1AAD19;
- }
\ No newline at end of file
+ }
+
+
+/* uni-icon */
+
+.uni-icon {
+ font-family: uniicons;
+ font-size: 24px;
+ font-weight: normal;
+ font-style: normal;
+ line-height: 1;
+ display: inline-block;
+ text-decoration: none;
+ -webkit-font-smoothing: antialiased;
+}
+
+.uni-icon.uni-active {
+ color: #007aff;
+}
+
+.uni-icon-contact:before {
+ content: '\e100';
+}
+
+.uni-icon-person:before {
+ content: '\e101';
+}
+
+.uni-icon-personadd:before {
+ content: '\e102';
+}
+
+.uni-icon-contact-filled:before {
+ content: '\e130';
+}
+
+.uni-icon-person-filled:before {
+ content: '\e131';
+}
+
+.uni-icon-personadd-filled:before {
+ content: '\e132';
+}
+
+.uni-icon-phone:before {
+ content: '\e200';
+}
+
+.uni-icon-email:before {
+ content: '\e201';
+}
+
+.uni-icon-chatbubble:before {
+ content: '\e202';
+}
+
+.uni-icon-chatboxes:before {
+ content: '\e203';
+}
+
+.uni-icon-phone-filled:before {
+ content: '\e230';
+}
+
+.uni-icon-email-filled:before {
+ content: '\e231';
+}
+
+.uni-icon-chatbubble-filled:before {
+ content: '\e232';
+}
+
+.uni-icon-chatboxes-filled:before {
+ content: '\e233';
+}
+
+.uni-icon-weibo:before {
+ content: '\e260';
+}
+
+.uni-icon-weixin:before {
+ content: '\e261';
+}
+
+.uni-icon-pengyouquan:before {
+ content: '\e262';
+}
+
+.uni-icon-chat:before {
+ content: '\e263';
+}
+
+.uni-icon-qq:before {
+ content: '\e264';
+}
+
+.uni-icon-videocam:before {
+ content: '\e300';
+}
+
+.uni-icon-camera:before {
+ content: '\e301';
+}
+
+.uni-icon-mic:before {
+ content: '\e302';
+}
+
+.uni-icon-location:before {
+ content: '\e303';
+}
+
+.uni-icon-mic-filled:before,
+.uni-icon-speech:before {
+ content: '\e332';
+}
+
+.uni-icon-location-filled:before {
+ content: '\e333';
+}
+
+.uni-icon-micoff:before {
+ content: '\e360';
+}
+
+.uni-icon-image:before {
+ content: '\e363';
+}
+
+.uni-icon-map:before {
+ content: '\e364';
+}
+
+.uni-icon-compose:before {
+ content: '\e400';
+}
+
+.uni-icon-trash:before {
+ content: '\e401';
+}
+
+.uni-icon-upload:before {
+ content: '\e402';
+}
+
+.uni-icon-download:before {
+ content: '\e403';
+}
+
+.uni-icon-close:before {
+ content: '\e404';
+}
+
+.uni-icon-redo:before {
+ content: '\e405';
+}
+
+.uni-icon-undo:before {
+ content: '\e406';
+}
+
+.uni-icon-refresh:before {
+ content: '\e407';
+}
+
+.uni-icon-star:before {
+ content: '\e408';
+}
+
+.uni-icon-plus:before {
+ content: '\e409';
+}
+
+.uni-icon-minus:before {
+ content: '\e410';
+}
+
+.uni-icon-circle:before,
+.uni-icon-checkbox:before {
+ content: '\e411';
+}
+
+.uni-icon-close-filled:before,
+.uni-icon-clear:before {
+ content: '\e434';
+}
+
+.uni-icon-refresh-filled:before {
+ content: '\e437';
+}
+
+.uni-icon-star-filled:before {
+ content: '\e438';
+}
+
+.uni-icon-plus-filled:before {
+ content: '\e439';
+}
+
+.uni-icon-minus-filled:before {
+ content: '\e440';
+}
+
+.uni-icon-circle-filled:before {
+ content: '\e441';
+}
+
+.uni-icon-checkbox-filled:before {
+ content: '\e442';
+}
+
+.uni-icon-closeempty:before {
+ content: '\e460';
+}
+
+.uni-icon-refreshempty:before {
+ content: '\e461';
+}
+
+.uni-icon-reload:before {
+ content: '\e462';
+}
+
+.uni-icon-starhalf:before {
+ content: '\e463';
+}
+
+.uni-icon-spinner:before {
+ content: '\e464';
+}
+
+.uni-icon-spinner-cycle:before {
+ content: '\e465';
+}
+
+.uni-icon-search:before {
+ content: '\e466';
+}
+
+.uni-icon-plusempty:before {
+ content: '\e468';
+}
+
+.uni-icon-forward:before {
+ content: '\e470';
+}
+
+.uni-icon-back:before,
+.uni-icon-left-nav:before {
+ content: '\e471';
+}
+
+.uni-icon-checkmarkempty:before {
+ content: '\e472';
+}
+
+.uni-icon-home:before {
+ content: '\e500';
+}
+
+.uni-icon-navigate:before {
+ content: '\e501';
+}
+
+.uni-icon-gear:before {
+ content: '\e502';
+}
+
+.uni-icon-paperplane:before {
+ content: '\e503';
+}
+
+.uni-icon-info:before {
+ content: '\e504';
+}
+
+.uni-icon-help:before {
+ content: '\e505';
+}
+
+.uni-icon-locked:before {
+ content: '\e506';
+}
+
+.uni-icon-more:before {
+ content: '\e507';
+}
+
+.uni-icon-flag:before {
+ content: '\e508';
+}
+
+.uni-icon-home-filled:before {
+ content: '\e530';
+}
+
+.uni-icon-gear-filled:before {
+ content: '\e532';
+}
+
+.uni-icon-info-filled:before {
+ content: '\e534';
+}
+
+.uni-icon-help-filled:before {
+ content: '\e535';
+}
+
+.uni-icon-more-filled:before {
+ content: '\e537';
+}
+
+.uni-icon-settings:before {
+ content: '\e560';
+}
+
+.uni-icon-list:before {
+ content: '\e562';
+}
+
+.uni-icon-bars:before {
+ content: '\e563';
+}
+
+.uni-icon-loop:before {
+ content: '\e565';
+}
+
+.uni-icon-paperclip:before {
+ content: '\e567';
+}
+
+.uni-icon-eye:before {
+ content: '\e568';
+}
+
+.uni-icon-arrowup:before {
+ content: '\e580';
+}
+
+.uni-icon-arrowdown:before {
+ content: '\e581';
+}
+
+.uni-icon-arrowleft:before {
+ content: '\e582';
+}
+
+.uni-icon-arrowright:before {
+ content: '\e583';
+}
+
+.uni-icon-arrowthinup:before {
+ content: '\e584';
+}
+
+.uni-icon-arrowthindown:before {
+ content: '\e585';
+}
+
+.uni-icon-arrowthinleft:before {
+ content: '\e586';
+}
+
+.uni-icon-arrowthinright:before {
+ content: '\e587';
+}
+
+.uni-icon-pulldown:before {
+ content: '\e588';
+}
+
+.uni-icon-scan:before {
+ content: "\e612";
+}
\ No newline at end of file
diff --git a/examples/hello-uniapp/components/im-chat/chatinput.vue b/examples/hello-uniapp/components/im-chat/chatinput.vue
index da2be1b49b5..dd87acbcec2 100644
--- a/examples/hello-uniapp/components/im-chat/chatinput.vue
+++ b/examples/hello-uniapp/components/im-chat/chatinput.vue
@@ -53,8 +53,6 @@
+
diff --git a/examples/hello-uniapp/components/load-more.vue b/examples/hello-uniapp/components/uni-load-more.vue
similarity index 94%
rename from examples/hello-uniapp/components/load-more.vue
rename to examples/hello-uniapp/components/uni-load-more.vue
index 8fad4010aa5..ac3ed7d4820 100644
--- a/examples/hello-uniapp/components/load-more.vue
+++ b/examples/hello-uniapp/components/uni-load-more.vue
@@ -1,192 +1,192 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{loadingType === 0 ? contentText.contentdown : (loadingType === 1 ? contentText.contentrefresh : contentText.contentnomore)}}
-
-
-
-
-
-
diff --git a/examples/hello-uniapp/pages/component/icon/icon.vue b/examples/hello-uniapp/pages/component/icon/icon.vue
index 886fb30c004..06268a956af 100644
--- a/examples/hello-uniapp/pages/component/icon/icon.vue
+++ b/examples/hello-uniapp/pages/component/icon/icon.vue
@@ -120,7 +120,6 @@
diff --git a/examples/hello-uniapp/pages/component/input/input.vue b/examples/hello-uniapp/pages/component/input/input.vue
index fa87315377b..4b5e5c506f6 100644
--- a/examples/hello-uniapp/pages/component/input/input.vue
+++ b/examples/hello-uniapp/pages/component/input/input.vue
@@ -113,6 +113,5 @@
diff --git a/examples/hello-uniapp/pages/template/load-more/load-more.vue b/examples/hello-uniapp/pages/template/load-more/load-more.vue
index 5efc1580063..201680a5f37 100644
--- a/examples/hello-uniapp/pages/template/load-more/load-more.vue
+++ b/examples/hello-uniapp/pages/template/load-more/load-more.vue
@@ -3,25 +3,25 @@
- 这是load-more组件使用示例,配置loadingType改变组件状态,配置contentText改变文字内容,配置showImage改变loading时是否显示loading图标,配置color改变文字和loading图标颜色。
+ 这是uni-load-more组件使用示例,配置loadingType改变组件状态,配置contentText改变文字内容,配置showImage改变loading时是否显示loading图标,配置color改变文字和loading图标颜色。
在列表中使用
list - {{value}}
-
+
diff --git a/examples/hello-uniapp/pages/template/qrcode/qrcode.vue b/examples/hello-uniapp/pages/template/qrcode/qrcode.vue
index 543bcaf457f..7fbff2973dc 100644
--- a/examples/hello-uniapp/pages/template/qrcode/qrcode.vue
+++ b/examples/hello-uniapp/pages/template/qrcode/qrcode.vue
@@ -71,6 +71,3 @@
}
-
diff --git a/examples/hello-uniapp/pages/template/sbanner/sbanner.vue b/examples/hello-uniapp/pages/template/sbanner/sbanner.vue
index 23096ae1ac2..c59b19f5c56 100755
--- a/examples/hello-uniapp/pages/template/sbanner/sbanner.vue
+++ b/examples/hello-uniapp/pages/template/sbanner/sbanner.vue
@@ -48,7 +48,6 @@