diff --git a/litemall-wx/pages/cart/cart.wxml b/litemall-wx/pages/cart/cart.wxml
index 18d923cd..092ce0ac 100644
--- a/litemall-wx/pages/cart/cart.wxml
+++ b/litemall-wx/pages/cart/cart.wxml
@@ -3,7 +3,7 @@
还没有登录
-
+
diff --git a/litemall-wx/pages/goods/goods.js b/litemall-wx/pages/goods/goods.js
index ece9ba8e..e79d855d 100644
--- a/litemall-wx/pages/goods/goods.js
+++ b/litemall-wx/pages/goods/goods.js
@@ -41,6 +41,17 @@ Page({
path: '/pages/index/index?goodId=' + this.data.id
}
},
+
+ shareFriendOrCircle: function () {
+ //var that = this;
+ if (this.data.openShare === false) {
+ this.setData({
+ openShare: !this.data.openShare
+ });
+ } else {
+ return false;
+ }
+ },
// 保存分享图
saveShare: function() {
diff --git a/litemall-wx/pages/goods/goods.wxml b/litemall-wx/pages/goods/goods.wxml
index 11f3ad59..1db20e80 100644
--- a/litemall-wx/pages/goods/goods.wxml
+++ b/litemall-wx/pages/goods/goods.wxml
@@ -1,10 +1,10 @@
-
-
-
-
-
-
+
+
+
+
+
+
{{goods.name}}
分享
@@ -26,169 +26,168 @@
-
-
- {{goods.name}}
- {{goods.goodsBrief}}
-
- 原价：￥{{goods.counterPrice}}
- 现价：￥{{checkedSpecPrice}}
-
+
+
+
+ {{goods.goodsBrief}}
+
+ 原价：￥{{goods.counterPrice}}
+ 现价：￥{{checkedSpecPrice}}
+
-
-
- {{brand.name}}
-
-
-
-
-
- {{checkedSpecText}}
-
-
-
-
- 商品参数
-
-
- {{item.attribute}}
- {{item.value}}
-
+
+ {{checkedSpecText}}
+
+
+
+
+ 商品参数
+
+
+ {{item.attribute}}
+ {{item.value}}
+
+
-
-
-
-
-
+
+
+
+
-
-
-
- 常见问题
-
-
-
-
-
- {{item.question}}
+
+
+
+ 常见问题
-
- {{item.answer}}
+
+
+
+
+ {{item.question}}
+
+
+ {{item.answer}}
+
+
-
-
-
-
-
-
- 大家都在看
+
+
+
+
+ 大家都在看
+
+
+
+
+
+ {{item.name}}
+ ￥{{item.retailPrice}}
+
+
+
-
-
-
-
- {{item.name}}
- ￥{{item.retailPrice}}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 价格：￥{{checkedSpecPrice}}
+ {{tmpSpecText}}
+
+
+
+
+
+
+
+ {{item.name}}
+
+ {{vitem.value}}
+
+
+
+
+
+ 团购立减
+
+ ￥{{vitem.discount}} ({{vitem.discountMember}}人)
+
+
+
+
+
+
+ 数量
+
+ -
+
+ +
+
+
+
+
+
-
-
-
-
- 价格：￥{{checkedSpecPrice}}
- {{tmpSpecText}}
-
-
-
-
-
-
-
- {{item.name}}
-
- {{vitem.value}}
-
-
-
-
-
- 团购立减
-
- ￥{{vitem.discount}} ({{vitem.discountMember}}人)
-
-
-
-
-
-
- 数量
-
- -
-
- +
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
- {{cartGoodsCount}}
-
+
+
-
- 加入购物车
- {{isGroupon?'参加团购':'立即购买'}}
- 商品已售空
+
+
+ {{cartGoodsCount}}
+
+
+
+ 加入购物车
+ {{isGroupon?'参加团购':'立即购买'}}
+ 商品已售空
\ No newline at end of file
diff --git a/litemall-wx/pages/goods/goods.wxss b/litemall-wx/pages/goods/goods.wxss
index 1aed0f1b..dd473697 100644
--- a/litemall-wx/pages/goods/goods.wxss
+++ b/litemall-wx/pages/goods/goods.wxss
@@ -12,6 +12,30 @@
height: 750rpx;
}
+.commodity_screen {
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ top: 0;
+ left: 0;
+ background: #000;
+ opacity: 0.2;
+ overflow: hidden;
+ z-index: 1000;
+ color: #fff;
+}
+
+.commodity_attr_box {
+ width: 100%;
+ overflow: hidden;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ z-index: 2000;
+ background: #fff;
+ padding-top: 20rpx;
+}
+
/* .service-policy {
width: 750rpx;
height: 73rpx;
@@ -52,14 +76,47 @@
.goods-info .c text {
display: block;
width: 687.5rpx;
- text-align: center;
+ text-align: left;
}
-.goods-info .name {
- height: 41rpx;
- margin-bottom: 5.208rpx;
- font-size: 41rpx;
- line-height: 41rpx;
+.goods_name {
+ /* border: 1px solid black; */
+ height: 86rpx;
+ line-height: 86rpx;
+ border-bottom: 1px solid #fafafa;
+}
+
+.goods_name_left {
+ /* border: 1px solid #757575; */
+ float: left;
+ height: 86rpx;
+ font-weight: 550;
+ line-height: 86rpx;
+ margin-left: 35rpx;
+ font-size: 38rpx;
+ letter-spacing: 1rpx;
+}
+
+.goods_name_right {
+ float: right;
+ font-weight: 550;
+ margin-top: 28rpx;
+ width: 140rpx;
+ height: 80rpx;
+ line-height: 82rpx;
+ padding: 0;
+ margin: 0;
+ margin-right: 0rpx;
+ text-align: center;
+ font-size: 25rpx;
+ color: #f4f4f4;
+ border-top-left-radius: 50rpx;
+ border-bottom-left-radius: 50rpx;
+ border-top-right-radius: 0rpx;
+ border-bottom-right-radius: 0rpx;
+ letter-spacing: 3rpx;
+ /* background-image: linear-gradient(to right, #ff7701 100%); */
+ background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
}
.goods-info .desc {
@@ -71,29 +128,28 @@
}
.goods-info .price {
- height: 70rpx;
- align-content: center;
+ height: 70rpx;
+ align-content: center;
}
.goods-info .counterPrice {
- float: left;
- padding-left: 120rpx;
- text-decoration: line-through;
- font-size: 30rpx;
- color: #999;
+ float: left;
+ padding-left: 0rpx;
+ text-decoration: line-through;
+ font-size: 30rpx;
+ color: #999;
}
.goods-info .retailPrice {
- /* float: right; */
- padding-left: 60rpx;
- font-size: 30rpx;
- color: #a78845;
+ padding-left: 5%;
+ font-size: 30rpx;
+ color: #a78845;
}
.goods-info .brand {
margin-top: 23rpx;
min-height: 40rpx;
- text-align: center;
+ text-align: left;
}
.goods-info .brand text {
@@ -431,7 +487,7 @@
width: 750rpx;
height: auto;
overflow: hidden;
- padding-bottom: 80rpx;
+ padding-bottom: 80rpx;
}
.related-goods .h {
@@ -601,7 +657,7 @@
.bottom-btn .c {
float: left;
- background: #f48f18;
+ background: #b4282d;
height: 100rpx;
line-height: 96rpx;
flex: 1;
@@ -611,8 +667,8 @@
}
.bottom-btn .r {
- border: 1px solid #b4282d;
- background: #b4282d;
+ border: 1px solid #f48f18;
+ background: #f48f18;
float: left;
height: 100rpx;
line-height: 96rpx;
@@ -767,71 +823,20 @@
line-height: 65rpx;
}
+
.contact {
height: 100rpx;
width: 100rpx;
- background-color: #008000;
border-radius: 100%;
position: fixed;
- bottom: 150rpx;
- right: 20rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- z-index: 9;
- flex-direction: column;
- /*line-height: 100rpx;
- text-align: center;
- padding-top: 26rpx;*/
+ bottom: 96rpx;
+ right: 10rpx;
font-size: 20rpx;
- color: #008000;
box-sizing: border-box;
background: url("https://litemall.oss-cn-shenzhen.aliyuncs.com/kefu.png") no-repeat center 21rpx;
background-size: 55rpx auto;
}
-
-/*分享样式*/
-.goods_name {
- /* border: 1px solid black; */
- height: 86rpx;
- line-height: 86rpx;
- border-bottom: 1px solid #fafafa;
-}
-
-.goods_name_left {
- /* border: 1px solid #757575; */
- float: left;
- height: 86rpx;
- font-weight: 550;
- line-height: 86rpx;
- margin-left: 35rpx;
- font-size: 38rpx;
- letter-spacing: 1rpx;
-}
-
-.goods_name_right {
- float: right;
- font-weight: 550;
- margin-top: 28rpx;
- width: 140rpx;
- height: 80rpx;
- line-height: 82rpx;
- padding: 0;
- margin: 0;
- margin-right: 0rpx;
- text-align: center;
- font-size: 25rpx;
- color: #f4f4f4;
- border-top-left-radius: 50rpx;
- border-bottom-left-radius: 50rpx;
- border-top-right-radius: 0rpx;
- border-bottom-right-radius: 0rpx;
- letter-spacing: 3rpx;
- /* background-image: linear-gradient(to right, #ff7701 100%); */
- background-image: linear-gradient(to right, #9a9ba1 0%, #9a9ba1 100%);
-}
-
.share-pop-box {
width: 100%;
height: 100%;