diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index bfbb243..13a075c 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -23,7 +23,7 @@
￥
{{filter.toFix(item[card_field],2)}}
- {{card_name}}
+ {{card_name}}
diff --git a/components/goods_list/goods_list.wxss b/components/goods_list/goods_list.wxss
index 15429bb..437a2a9 100644
--- a/components/goods_list/goods_list.wxss
+++ b/components/goods_list/goods_list.wxss
@@ -2,7 +2,7 @@
margin-top: 40rpx;
}
.ib{
- display: inline-block;
+ display: inline-block;
}
.fs20{
font-size: 20rpx;
@@ -151,6 +151,11 @@ color: #b9b9b9;
}
.line_th{ text-decoration: line-through}
-.card_bg {display: flex; width: 108rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;
+.card_bg {display: flex; padding: 2rpx 10rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;line-height: 28rpx;max-width: 110rpx;
background: #333; color: #fff; justify-content: center; margin-left: 2rpx;}
-.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx;}
\ No newline at end of file
+.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx;}.card_bg .card_name{
+ max-width: 76rpx;
+ width: auto;
+ overflow: hidden;
+ white-space:nowrap;
+}
\ No newline at end of file
diff --git a/pages/getphone/getphone.js b/pages/getphone/getphone.js
index c2a8042..76a4154 100644
--- a/pages/getphone/getphone.js
+++ b/pages/getphone/getphone.js
@@ -17,7 +17,9 @@ Page({
var openid = getApp().globalData.openid;
if (openid == "" || openid == null) {
- openid = getApp().globalData.userInfo.weapp_openid;
+
+ if (getApp().globalData.userInfo)
+ openid = getApp().globalData.userInfo.weapp_openid;
}
if(openid=="" || openid==null ){
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index cbe4ee7..d4bfb97 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -3045,11 +3045,11 @@ Page({
is_gps: "3"
});
}
-
th.data.is_get_local_ok = 1;
}
})
}else{
+ th.data.is_get_local_ok = 1;
th.get_sto();
}
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 7bf7aa6..940dd39 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1,21 +1,21 @@
-
+
-
+
{{item.name}}
-
+
-
+
@@ -44,7 +44,7 @@
-
+
视频
@@ -57,6 +57,8 @@
+
+
@@ -78,6 +80,7 @@
秒
+
@@ -225,10 +228,11 @@
+
-
+
@@ -244,6 +248,7 @@
原价:￥{{data.market_price}}
+
@@ -251,9 +256,14 @@
分享
-
-
+
+
+
+
+
+
+
{{g_filters.get_card_price(data,card_list,1)}}
@@ -263,10 +273,11 @@
￥{{g_filters.get_card_price(data,card_list,0)}}
-
-
-
+
+
+
+
@@ -309,15 +320,8 @@
-
-
-
-
-
-
-
-
-
+
+
{{data.goods_name}}
@@ -325,7 +329,7 @@
- 销量:{{data.sales_sum}}件
+ 销量：{{data.sales_sum}}件
折扣：{{data.disc}}折
{{categories3[0].num}}人评价
@@ -344,7 +348,7 @@
-
+
{{data.goods_name}}
@@ -371,6 +375,37 @@
+
+
+
+
+
+
+
+ 选择门店
+
+
+ 更多门店
+
+
+
+
+
+
+
+ {{def_pick_store.pickup_name}}
+
+
+ 距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+
+
+
+ 地址:{{def_pick_store.fulladdress}}
+
+
+
+
+
@@ -412,16 +447,16 @@
@@ -503,7 +539,7 @@
规格
- {{data.goods_spec==""?"规格1":data.goods_spec}}
+ {{filters.show_gui_ge(data.goods_spec,data.goods_color)}}
@@ -532,11 +568,27 @@
-
+
+
+
+
+
+
+
+ ￥
+ {{item.shop_price}}
+
+ 原价￥{{item.market_price}}
+
+ {{item.goods_name}}
+
+
+
+
-
+
@@ -609,7 +661,7 @@
-
+
+
@@ -1035,7 +1165,7 @@
-
+
@@ -1070,9 +1200,151 @@
+
+
+
+
+
+
-
-
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index e533e88..e563b28 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -6,7 +6,7 @@ image {
.goods-detail{overflow: hidden}
.type-navbar {
- display: flex;
+ display: flex;
justify-content: center;
width: 100%;
height: 80rpx;
@@ -26,6 +26,9 @@ image {
}
.type-navbar-item {
border-bottom: 4rpx solid #fff;
+ display: flex;
+ justify-content: center;
+ width: 100%;
}
.type-item-on {
border-bottom: 4rpx solid #333;
@@ -282,6 +285,7 @@ image {
width: 150rpx;
height: 150rpx;
margin-top: 8rpx;
+ margin-right: 10rpx;
}
.comment-btn {
@@ -321,6 +325,9 @@ image {
height: 100rpx;
background-color: #fff;
text-align: center;
+ z-index: 9;
+ border-top: 4rpx solid #eee;
+
}
.join-cart>view {
@@ -355,7 +362,7 @@ image {
.cart-num {
position: absolute;
left: 50%;
- top: 0;
+ top: 1rpx;
width: 40rpx;
height: 40rpx;
line-height: 40rpx;
@@ -368,11 +375,19 @@ image {
.cart-btn {
font-size: 28rpx;
color: #fff;
- line-height: 100rpx;
+ line-height: 70rpx;
+ 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 +396,9 @@ view.cart-btn-lg {
.buy-btn {
background-color: #f23030;
+ height: 70rpx;
+border-radius: 0 56rpx 55rpx 0;
+
}
.toTop {
@@ -505,24 +523,23 @@ view.cart-btn-lg {
/* padding: 0 30rpx; */
font-size: 32rpx;
box-sizing: border-box;
-
+ border-radius: 20rpx;
+ height: 72%;
}
.spec-model .pding{padding: 0 30rpx;}
.spec-goods {
- padding: 15rpx 0 10rpx;
+ padding: 30rpx 0 20rpx;
float: left;
width: 100%;
- border-bottom: 1px solid #f8f8f8;
+ border-bottom:2rpx solid #eee;
}
.spec-img {
float: left;
height: 186rpx;
width: 186rpx;
- position: relative;
- top:-40rpx;
border: 4rpx solid #eee
}
@@ -542,7 +559,7 @@ view.cart-btn-lg {
}
.spec-goods-price {
- color: #ec5151;
+ color: #d60021;
font-size: 33rpx;
font-weight: bold;
}
@@ -551,6 +568,7 @@ view.cart-btn-lg {
margin-top: 3rpx;
font-size: 24rpx;
color: #999999;
+ margin-right: 15rpx;
}
.spec-name {
@@ -568,7 +586,7 @@ view.cart-btn-lg {
position: fixed;
display: flex;
height: 50rpx;
- border: 1rpx solid #f8f8f8;
+ border: 1rpx solid #000;
font-size: 28rpx;
right: 30rpx;
}
@@ -581,15 +599,15 @@ view.cart-btn-lg {
text-align: center;
}
.spec_bt{
- background: fff;color: #333; margin-left: 10rpx;padding: 8rpx 12rpx; border-radius: 5px;font-size: 24rpx;border: 1rpx solid #ccc;
+ background: fff;color: #333; margin-left: 10rpx;padding: 4rpx 15rpx 4rpx; border-radius:30rpx;font-size: 24rpx;border: 1rpx solid #ccc;
}
-.spec_bt.act{background: #C4182E;color: #fff;border: 1rpx solid #C4182E;}
+.spec_bt.act{background: #d60021;color: #fff;border: 1rpx solid #d60021;}
.sub {
- border-right: 1px solid #ddd;
+ border-right: 1px solid #000;
}
.add {
- border-left: 1px solid #ddd;
+ border-left: 1px solid #000;
}
.spec-btn {
@@ -611,22 +629,24 @@ view.cart-btn-lg {
}
.spec-cart-btns {
- /* background-color: #f8f8f8;
- margin: 40rpx -30rpx 0;
- padding: 20rpx 34rpx; */
- float: left;
- width: 100%;
- line-height: 80rpx;
- margin-top: 40rpx;
+ width: 92%;
+ line-height: 70rpx;
+ margin: 0rpx auto;
+ margin-top: 160rpx;
+ border-radius: 20rpx;
+position: fixed;
+bottom: 50rpx;
+left: 4%;
+
}
.spec-cart-btn {
- float: left;
- width: 100%;
+
+ width:100%;
font-size: 30rpx;
text-align: center;
color: white;
- border-radius: 4rpx;
+ border-radius: 40rpx;
}
.spec-add-cart {
@@ -718,7 +738,8 @@ left:31rpx;}
.pt_fir .pt_fir_title .js{padding: 0 15rpx;height: 40rpx;background:#e9030d; text-align: center; border-radius: 8rpx; color: #fff; margin-left: 10rpx;}
.pt_fir .pt_fir_title .tuannum{color: #e9030d; position: absolute; right: 20rpx; font-size: 26rpx;}
-.pding{padding-top: 20rpx;padding-left: 20rpx; padding-right: 20rpx;font-size: 26rpx;color: #ea120f}
+.pding{padding-top: 20rpx;padding-left: 20rpx;height: 81%;
+ padding-right: 20rpx;font-size: 26rpx;color: #ea120f}
.pdres{margin-left: 10rpx;color: #8f8f94}
.ptgz{position: relative;font-size: 30rpx;padding-left: 20rpx;margin-top: 10rpx; overflow: hidden }
.shuxian{width: 6rpx;height: 28rpx; background: #ea120f; display: inline-block;top: 5rpx;position: relative; margin-right: 5rpx}
@@ -741,7 +762,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;}
@@ -777,7 +798,7 @@ left:31rpx;}
.juzhong .xq .title .close{position: absolute;top: 0; right: 0; width: 45rpx; height: 45rpx;}
.pt_qd{margin-top: 40rpx; height: auto;}
-.spec-cart-btn.w100{width: 100%; margin-left: 0; height: 80rpx; line-height: 80rpx;}
+.spec-cart-btn.w100{width: 95%; margin-left: 0; height: 75rpx; line-height:75rpx;margin: auto; }
.sto_v{color: #333;}
.ellipsis{overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
@@ -927,14 +948,13 @@ 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;
border-right: 2rpx solid #d70026;
transform: rotate(45deg);display:inline-block;
margin-bottom:3rpx;
-
}
/* 顶部边框 */
.topframe{
@@ -952,7 +972,7 @@ left:31rpx;}
margin-bottom: 36rpx;
color: #7d7d7d;
padding-left: 20rpx;
- font-size: 28rpx;
+ font-size: 32rpx;
}
/*评价人数量*/
.topframe .topframe-top .topframe-top-val{
@@ -980,7 +1000,7 @@ left:31rpx;}
.buttem-list .item{
min-width: 17%;
- font-size: 23rpx;
+ font-size: 24rpx;
border-radius: 20rpx;
background:#ffe3e2;
height:38rpx;
@@ -996,16 +1016,11 @@ left:31rpx;}
/* 用户评价 */
.middle{
-
width: 95%;
- height:auto;
-
margin:0 auto;
-
-
}
.middle-img-frame{
- height:65rp;
+ height:65rpx;
display: flex;
margin-top: 32rpx;
@@ -1035,11 +1050,13 @@ left:31rpx;}
text-align: center;
margin-bottom:20rpx;
margin-left:5rpx;
-
+}
+.xc-pirces{
+ margin-top: 14rpx;
}
/* 评价文字 */
.middle-font{
- font-size: 24rpx;
+ font-size: 30rpx;
}
.iddle-goods-img{
@@ -1065,11 +1082,12 @@ left:31rpx;}
height: 45rpx;
display:flex;
line-height: 45rpx;
+ margin-top: 20rpx;
margin-bottom: 14rpx;
justify-content : space-between;
}
.parameter-font{
- font-size: 24rpx;
+ font-size: 26rpx;
}
/* 规格 */
@@ -1091,13 +1109,13 @@ left:31rpx;}
}
/* 点赞图片 */
.parameter-img{
- width: 25rpx;
- height: 25rpx;
+ width: 27rpx;
+ height: 27rpx;
margin-top: 3rpx;
}
.parameter-val{
margin-left:25rpx;
- font-size: 24rpx;
+ font-size: 26rpx;
color: #999;
}
/* 回复 */
@@ -1170,7 +1188,7 @@ left:31rpx;}
width: 524rpx;
margin-left: 34rpx;
border-radius: 25rpx;
- border: 1rpx solid #d6d4d5;
+ border: 2rpx solid #d6d4d5;
overflow: hidden;
}
@@ -1197,19 +1215,20 @@ left:31rpx;}
margin-right: 5rpx
}
.xc_comment-font{
- height: 85rpx;
+ height: 75rpx;
margin-left: 22rpx;
white-space:normal;
overflow: hidden;
margin-top: 8rpx;
+
}
.xc_comment-val{
width: 88%;
height: 30rpx;
margin-left: 22rpx;
display: flex;
- margin-top: 28rpx;
- margin-bottom:8rpx;
+ margin-top: 15rpx;
+ margin-bottom:15rpx;
}
.xc_comment-time{
@@ -1266,7 +1285,7 @@ left:31rpx;}
height: 100%;
line-height: 100rpx;
overflow: hidden;
- margin-left: 7rpx;
+ margin-left: 10rpx;
}
.xc-coupon-fram{
position: relative;
@@ -1306,7 +1325,7 @@ left:31rpx;}
padding-left:15rpx;
color: #d70025;
position: absolute;
- right: 7rpx;
+ right: 5rpx;
}
/* 自定义弹出窗口 */
@@ -2221,9 +2240,247 @@ right:17rpx; top:55rpx;
.pd_top1{padding-top: 10rpx}
.s_ms_bth{margin-top: 85rpx}
-.xc-pirces{
- height:40rpx;
- line-height:15rpx;
+
+.no_pj_list{text-align: center; width: 100%; color: #999; margin: 30rpx 0; display: inline-block; font-size: 28rpx}
+/* 门店地址 */
+.xc-address_frame{
+ border-top:1rpx solid #eee;
+ width: 100%;
+ height: auto;
+}
+.on_height{
+height: 90rpx;
+}
+.sn_height{
+ 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%;
+ margin-top: 5rpx;
+ margin-bottom: 5rpx;
+}
+.distance{
+ padding-left: 15rpx;
+ padding-right: 15rpx;
+ background: #eee;
+ border-radius: 20rpx;
+ margin-right: 5rpx;
+ color: #999;
+ height: 38rpx;
+line-height: 38rpx;
+
+}
+/* 选择门店的弹窗 */
+.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: 72%;
+}
+.popup-top{
+ border-bottom: 1rpx solid #eee;
+ height: 155rpx;
+ width: 95%;
+ margin: auto;
+ line-height: 155rpx;
+
+}
+.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;
+ top: -15rpx;
+ height: 25rpx;
+
+}
+.choose_more{
+ margin-top: 40rpx;
+ margin-right: 20rpx;
+
+}
+.choose_mores{
+ margin-top: 30rpx;
+ margin-right: 15rpx;
+
+}
+.store-list{
+ width: 95%;
+ height: 72%;
+ overflow-y: scroll;
+ margin: auto;
+}
+.store-list .store_choose{
+ width: 100%;
+ height: 120rpx;
+ line-height: 125rpx;
+ border-bottom: 1rpx solid #eee;
+
+}
+.store-list .store_choose .store{
+width: 100%;
+margin: auto;
+line-height: 37rpx;
+padding-left: 20rpx;
+
+}
+.xc-hook{
+ width: 35rpx;
+ height: 35rpx;
+ transform: rotate(-145deg);
+line-height: 37rpx;
+text-align: center;
+}
+ .xc-hooks{
+ width: 30rpx;
+ height: 30rpx;
+ border: 1rpx solid #999;
+ }
+ .address-frame{
+ width: 93%;
+margin-left: 7rpx;
+
+ }
+ .nearby_store{
+margin-left: 17rpx;
+ }
+ .address_name{
+ margin-right: 10rpx;
+
+ }
+ .address-val{
+ height: 38rpx;
+line-height: 38rpx;
+
+ }
+ .store-bottom{
+ width: 85%;
+ margin: auto;
+ height: 70rpx;
+ }
+ .determine{
+ width: 260rpx;
+ height: 55rpx;
+ border-radius: 50rpx;
+ line-height: 55rpx;
+ }
+ .default{
+ width: 260rpx;
+ height: 55rpx;
+ border:3rpx solid #c8c8c8;
+ border-radius: 50rpx;
+ line-height: 55rpx;
+ }
+ .store-bottom-frame{
+ width: 95%;
+ margin: auto;
+
+ }
+ /* 门店分类列表 */
+.sort_store_list{
+ height: 82%;
+ overflow: hidden;
+ overflow-y: scroll;
+ width: 95%;
+ margin: auto;
+}
+.sort_store_list .sort-store-frame{
+ width: 100%;
+height: 100rpx;
+line-height:100rpx;
+border-bottom: 1rpx solid #eee;
+
+}
+.sort_store_list .sort-store-frame .sort-store{
+ width: 94.5%;
+ margin: auto;
+}
+.black_rights-frame{
+width: 50%；
+}
+.black_rights-frame .black_rights{
+ border-top: 3rpx solid;
+border-right: 3rpx solid;
+transform: rotate(45deg);
+display: inline-block;
+width: 20rpx;
+height: 20rpx;
+}
+.xc-val-money{
+ height:80rpx;
+}
+
+.xc-distance-bottom{
+ margin-bottom: 40rpx;
+}
+.xc-distance-top{
+margin-top: 10rpx;
+}
+.xc-width{
+ width: 100%;
+}
+.right-arrow{ width: 15rpx; height:15rpx;
+ border-top: 2rpx solid #d70026;
+ border-right: 2rpx solid #d70026;
+ transform: rotate(45deg);display:inline-block;
+ margin-bottom:3rpx;
+}
+.xc-goods-attribute{
+ border-bottom: 1px solid #eee;
+padding-bottom: 15px;
+margin-bottom:40rpx;
+}
+.xc-val-fream{
+ width: 105rpx;
+}
+.is_stock{
+width: 58%;
+height: 70rpx;
+border-radius: 55rpx;
+}
+.select_store_height{
+ height: 50rpx;
+}
+.butttem5{
+ margin-bottom: 5rpx;
}
.no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
@@ -2233,8 +2490,7 @@ right:17rpx; top:55rpx;
width: 58%; background-color: #adadad;
}
-
-
+.s_btn{ margin-top: 25rpx; }
/* 美妆价的样式 */
.beauty-makeup-frame{
width: 101.5%;
@@ -2266,14 +2522,14 @@ right:17rpx; top:55rpx;
border-radius: 0rpx 20rpx 20rpx 0rpx;
}
.grade-card-frame{
- width: 26%;
+
height:45rpx ;
background: #3c300a;
border-radius: 20rpx;
margin-top: 10px;
margin-left: 7rpx;
justify-content: center;
- padding: 0 10rpx;
+ padding: 0 15rpx;
}
.grade-card-frame .img{
width: 24rpx;
@@ -2283,6 +2539,9 @@ right:17rpx; top:55rpx;
}
.grade-card-frame .card-name{
margin-left: 5rpx;
+ max-width: 120rpx;
+ margin-right: 6px;
+
}
.card-effect{
margin-left: 15rpx;
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 735d087..9d5260e 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -47,7 +47,8 @@
￥{{item[card_field]}}
- {{card_name}}
+
+ {{card_name}}