|
@@ -13,7 +13,7 @@
|
|
<view class="shoptitle">
|
|
<view class="shoptitle">
|
|
<!--选择商店的全部商品"-->
|
|
<!--选择商店的全部商品"-->
|
|
<view class="checkbox-box" @click.stop="checkShop(item)">
|
|
<view class="checkbox-box" @click.stop="checkShop(item)">
|
|
- <view class="checkbox iconfont" :class="[item.checked ?'icon-gouxuanl':'icon-weigouxuan']"></view>
|
|
|
|
|
|
+ <view class="checkbox iconfont" :class="[item.checked ?'icon-yixuanze':'icon-weixuanze']"></view>
|
|
</view>
|
|
</view>
|
|
<view v-if="item.promotions" class="floor-item-act">
|
|
<view v-if="item.promotions" class="floor-item-act">
|
|
<view class="floor-tags" @click.stop="clickPopupShow(item,2)">{{item.promotions.name}}</view>
|
|
<view class="floor-tags" @click.stop="clickPopupShow(item,2)">{{item.promotions.name}}</view>
|
|
@@ -25,7 +25,7 @@
|
|
<view class="goods-pros-t">
|
|
<view class="goods-pros-t">
|
|
<!--选择商品-->
|
|
<!--选择商品-->
|
|
<view class="checkbox-box" @click.stop="ischeck(item,pros)">
|
|
<view class="checkbox-box" @click.stop="ischeck(item,pros)">
|
|
- <view class="checkbox iconfont" :class="[pros.productsChecked ? 'icon-gouxuanl':'icon-weigouxuan']"></view>
|
|
|
|
|
|
+ <view class="checkbox iconfont" :class="[pros.productsChecked ? 'icon-yixuanze':'icon-weixuanze']"></view>
|
|
</view>
|
|
</view>
|
|
<view class="pros-img" @click.stop="navToListPage(pros.productId)" ><image :src="pros.image ? pros.image:''" alt="" /></view>
|
|
<view class="pros-img" @click.stop="navToListPage(pros.productId)" ><image :src="pros.image ? pros.image:''" alt="" /></view>
|
|
<view class="pros-product">
|
|
<view class="pros-product">
|
|
@@ -84,12 +84,12 @@
|
|
<!--选择商品-->
|
|
<!--选择商品-->
|
|
<view class="checkbox-box" @click.stop="ischeckFailure(failure)" v-if="isshowDelbtn">
|
|
<view class="checkbox-box" @click.stop="ischeckFailure(failure)" v-if="isshowDelbtn">
|
|
<button class="checkbox iconfont"
|
|
<button class="checkbox iconfont"
|
|
- :class="[ failure.productsChecked ? 'icon-gouxuanl':'icon-weigouxuan']">
|
|
|
|
|
|
+ :class="[ failure.productsChecked ? 'icon-yixuanze':'icon-weixuanze']">
|
|
</button>
|
|
</button>
|
|
</view>
|
|
</view>
|
|
|
|
+ <text class="img-tip">失效</text>
|
|
<view class="pros-img">
|
|
<view class="pros-img">
|
|
<image :src="failure.image ? failure.image:''" alt="" />
|
|
<image :src="failure.image ? failure.image:''" alt="" />
|
|
- <text class="img-tip">失效</text>
|
|
|
|
</view>
|
|
</view>
|
|
<view class="pros-product">
|
|
<view class="pros-product">
|
|
<view class="producttitle">{{failure.name}}</view>
|
|
<view class="producttitle">{{failure.name}}</view>
|
|
@@ -106,7 +106,7 @@
|
|
<view class="footer">
|
|
<view class="footer">
|
|
<view class="footer-le">
|
|
<view class="footer-le">
|
|
<view class="foot-check checkbox-box" @tap.stop="checkAll()">
|
|
<view class="foot-check checkbox-box" @tap.stop="checkAll()">
|
|
- <button class="checkbox iconfont" :class="[isCheckAll?'icon-gouxuan':'icon-weigouxuan']"></button>
|
|
|
|
|
|
+ <button class="checkbox iconfont" :class="[isCheckAll?'icon-yixuanze':'icon-weixuanze']"></button>
|
|
<view class="text">全选</view>
|
|
<view class="text">全选</view>
|
|
</view>
|
|
</view>
|
|
|
|
|
|
@@ -874,11 +874,10 @@
|
|
font-size: $font-size-26;
|
|
font-size: $font-size-26;
|
|
height: 50rpx;
|
|
height: 50rpx;
|
|
line-height: 50rpx;
|
|
line-height: 50rpx;
|
|
- color: $text-color;
|
|
|
|
|
|
+ color:#666666;
|
|
float: left;
|
|
float: left;
|
|
padding-left: 10rpx;
|
|
padding-left: 10rpx;
|
|
text{
|
|
text{
|
|
- color: $color-system;
|
|
|
|
margin: 0 6rpx;
|
|
margin: 0 6rpx;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -891,7 +890,7 @@
|
|
line-height: 50rpx;
|
|
line-height: 50rpx;
|
|
border-radius: 30rpx;
|
|
border-radius: 30rpx;
|
|
background:#FFFFFF;
|
|
background:#FFFFFF;
|
|
- border: 1px solid #C9C9C9;
|
|
|
|
|
|
+ border: 1px solid #e15616;
|
|
color: #E15616;
|
|
color: #E15616;
|
|
float: right;
|
|
float: right;
|
|
text-align: center;
|
|
text-align: center;
|
|
@@ -906,7 +905,7 @@
|
|
.checkbox{
|
|
.checkbox{
|
|
display: flex;
|
|
display: flex;
|
|
margin: 0;
|
|
margin: 0;
|
|
- padding: 0;
|
|
|
|
|
|
+ padding: 5rpx;
|
|
display: flex;
|
|
display: flex;
|
|
flex-direction: column;
|
|
flex-direction: column;
|
|
align-items: center;
|
|
align-items: center;
|
|
@@ -918,7 +917,10 @@
|
|
overflow: hidden;
|
|
overflow: hidden;
|
|
background-color:#FFFFFF;
|
|
background-color:#FFFFFF;
|
|
font-size: 36rpx;
|
|
font-size: 36rpx;
|
|
- color:$color-system;
|
|
|
|
|
|
+ color:#999999;
|
|
|
|
+ &.icon-yixuanze{
|
|
|
|
+ color: $color-system;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
&.disabled{
|
|
&.disabled{
|
|
.checkbox{
|
|
.checkbox{
|
|
@@ -984,6 +986,7 @@
|
|
.goods-pros{
|
|
.goods-pros{
|
|
width: 100%;
|
|
width: 100%;
|
|
height: auto;
|
|
height: auto;
|
|
|
|
+ margin-bottom: 20rpx;
|
|
}
|
|
}
|
|
.goods-pros-t{
|
|
.goods-pros-t{
|
|
display: flex;
|
|
display: flex;
|
|
@@ -1047,15 +1050,16 @@
|
|
.sum{
|
|
.sum{
|
|
width: 100%;
|
|
width: 100%;
|
|
height: 40rpx;
|
|
height: 40rpx;
|
|
- font-size: $font-size-28;
|
|
|
|
|
|
+ font-size: $font-size-26;
|
|
line-height: 40rpx;
|
|
line-height: 40rpx;
|
|
color: $text-color;
|
|
color: $text-color;
|
|
float: left;
|
|
float: left;
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: flex-end;
|
|
justify-content: flex-end;
|
|
|
|
+ font-weight: bold;
|
|
.money{
|
|
.money{
|
|
color: #FF2A2A;
|
|
color: #FF2A2A;
|
|
- font-size: $font-size-28;
|
|
|
|
|
|
+ font-size: $font-size-26;
|
|
}
|
|
}
|
|
.money-sign{
|
|
.money-sign{
|
|
font-size: $font-size-24;
|
|
font-size: $font-size-24;
|
|
@@ -1064,7 +1068,7 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.pros-product{
|
|
.pros-product{
|
|
- width: 402rpx;
|
|
|
|
|
|
+ width: 416rpx;
|
|
height: 100%;
|
|
height: 100%;
|
|
line-height: 36rpx;
|
|
line-height: 36rpx;
|
|
font-size: $font-size-28;
|
|
font-size: $font-size-28;
|
|
@@ -1079,7 +1083,7 @@
|
|
-webkit-box-orient: vertical;
|
|
-webkit-box-orient: vertical;
|
|
-webkit-line-clamp: 2;
|
|
-webkit-line-clamp: 2;
|
|
overflow: hidden;
|
|
overflow: hidden;
|
|
- margin-bottom: 8rpx;
|
|
|
|
|
|
+ margin-bottom: 15rpx;
|
|
.no-text{
|
|
.no-text{
|
|
display: inline-block;
|
|
display: inline-block;
|
|
height:36rpx;
|
|
height:36rpx;
|
|
@@ -1101,13 +1105,14 @@
|
|
.productprice{
|
|
.productprice{
|
|
width: 100%;
|
|
width: 100%;
|
|
height: 48rpx;
|
|
height: 48rpx;
|
|
- margin: 10rpx 0 0 0;
|
|
|
|
|
|
+ margin: 30rpx 0 0 0;
|
|
.price{
|
|
.price{
|
|
line-height: 48rpx;
|
|
line-height: 48rpx;
|
|
- font-size: $font-size-28;
|
|
|
|
|
|
+ font-size: $font-size-26;
|
|
width: 48%;
|
|
width: 48%;
|
|
color: #FF2A2A;
|
|
color: #FF2A2A;
|
|
float: left;
|
|
float: left;
|
|
|
|
+ font-weight: bold;
|
|
&.disabled{
|
|
&.disabled{
|
|
color: #999999;
|
|
color: #999999;
|
|
text-decoration: line-through;
|
|
text-decoration: line-through;
|
|
@@ -1162,22 +1167,26 @@
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: center;
|
|
justify-content: center;
|
|
align-items: center;
|
|
align-items: center;
|
|
|
|
+ border: 2rpx solid #ffe6dc;
|
|
.iconfont{
|
|
.iconfont{
|
|
font-size: $font-size-24;
|
|
font-size: $font-size-24;
|
|
padding:0 20rpx;
|
|
padding:0 20rpx;
|
|
- color: $text-color;
|
|
|
|
|
|
+ color: #999999;
|
|
text-align: center;
|
|
text-align: center;
|
|
line-height: 48rpx;
|
|
line-height: 48rpx;
|
|
font-weight: bold;
|
|
font-weight: bold;
|
|
|
|
+ background: #fef6f3;
|
|
|
|
+
|
|
}
|
|
}
|
|
.btn-input{
|
|
.btn-input{
|
|
width: 62rpx;
|
|
width: 62rpx;
|
|
height: 48rpx;
|
|
height: 48rpx;
|
|
line-height: 48rpx;
|
|
line-height: 48rpx;
|
|
- background: #F8F8F8;
|
|
|
|
|
|
+ background: #fff;
|
|
border-radius: 4rpx;
|
|
border-radius: 4rpx;
|
|
text-align: center;
|
|
text-align: center;
|
|
font-size: $font-size-24;
|
|
font-size: $font-size-24;
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.uni-numbox{
|
|
.uni-numbox{
|
|
@@ -1226,13 +1235,13 @@
|
|
background: #FFFFFF;
|
|
background: #FFFFFF;
|
|
.failure-title{
|
|
.failure-title{
|
|
width: 100%;
|
|
width: 100%;
|
|
- height: 80rpx;
|
|
|
|
- line-height: 80rpx;
|
|
|
|
|
|
+ height: 82rpx;
|
|
|
|
+ line-height: 82rpx;
|
|
font-size: $font-size-28;
|
|
font-size: $font-size-28;
|
|
border-bottom: 1px solid #EBEBEB;
|
|
border-bottom: 1px solid #EBEBEB;
|
|
.title-txt{
|
|
.title-txt{
|
|
float: left;
|
|
float: left;
|
|
- color: $text-color;
|
|
|
|
|
|
+ color:#666666;
|
|
text-align: left;
|
|
text-align: left;
|
|
}
|
|
}
|
|
.title-btn{
|
|
.title-btn{
|
|
@@ -1248,8 +1257,8 @@
|
|
line-height: 50rpx;
|
|
line-height: 50rpx;
|
|
border-radius: 30rpx;
|
|
border-radius: 30rpx;
|
|
background:#FFFFFF;
|
|
background:#FFFFFF;
|
|
- border: 1px solid #C9C9C9;
|
|
|
|
- color: #999999;
|
|
|
|
|
|
+ // border: 1px solid #C9C9C9;
|
|
|
|
+ // color: #999999;
|
|
margin-top: 15rpx;
|
|
margin-top: 15rpx;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1267,30 +1276,30 @@
|
|
width: 100%;
|
|
width: 100%;
|
|
height: 210rpx;
|
|
height: 210rpx;
|
|
position: relative;
|
|
position: relative;
|
|
|
|
+ .img-tip{
|
|
|
|
+ display: block;
|
|
|
|
+ width: 72rpx;
|
|
|
|
+ height: 36rpx;
|
|
|
|
+ line-height: 36rpx;
|
|
|
|
+ font-size: $font-size-24;
|
|
|
|
+ text-align: center;
|
|
|
|
+ color: #FFFFFF;
|
|
|
|
+ border-radius: 24rpx;
|
|
|
|
+ background:rgba(51,51,51,0.3);
|
|
|
|
+ // position: absolute;
|
|
|
|
+ // left: 0;
|
|
|
|
+ // top: 0;
|
|
|
|
+ }
|
|
.checkbox-box{
|
|
.checkbox-box{
|
|
padding: 10rpx;
|
|
padding: 10rpx;
|
|
}
|
|
}
|
|
.pros-img{
|
|
.pros-img{
|
|
- width: 210rpx;
|
|
|
|
|
|
+ width: 180rpx;
|
|
height: 100%;
|
|
height: 100%;
|
|
border-radius: 10rpx;
|
|
border-radius: 10rpx;
|
|
margin:0 20rpx;
|
|
margin:0 20rpx;
|
|
border:1px solid #f3f3f3;
|
|
border:1px solid #f3f3f3;
|
|
position: relative;
|
|
position: relative;
|
|
- .img-tip{
|
|
|
|
- display: block;
|
|
|
|
- width: 72rpx;
|
|
|
|
- height: 36rpx;
|
|
|
|
- line-height: 36rpx;
|
|
|
|
- font-size: $font-size-24;
|
|
|
|
- text-align: center;
|
|
|
|
- color: #FFFFFF;
|
|
|
|
- border-radius: 10rpx 0 10rpx 0;
|
|
|
|
- background:linear-gradient(34deg,rgba(255,149,42,1) 0%,rgba(225,86,22,1) 100%);
|
|
|
|
- position: absolute;
|
|
|
|
- left: 0;
|
|
|
|
- top: 0;
|
|
|
|
- }
|
|
|
|
image{
|
|
image{
|
|
width: 100%;
|
|
width: 100%;
|
|
height: 100%;
|
|
height: 100%;
|
|
@@ -1368,6 +1377,7 @@
|
|
height: 36rpx;
|
|
height: 36rpx;
|
|
color: #999999;
|
|
color: #999999;
|
|
font-size: $font-size-26;
|
|
font-size: $font-size-26;
|
|
|
|
+ margin-top: 20rpx;
|
|
}
|
|
}
|
|
.productstate{
|
|
.productstate{
|
|
font-size: $font-size-28;
|
|
font-size: $font-size-28;
|
|
@@ -1388,7 +1398,7 @@
|
|
bottom: 0rpx;
|
|
bottom: 0rpx;
|
|
z-index: 100;
|
|
z-index: 100;
|
|
.footer-le{
|
|
.footer-le{
|
|
- width: 520rpx;
|
|
|
|
|
|
+ width: 472rpx;
|
|
height: 100%;
|
|
height: 100%;
|
|
padding:0 24rpx;
|
|
padding:0 24rpx;
|
|
float: left;
|
|
float: left;
|
|
@@ -1407,7 +1417,7 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.sum{
|
|
.sum{
|
|
- width: 380rpx;
|
|
|
|
|
|
+ width: 350rpx;
|
|
height: 110rpx;
|
|
height: 110rpx;
|
|
float: right;
|
|
float: right;
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
@@ -1459,14 +1469,17 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.footer-ri{
|
|
.footer-ri{
|
|
- width: 180rpx;
|
|
|
|
- height: 100%;
|
|
|
|
|
|
+ width: 210rpx;
|
|
|
|
+ height: 84rpx;
|
|
background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
|
|
background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
|
|
float: right;
|
|
float: right;
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
align-items: center;
|
|
align-items: center;
|
|
z-index: 999;
|
|
z-index: 999;
|
|
|
|
+ margin-right: 20rpx;
|
|
|
|
+ border-radius: 49rpx;
|
|
|
|
+ margin-top: 14rpx;
|
|
&.none{
|
|
&.none{
|
|
display: none;
|
|
display: none;
|
|
}
|
|
}
|