From cc856530bd0a0f59441a839a01376f7eaae5ba21 Mon Sep 17 00:00:00 2001 From: taiyuan Date: Mon, 12 Jul 2021 14:58:49 +0800 Subject: [PATCH] 商品详情修改 --- app.json | 8 +++++--- packageA/pages/goodsInfo/goodsInfo.js | 8 ++++++++ packageA/pages/goodsInfo/goodsInfo.wxml | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------- packageA/pages/goodsInfo/goodsInfo.wxss | 577 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/cart/cart2/cart2.js | 8 -------- pages/goods/goodsInfo/buy_integral.wxml | 2 +- pages/goods/goodsInfo/buy_integral_normal.wxml | 2 +- pages/goods/goodsInfo/buy_pt.wxml | 2 +- pages/goods/goodsInfo/goodsInfo.wxss | 8 ++++---- 9 files changed, 407 insertions(+), 292 deletions(-) diff --git a/app.json b/app.json index 21bfb31..88cba8b 100644 --- a/app.json +++ b/app.json @@ -154,9 +154,11 @@ "pages/user/view_comment/view_comment", "pages/user/add_comment/add_comment", "pages/user/user_coupon/user_coupon", - "pages/user/buyDetails/buyDetails", - "pages/evaluate/evaluate", - "pages/evaluate_list/evaluate_list" + "pages/user/buyDetails/buyDetails", + "pages/evaluate/evaluate", + "pages/evaluate_list/evaluate_list", + "pages/luckactivity/luckinfo/luckinfo", + "pages/luckactivity/index/index" ] } diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index c06928f..ef62e6d 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -2175,6 +2175,14 @@ Page({ imageUrl:this.data.gallery[0].image_url, } }, + + + + clickCollapse() { + this.setData({ + flag: !this.data.flag, + }) + }, diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index 711a282..d57a27f 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -39,7 +39,7 @@ {{data.goods_name}} - + 销量：{{data.sales_sum}} 有效天数：{{data.validDays?data.validDays:'不限'}} @@ -55,7 +55,7 @@ 选择门店 - + 更多门店 @@ -86,28 +86,42 @@ - - - {{store_config.service_bz}} - + + + + {{store_config.service_bz}} + + + + + + + + + + + + + + - - + + - + 项目名称 耗时(分) 手工费 次数 - + {{item.projectName}} {{item.timeConsuming}} {{item.money}} @@ -143,29 +157,33 @@ - - - - - - 客服 - - - - - - {{cartGoodsNum}} - 购物车 - - + + + + + + + 客服 + + + + + + {{cartGoodsNum}} + 购物车 + + + + - - 加入购物车 - 立即购买 - + + + 加入购物车 + 立即购买 + diff --git a/packageA/pages/goodsInfo/goodsInfo.wxss b/packageA/pages/goodsInfo/goodsInfo.wxss index 6173baa..939079f 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxss +++ b/packageA/pages/goodsInfo/goodsInfo.wxss @@ -9,15 +9,19 @@ image { display: flex; justify-content: center; width: 100%; + position: fixed; + top: 0; + z-index: 999; /* height: 80rpx; */ /* margin-bottom: 20rpx; */ background-color: #fff; + border-top: 2rpx solid #ebedf0; /* border-bottom: 1rpx #fafafa solid; */ } .type-box { width: 25%; box-sizing: border-box; - font-size: 28rpx; + font-size: 32rpx; line-height: 76rpx; padding: 0 20rpx; text-align: center; @@ -29,12 +33,14 @@ image { display: flex; justify-content: center; width: 100%; + font-size: 26rpx; } .type-item-on { color: #F95D74; font-weight: bold; /* border-bottom: 4rpx solid #F95D74; */ position: relative; + font-size: 30rpx; } .type-item-on:after { content: ''; @@ -53,19 +59,21 @@ image { } .goods-title { display: flex; - justify-content: space-between; overflow: hidden; + justify-content: space-between; + /* overflow: hidden; */ /* height: 108rpx; */ } .goods-name { - width: 560rpx; - line-height: 46rpx; + /* width: 560rpx; */ + /* line-height: 46rpx; */ font-size: 32rpx; font-weight: bold; color: #333; - margin-top: 30rpx; - margin-bottom:30rpx; + /* margin-top: 30rpx; + margin-bottom:30rpx; */ flex: 1; text-align: justify; + margin: 10rpx 0 20rpx; } .goods-collect { @@ -89,13 +97,13 @@ image { .goods-price { font-size: 60rpx; /* padding: 20rpx 34rpx; */ - padding:0rpx 34rpx; + /* padding:0rpx 34rpx; */ /* line-height: 60rpx; */ color: #999; - + padding: 20rpx; /* margin-top: 46rpx; */ - margin-top:26rpx; - padding-bottom:20rpx; + /* margin-top:26rpx; + padding-bottom:20rpx; */ } .prom-info { @@ -111,13 +119,13 @@ image { border-radius: 4rpx; } .market-price { - display: flex; - margin-left: -5rpx; + /* display: flex; + margin-left: -5rpx; */ } .market-price .yuan{ - top:24rpx; - font-size: 36rpx + /* top:24rpx; */ + font-size: 30rpx } .market-price>view>text { @@ -125,7 +133,8 @@ image { } .market-price>.yj{ - color: #999999; font-size: 26rpx;margin-left: 16rpx;position: relative;top:30rpx; + color: #999999; font-size: 24rpx;/* margin-left: 16rpx;position: relative;top:30rpx; */ + display: inline-block; } .goods-price>.tm{ color: #999999; font-size: 26rpx;margin-top: 10rpx;} @@ -134,6 +143,7 @@ image { display: flex; font-size: 24rpx; justify-content: space-between; + } .goods-detail .twen{ @@ -348,11 +358,11 @@ image { } .join-cart>view { - width: 32%; + width: 29%; } .join-cart>.new_split { - width: 17%; + width: 13%; text-align: center; padding: 0; margin: 0; @@ -551,29 +561,28 @@ border-radius: 0 56rpx 55rpx 0; /* padding: 0 30rpx; */ font-size: 32rpx; box-sizing: border-box; - border-radius: 20rpx; + border-radius: 20rpx 20rpx 0 0; /* height: 72%; */ } -.spec-model .pding{padding: 0 30rpx;} +.spec-model .pding{padding: 0 20rpx;} .spec-goods { padding: 30rpx 0 20rpx; /* float: left; */ - display: flex; width: 100%; border-bottom:2rpx solid #eee; } .spec-img { - /* float: left; */ + float: left; height: 186rpx; width: 186rpx; border: 4rpx solid #eee } .spec-goods-info { - /* float: left; */ + float: left; padding: 0 25rpx; width: 400rpx; } @@ -608,14 +617,14 @@ border-radius: 0 56rpx 55rpx 0; .quhuo{font-size: 30rpx; color: #000} .b_num{ - display: flex; - font-size: 30rpx; - color: #333; - padding: 20rpx; + display: flex;font-size: 30rpx; color: #333; + justify-content: space-between; + align-items: center; + padding: 20rpx 0; } .count { - position: fixed; + /* position: fixed; */ display: flex; height: 50rpx; border: 1rpx solid #000; @@ -638,6 +647,10 @@ border-radius: 0 56rpx 55rpx 0; .sub { border-right: 1px solid #000; } +.sub.active { + /* background-color: #ddd; */ + color: #ccc; +} .add { border-left: 1px solid #000; @@ -662,14 +675,15 @@ border-radius: 0 56rpx 55rpx 0; } .spec-cart-btns { - width: 92%; + /* width: 92%; */ line-height: 70rpx; - margin: 20rpx auto; - /* margin-top: 160rpx; */ - border-radius: 20rpx; -/* position: fixed; -bottom: 50rpx; -left: 4%; */ + /* margin: 0rpx auto; + margin-top: 160rpx; */ + /* border-radius: 20rpx; */ +/* position: fixed; */ +/* bottom: 50rpx; */ +/* left: 4%; */ + padding: 20rpx; } .spec-cart-btn { @@ -763,8 +777,8 @@ left:31rpx;} /*------拼单------*/ .pt_view{ text-align: center; width: 100%; height: 100rpx; line-height: 100rpx; font-size: 26rpx} .pt_view .secondkill-img{width: 100%;height: 100%;} -.pt_fir{ background: #fff;margin-bottom: 10rpx; } -.pt_fir .pt_fir_title{display: flex; align-items: center; margin-left: 10rpx; margin-top: 20rpx; font-size: 28rpx; position: relative;} +.pt_fir{ background: #fff;/* margin-bottom: 10rpx; */} +.pt_fir .pt_fir_title{display: flex; align-items: center; /* margin-left: 10rpx; margin-top: 20rpx; */ font-size: 28rpx; position: relative;} .pt_fir .pt_fir_title .kt_type{ color: #fff;background:#e9030d; width: 100rpx; line-height: 40rpx; border-radius: 6rpx; margin: 0 10rpx; height: 40rpx; font-size: 24rpx; text-align: center;} .pt_fir .pt_fir_title .price{color: #e9030d;font-size: 26rpx;} @@ -786,7 +800,7 @@ left:31rpx;} .t_gz{padding: 10rpx 20rpx; font-size:28rpx } .pt_fir.se1{height: auto; margin: 0} -.pt_fir.se2{height: auto; margin: 0;border-top:6rpx solid #eeeeee;border-bottom:2rpx solid #eeeeee;} +.pt_fir.se2{height: auto; margin: 0;/* border-top:6rpx solid #eeeeee;border-bottom:2rpx solid #eeeeee; */} .pt_hb{height:78rpx; line-height: 75rpx; position: relative; font-size: 32rpx;overflow: hidden;width:695rpx;margin-left:28rpx; border-bottom: 1rpx solid #E5E5E5 } @@ -808,14 +822,14 @@ left:31rpx;} .pt_fir .pt_fir_title.no-mar-b{margin-bottom: 0;padding-bottom: 10rpx; margin-left: 20rpx} .pt_fir .pt_fir_title.boder-1{border-bottom: 1rpx #e7e7e7 solid} -.jie_price{padding: 10rpx 30rpx;} +.jie_price{/* padding: 10rpx 30rpx; */} .jie_price_title{font-size: 30rpx; color: #a26270; margin-bottom: 10rpx} .price_list{display: flex; width: 100%;} .price_item{width: 25%;font-size: 28rpx; color: #4c336c} -.pt_fir.se2 .zzk-1{margin-top: 23rpx; font-size: 30rpx;position: relative; margin-bottom: 30rpx; border-left:4rpx solid red;margin-left:14rpx;height:30rpx;line-height:30rpx;padding-left:5rpx;} -.ckgd{position: absolute;top:0;right:57rpx; color:#d70025; font-size: 32rpx;} -.ckgd .arrow-one{width:18rpx;height:18rpx;border-color:#da0b31;margin-top:5rpx;} +.pt_fir.se2 .zzk-1{/* margin-top: 23rpx; */ font-size: 30rpx;position: relative; /* margin-bottom: 30rpx; */ border-left:4rpx solid red;/* margin-left:14rpx; */height:30rpx;line-height:30rpx;/* padding-left:5rpx; */} +.ckgd{/* position: absolute;top:0;right:57rpx; */ color:#d70025; font-size: 26rpx;} +.ckgd .arrow-one{width:14rpx;height:14rpx;border-color:#da0b31;/* margin-top:5rpx; */ margin:auto;} .bview{ position: fixed; top:0; left:0; width: 100%; height: 100%; background-color: rgba(0, 0, 0, 0.5); @@ -842,65 +856,71 @@ left:31rpx;} /*---多少人参加团--*/ .group { - padding-top:25rpx; - width: 91%; - min-height: 92rpx; - border-bottom:2rpx solid #eee; - padding-bottom:25rpx; + padding-top:20rpx; + padding-bottom:20rpx; + width: 100%; + /* min-height: 92rpx; */ + border-bottom: 2rpx solid #ebedf0; } .group .group-list { - - height: 90rpx; - padding: 0 130rpx 0 100rpx; - width: 470rpx; + display: flex; + align-items: center; + justify-content: space-around; + /* height: 90rpx; */ + /* padding: 0 130rpx 0 100rpx; */ + /* width: 470rpx; - position: absolute; + position: absolute; */ } .group .group-list .gtou { - width: 80rpx; - height: 80rpx; - float: left; + width: 70rpx; + height: 70rpx; + /* float: left; position: relative; top: 6rpx; - left: -96rpx; + left: -96rpx; */ } .group .group-list .gtou image { - width: 80rpx; - height: 80rpx; - border-radius: 200rpx; - background-color: green; + display: block; + width: 100%; + height: 100%; + border-radius: 50%; + background-color: #f0f0f0; } .group .group-list .gdn { - float: left; + width: 140rpx; + text-align: center; + /* float: left; */ font-size: 26rpx; - line-height: 48rpx; + /* padding-left: 20rpx; */ + /* line-height: 48rpx; height: 48rpx; width: 168rpx; position: relative; left: -80rpx; - top:20rpx; - font-weight:600; + top:20rpx; */ + font-weight:bold; } .group .group-list .ghaicha { - width:300rpx; + /* width:300rpx; */ font-size: 27rpx; - margin-left:180rpx; + /* margin-left:180rpx; top:13rpx; - left:-3rpx; - font-weight:600; + left:-3rpx; */ + font-weight: bold; } .group .group-list .ghaicha .gred { - height: 48rpx; - width: 300rpx; + /* height: 48rpx; + width: 300rpx; */ } .gsj { @@ -911,9 +931,9 @@ left:31rpx;} .group .group-list .cjt { height:42rpx; width: 137rpx; - position: absolute; + /* position: absolute; right: 4rpx; - top:25rpx; + top:25rpx; */ line-height: 42rpx; font-size: 24rpx; color: #fff; @@ -926,7 +946,7 @@ left:31rpx;} .gbody { background-color: white; } -.t_show{overflow: hidden; display: flex; width: 300rpx; color: #292929; line-height: 36rpx;font-size:26rpx; +.t_show{/* overflow: hidden; */ display: flex; /* width: 300rpx; */ color: #292929; /* line-height: 36rpx; */font-size:26rpx; } .join-cart>view.set_width { width:58%; @@ -955,8 +975,8 @@ left:31rpx;} white-space:nowrap; } -.tuwen_title{ height: 86rpx; background-color:#eeeeee; margin-bottom: 32rpx; position: relative; - display: flex; justify-content: center;align-items: center; } +.tuwen_title{ /* height: 86rpx; */ background-color:#eeeeee; /* margin-bottom: 32rpx; */ position: relative; + display: flex; justify-content: center;align-items: center; padding: 20rpx;} .tuwen_title .g_line{ width:496rpx; @@ -968,27 +988,28 @@ left:31rpx;} overflow: hidden; justify-content: center;align-items: center; } .tuwen_title .center_s image{ width: 34rpx; height: 26rpx; margin-right: 10rpx} -.t_g_info{ margin: 0 34rpx;margin-bottom: 20rpx; display: flex; align-items: center } +.t_g_info{ /* margin: 0 34rpx;margin-bottom: 20rpx; */ display: flex; align-items: center;padding: 20rpx; } .red_shu{ width: 10rpx; height: 36rpx; background-color:#da0035; margin-right: 8rpx; } -.tb-l{ line-height: 96rpx;} -.table_s{ border:#e4e4e4 1rpx solid; width: 682rpx; margin: 0 34rpx;font-size: 30rpx;} -.tb_item{display: flex; height: 96rpx; border-bottom: 1rpx solid #e4e4e4 } -.item_left{width: 214rpx; height: 100%; background: #f9f9f9 ;border-right:1rpx solid #e4e4e4} .item_left text{ margin-left: 44rpx;} -.item_right{width: 468rpx; height: 100%; overflow : hidden;white-space:nowrap; - text-overflow: ellipsis;} -.item_right text{ margin-left: 66rpx;} +.tb-l{ /* line-height: 96rpx; */} +.table_s{ border:#e4e4e4 1rpx solid; box-sizing: border-box;font-size: 26rpx;} +.tb_item{display: flex; /* height: 96rpx; */ border-bottom: 1rpx solid #e4e4e4 } +.item_left{width: 210rpx; height: 100%; box-sizing:border-box; text-align: center;padding: 20rpx; background: #f9f9f9 ;border-right:2rpx solid #e4e4e4} .item_left text{ /* margin-left: 44rpx; */} +.item_right{flex:1; height: 100%; overflow : hidden;white-space:nowrap;text-overflow: ellipsis; padding: 20rpx;} +.item_right text{ /* margin-left: 66rpx; */} + +.table_s .tb-l:last-child {border-bottom: none;} -.bzfu_img{ width: 164rpx; height:34rpx; margin-right: 18rpx; margin-left: 12rpx } - .bz_view{ height:100rpx; padding: 0 34rpx 0 13rpx; color: #333; font-size: 28rpx; +.bzfu_img{ width: 164rpx; height:34rpx; /* margin-right: 18rpx; margin-left: 12rpx */ } + .bz_view{ /* height:100rpx; padding: 0 34rpx 0 13rpx; */ color: #333; font-size: 28rpx; padding: 20rpx 20rpx 20rpx 10rpx; /* border-bottom: 3rpx solid #eee; */ /* border-top: 3rpx solid #eee; */} - .bz_view view{ width: 460rpx; max-height: 70rpx; overflow: hidden;} + .bz_view view{ width: 460rpx; /* max-height: 70rpx; */ /* overflow: hidden; */} -.bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 0 34rpx; color: #333; - font-size: 30rpx; 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; +.bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 20rpx; color: #333; + font-size: 30rpx; /* height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx */ } +.red_bb{ color: #d70026; /* min-width:158rpx;width: auto; */} +.bg_jj{ width: 14rpx; height:14rpx; border-top: 2rpx solid #d70026; border-right: 2rpx solid #d70026; transform: rotate(45deg);display:inline-block; @@ -999,6 +1020,7 @@ left:31rpx;} .bz-content { flex-grow: 1; text-align: justify; + padding: 0 30rpx 0 20rpx; } /* 顶部边框 */ @@ -1199,20 +1221,23 @@ left:31rpx;} .xc_comment{ display: flex; + justify-content: space-around; width: 100%; - height: 42rpx; - padding-left: 34rpx; + box-sizing: border-box; + padding: 10rpx 20rpx; + /* height: 42rpx; + padding-left: 34rpx; */ color: #333; } .xc_comment-have-pictures{ width: 153rpx; - height: 42rpx; + /* height: 42rpx; */ line-height: 42rpx; text-align: center; background: #ffe3e2; color: 28rpx; - border-radius:20rpx; + border-radius:21rpx; font-size: 24rpx; } .xc_comment-discuss{ @@ -1229,22 +1254,25 @@ left:31rpx;} .xc_comment-detail{ display: flex; - margin-top: 40rpx; - width: 524rpx; - margin-left: 34rpx; - border-radius: 25rpx; - border: 2rpx solid #d6d4d5; - overflow: hidden; + /* margin-top: 40rpx; */ + /* width: 524rpx; */ + /* margin-left: 34rpx; */ + border-radius: 24rpx; + border: 2rpx solid #ebedf0; + margin-left: 20rpx; + box-sizing: border-box; + /* overflow: hidden; */ } .xc_user-img{ - border-radius:50%; + border-radius:50%; + margin: auto 0; } .xc_comment-user{ display: flex; - margin-top: 22rpx; - margin-left: 22rpx; + /* margin-top: 22rpx; + margin-left: 22rpx; */ } .xc_user{ width: 170rpx; @@ -1252,34 +1280,34 @@ left:31rpx;} margin-left: 6rpx; overflow: hidden; } -.xc_user-name{ height: 25rpx;} +.xc_user-name{ /* height: 25rpx; */} .xc_comment-img{ width: 22rpx; height: 22rpx; - margin-top: 14rpx; + /* margin-top: 14rpx; */ margin-right: 5rpx } .xc_comment-font{ - height: 75rpx; - margin-left: 22rpx; + /* height: 75rpx; */ + /* margin-left: 22rpx; */ white-space:normal; overflow: hidden; - margin-top: 8rpx; - line-height: 38rpx; + /* margin-top: 8rpx; + line-height: 38rpx; */ } .xc_comment-val{ - width: 88%; + /* width: 88%; height: 30rpx; margin-left: 22rpx; display: flex; margin-top: 15rpx; - margin-bottom:15rpx; + margin-bottom:15rpx; */ } .xc_comment-time{ - height: 30rpx; - font-size: 24rpx; + /* height: 30rpx; */ + font-size: 22rpx; color: #a5a5a5; overflow: hidden; } @@ -1290,14 +1318,17 @@ left:31rpx;} .xc_comment-left{ display:inline-block; width: 312rpx; + padding: 20rpx; } .xc_goods-img-frame{ - display:inline-block; - width: 40%; + border-radius: 0 22rpx 22rpx 0; + overflow: hidden; + /* display:inline-block; */ + /* width: 40%; height: 90%; text-align: center; padding-top: 30rpx; - vertical-align: top; + vertical-align: top; */ } .xc_imgs{ width: 50rpx; @@ -1308,11 +1339,13 @@ left:31rpx;} .pj_word_size{ font-size: 28rpx} .pj_scroll{ - white-space: nowrap; + /* white-space: nowrap; */ /* height: 324rpx; */ - margin-bottom: 50rpx; + /* margin-bottom: 50rpx; */ display: flex; align-items: center; + padding: 20rpx 0; + /* box-sizing: border-box; */ /* box-shadow: 0 8px 12px #e7e9eb; */ } @@ -1326,57 +1359,61 @@ left:31rpx;} } .cx-frame{ /* border-top:3rpx solid #eee; */ - width:99%; + /* width:99%; height: 95rpx; line-height: 95rpx; - padding-left:24rpx; - - + padding-left:24rpx; */ + padding: 20rpx; } .cx-frame .cx-sizs{ - width: 68rpx; - height: 100%; - line-height: 100rpx; - overflow: hidden; - margin-left: 10rpx; + /* width: 68rpx; */ + /* height: 100%; */ + /* line-height: 100rpx; */ + /* overflow: hidden; */ + /* margin-left: 10rpx; */ } .xc-coupon-fram{ position: relative; - width:200rpx; - padding-top:30rpx; + margin-right: 16rpx; + /* width:200rpx; */ + /* padding-top:30rpx; */ } .xc-coupon-fram .xc-coupon{ - width:175rpx ; + /* width:175rpx ; height: 40rpx; - line-height: 40rpx; + line-height: 40rpx; */ background-color:#d60021 ; - margin:0 auto; + /* margin:0 auto; */ color:#fff; - + padding: 6rpx 20rpx; } .xc-coupon-fram .xc-circular{ - width: 22rpx; - height:22rpx; - background-color:#fff; + width: 16rpx; + height:16rpx; + background-color: white; position:absolute; - top: 40rpx; + top: 50%; + /* left: -10rpx; */ + transform: translateY(-50%); } .xc-coupon-fram .xc-one{ - left:3rpx; + left: -8rpx; } .xc-coupon-fram .xc-two{ - left: 178rpx; + right: -8rpx; } .cx-obtain-coupon{ - width: 65rpx; + /* width: 65rpx; height: 100%; - padding-left:15rpx; + padding-left:15rpx; */ color: #d70025; - position: absolute; - right: 5rpx; + display: flex; + align-items: center; + /* position: absolute; + right: 5rpx; */ } /* 自定义弹出窗口 */ @@ -1391,18 +1428,20 @@ left:31rpx;} } .cx-popup .top{ - width: 90%; - height:85rpx; - border-bottom: 4rpx solid #d5d5d5; - padding-top: 50rpx; - font-weight:600; + /* width: 90%; + height:85rpx; */ + font-size: 32rpx; + padding: 20rpx 0; + border-bottom: 2rpx solid #ebedf0; + /* padding-top: 50rpx; + font-weight:600; */ } .cx-popup .top-frame{ - width: 100%; + /* width: 100%; display: flex; justify-content: center; - overflow: hidden; + overflow: hidden; */ } .xc-valid-coupon{ width: 90%; @@ -1413,41 +1452,52 @@ left:31rpx;} .xc-frame{ position: relative; } -.xc-coupon-frame{ - width: 90%; +.xc-coupon-frame { + width: 100%; max-height: 560rpx; overflow: auto; } -.xc-coupon-frame .coupon{ - width:99%; +.xc-coupon-frame .rel:not(:first-child) { + margin-top: 20rpx; +} +.xc-coupon-frame .coupon { + width:100%; height: 168rpx; border-radius: 25rpx; - border:3rpx solid #ffdcdc; + border:2rpx solid #ffdcdc; overflow: hidden; - margin-top:16rpx; + /* margin-top:16rpx; */ + box-sizing: border-box; } +/* .xc-coupon-frame .coupon ~ .coupon { + margin-top:16rpx; +} */ .xc-coupon-left{ width: 216rpx; - height: 100%; + /* height: 100%; */ background-color: #ffeeef; border-right: 4rpx dashed #ffdbd9; overflow: hidden; - line-height: 100%; - + /* line-height: 100%; */ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + flex-shrink: 0; } .xc-money{ color: #f30026; text-align:center; } .xc-rmb{ - width:44rpx; - padding-top:7rpx; + /* width:44rpx; + padding-top:7rpx; */ } .xc-money-frame{ - margin-left:35rpx; - margin-top:48rpx; + /* margin-left:35rpx; + margin-top:48rpx; */ } .xc-spacing{ @@ -1455,45 +1505,52 @@ left:31rpx;} } .xc-circular-one{ position: absolute; - top:-8rpx; - left:208rpx; - width: 27rpx; + top:-15rpx; + left:205rpx; + width: 30rpx; height: 30rpx; background: #fff; overflow: hidden; } .xc-circular-two{ position: absolute; - top:150rpx; - left:207rpx; - width: 27rpx; + bottom: -15rpx; + /* top:150rpx; */ + left:205rpx; + width: 30rpx; height:30rpx; background: #fff; } .xc-detail-coupon{ - margin-left: 22rpx; + /* margin-left: 22rpx; overflow: hidden; - padding-top: 43rpx; - + padding-top: 43rpx; */ + /* display: flex; + align-items: center; */ } .xc-coupon-right{ - width: 455rpx; - height: 100%; + /* width: 455rpx; + height: 100%; */ background: #fffaf9; + padding: 20rpx; + box-sizing: border-box; + width: 100%; + justify-content: space-between; + align-items: center; } .xc-below{ - margin-top:22rpx; + margin-top:20rpx; } .xc-get{ - width: 132rpx; - height: 48rpx; + width: 140rpx; + /* height: 48rpx; */ color: #fff; text-align: center; - border-radius:20rpx; - line-height:48rpx; - margin-left:20rpx; + border-radius:27rpx; + line-height:54rpx; + /* margin-left:20rpx; */ } .background{ @@ -1511,16 +1568,19 @@ left:31rpx;} .cx-confirm{ width: 100%; - height: 160rpx; + padding: 20rpx; + box-sizing: border-box; + /* height: 160rpx; */ } .cx-confirm .confirm{ - width: 372rpx; - height: 60rpx; - background: #f40026; + /* width: 372rpx; + height: 60rpx; */ + background-color: #f40026; color: #fff; - border-radius:20rpx; - line-height:60rpx; + border-radius:10rpx; + line-height: 80rpx; + font-size: 28rpx; } @@ -1531,17 +1591,21 @@ left:31rpx;} /* 分享 */ +.icon-share { + font-size: 46rpx; + color: #d60021; +} .xc-share-frame{ - width: 129rpx; + /* width: 129rpx; height: 48rpx; border-top-left-radius: 18rpx; - border-bottom-left-radius: 18rpx; - background: #d60021; - position:absolute; + border-bottom-left-radius: 18rpx; */ + /* background: #d60021; */ + /* position:absolute; left:622rpx; top:-37rpx; line-height:50rpx; - margin-top:52rpx; + margin-top:52rpx; */ } .xc-share-frame-jieti{ width: 129rpx; @@ -1559,6 +1623,7 @@ left:31rpx;} } + .xc-share-frame .share-frame,.xc-share-frame-jieti .share-frame{ width: 30rpx; height: 30rpx; @@ -1779,10 +1844,10 @@ xc-ensure-div{ padding-top: 24rpx; overflow: hidden; } -.xc-frame{ - width: 100%; - margin-top:20rpx; - +.xc-frame { + /* width: 100%; + margin-top:20rpx; */ + padding: 20rpx; } .xc-frame .list-frame{ @@ -1817,7 +1882,7 @@ xc-ensure-div{ } .xc-money-frame{ - margin-left:35rpx; + /* margin-left:35rpx; */ } .xc-coupon-effect{ @@ -1952,11 +2017,11 @@ xc-ensure-div{ } .xc-video{ - width:100rpx; - height: 50rpx; - line-height: 50rpx; + /* width:100rpx; */ + /* height: 50rpx; + line-height: 50rpx; */ text-align: center; - margin-left:-30rpx; + /* margin-left:-30rpx; */ } @@ -2030,7 +2095,7 @@ xc-ensure-div{ .wsize{font-size: 32rpx} -.five-level-word{font-size: 28rpx;} +.five-level-word{font-size: 24rpx;} /*-- 推荐商品 --*/ @@ -2103,13 +2168,13 @@ padding-left:24rpx; .xc-linellae-frame{ width: 100%; - height: 60rpx; + height: 80rpx; background: #f2f2f2; } .xc-linellae-frame .xc-linellae{ width: 386rpx; height: 1rpx; - border-bottom: 1rpx solid #a5a5a5; + border-bottom: 1rpx solid #ebedf0; } .xc-recommend-frame{ background:#f2f2f2; @@ -2132,7 +2197,8 @@ margin-top: 1rpx; } .xc-price-frame{ color: #ec0022; -height:44rpx; + align-items: baseline; +/* height:44rpx; */ } .xc-price-frame .sign{ margin-top:19rpx; @@ -2163,6 +2229,9 @@ padding-left:-4rpx; .xc-explain{ color:#292929; width:542rpx; + margin: 10rpx 0 20rpx; + width: 100%; + font-weight: bold; } .xc-item{width: 16%; font-size: 26rpx; color: #666;margin-right:5rpx;} .xc-item .yuan{ @@ -2268,15 +2337,16 @@ margin-top:5rpx; } .xc-goods-explain{ width:100%; - padding-left:30rpx; + /* padding-left:30rpx; margin-left:-9rpx; - height: 150rpx + height: 150rpx */ } .xc-partner-frame{ border-bottom:2rpx solid #eee; width:100%; -padding:0 20rpx; -height:56rpx; +padding:20rpx; +/* height:56rpx; */ +box-sizing: border-box; } .xc-person-number{ width:120rpx; @@ -2298,41 +2368,43 @@ right:17rpx; top:55rpx; /* border-top:1rpx solid #eee; */ width: 100%; height: auto; + padding: 20rpx; + box-sizing: border-box; } .on_height{ height: 90rpx; } .sn_height{ - min-height: 170rpx; height: auto;padding: 10rpx 0; + /* min-height: 170rpx; height: auto;padding: 10rpx 0; */ } .xc-address_frame .address_frame{ - width: 92%; -padding-left: 10rpx; -margin: auto; + width: 100%; +/* padding-left: 10rpx; +margin: auto; */ } .shop_name{ } .stores-img{ -width: 40rpx; - height: 35rpx; + width: 28rpx; + height: 28rpx; margin-right: 10rpx; } .shop_name{ margin-right: 10rpx; } .address{ - width: 87%; + /* width: 100%; margin-top: 5rpx; - margin-bottom: 5rpx; + margin-bottom: 5rpx; */ } .distance{ - padding-left: 15rpx; - padding-right: 15rpx; + padding-left: 20rpx; + padding-right: 20rpx; background: #eee; border-radius: 20rpx; - margin-right: 5rpx; + /* margin-right: 5rpx; */ color: #999; height: 38rpx; line-height: 38rpx; @@ -2518,8 +2590,8 @@ margin-top: 10rpx; } .xc-goods-attribute{ border-bottom: 1px solid #eee; -padding-bottom: 15px; -margin-bottom:40rpx; +padding-bottom: 20rpx; +/* margin-bottom:40rpx; */ } .xc-val-fream{ width: 105rpx; @@ -2546,11 +2618,11 @@ border-radius: 55rpx; .s_btn{ margin-top: 25rpx; } /* 美妆价的样式 */ .beauty-makeup-frame{ - width: 101.5%; - margin: auto; + /* width: 101.5%; + margin: auto; */ height: 120rpx; border-radius: 15rpx; - margin-top: 18px; + margin-top: 10px; } .beauty-makeup-frame .left{ @@ -2558,11 +2630,12 @@ border-radius: 55rpx; height: 100%; background:#f7f7f7; border-radius: 20rpx 0rpx 0rpx 20rpx; - padding-left: 20rpx; + /* padding: 0 10rpx; */ } .card-frame{ - margin-top: 0rpx; padding-right: 23rpx; - margin-right: 15rpx; + margin-top: 0rpx; + /* padding-right: 23rpx; + margin-right: 15rpx; */ } .advert-card{ margin-top: 0rpx!important; @@ -2576,13 +2649,13 @@ border-radius: 55rpx; } .grade-card-frame{ - height:45rpx ; + /* height:45rpx ; */ background: #3c300a; border-radius: 20rpx; - margin-top: 10px; - margin-left: 7rpx; + /* margin-top: 10px; + margin-left: 7rpx; */ justify-content: center; - padding: 0 15rpx; + padding: 4rpx 12rpx; } .grade-card-frame .img{ width: 24rpx; @@ -2596,7 +2669,7 @@ border-radius: 55rpx; max-width: 165rpx; } .card-effect{ - margin-left: 15rpx; + /* margin-left: 15rpx; */ } .at_once_carde{ width:65rpx; @@ -2620,22 +2693,23 @@ button.custom-service::after{ border: 0; } .no_store{color:#d60021; font-size: 26rpx;} -.cx_show_view{ width: 580rpx; line-height: 30rpx; margin-bottom: 6rpx; } +.cx_show_view{ width: 580rpx; /* line-height: 30rpx; margin-bottom: 6rpx; */ } .cx_show_view .word{ width: 400rpx} .prom_condition { color: #d60021; - width: 180rpx; - height: 30rpx; + /* width: 180rpx; */ + /* height: 30rpx; */ font-size: 20rpx; - padding-top: 0.01rpx; - display: flex; + /* padding-top: 0.01rpx; */ + /* display: flex; justify-content: center; - align-items: center; - border: #d60021 solid 1rpx; + align-items: center; */ + border: 2rpx solid #d60021; border-radius: 10rpx; margin-right:10rpx ; - margin-left: 10rpx; - + /* margin-left: 10rpx; */ + font-size: 24rpx; + padding: 0 10rpx; } .hui_img{ width: 44rpx; height: 44rpx; margin-right: 8rpx} .order_hui{color: #444; width: 420rpx} @@ -2733,4 +2807,25 @@ button.custom-service::after{ .quan_price{ background-color: #ff4700; color: #fff; padding: 10rpx 25rpx; margin-left: 10rpx; border-radius: 30rpx; } -.stock{ width: 25%; height: 60rpx; border: 1rpx solid #eee; text-align: center; line-height: 60rpx;} \ No newline at end of file + +/*--闪白屏--*/ +.g_img_box{ + background-position: center center; + background-repeat: no-repeat; + -webkit-background-size: cover; + -moz-background-size: cover; + background-size: cover; +} + + + +.arrow { + width: auto !important; + position: absolute; + right: 0; + top: 10rpx; +} + +.stock { + flex: 1; +} \ No newline at end of file diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 3af5a32..097bdb2 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -3429,14 +3429,6 @@ Page({ }, - clickTab(e) { - // console.log(e); - let index = e.currentTarget.dataset.index; - this.setData({ - currentTabIndex: index, - }); - this.setexptype_w(e); - }, diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml index be8b5ca..208e2a7 100644 --- a/pages/goods/goodsInfo/buy_integral.wxml +++ b/pages/goods/goodsInfo/buy_integral.wxml @@ -70,7 +70,7 @@ 购买数量 - - + - + diff --git a/pages/goods/goodsInfo/buy_integral_normal.wxml b/pages/goods/goodsInfo/buy_integral_normal.wxml index 82293cc..ffb4a38 100644 --- a/pages/goods/goodsInfo/buy_integral_normal.wxml +++ b/pages/goods/goodsInfo/buy_integral_normal.wxml @@ -71,7 +71,7 @@ 购买数量 - - + - + diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml index cfeab1b..d5078a0 100644 --- a/pages/goods/goodsInfo/buy_pt.wxml +++ b/pages/goods/goodsInfo/buy_pt.wxml @@ -107,7 +107,7 @@