diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 7049609..6f51416 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -38,7 +38,7 @@
-
+
{{item.pname}}
@@ -50,7 +50,7 @@
- {{items.goods_name}}
+ {{items.goods_name}}
@@ -176,7 +176,7 @@
- {{bn_goods.goods_name}}
+ {{bn_goods.goods_name}}
@@ -205,7 +205,7 @@
- {{buy_now_gift_goods.goods_name}}
+ {{buy_now_gift_goods.goods_name}}
@@ -228,7 +228,7 @@
- {{item.goods_name}}
+ {{item.goods_name}}
diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss
index 72adb66..0da96cd 100644
--- a/pages/cart/cart2/cart2.wxss
+++ b/pages/cart/cart2/cart2.wxss
@@ -95,8 +95,8 @@ page {
.goods-img {
float: left;
- width: 191rpx;
- height: 191rpx;
+ width: 200rpx;
+ height: 200rpx;
margin: 0 20rpx;
}
@@ -335,9 +335,14 @@ margin:auto; */
}
/*----------nyf新增，地址---------*/
-.add_new{height: 60rpx; line-height: 60rpx;}
+.add_new{
+ height: 90rpx;
+ display: flex;
+ align-items: center;
+ padding: 0 26rpx;
+}
.addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd;
- margin-right: 15rpx; margin-left: 20rpx; vertical-align: middle;}
+ margin-right: 15rpx;vertical-align: middle;}
.yu_er{
margin-left: 10rpx;
/* margin-right: 60rpx; */
diff --git a/pages/cart/cart2_pt/cart2_pt.wxml b/pages/cart/cart2_pt/cart2_pt.wxml
index 58566d5..f53a019 100644
--- a/pages/cart/cart2_pt/cart2_pt.wxml
+++ b/pages/cart/cart2_pt/cart2_pt.wxml
@@ -2,14 +2,14 @@
diff --git a/pages/cart/cart2_pt/cart2_pt.wxss b/pages/cart/cart2_pt/cart2_pt.wxss
index 753ef7b..0da96cd 100644
--- a/pages/cart/cart2_pt/cart2_pt.wxss
+++ b/pages/cart/cart2_pt/cart2_pt.wxss
@@ -1,15 +1,49 @@
+.bdr_t-14 {
+ border-top-left-radius: 14rpx;
+ border-top-right-radius: 14rpx;
+}
+.bdr_b-14 {
+ border-bottom-left-radius: 14rpx;
+ border-bottom-right-radius: 14rpx;
+}
+.bdr14 {
+ border-radius: 14rpx;
+}
+.mgt20 {
+ margin-top: 20rpx;
+}
+.shadow {
+ box-shadow: 0 4rpx 12px #e7e9eb;
+}
+.shadow-1 {
+ box-shadow: 16rpx 0px 12px #e7e9eb;
+}
+
+
+page {
+ /* background-color: #FAFAFA; */
+ background-color: #F0F0F0;
+ padding: 0 22rpx;
+ box-sizing: border-box;
+}
+.container {
+ background-color: #F0F0F0;
+ /* padding-top: 28rpx; */
+ padding-bottom: 120rpx;
+}
.user-mes {
position: relative;
background-color: #fff;
font-size: 32rpx;
color: #444;
+ /* margin-top: 28rpx; */
+ border-radius: 14rpx;
}
.user-contact {
- padding: 24rpx 70rpx;
- font-weight: 600;
-
+ padding: 24rpx 26rpx;
+ font-weight: 600;
}
-
+
.location {
position: relative;
padding: 0 70rpx 24rpx;
@@ -17,15 +51,15 @@
.pos-icon {
position: absolute;
- left: 22rpx;
- top: 20rpx;
- width: 32rpx;
- height: 40rpx;
+ left: 28rpx;
+ top: 6rpx;
+ width: 30rpx;
+ height: 36rpx;
}
.border-img {
width: 100%;
- height: 16rpx;
+ height: 12rpx;
}
.update-logistics {
@@ -33,7 +67,7 @@
right: 0;
top: 0;
width: 80rpx;
- height: 148rpx;
+ height: 100%;
display: flex;
align-items: center;
justify-content: center;
@@ -52,7 +86,7 @@
.order-detail {
padding: 30rpx 0;
- border-bottom: 7rpx solid #eee;
+ border-bottom: 2rpx solid #eee;
color: #777;
min-height: 190rpx;
background-color: #fff;
@@ -61,14 +95,14 @@
.goods-img {
float: left;
- width: 190rpx;
- height: 190rpx;
+ width: 200rpx;
+ height: 200rpx;
margin: 0 20rpx;
}
.order-cont {
float: left;
- width: 400rpx;
+ width: 438rpx;
}
.goods-name {
@@ -78,7 +112,7 @@
margin-bottom: 16rpx;
font-size: 28rpx;
color: #333;
-
+
}
.goods-color {
@@ -86,29 +120,38 @@
}
.order-num {
- float: right;
+ margin-top: 25rpx;
font-size: 24rpx;
- margin-top: 10rpx;
- margin-right: 20rpx;
- text-align: right;
line-height: 42rpx;
}
-.set-mes{background-color: #fff; }
+.set-mes{
+ background-color: #fff;
+ /* margin-top: 20rpx; */
+}
.use-item{
display: flex;
align-items: center;
- height: 92rpx;
- border-bottom: 1px solid #ddd;
+ height: 80rpx;
+ /* border-bottom: 1px solid #ddd; */
font-size: 30rpx;
- width: 95%;
- margin: auto;
+ /* width:95%;
+margin:auto; */
+ padding: 0 26rpx;
}
.use-item>view{
- display: flex;margin-right: 10rpx;
+ display: flex;
+ /* margin-right: 12rpx; */
+}
+.use-item.bfff{
+ background-color: #fff;
+}
+.use-item .dp{
+ display: block;
+ width: 50rpx;
+ height: 50rpx;
+ margin-left: -6rpx;
}
-.use-item.bfff{ background-color: #fff;}
-.use-item .dp{width: 56rpx; height: 56rpx; margin-left: -5rpx}
.set-item {
justify-content: space-between;
@@ -138,15 +181,16 @@
}
.coupon-mes {
- height:95rpx;
- padding: 0 20rpx;
+ /* box-sizing: border-box; */
+ height:95rpx;
+ padding: 0 26rpx;
background-color: #fff;
font-size: 30rpx;
color: #444;
- width: 100%;
- border-bottom: 6rpx solid #eee;
- margin-bottom: 20rpx;
-
+ /* width: 100%; */
+ border-radius: 14rpx;
+ margin-top: 20rpx;
+ margin-bottom: 20rpx;
}
.coupon-title {
@@ -175,12 +219,12 @@
position: relative;
font-size: 24rpx;
margin-left: 20rpx;
-
+ flex-grow: 1;
}
.word-box {
-
- width: 600rpx;
+ font-size: 26rpx;
+ /* width: 600rpx; */
padding: 10rpx;
height: 28rpx;
line-height: 40rpx;
@@ -193,9 +237,9 @@
}
.information {
- padding: 0 20rpx;
+ padding: 0 26rpx;
background-color: #fff;
- margin-bottom: 120rpx;
+ /* margin-bottom: 120rpx; */
}
.information .item {
@@ -208,34 +252,50 @@
}
.btn-wrap {
- height: 100rpx; width: 100%;
- background-color: #fff;
- position: fixed; bottom: 0;left: 0
+ height: 94rpx;
+ box-sizing: border-box;
+ display: flex;
+ justify-content: space-between;
+ background-color: white;
+ align-items: center;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ padding: 0 30rpx;
}
.tips-btn {
- float: right;
+ /* float: right;
width: 200rpx;
height: 100rpx;
line-height: 100rpx;
text-align: center;
font-size: 30rpx;
color: #fff;
- background-color: #f23030;
+ background-color: #f23030; */
+ color: white;
+ background-color: #FE4445;
+ height: 72rpx;
+ line-height: 72rpx;
+ padding: 0 42rpx;
+ border-radius: 36rpx;
+ margin-left: 0;
+ margin-right: 0;
}
.pay-amount {
- float: right;
+ /* float: right;
display: flex;
align-items: center;
height: 100rpx;
font-size: 26rpx;
- margin-right: 40rpx;
+ margin-right: 40rpx; */
}
.payable {
color: #444;
- margin-right: 20rpx;
+ /* margin-right: 20rpx; */
}
.shipping-modal {
@@ -275,24 +335,58 @@
}
/*----------nyf新增，地址---------*/
-.add_new{height: 60rpx; line-height: 60rpx;}
+.add_new{
+ height: 90rpx;
+ display: flex;
+ align-items: center;
+ padding: 0 26rpx;
+}
.addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd;
- margin-right: 15rpx; margin-left: 20rpx; vertical-align: middle;}
-.yu_er{margin-left: 15rpx;} .wuliu{margin-left: 20rpx;}
+ margin-right: 15rpx;vertical-align: middle;}
+.yu_er{
+ margin-left: 10rpx;
+ /* margin-right: 60rpx; */
+}
+.wuliu{margin-left: 20rpx;}
+/*---- 优惠券列表 -----*/
+.xc-coupon-frame{
+ width: 100%;
+ height: 92rpx;
+
+}
+.xc-coupon-frame .work-frame{
+ width: 100%;
+ height: 100%;
+ border-bottom:3rpx solid #eee;
+ padding: 0 26rpx;
+ background-color: white;
+}
+.xc-right{
+ width:20rpx;
+ height:20rpx;
+ border-top:2rpx solid #000;
+ border-right:2rpx solid #000;
+ transform:rotate(45deg);
+ display:inline-block;
+}
+
+.xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; }
+.xc-right-frame{font-size: 30rpx;line-height: 92rpx; margin-right: 10rpx }
+
/* 自定义弹出窗口 */
.cx-popup{
width:100%;
- height:920rpx;
+ height:880rpx;
background: #fff;
z-index: 35;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
position:fixed;
bottom:0;
- padding-bottom: 25rpx;
-
+ left: 0;
+ /* padding-bottom: 25rpx; */
}
.cx-popup .top{
@@ -300,7 +394,7 @@
height:100rpx;
border-bottom:3rpx solid #ddd;
margin: auto;
- margin-top: 30rpx;
+ margin-top: 30rpx;
}
.xc-top-content{
@@ -321,7 +415,7 @@
}
.xc-frame{
width: 100%;
- height:68.9%;
+ height:60%;
}
.xc-frame .list-frame{
@@ -332,18 +426,18 @@
}
.xc-close-frame{
margin-top:-10rpx;
-
+
}
.xc-close{
- width: 37rpx;
- height: 37rpx;
- border-radius: 50%;
- border: 3rpx solid #333;
- text-align: center;
- line-height: 34rpx;
- font-size: 29rpx;
- color: #333;
+ width: 37rpx;
+height: 37rpx;
+border-radius: 50%;
+border: 3rpx solid #333;
+text-align: center;
+line-height: 34rpx;
+font-size: 29rpx;
+color: #333;
}
.xc-money{
@@ -388,7 +482,7 @@
.xc-coupon-money1{
color: #444;
font-size: 28rpx;
- line-height: 60rpx;
+ line-height: 60rpx;
}
@@ -406,9 +500,9 @@
}
.xc-confirm {
- width: 48%;
- border-radius: 50rpx;
- height: 50rpx;
+ width: 50%;
+ border-radius: 50rpx;
+ height: 80rpx;
margin:0 auto;
background:#d60021;
color:#fff;
@@ -422,128 +516,300 @@
@keyframes down { 0% { transform: translateY(0); } 100% { transform: translateY(550rpx); } }
.xc-not-Selection{
- width: 40rpx;
- height: 40rpx;
+ width: 40rpx;
+height: 40rpx;
background: #eeeeee;
}
.xc-close-express{
- width: 40rpx;
- height: 40rpx;
- border-radius: 50%;
- border: 3rpx solid #333;
- text-align: center;
- font-size:32rpx;
- line-height: 38rpx;
- color: #333;
- margin-top: 5rpx;
+ width: 40rpx;
+height: 40rpx;
+border-radius: 50%;
+border: 3rpx solid #333;
+text-align: center;
+font-size:32rpx;
+line-height: 38rpx;
+color: #333;
+margin-top: 5rpx;
}
.cx-popup .tops{
- width: 100%;
- height: 145rpx;
- border-bottom: 3rpx solid #eee;
+ width: 100%;
+height: 145rpx;
+border-bottom: 3rpx solid #eee;
}
.top-content {
- width: 82%;
- padding-top: 33px;
- height: 100%;
- padding-left: 40rpx;
+ width: 82%;
+padding-top: 33px;
+height: 100%;
+padding-left: 40rpx;
}
.close-frame{
- margin-top: 30rpx;
+ margin-top: 30rpx;
}
-.cx-popup.radius{
-
- height: 650rpx;
-}
.xc-hook {
- width: 33rpx;
- height: 33rpx;
- transform: rotate(-135deg);
- line-height: 35rpx;
- text-align: center;
- margin-right: 20rpx
+width: 33rpx;
+height: 33rpx;
+transform: rotate(-135deg);
+line-height: 35rpx;
+text-align: center;
+margin-right: 20rpx
}
.xc-hooks {
- width: 30rpx;
- height: 30rpx;
- border: 1rpx solid #999;
- margin-right: 20rpx;
+width: 30rpx;
+height: 30rpx;
+border: 1rpx solid #999;
+margin-right: 20rpx;
}
.express_list_frame{
- display: flex;
- height: 80rpx;
- align-items: center;
- padding-left: 40rpx;
- border-bottom: 1rpx solid #eee;
+ display: flex;
+height: 80rpx;
+align-items: center;
+padding-left: 40rpx;
+border-bottom: 1rpx solid #eee;
}
.express_list{
- width: 100%;
- height: 65%;
- overflow-y: scroll;
- overflow: hidden;
+ width: 100%;
+ height: 65%;
+ overflow-y: auto;
+ margin-bottom: 40rpx;
+
}
.xc-confirms {
- width: 40%;
- border-radius: 50rpx;
- height: 55rpx;
- margin:0 auto;
- font-size:28rpx;
- background: #fff;
- color: #333;
- border: 2rpx solid #333;
-
+ box-sizing: border-box;
+ width: 40%;
+ border-radius: 50rpx;
+ height: 80rpx;
+ margin:0 auto;
+ font-size:28rpx;
+ background: #fff;
+ color: #333;
+ border: 2rpx solid #333;
}
-.xc-right{
- width:20rpx;
- height:20rpx;
- border-top:2rpx solid #000;
- border-right:2rpx solid #000;
- transform:rotate(45deg);
- display:inline-block;
- margin-right: 5rpx;
- margin-left: 10rpx;
-}
+/* 优惠券的改版样式 */
+.xc-coupon-frame{
+ /* width: 710rpx; */
+ width: 100%;
+ height:auto;
+ margin: 0 auto;
+}
+.xc-coupon-frame .coupon-frame{
+ width: 100%;
+ height: 200rpx;
+ margin-top:10rpx;
+ border-bottom: 1rpx solid #eee;
-.xc-left{
- margin-left: 45rpx;
}
-.xc-border{
- border-top:8rpx solid #eee;
-width: 100%
+.xc-coupon-frame .coupon-frame .coupon-left{
+ width: 215rpx;
+ height:100%;
+ overflow: hidden;
}
-.main-top{
-margin-top: 20rpx;
+.xc-money-frames{
+ width:96%;
+ margin-top: -10px;
+}
+
+.xc-rmb-symbol{
+ font-size:40rpx;
}
-.order-num {
- margin-top: 25rpx;
- font-size: 24rpx;
- line-height: 42rpx;
- width: 95%;
+.xc-rmb-val{
+ font-size:60rpx;
+
+}
+.coupon-explain{
+ font-size:25rpx;
+width:100%;
+
+
+}
+.xc-valuer{
+ margin-top:39rpx;
+ margin-left:28rpx;
+ font-size:25rpx;
+}
+.coupon-frame .oval{
+ width:155rpx;
+ height:83rpx;
+ border-radius: 50%;
+ right:-78rpx;
+ top:-37rpx;
+}
+.coupon-right{
+ /* width:490rpx; */
+ height: 99%;
+ border-top: 1rpx solid #eaeaea;
+ /* //border-bottom: 1rpx solid #eaeaea; */
+ border-right: 1rpx solid #eaeaea;
+ flex-grow: 1;
+}
+.coupon-annotation{
+ width: 95%;
+ height: 100%;
+
}
+.xc-brand{
+ width:100rpx;
+ height:35rpx;
+ line-height: 35rpx;
+ font-size:21rpx;
+ border-radius:10rpx; position: relative; top:-1px;
+ margin-right: 8rpx
+}
+.top-frame{
+ width:82%;
+ height: 75rpx;
+ margin-top:10rpx;
+}
+.top-frame .coupon-wode{
+ font-size: 25rpx;
+ margin-left:10rpx;
+ width:340rpx;
+ height:88rpx;
+}
+.coupon-code{
+ width:60rpx;
+ height:60rpx;
+ margin-top:5rpx;
+
+}
+.frame{
+ width: 100%
+}
+.coupon-time{
+ font-size: 23rpx;
+ line-height:33rpx;
+ color: #333;
+}
+
+.clik-get{
+ width:125rpx;
+ height:45rpx;
+ border-radius: 25rpx;
+ line-height: 45rpx;
+ font-size:25rpx;
+ bottom:67rpx;
+ right:6px;
+}
+
+.code-img{
+ margin-left:20rpx;
+}
+.bottmo-explain{
+top:145rpx;
+width:94%;
+border-top:1rpx dashed #eee;
+padding-top:8rpx;
+height:38rpx;
+line-height: 51rpx;
+
+}
+.font-word{
+ font-size: 22rpx;
+}
+.circle-size{
+ background: #a0a0a0;
+ width: 27rpx;
+ height: 27rpx;
+ margin-top:13rpx;
+margin-left:8rpx;
+display: flex;
+
+align-items: center;
+}
+.xc-jiantou{
+ /* width: 9rpx;
+ height: 9rpx; */
+ /* border-top: 2rpx solid #fff;
+ border-right: 2rpx solid #fff; */
+ transform: rotate(-90deg);
+ color: #fff;
+ font-size: 15rpx;
+ /* display:inline-block;
+ margin-top: 6.5rpx; */
+ text-align: center;
+width: 24rpx;
+}
+.xc-buttom{
+ box-sizing: border-box;
+ width:100%;
+ min-height:76rpx;
+ height:auto;
+ line-height:40rpx;
+ border-left:1rpx solid #eee;
+ border-right:1rpx solid #eee;
+ border-bottom:1rpx solid #eee;
+/* margin-left: 6rpx; */
+}
+
.goods-num{
font-size: 28rpx;
-color: #333;
+ color: #333;
+}
+.explain-coupon{
+ font-size:25rpx;
+ padding: 10rpx 10rpx
}
-.click-buttem{
-width: 90%;
-margin: auto;
+.circle-frame{
+ width: 20rpx;
+ height: auto;
+ z-index:1;
+ left:210rpx;
+
+}
+.circle-sawtooth{
+ width: 11rpx;
+ height: 11rpx;
+ background: #fff;
+}
+
+.red{background-color: #fe7496;}
+.green{ background-color: #22c7c1;}
+.blue{background-color:#5e82e3;}
+.g_gray{background-color: #aaaaaa}
+
+.f_text{text-align: center; height:96rpx; }
+.xc-hook.sn {
+ margin-top:12%;
+width:45rpx;
+height:45rpx;
+font-size:28rpx;
+line-height:44rpx;
+
+
+}
+.xc-hooks.on{
+ margin-top:12%;
+width:42rpx;
+height:42rpx;
+}
+.may_use_coupon{
+ /* width: 95%; */
+ /* height: 68rpx; */
+ line-height:78rpx;
+ padding: 0 26rpx;
+ justify-content: space-between;
+ align-items: center;
+}
+.determine-frame{
+ width: 100%;
+ height: 130rpx;
+
}
.xc-determine{
- height: 55rpx;
+ height: 80rpx;
width: 40%;
border-radius: 50rpx;
background: #d60021;
@@ -552,6 +818,21 @@ font-size: 28rpx;
margin: 0 auto;
}
+.click-buttem{
+width: 90%;
+margin: auto;
+}
+.logistics-name{
+ margin-right:20rpx;
+}
+.xc-border{
+ border-top:8rpx solid #eee;
+width: 100%
+}
+.main-top{
+margin-top: 20rpx;
+
+}
.xc-hookts{
border: 1rpx solid #999;
@@ -561,8 +842,60 @@ border: 1rpx solid #999;
height:30rpx;
}
+.xc-hookt.sn{
+ width: 32rpx;
+height: 32rpx;
+font-size: 28rpx;
+line-height: 34rpx;
+}
+.xc-hookt{
+ transform: rotate(-135deg);
+text-align: center;
+
+}
+.main-bottom{
+ margin-bottom: 20rpx;
+
+}
+.xc-hookst{
+ border: 1rpx solid #999;
+
+}
+.xc-hookst.ons{
+ width: 42rpx;
+height: 42rpx;
+margin-left: 20rpx;
+
+}
+.is_use_coupon{
+ width: 65%;
+justify-content: flex-end;
+padding-top: 10rpx;
+
+
+}
+.xc-hooka{
+ transform: rotate(-135deg);
+text-align: center;
+
+}
+.xc-hooka.sn{
+ width: 45rpx;
+height: 45rpx;
+font-size: 28rpx;
+line-height: 44rpx;
+margin-left: 20rpx;
+
+}
.color-gray{
color: #808080;
}
+.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx }
+.gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0}
-.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx }
\ No newline at end of file
+.quan_num_show{ padding: 4rpx 6rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;font-size:24rpx;}
+
+.navigator-hover {
+ background: none;
+ opacity: 1;
+}
diff --git a/pages/cart/cart_wk/cart_wk.wxml b/pages/cart/cart_wk/cart_wk.wxml
index b083181..a2f5d2e 100644
--- a/pages/cart/cart_wk/cart_wk.wxml
+++ b/pages/cart/cart_wk/cart_wk.wxml
@@ -1,14 +1,14 @@
-
- {{user_addr.consignee}}{{' '}}{{user_addr.mobile}}
+ 收货人：{{user_addr.consignee}}{{' '}}{{user_addr.mobile}}
{{user_addr.more_address}}{{' '}}{{user_addr.address}}
-
+
@@ -21,15 +21,13 @@
添加地址
-
+
-
-
-
-
- {{pickup.pickup_name}}
+
+
+ 美得得超市{{pickup.pickup_name}}
@@ -39,17 +37,19 @@
- {{order.order_goods.goods_name}}
-
- ￥{{order.order_goods.goods_price}}
- x{{order.order_goods.goods_num}}
-
-
+
+ {{order.order_goods.goods_name}}
+
+ ￥{{order.order_goods.goods_price}}
+ x{{order.order_goods.goods_num}}
+
+
+
-
+
@@ -64,7 +64,7 @@
-
+
使用物流：
{{wu_arr[index].name}}
@@ -72,46 +72,45 @@
-
+
成团人数
{{teamgroup.jt_ct_num}}人
成团金额
- ￥{{filters.toFix(order.order_amount+order.user_money+order.tail_money,2)}}
+ ￥{{filters.toFix(order.order_amount+order.user_money+order.tail_money,2)}}
支付定金
- ￥{{filters.toFix(order.order_amount+order.user_money,2)}}
+ ￥{{filters.toFix(order.order_amount+order.user_money,2)}}
-
+
尾款金额
- ￥{{order.tail_money}}
+ ￥{{order.tail_money}}
配送费用
- ￥{{exp_price}}
+ ￥{{exp_price}}
-
-
+
+
+ 支付合计：¥{{filters.toFix(order.tail_money+exp_price,2)}}
+ 支付尾款
diff --git a/pages/cart/cart_wk/cart_wk.wxss b/pages/cart/cart_wk/cart_wk.wxss
index e8f3bf6..760dd32 100644
--- a/pages/cart/cart_wk/cart_wk.wxss
+++ b/pages/cart/cart_wk/cart_wk.wxss
@@ -1,26 +1,54 @@
-/* pages/cart/cart_wk/cart_wk.wxss */
+.bdr_t-14 {
+ border-top-left-radius: 14rpx;
+ border-top-right-radius: 14rpx;
+}
+.bdr_b-14 {
+ border-bottom-left-radius: 14rpx;
+ border-bottom-right-radius: 14rpx;
+}
+.bdr14 {
+ border-radius: 14rpx;
+}
+.mgt20 {
+ margin-top: 20rpx;
+}
+.shadow {
+ box-shadow: 0 4rpx 12px #e7e9eb;
+}
+.shadow-1 {
+ box-shadow: 16rpx 0px 12px #e7e9eb;
+}
+
+page {
+ background-color: #F0F0F0;
+ padding: 0 22rpx;
+ box-sizing: border-box;
+}
.user-mes {
- position: relative;
- background-color: #fff;
- font-size: 30rpx;
- color: #444;
+ position: relative;
+ background-color: #fff;
+ font-size: 32rpx;
+ color: #444;
+ /* margin-top: 28rpx; */
+ border-radius: 14rpx;
}
.user-contact {
- padding: 24rpx 80rpx;
+ padding: 24rpx 26rpx;
+ font-weight: 600;
}
-
+
.location {
- position: relative;
- padding: 0 80rpx 24rpx;
+ position: relative;
+ padding: 0 70rpx 24rpx;
}
.pos-icon {
- position: absolute;
- left: 30rpx;
- top: 0;
- width: 32rpx;
- height: 32.5rpx;
+ position: absolute;
+ left: 28rpx;
+ top: 6rpx;
+ width: 30rpx;
+ height: 36rpx;
}
.border-img {
@@ -29,14 +57,14 @@
}
.update-logistics {
- position: absolute;
- right: 0;
- top: 0;
- width: 80rpx;
- height: 148rpx;
- display: flex;
- align-items: center;
- justify-content: center;
+ position: absolute;
+ right: 0;
+ top: 0;
+ width: 80rpx;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.arrow-rigth {
@@ -60,56 +88,65 @@
}
.top {
-
- background-color: white;
-height: 40px;
-display: flex;
-padding: 10rpx 0 0 0;
-border-bottom: 2rpx solid rgb(238, 238, 238);
-margin-top: 10rpx;
-
+ background-color: white;
+ height: 40px;
+ display: flex;
+ padding: 0 26rpx;
+ /* border-bottom: 2rpx solid rgb(238, 238, 238); */
+ margin-top: 20rpx;
+ align-items: center;
}
-.t_img image {
- width: 70rpx;
- height: 70rpx;
+.t_img {
+ display: block;
+ width: 50rpx;
+ height: 50rpx;
+ margin-left:-6rpx;
}
.t_wz {
font-size: 30rpx;
- font-weight: bold;
+ /* font-weight: bold; */
color: rgb(0, 0, 0);
line-height: 65rpx;
- margin-left: 18rpx;
+ /* margin-left: 18rpx; */
}
.center {
+ box-sizing: border-box;
background-color: white;
width: 100%;
min-height: 80rpx;
display: flex;
- padding: 24rpx 140rpx 24rpx 20rpx;
+ padding: 24rpx 26rpx;
border-bottom: 2rpx solid #eee;
}
.center .cen_img {
- width: 120rpx;
- height: 120rpx;
+ width: 200rpx;
+ height: 200rpx;
+ border-radius: 14rpx;
+ overflow: hidden;
+ flex-shrink: 0;
}
.center .cen_img image {
- width: 120rpx;
- height: 120rpx;
+ display: block;
+ width: 100%;
+ height: 100%;
+}
+
+.details-container {
+ display: flex;
+ padding-left:20rpx;
+ flex:1;
+ flex-direction: column;
+ justify-content: space-between;
}
.center .cen_name {
height: 120rpx;
- width: 370rpx;
font-size: 30rpx;
- padding-left: 10rpx;
- overflow:hidden;
- text-overflow:ellipsis;
- white-space:nowraps
}
.center .cen_jg {
@@ -117,7 +154,6 @@ margin-top: 10rpx;
font-size: 32rpx;
width: 200rpx;
height: 40rpx;
- text-align: right;
}
.center .cen_jg .cen_sl {
@@ -128,20 +164,23 @@ margin-top: 10rpx;
}
.quhou {
+ box-sizing: border-box;
background-color: white;
border-bottom: 2rpx solid #eee;
font-size: 28rpx;
- min-height: 70rpx;
+ height: 92rpx;
display: flex;
- padding-top: 20rpx;
+ align-items: center;
+ padding: 0 26rpx;
}
.quhou .qu_fs {
font-size: 30rpx;
display: flex;
height: 60rpx;
- margin-left: 25rpx;
+ /* margin-left: 25rpx; */
line-height: 62rpx;
+ margin-right: 20rpx;
}
.quhou .qu_fs image {
@@ -156,23 +195,26 @@ margin-top: 10rpx;
.quhou .qu_fs .qu_wz {}
.chentuan {
+ box-sizing: border-box;
width: 100%;
min-height: 90rpx;
background-color: white;
- padding: 20rpx 10rpx;
+ padding: 20rpx 26rpx;
margin-top: 20rpx;
font-size: 28rpx;
}
.chentuan .ct_one {
- height: 40rpx;
- margin-bottom: 10rpx;
+ /* height: 40rpx; */
+ /* margin-bottom: 10rpx; */
display: flex;
- width: 708rpx;
+ line-height: 60rpx;
+ font-size: 30rpx;
+ /* width: 708rpx; */
}
.chentuan .ct_one .ct_one_left {
- margin-left: 10rpx;
+ /* margin-left: 10rpx; */
}
.chentuan .ct_one .ct_one_right {
@@ -185,14 +227,26 @@ margin-top: 10rpx;
}
.zf {
- background-color: white;
+ /* background-color: white;
width: 100%;
min-height: 80rpx;
line-height: 80rpx;
font-size: 30rpx;
position: fixed;
bottom: 0;
- text-align: right;
+ text-align: right; */
+
+ height: 94rpx;
+ box-sizing: border-box;
+ display: flex;
+ justify-content: space-between;
+ background-color: white;
+ align-items: center;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ padding: 0 30rpx;
}
.zf view{
@@ -204,13 +258,29 @@ margin-top: 10rpx;
margin-right: 20rpx;
}
-.zf .zf_btn {
- color: white;
+.zf_btn {
+ /* color: white;
background-color: #c4182e;
font-size: 28rpx;
width: 170rpx;
text-align: center;
- line-height: 80rpx;
+ line-height: 80rpx; */
+ /* float: right;
+ width: 200rpx;
+ height: 100rpx;
+ line-height: 100rpx;
+ text-align: center;
+ font-size: 30rpx;
+ color: #fff;
+ background-color: #f23030; */
+ color: white;
+ background-color: #FE4445;
+ height: 72rpx;
+ line-height: 72rpx;
+ padding: 0 42rpx;
+ border-radius: 36rpx;
+ margin-left: 0;
+ margin-right: 0;
}
.zf .zf_left .zf_left_red {
@@ -218,9 +288,22 @@ margin-top: 10rpx;
}
/*----------nyf新增，地址---------*/
-.add_new{height: 60rpx; line-height: 60rpx;}
-.addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd;
- margin-right: 15rpx; margin-left: 20rpx; vertical-align: middle;}
+.add_new{
+ box-sizing: border-box;
+ height: 92rpx;
+ padding: 0 26rpx;
+ display: flex;
+ align-items: center;
+ /* line-height: 60rpx; */
+}
+.addr_jia{
+ width: 45rpx;
+ height: 45rpx;
+ border: 1rpx solid #ddd;
+ margin-right: 15rpx;
+ /* margin-left: 20rpx; */
+ vertical-align: middle;
+}
.yu_er{margin-left: 15rpx;} .wuliu{margin-left: 20rpx;}
@@ -228,9 +311,9 @@ margin-top: 10rpx;
display: flex;
align-items: center;
height: 92rpx;
- border-bottom: 1px solid #ddd;
+ /* border-bottom: 1px solid #ddd; */
font-size: 30rpx;
- padding-left: 20rpx;
+ padding:0 26rpx;
background: #fff;
}
.use-item>view{