From ff7dc3ce3a002001f414c0f8976bacd5a07b5dd0 Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Fri, 19 Jun 2020 09:58:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E5=85=BC=E5=AE=B9=20easycom?=
 =?UTF-8?q?=20=E6=A8=A1=E5=BC=8F=EF=BC=8C=E4=B8=8D=E5=92=8C=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E8=87=AA=E8=BA=AB=E7=9A=84=20cXxx=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=86=B2=E7=AA=81=EF=BC=8C=E6=8A=8A=20cXxx=20?=
 =?UTF-8?q?=E6=94=B9=E5=90=8D=E4=B8=BA=20ucXxx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.js                                            |   4 +++-
 .../cColorText.vue => ucColorText/ucColorText.vue   |   1 -
 cPager/cPager.left.png => ucPager/img/left.png      | Bin
 cPager/cPager.left.svg => ucPager/img/left.svg      |   0
 .../cPager.leftend.png => ucPager/img/leftend.png   | Bin
 .../cPager.leftend.svg => ucPager/img/leftend.svg   |   0
 cPager/cPager.next.png => ucPager/img/next.png      | Bin
 cPager/cPager.next.svg => ucPager/img/next.svg      |   0
 cPager/cPager.prev.png => ucPager/img/prev.png      | Bin
 cPager/cPager.prev.svg => ucPager/img/prev.svg      |   0
 cPager/cPager.right.png => ucPager/img/right.png    | Bin
 cPager/cPager.right.svg => ucPager/img/right.svg    |   0
 .../cPager.rightend.png => ucPager/img/rightend.png | Bin
 .../cPager.rightend.svg => ucPager/img/rightend.svg |   0
 cPager/cPager.vue => ucPager/ucPager.vue            |   2 +-
 cQrcode/cQrcode.loading.png => ucQrcode/loading.png | Bin
 {cQrcode => ucQrcode}/qrcode.js                     |   0
 cQrcode/cQrcode.vue => ucQrcode/ucQrcode.vue        |   3 ++-
 cToast/cToast.fail.png => ucToast/img/fail.png      | Bin
 cToast/cToast.info.png => ucToast/img/info.png      | Bin
 .../cToast.loading.png => ucToast/img/loading.png   | Bin
 cToast/cToast.msg.png => ucToast/img/msg.png        | Bin
 .../cToast.success.png => ucToast/img/success.png   | Bin
 cToast/cToast.warn.png => ucToast/img/warn.png      | Bin
 cToast/cToast.vue => ucToast/ucToast.vue            |   0
 25 files changed, 6 insertions(+), 4 deletions(-)
 rename cColorText/cColorText.vue => ucColorText/ucColorText.vue (99%)
 rename cPager/cPager.left.png => ucPager/img/left.png (100%)
 rename cPager/cPager.left.svg => ucPager/img/left.svg (100%)
 rename cPager/cPager.leftend.png => ucPager/img/leftend.png (100%)
 rename cPager/cPager.leftend.svg => ucPager/img/leftend.svg (100%)
 rename cPager/cPager.next.png => ucPager/img/next.png (100%)
 rename cPager/cPager.next.svg => ucPager/img/next.svg (100%)
 rename cPager/cPager.prev.png => ucPager/img/prev.png (100%)
 rename cPager/cPager.prev.svg => ucPager/img/prev.svg (100%)
 rename cPager/cPager.right.png => ucPager/img/right.png (100%)
 rename cPager/cPager.right.svg => ucPager/img/right.svg (100%)
 rename cPager/cPager.rightend.png => ucPager/img/rightend.png (100%)
 rename cPager/cPager.rightend.svg => ucPager/img/rightend.svg (100%)
 rename cPager/cPager.vue => ucPager/ucPager.vue (96%)
 rename cQrcode/cQrcode.loading.png => ucQrcode/loading.png (100%)
 rename {cQrcode => ucQrcode}/qrcode.js (100%)
 rename cQrcode/cQrcode.vue => ucQrcode/ucQrcode.vue (96%)
 rename cToast/cToast.fail.png => ucToast/img/fail.png (100%)
 rename cToast/cToast.info.png => ucToast/img/info.png (100%)
 rename cToast/cToast.loading.png => ucToast/img/loading.png (100%)
 rename cToast/cToast.msg.png => ucToast/img/msg.png (100%)
 rename cToast/cToast.success.png => ucToast/img/success.png (100%)
 rename cToast/cToast.warn.png => ucToast/img/warn.png (100%)
 rename cToast/cToast.vue => ucToast/ucToast.vue (100%)

diff --git a/index.js b/index.js
index ac584b3..81e6801 100644
--- a/index.js
+++ b/index.js
@@ -6,6 +6,8 @@ module.exports = {
       '】】】】】】】】】】】')
   },
 
+  sleep: (ms)=>new Promise((resolve, reject)=>setTimeout(resolve, ms)),
+
   async request(obj){
     obj.method = 'POST'
     
@@ -101,7 +103,7 @@ module.exports = {
     // #ifdef H5
     document.title = windowTitle || page.$store.getters['i18n/getAppName'] || page.appName // 必须放在 setNavigationBarTitle 之后，否则会被其覆盖掉。
     // #endif
-    page.$store.commit('i18n/setTabbar') // 必须要在有 tab 的页面里重置才能成功
+    page.$store.commit('i18n/setTabbar') // 必须要在有 tab 的页面里重置才有效果
   },
   
   localeText(){
diff --git a/cColorText/cColorText.vue b/ucColorText/ucColorText.vue
similarity index 99%
rename from cColorText/cColorText.vue
rename to ucColorText/ucColorText.vue
index ad4d174..3a89e93 100644
--- a/cColorText/cColorText.vue
+++ b/ucColorText/ucColorText.vue
@@ -1,6 +1,5 @@
 <script>
 export default {
-  name: 'cColorText',
   props: {
     colorText: {
       type: String,
diff --git a/cPager/cPager.left.png b/ucPager/img/left.png
similarity index 100%
rename from cPager/cPager.left.png
rename to ucPager/img/left.png
diff --git a/cPager/cPager.left.svg b/ucPager/img/left.svg
similarity index 100%
rename from cPager/cPager.left.svg
rename to ucPager/img/left.svg
diff --git a/cPager/cPager.leftend.png b/ucPager/img/leftend.png
similarity index 100%
rename from cPager/cPager.leftend.png
rename to ucPager/img/leftend.png
diff --git a/cPager/cPager.leftend.svg b/ucPager/img/leftend.svg
similarity index 100%
rename from cPager/cPager.leftend.svg
rename to ucPager/img/leftend.svg
diff --git a/cPager/cPager.next.png b/ucPager/img/next.png
similarity index 100%
rename from cPager/cPager.next.png
rename to ucPager/img/next.png
diff --git a/cPager/cPager.next.svg b/ucPager/img/next.svg
similarity index 100%
rename from cPager/cPager.next.svg
rename to ucPager/img/next.svg
diff --git a/cPager/cPager.prev.png b/ucPager/img/prev.png
similarity index 100%
rename from cPager/cPager.prev.png
rename to ucPager/img/prev.png
diff --git a/cPager/cPager.prev.svg b/ucPager/img/prev.svg
similarity index 100%
rename from cPager/cPager.prev.svg
rename to ucPager/img/prev.svg
diff --git a/cPager/cPager.right.png b/ucPager/img/right.png
similarity index 100%
rename from cPager/cPager.right.png
rename to ucPager/img/right.png
diff --git a/cPager/cPager.right.svg b/ucPager/img/right.svg
similarity index 100%
rename from cPager/cPager.right.svg
rename to ucPager/img/right.svg
diff --git a/cPager/cPager.rightend.png b/ucPager/img/rightend.png
similarity index 100%
rename from cPager/cPager.rightend.png
rename to ucPager/img/rightend.png
diff --git a/cPager/cPager.rightend.svg b/ucPager/img/rightend.svg
similarity index 100%
rename from cPager/cPager.rightend.svg
rename to ucPager/img/rightend.svg
diff --git a/cPager/cPager.vue b/ucPager/ucPager.vue
similarity index 96%
rename from cPager/cPager.vue
rename to ucPager/ucPager.vue
index 35775f8..54e0732 100644
--- a/cPager/cPager.vue
+++ b/ucPager/ucPager.vue
@@ -1,9 +1,9 @@
 <!-- 
 // based on Pagination 分页器组件： https://ext.dcloud.net.cn/plugin?id=32
+// 我修改过的版本，使用本地图标文件，不用 uni-icons。
 -->
 <script>
 	export default {
-		name: 'cPager',
 		props: {
 			leftText: {
 				type: String,
diff --git a/cQrcode/cQrcode.loading.png b/ucQrcode/loading.png
similarity index 100%
rename from cQrcode/cQrcode.loading.png
rename to ucQrcode/loading.png
diff --git a/cQrcode/qrcode.js b/ucQrcode/qrcode.js
similarity index 100%
rename from cQrcode/qrcode.js
rename to ucQrcode/qrcode.js
diff --git a/cQrcode/cQrcode.vue b/ucQrcode/ucQrcode.vue
similarity index 96%
rename from cQrcode/cQrcode.vue
rename to ucQrcode/ucQrcode.vue
index b249673..7161181 100644
--- a/cQrcode/cQrcode.vue
+++ b/ucQrcode/ucQrcode.vue
@@ -1,5 +1,7 @@
 <!-- 
   Based on tki-qrcode 组件： https://github.com/q310550690/uni-app-qrcode , https://ext.dcloud.net.cn/plugin?id=39
+	// 另一个app里二维码解决方案，但要手动调用生成函数: https://github.com/alei817927/qrcode
+	// 另一个h5里二维码解决方案：import VueQriously from 'vue-qriously'; Vue.use(VueQriously)
 -->
 <template xlang="wxml" minapp="mpvue">
 	<view class="cQrcode">
@@ -17,7 +19,6 @@
 import QRCode from "./qrcode.js"
 let qrcode
 export default {
-	name: "cQrcode",
 	props: {
 		cid: {
 			type: String,
diff --git a/cToast/cToast.fail.png b/ucToast/img/fail.png
similarity index 100%
rename from cToast/cToast.fail.png
rename to ucToast/img/fail.png
diff --git a/cToast/cToast.info.png b/ucToast/img/info.png
similarity index 100%
rename from cToast/cToast.info.png
rename to ucToast/img/info.png
diff --git a/cToast/cToast.loading.png b/ucToast/img/loading.png
similarity index 100%
rename from cToast/cToast.loading.png
rename to ucToast/img/loading.png
diff --git a/cToast/cToast.msg.png b/ucToast/img/msg.png
similarity index 100%
rename from cToast/cToast.msg.png
rename to ucToast/img/msg.png
diff --git a/cToast/cToast.success.png b/ucToast/img/success.png
similarity index 100%
rename from cToast/cToast.success.png
rename to ucToast/img/success.png
diff --git a/cToast/cToast.warn.png b/ucToast/img/warn.png
similarity index 100%
rename from cToast/cToast.warn.png
rename to ucToast/img/warn.png
diff --git a/cToast/cToast.vue b/ucToast/ucToast.vue
similarity index 100%
rename from cToast/cToast.vue
rename to ucToast/ucToast.vue