diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 2c273f7..b121061 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -25,7 +25,7 @@ Page({
color_type:0,//线条控制
color_type_one:0,
color_type_two:1,
-
+
gid: "",
stoid: o.stoid,
url: o.url,
@@ -204,6 +204,9 @@ Page({
//是否点赞中
iszaning: 0,
+
+ store:0,//选择更多
+ index:1
},
//------初始化加载----------
@@ -2642,6 +2645,13 @@ Page({
}
}
})
- }
-
+ },
+ // 选择门店
+ choice_store:function(){
+ this.setData({store:1})
+},
+ //关闭选择门店
+close_popup:function(){
+ this.setData({ store: 0})
+}
});
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 457321e..b17348b 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -253,7 +253,7 @@
- 销量:{{data.sales_sum}}件
+ 销量：{{data.sales_sum}}件
折扣：{{data.disc}}折
{{categories3[0].num}}人评价
@@ -272,7 +272,7 @@
-
+
{{data.goods_name}}
@@ -299,6 +299,35 @@
+
+
+
+
+
+
+
+ 选择附近门店
+
+
+ 更多门店
+
+
+
+
+
+ 泉州开源盛世
+ 暂无库存
+
+
+ 距离:3754m
+
+
+ 地址:福建省泉州市鲤城区软件园4栋4层
+
+
+
+
+
@@ -983,6 +1012,65 @@
+
+
+
+
+
+
+
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index fe8c3ef..a70e322 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -321,6 +321,8 @@ image {
height: 100rpx;
background-color: #fff;
text-align: center;
+ z-index: 9;
+
}
.join-cart>view {
@@ -355,7 +357,7 @@ image {
.cart-num {
position: absolute;
left: 50%;
- top: 0;
+ top: 1rpx;
width: 40rpx;
height: 40rpx;
line-height: 40rpx;
@@ -368,11 +370,18 @@ image {
.cart-btn {
font-size: 28rpx;
color: #fff;
- line-height: 100rpx;
+ line-height: 60rpx;
+ margin-top:16rpx;
+
}
.join-btn {
background-color: #ffb03f;
+ height: 70rpx;
+border-radius: 55rpx 0rpx 0rpx 55rpx;
+margin-top: 16rpx;
+
+
}
view.cart-btn-lg {
@@ -381,6 +390,9 @@ view.cart-btn-lg {
.buy-btn {
background-color: #f23030;
+ height: 70rpx;
+border-radius: 0 56rpx 55rpx 0;
+
}
.toTop {
@@ -741,7 +753,7 @@ left:31rpx;}
.wf .item .item_txy.hs{ background: #cbcbcb;}
.po{margin-bottom: 20rpx;}
-.cart-btn.line-h{ line-height: 40rpx;}
+.cart-btn.line-h{ line-height: 26rpx;}
.cart-btn .fir-v{ margin-top: 10rpx;}
.hyt{ padding: 0 20rpx; font-size: 30rpx; display: flex; align-items:center; margin-top: 10rpx;}
@@ -927,7 +939,7 @@ left:31rpx;}
border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; line-height: 100rpx }
.bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 0 34rpx; color: #333;
- font-size: 32rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:31rpx }
+ font-size: 32rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx }
.red_bb{ color: #d70026; min-width:158rpx;width: auto;}
.bg_jj{ width: 18rpx; height:18rpx;
border-top: 2rpx solid #d70026;
@@ -1139,7 +1151,7 @@ left:31rpx;}
width: 100%;
height: 42rpx;
padding-left: 34rpx;
- color: #948485;
+ color: #333;
}
.xc_comment-have-pictures{
@@ -1266,7 +1278,7 @@ left:31rpx;}
height: 100%;
line-height: 100rpx;
overflow: hidden;
- margin-left: 7rpx;
+ margin-left: 10rpx;
}
.xc-coupon-fram{
position: relative;
@@ -1306,7 +1318,7 @@ left:31rpx;}
padding-left:15rpx;
color: #d70025;
position: absolute;
- right: 7rpx;
+ right: 5rpx;
}
/* 自定义弹出窗口 */
@@ -2226,4 +2238,158 @@ right:17rpx; top:55rpx;
line-height:15rpx;
}
-.no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
\ No newline at end of file
+.no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
+/* 门店地址 */
+.xc-address_frame{
+ border-top:1rpx solid #eee;
+ width: 100%;
+ height: 170rpx;
+}
+.xc-address_frame .address_frame{
+ width: 92%;
+padding-left: 10rpx;
+margin: auto;
+
+}
+.shop_name{
+
+}
+.stores-img{
+width: 40rpx;
+ height: 35rpx;
+ margin-right: 10rpx;
+}
+.shop_name{
+ margin-right: 10rpx;
+}
+.address{
+ width: 87%;
+}
+.distance{
+ padding-left: 15rpx;
+ padding-right: 15rpx;
+ background: #eee;
+ border-radius: 20rpx;
+}
+/* 选择门店的弹窗 */
+.mongolia-layer{
+ position: fixed;
+left: 0;
+top: 0;
+right: 0;
+bottom: 0;
+z-index: 11;
+background: rgba(0,0,0,0.4);
+width: 100%;
+height: 91.9%;
+
+}
+.popup-frame{
+ position: fixed;
+bottom:99rpx;
+z-index: 20;
+background: white;
+width: 100%;
+border-radius: 20rpx 20rpx 0 0;
+height: 55%;
+}
+.popup-top{
+ border-bottom: 1rpx solid #eee;
+ height: 120rpx;
+ width: 95%;
+ margin: auto;
+ line-height: 120rpx;
+
+}
+.bg_rights{
+ border-top: 2rpx solid ;
+ border-right: 2rpx solid ;
+ transform: rotate(45deg);
+ display:inline-block;
+ width:15rpx;height:15rpx;
+ border-color:#da0b31;
+}
+.modal-closes {
+ position: absolute;
+ right: 30rpx;
+}
+.choose_more{
+ margin-top: 30rpx;
+ margin-right: 20rpx;
+
+}
+.store-list{
+ width: 95%;
+ height: 428rpx;
+ overflow-y: scroll;
+ overflow: hidden;
+ margin: auto;
+
+}
+.store-list .store_choose{
+ width: 100%;
+ height: 100rpx;
+ line-height: 100rpx;
+ border-bottom: 1rpx solid #eee;
+
+}
+.store-list .store_choose .store{
+width: 100%;
+margin: auto;
+line-height: 37rpx;
+padding-left: 20rpx;
+
+}
+.xc-hook{
+ width: 30rpx;
+ height: 30rpx;
+ transform: rotate(-145deg);
+line-height: 32rpx;
+text-align: center;
+}
+ .xc-hooks{
+ width: 30rpx;
+ height: 30rpx;
+ border: 3rpx solid #999;
+ }
+ .address-frame{
+ width: 93%;
+margin-left: 7rpx;
+
+ }
+ .nearby_store{
+margin-left: 17rpx;
+ }
+ .address_name{
+ margin-right: 10rpx;
+
+ }
+ .address-val{
+ height: 30rpx;
+line-height: 30rpx;
+
+ }
+ .store-bottom{
+ width: 85%;
+ margin: auto;
+ height: 115rpx;
+
+ }
+ .determine{
+ width: 280rpx;
+ height: 44rpx;
+ border-radius: 50rpx;
+ line-height: 44rpx;
+ }
+ .default{
+ width: 280rpx;
+ height: 44rpx;
+ border:3rpx solid #444;
+ border-radius: 50rpx;
+ line-height: 44rpx;
+ }
+ .store-bottom-frame{
+ width: 95%;
+ border-top: 3rpx solid #eee;
+ margin: auto;
+ }
\ No newline at end of file