diff --git a/public/appmini/old/weixin/app.wxss b/public/appmini/old/weixin/app.wxss
index c75be1e4e680d21e52c99c5755628d2eeb2a0e59..58500570461afccc6411efcaa5384a00b08c8a58 100755
--- a/public/appmini/old/weixin/app.wxss
+++ b/public/appmini/old/weixin/app.wxss
@@ -269,8 +269,51 @@ button[disabled].bg-primary {
}
/*
- 滚动标签高度
+ 滚动标签高度
*/
.scroll-box {
height: 100vh;
+}
+
+/*
+ 分享组建样式
+*/
+.share-popup {
+ padding: 20rpx 10rpx 0 10rpx;
+ position: relative;
+}
+.share-popup .close {
+ position: absolute;
+ top: 20rpx;
+ right: 20rpx;
+ z-index: 2;
+}
+.share-popup-content {
+ padding: 0 20rpx;
+ margin-top: 40rpx;
+ text-align: left;
+}
+.share-popup-content .share-items {
+ padding: 30rpx 0;
+ height: 85rpx;
+}
+.share-popup-content .share-items:not(:first-child) {
+ border-top: 1px solid #f0f0f0;
+}
+.share-popup-content .share-items button {
+ background: transparent;
+ padding: 0;
+ width: 100%;
+ text-align: left;
+ margin: 0;
+}
+.share-popup-content .share-items image {
+ width: 80rpx;
+ height: 80rpx;
+ vertical-align: middle;
+ margin-right: 20rpx;
+}
+.share-popup-content .share-items .single-text {
+ width: calc(100% - 100rpx);
+ line-height: 85rpx;
}
\ No newline at end of file
diff --git a/public/appmini/old/weixin/components/popup/popup.wxss b/public/appmini/old/weixin/components/popup/popup.wxss
index ac62b901749fdfa292d5769df4a0904545695389..147ac3e23d9df5e0d465318cc32f8a97251aecd6 100755
--- a/public/appmini/old/weixin/components/popup/popup.wxss
+++ b/public/appmini/old/weixin/components/popup/popup.wxss
@@ -1,6 +1,7 @@
.am-popup-content {
position: fixed;
background:#fff;
+ z-index: 101;
}
.am-popup-mask {
@@ -12,6 +13,7 @@
background-color: rgba(0, 0, 0, 0.75);
opacity: 0;
pointer-events: none;
+ z-index: 100;
}
.am-popup-left {
diff --git a/public/appmini/old/weixin/images/share-friend-icon.png b/public/appmini/old/weixin/images/share-friend-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9f453dab63e308b0d347f7dc14394776ba1386c
Binary files /dev/null and b/public/appmini/old/weixin/images/share-friend-icon.png differ
diff --git a/public/appmini/old/weixin/images/share-recomend-icon.png b/public/appmini/old/weixin/images/share-recomend-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..55b727af680248857e9c396413842774985d4a89
Binary files /dev/null and b/public/appmini/old/weixin/images/share-recomend-icon.png differ
diff --git a/public/appmini/old/weixin/images/share-weixin-icon.png b/public/appmini/old/weixin/images/share-weixin-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ad5abe7875639b756bab5625900b7b750661c09
Binary files /dev/null and b/public/appmini/old/weixin/images/share-weixin-icon.png differ
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
index 52ec52847926e604ee53acc5d6d2b04d652ff94d..6b47cfdfe7184b551a0ca0b0961595364a44bdbf 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -33,10 +33,12 @@ Page({
goods_video_is_autoplay: false,
is_use_mobile_detail: 1,
+
+ popup_share_status: false,
},
onLoad(params) {
- //params['goods_id']=2;
+ params['goods_id']=2;
this.setData({params: params});
this.init();
},
@@ -188,7 +190,7 @@ Page({
});
},
- // 弹层关闭
+ // 购买弹层关闭
popup_close_event(e) {
this.setData({popup_status: false});
},
@@ -609,6 +611,16 @@ Page({
this.setData({ goods_video_is_autoplay: false });
},
+ // 分享开启弹层
+ popup_share_event(e) {
+ this.setData({ popup_share_status: true });
+ },
+
+ // 分享弹层关闭
+ popup_share_close_event(e) {
+ this.setData({ popup_share_status: false });
+ },
+
// 自定义分享
onShareAppMessage() {
return {
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
index 14783cc1764fea449f0dda9ca611e222117588b8..db937ce28ebbc57222d4ac513fc853b0e7aa2d5c 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
@@ -30,11 +30,9 @@
{{goods.title}}
-
-
+
+
+ 分享
@@ -95,7 +93,7 @@
-
+
+
+
+
+
+
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
index 2d406b6903d18ae0b40cad9bfe7f7ca0435d1163..b3f62ba4788a3342dd9c7fa1c0fc8030f2f86cca 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
@@ -180,21 +180,19 @@
right: 0;
}
.goods-base .goods-title {
- width: calc(100% - 130rpx);
+ width: calc(100% - 100rpx);
font-size: 32rpx;
line-height: 44rpx;
font-weight: 500;
}
+.goods-base .goods-share {
+ padding: 0 20rpx;
+ margin-bottom: 10rpx;
+}
.goods-base .goods-share image {
width: 50rpx;
height: 50rpx;
}
-.goods-base .goods-share button {
- height: auto;
- font-size: 26rpx;
- border: 0;
- min-width: initial;
-}
.goods-base .goods-price {
margin-top: 10rpx;
padding-right: 160rpx;