From 12c48f04f9ea1a57781a6e8c5c9ef901eaad8518 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 05 九月 2024 22:31:17 +0800
Subject: [PATCH] merge 1.小程序-花店:1.1-浏览记录建议改成显示30条数据; 1.2-增加一个一键清空已失效商品 2.小程序-花店:增加热区跳转进入店铺 及 点击头像和名字也可以跳转进入店铺 3.小程序-花店:轮播图指示点优化去掉 4.小程序-花店:登录,注册失去焦点验证手机号

---
 plugins/message.js |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/message.js b/plugins/message.js
index ba0680b..6315163 100644
--- a/plugins/message.js
+++ b/plugins/message.js
@@ -6,7 +6,7 @@
 			title,
 			icon: 'none',
 			mask: false,
-			duration: 1500,
+			duration: 1200,
 			position: 'center'
 		}
 		if (options && options.image) {
@@ -44,7 +44,7 @@
 			content,
 			showCancel: false,
 			confirmText: '确定',
-			confirmColor: '#04BA97'
+			confirmColor: '#20613D'
 		}
 		options = Object.assign({}, initOptions, options)
 		return new Promise((resolve) => {
@@ -66,7 +66,7 @@
 			cancelText: '取消',
 			cancelColor: '#000000',
 			confirmText: '确定',
-			confirmColor: '#04BA97'
+			confirmColor: '#20613D'
 		}
 		options = Object.assign({}, initOptions, options)
 		return new Promise((resolve, reject) => {
@@ -74,7 +74,7 @@
 				...options,
 				success: (res) => {
 					if (res.confirm) {
-						resolve()
+						resolve(res)
 					}
 					if (res.cancel) {
 						reject()

--
Gitblit v1.9.3