From 15ea84f3b499c9cbd3fac0b7945fc9fb93aca99b Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Fri, 16 Oct 2020 11:01:52 +0800
Subject: [PATCH] 分享修改

---
 components/share/share.js   |  4 +++-
 components/share/share.wxml | 21 +++++++++++++--------
 components/share/share.wxss | 39 ++++++++++++++++++++-------------------
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/components/share/share.js b/components/share/share.js
index 2a2c042..23739ae 100644
--- a/components/share/share.js
+++ b/components/share/share.js
@@ -7,6 +7,8 @@ Component({
   },
 
   methods: {
-
+		cancel() {
+			this.triggerEvent(cancel',{},{bubbles: true});
+		}
   }
 })
\ No newline at end of file
diff --git a/components/share/share.wxml b/components/share/share.wxml
index c77693a..c03b4a1 100644
--- a/components/share/share.wxml
+++ b/components/share/share.wxml
@@ -1,10 +1,15 @@
-<view class="container animated slideInUp">
-	<view class="btn">
-		<view class="icon-container bg-green"><view class="iconfont icon-weixin"></view></view>
-		<view class="title">发送给好友</view>
-	</view>
-	<view class="btn">
-		<view class="icon-container bg-red"><view class="iconfont icon-pic"></view></view>
-		<view class="title">生成海报分享</view>
+<view class="container" hidden="{{hiddenShare}}">
+	<view class="container-wrap animated slideInUp">
+		<view class="flex">
+			<view class="btn">
+				<view class="icon-container bg-green"><view class="iconfont icon-weixin"></view></view>
+				<view class="title">发送给好友</view>
+			</view>
+			<view class="btn">
+				<view class="icon-container bg-red"><view class="iconfont icon-pic"></view></view>
+				<view class="title">生成海报分享</view>
+			</view>
+		</view>
+		<view class="btn-cancel" bindtap="cancel">取消</view>
 	</view>
 </view>
\ No newline at end of file
diff --git a/components/share/share.wxss b/components/share/share.wxss
index 143fae3..2319856 100644
--- a/components/share/share.wxss
+++ b/components/share/share.wxss
@@ -1,3 +1,4 @@
+@charset "UTF-8";
 @font-face {
 	font-family: 'iconfont';
 	/* project id 2125414 */
@@ -29,15 +30,25 @@
 	background-color: white;
 	position: fixed;
 	width: 100%;
+	height: 100%;
 	left: 0;
+	top: 0;
+	background-color: rgba(0,0,0,.5);
+}
+.container-wrap {
+	background-color: white;
+	position: absolute;
 	bottom: 0;
+	width: 100%;
+}
+.flex {
 	display: flex;
 }
 
 .btn {
 	box-sizing: border-box;
 	width: 50%;
-	padding: 20rpx;
+	padding: 30rpx;
 	text-align: center;
 }
 
@@ -69,25 +80,15 @@
 	padding-top: 10rpx;
 }
 
+.btn-cancel {
+	padding: 20rpx;
+	text-align: center;
+	color: #7b7b7b;
+	background-color: #f9f9f9;
+	font-size: 28rpx;
+	line-height: 2;
+}
 
-
-
-
-
-@charset "UTF-8";
-
-/*!
-Animate.css - http://daneden.me/animate
-Licensed under the MIT license
-
-Copyright (c) 2013 Daniel Eden
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
 .animated {
 	-webkit-animation-duration: .5s;
 	animation-duration: .5s;
--
libgit2 0.21.4