From 21bb81e7eec86ccf7f463c5bb24fb93174c3cf48 Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Tue, 24 Mar 2020 07:58:41 +0800
Subject: [PATCH] u

---
 cPager/cPager.vue   |  4 ++-
 cQrcode/cQrcode.vue |  4 ++-
 cToast/cToast.vue   | 73 ++++++++++++++++++---------------------------
 3 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/cPager/cPager.vue b/cPager/cPager.vue
index 468e8b0..e1186cd 100644
--- a/cPager/cPager.vue
+++ b/cPager/cPager.vue
@@ -1,5 +1,7 @@
-<script>
+<!-- 
 // based on Pagination 分页器组件： https://ext.dcloud.net.cn/plugin?id=32
+-->
+<script>
 	export default {
 		name: 'cPager',
 		props: {
diff --git a/cQrcode/cQrcode.vue b/cQrcode/cQrcode.vue
index 30aa2a9..b249673 100644
--- a/cQrcode/cQrcode.vue
+++ b/cQrcode/cQrcode.vue
@@ -1,3 +1,6 @@
+<!-- 
+  Based on tki-qrcode 组件： https://github.com/q310550690/uni-app-qrcode , https://ext.dcloud.net.cn/plugin?id=39
+-->
 <template xlang="wxml" minapp="mpvue">
 	<view class="cQrcode">
 		<!-- #ifndef MP-ALIPAY -->
@@ -11,7 +14,6 @@
 </template>
 
 <script>
-// Based on tki-qrcode 组件： https://github.com/q310550690/uni-app-qrcode , https://ext.dcloud.net.cn/plugin?id=39
 import QRCode from "./qrcode.js"
 let qrcode
 export default {
diff --git a/cToast/cToast.vue b/cToast/cToast.vue
index c5d69b8..2fe21ec 100644
--- a/cToast/cToast.vue
+++ b/cToast/cToast.vue
@@ -4,18 +4,18 @@ based on
  https://github.com/steffenx/uniapp_popup
   
  *数组形式传值
- *type,类型 success warn info fail loading（string），默认info
- *content,内容（string）
- *duration,消失时间（Number），默认2000
- *distance,弹窗间距，默认128，可设为0代表重叠
- *isClick,是否点击消失（Boolean），默认false
+ *type: success warn info fail loading（string），默认info
+ *content: 内容（string）
+ *duration: 消失时间（Number），默认2000
+ *distance: 弹窗间距，默认128，可设为0代表重叠
+ *clickable: 是否点击消失（Boolean），默认false
  -->
 <template>
 	<view class="popup_list">
 		<view v-for="(toast,index) of popup_list" :id="toast.uuid" :key="toast.uuid" >
-			<view class="mpopup" :style="{ background: toast.color ,top:index*toast.distance+50+'px'}" :class="[toast.animator,toast.typeClass]" @click="close(toast.uuid,index)">
-				<view class="icon" :style="{ backgroundImage: `url(${toast.icon})` }" ></view>
-				<text class="text" :style="{ color: toast.colortext }">{{ toast.content }}</text>
+			<view class="mpopup" :style="{ background: toast.color ,top:index*toast.distance+50+'px'}" :class="[toast.animator,'mpopup-'+toast.type]" @click="close(toast.uuid,index)">
+				<view class="icon" ></view>
+				<text class="text" >{{ toast.content }}</text>
 			</view>
 		</view>
 	</view>
@@ -31,33 +31,6 @@ based on
 		props:{
 		},
 		methods:{
-			init:function(toast){
-				if (toast.type == 'success') {
-					toast.icon = toast.icon || 'data:image/png;base64,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' 
-					toast.typeClass='mpopup-success';
-					return toast;
-				}
-				if (toast.type == 'warn') {
-					toast.icon = toast.icon || 'data:image/png;base64,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'
-					toast.typeClass='mpopup-warn';
-					return toast;
-				}
-				if (toast.type == 'info') {
-					toast.icon = toast.icon || 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNTgyMjYwODY5MzA1IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9Ijk5NiIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHdpZHRoPSI2NCIgaGVpZ2h0PSI2NCI+PGRlZnM+PHN0eWxlIHR5cGU9InRleHQvY3NzIj48L3N0eWxlPjwvZGVmcz48cGF0aCBkPSJNMjc3LjkgNzQyczE2Ny45LTI5NC4xIDQ2NS4zLTQ2NS4zQzU3NS43IDU3Ny44IDI3Ny45IDc0MiAyNzcuOSA3NDJ6IiBmaWxsPSIjRkZGRkZGIiBwLWlkPSI5OTciPjwvcGF0aD48cGF0aCBkPSJNNzQzLjEgNzQyUzU3NS4yIDQ0Ny45IDI3Ny44IDI3Ni43QzQ0NS4zIDU3Ny44IDc0My4xIDc0MiA3NDMuMSA3NDJ6IiBmaWxsPSIjRkZGRkZGIiBwLWlkPSI5OTgiPjwvcGF0aD48cGF0aCBkPSJNNTEyIDUxMm0tNDQ4IDBhNDQ4IDQ0OCAwIDEgMCA4OTYgMCA0NDggNDQ4IDAgMSAwLTg5NiAwWiIgZmlsbD0iIzE4ODFFQSIgcC1pZD0iOTk5Ij48L3BhdGg+PHBhdGggZD0iTTUxMiAyNjcuMW0tNjMgMGE2MyA2MyAwIDEgMCAxMjYgMCA2MyA2MyAwIDEgMC0xMjYgMFoiIGZpbGw9IiNGRkZGRkYiIHAtaWQ9IjEwMDAiPjwvcGF0aD48cGF0aCBkPSJNNTEyIDc5Ny4yczYzLTIyMC41IDYzLTMwNi4zLTI1LjUtMTAxLjUtNjMtMTAxLjUtNjMgMTUuOC02MyAxMDEuNSA2MyAzMDYuMyA2MyAzMDYuM3oiIGZpbGw9IiNGRkZGRkYiIHAtaWQ9IjEwMDEiPjwvcGF0aD48L3N2Zz4=' 
-					toast.typeClass='mpopup-info';
-					return toast;
-				}
-				if (toast.type == 'fail') {
-					toast.icon = toast.icon || 'data:image/png;base64,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'
-					toast.typeClass='mpopup-fail';
-					return toast;
-				}
-				if (toast.type == 'loading') {
-					toast.icon = toast.icon || 'data:image/png;base64,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'
-					toast.typeClass='mpopup-loading';
-					return toast;
-				}
-			},
 			open:function(toast){
 				//生成uuid
 				let uuid=this.guid();
@@ -65,21 +38,19 @@ based on
 				//添加动画
 				toast.animator='fade_Down';
         
-				toast.isClick = toast.isClick || false //判断是否可点击消失/可控制消失
+				toast.clickable = toast.clickable || false //判断是否可点击消失/可控制消失
         toast.duration = toast.duration || 1500
 				toast.distance = toast.distance || 128 // 弹窗间距
         toast.type = toast.type || 'info'
         
-				//初始化
-				let newToast=this.init(toast);		
 				//添加进数组
-				this.popup_list.push(newToast);
+				this.popup_list.push(toast);
 		
-				if(!newToast.isClick){
-					this.disappear(newToast.uuid,newToast.duration);
+				if(!toast.clickable){
+					this.disappear(toast.uuid,toast.duration);
 				}//可点击消失
 				else{
-					this.$emit('uuidCallback',newToast.uuid);
+					this.$emit('uuidCallback',toast.uuid);
 				}
 				
 			},
@@ -116,7 +87,7 @@ based on
 			//可控制关闭的弹出框
 			close:function(uuid,ind){
 				if(ind){
-					if(!this.popup_list[ind].isClick){return}
+					if(!this.popup_list[ind].clickable){return}
 				}
 				this.remove_element(uuid).then((res)=>{
 					setTimeout(()=>{
@@ -202,27 +173,41 @@ based on
 		background: #f0f9eb;
 		border: 1px solid #e1f3d8;
 		color: #67c23a;
+		.icon{
+			background-image: url('./cToast.success.png');
+		}
 	}
 	.mpopup-fail{
 		background: #fef0f0;
 		border: 1px solid #fde2e2;
 		color: #f56c6c;
+		.icon{
+			background-image: url('./cToast.fail.png');
+		}
 	}
 	.mpopup-warn{
 		background: #fdf6ec;
 		border: 1px solid #faecd8;
 		color: #e6a23c;
+  	.icon{
+			background-image: url('./cToast.warn.png');
+		}
+
 	}
 	.mpopup-info{
 		background: #edf2fc;
 		border: 1px solid #ebeef5;
 		color: #909399;
+		.icon{
+			background-image: url('./cToast.info.png');
+		}
 	}
 	.mpopup-loading{
 		background: #e2f5ff;
 		border: 1px solid #ceeeff;
 		color: #5cbaff;
-		image{
+		.icon{
+			background-image: url('./cToast.loading.png');
 			animation: rotate360 1.5s ease infinite;
 		}
 	}