Skip to content

U
user
Commit 808b07ab by weijiguang
Options

修改样式

parent 1e2b877b
Showing with 67 additions and 71 deletions
components/menuAssembly/index.vue
...@@ -294,7 +294,7 @@ export default { ...@@ -294,7 +294,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0rpx 32rpx 0rpx 32rpx; padding: 0rpx 32rpx 0rpx 32rpx;
margin-bottom: 64rpx; margin-bottom: 60rpx;
background: #fff; background: #fff;
position: relative; position: relative;
.thumbnailBox{ .thumbnailBox{
...@@ -310,7 +310,7 @@ export default { ...@@ -310,7 +310,7 @@ export default {
//缩略图 //缩略图
width: 160rpx; width: 160rpx;
height: 160rpx; height: 160rpx;
margin-top: -2rpx; // margin-top: -2rpx;
vertical-align: bottom; vertical-align: bottom;
} }
} }
...@@ -364,7 +364,7 @@ export default { ...@@ -364,7 +364,7 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-top: 22rpx; margin-top: 28rpx;
.priceBox{ .priceBox{
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
...@@ -378,7 +378,7 @@ export default { ...@@ -378,7 +378,7 @@ export default {
color: #333333; color: #333333;
line-height: 30rpx; line-height: 30rpx;
margin-right: 4.2rpx; margin-right: 4.2rpx;
font-weight:500; font-weight: 500;
.moneyLog { .moneyLog {
font-size: 24rpx; font-size: 24rpx;
...@@ -400,15 +400,14 @@ export default { ...@@ -400,15 +400,14 @@ export default {
} }
.addbox{ .addbox{
// line-height: 26rpx; // line-height: 26rpx;
// margin-top: 20rpx ; padding-top: 12rpx;
.add { .add {
// padding-top: 10rpx;
margin-right: -1rpx; margin-right: -1rpx;
width: 40rpx; width: 44rpx;
height: 40rpx; height: 44rpx;
margin-top: 1rpx;
} }
} }
} }
} }
......
components/tabBar/tabBar.vue
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
} }
.navigator-item { .navigator-item {
padding-top: 1rpx;
display: flex; display: flex;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
......
menuSubPackage/pages/goodsDetail/goodsDetail.vue
...@@ -424,15 +424,14 @@ export default { ...@@ -424,15 +424,14 @@ export default {
} }
.spec-info-left { .spec-info-left {
padding: 24rpx 32rpx; padding: 28rpx 32rpx;
} }
.good { .good {
display: block; display: block;
width: 100%; width: 100%;
text-align: left; text-align: left;
// background-color: #000000;
.good-name { .good-name {
font-size: 28rpx; font-size: 28rpx;
...@@ -449,7 +448,7 @@ export default { ...@@ -449,7 +448,7 @@ export default {
} }
.good-spec-name { .good-spec-name {
padding-top: 30rpx; padding-top: 32rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
color: #999999; color: #999999;
font-weight: 400; font-weight: 400;
...@@ -490,7 +489,7 @@ export default { ...@@ -490,7 +489,7 @@ export default {
} }
.good-spec-rule-item { .good-spec-rule-item {
padding: 7rpx 48rpx; padding: 7rpx 24rpx;
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 24rpx; font-size: 24rpx;
...@@ -503,13 +502,15 @@ export default { ...@@ -503,13 +502,15 @@ export default {
line-height: 40rpx; line-height: 40rpx;
border-radius: 0rpx; border-radius: 0rpx;
border: none; border: none;
font-style: normal;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
background: #EAEAEA; background: #EAEAEA;
pointer-events: none; pointer-events: none;
&.active { &.active {
font-weight: 400; font-weight: 400;
padding: 7rpx 48rpx 6rpx 48rpx; padding: 7rpx 24rpx;
background: #0050F6; background: #0050F6;
font-style: normal;
color: #FFFFFF; color: #FFFFFF;
border-radius: 0rpx; border-radius: 0rpx;
border: 0rpx; border: 0rpx;
...@@ -583,7 +584,7 @@ button[disabled]:not([type]) { ...@@ -583,7 +584,7 @@ button[disabled]:not([type]) {
background: #FFFFFF; background: #FFFFFF;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 24rpx 32rpx 24rpx 32rpx; padding: 26rpx 32rpx 26rpx 32rpx;
.price{ .price{
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
...@@ -641,7 +642,7 @@ button[disabled]:not([type]) { ...@@ -641,7 +642,7 @@ button[disabled]:not([type]) {
.good-select-btn2 { .good-select-btn2 {
width: 328rpx; width: 328rpx;
height: 106rpx; height: 104rpx;
border-radius: 2px; border-radius: 2px;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
......
orderSubPackage/pages/orderInfo/index.vue
...@@ -35,50 +35,40 @@ ...@@ -35,50 +35,40 @@
</div> </div>
</div> </div>
<div class="shop_info"> <div class="shop_info">
<div class="address"> <div class="address">
<div class="address_1">{{ orderInfo.shop.name }}</div> <div class="address_1">{{ orderInfo.shop.name }}</div>
<div class="address_2">{{ orderInfo.shop.address }}</div> <div class="address_2">{{ orderInfo.shop.address }}</div>
</div> </div>
<div v-for="item in orderInfo.orderDetails" :key="item.id"> <div v-for="item in orderInfo.orderDetails" :key="item.id">
<div class="goods"> <div class="goods">
<div class="goods_item"> <div class="goods_item">
<image v-if="jsonParse(item.goods.pics).thumbnailApplet" :src="jsonParse(item.goods.pics).thumbnailApplet" class="goods_img" /> <image v-if="jsonParse(item.goods.pics).thumbnailApplet" :src="jsonParse(item.goods.pics).thumbnailApplet" class="goods_img" />
<image v-else :src="jsonParse(item.goods.pics).thumbnail" class="goods_img" /> <image v-else :src="jsonParse(item.goods.pics).thumbnail" class="goods_img" />
<div class="goods_text"> <div class="goods_text">
<div class="goods_name"> <div class="goods_name">
<div class="name">{{ item.goodsName }}</div> <div class="name">{{ item.goodsName }}</div>
<div class="price">¥{{ Utils.isInteger(item.realAmount) }}</div> <div class="price">¥{{ Utils.isInteger(item.realAmount) }}</div>
</div> </div>
<div class="goods_psce"> <div class="goods_psce">
<div class="psce_name"> <div class="psce_name">
<span v-for="(rule, index) in jsonParse(item.specRuleDetail)" :key="rule.specId"> <span v-for="(rule, index) in jsonParse(item.specRuleDetail)" :key="rule.specId">
{{ rule.ruleName }} {{ rule.ruleName }}
<text v-if="index != jsonParse(item.specRuleDetail).length - 1">/</text> <text v-if="index != jsonParse(item.specRuleDetail).length - 1">/</text>
</span> </span>
</div>
<div class="size">x{{ item.num }}</div>
</div> </div>
<div class="size">x{{ item.num }}</div>
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="discount">
<div class="discount_1">
<div class="name">优惠免减</div>
<div class="price">¥{{ setPrice(item.amount - item.realAmount) }}</div>
</div>
<div class="concessional_rate">
<div class="name">特惠价</div>
<div class="price">¥{{ setPrice(item.realAmount) }}</div>
</div>
</div> -->
</div> </div>
<div class="total"> </div>
<div class="size">共{{ totalNum }}件商品</div> <div class="total">
<div class="price"> <div class="size">共{{ totalNum }}件商品</div>
<span class="paid_in">实付</span> <div class="price">
<span class="money">￥{{ Utils.isInteger(orderInfo.amount) }}</span> <span class="paid_in">实付</span>
</div> <span class="money"><text class="money_logo">￥</text>{{ Utils.isInteger(orderInfo.amount) }}</span>
</div> </div>
</div>
</div> </div>
<div class="order_describe"> <div class="order_describe">
...@@ -332,7 +322,7 @@ export default { ...@@ -332,7 +322,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.pages { .pages {
padding-top: 1rpx; padding-top: 1rpx;
padding-bottom: 30rpx; padding-bottom: 32rpx;
.topBar{ .topBar{
position: fixed; position: fixed;
width: 100%; width: 100%;
...@@ -485,7 +475,7 @@ export default { ...@@ -485,7 +475,7 @@ export default {
.flow_describe { .flow_describe {
padding-top: 50rpx; padding-top: 50rpx;
padding-left: 32rpx; padding-left: 32rpx;
padding-right: 30rpx; padding-right: 32rpx;
padding-bottom: 58rpx; padding-bottom: 58rpx;
.title { .title {
...@@ -510,7 +500,7 @@ export default { ...@@ -510,7 +500,7 @@ export default {
.shop_info { .shop_info {
margin: 32rpx; margin: 32rpx;
background: #FFFFFF; background: #FFFFFF;
padding: 40rpx 30rpx 22rpx 30rpx; padding: 40rpx 32rpx 22rpx 32rpx;
h3 { h3 {
font-size: 28rpx; font-size: 28rpx;
...@@ -547,7 +537,7 @@ export default { ...@@ -547,7 +537,7 @@ export default {
.goods_item { .goods_item {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 30rpx; margin-top: 32rpx;
} }
.goods_img { .goods_img {
...@@ -597,10 +587,10 @@ export default { ...@@ -597,10 +587,10 @@ export default {
} }
.size { .size {
height: 34rpx; height: 40rpx;
line-height: 34rpx; line-height: 40rpx;
font-size: 28rpx;
margin-top: 24rpx; margin-top: 24rpx;
font-size: 24rpx;
font-family: ArialMT; font-family: ArialMT;
color: #666666; color: #666666;
} }
...@@ -659,11 +649,12 @@ export default { ...@@ -659,11 +649,12 @@ export default {
.size { .size {
height: 40rpx; height: 40rpx;
line-height: 40rpx; line-height: 52rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
} }
.price { .price {
display: flex; display: flex;
...@@ -675,16 +666,19 @@ export default { ...@@ -675,16 +666,19 @@ export default {
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
// vertical-align: bottom;
} }
.money { .money {
height: 48rpx; height: 48rpx;
line-height: 50rpx; line-height: 50rpx;
vertical-align: top;
font-size: 36rpx; font-size: 36rpx;
font-family: Futura-Medium, Futura; font-family: Futura-Medium, Futura;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
.money_logo {
font-weight: 900;
}
} }
} }
} }
...@@ -692,8 +686,8 @@ export default { ...@@ -692,8 +686,8 @@ export default {
.order_describe { .order_describe {
background: #fff; background: #fff;
padding: 24rpx 30rpx 24rpx 32rpx; padding: 24rpx 32rpx 24rpx 32rpx;
margin: 30rpx 32rpx 32rpx 32rpx; margin: 32rpx 32rpx 32rpx 32rpx;
.title { .title {
font-size: 28rpx; font-size: 28rpx;
......
pages/menu/menu.vue
...@@ -443,7 +443,7 @@ export default { ...@@ -443,7 +443,7 @@ export default {
width: 718rpx; width: 718rpx;
height: 179rpx; height: 179rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: -2px -2px 8px 0px rgba(102, 102, 102, 0.1), 4px 4px 8px 0px rgba(102, 102, 102, 0.1); box-shadow: -2px -2px 8px 0px rgba(102, 102, 102, 0.1), 2px 2px 8px 0px rgba(102, 102, 102, 0.1);
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
left: 16rpx; left: 16rpx;
......
pages/order/order.vue
...@@ -326,7 +326,7 @@ export default { ...@@ -326,7 +326,7 @@ export default {
background: #FFFFFF; background: #FFFFFF;
margin: 32rpx auto 0; margin: 32rpx auto 0;
box-sizing: border-box; box-sizing: border-box;
padding: 25rpx 30rpx 30rpx 30rpx; padding: 25rpx 32rpx 32rpx 32rpx;
.order_header { .order_header {
display: flex; display: flex;
...@@ -343,12 +343,13 @@ export default { ...@@ -343,12 +343,13 @@ export default {
.order_time { .order_time {
font-size: 24rpx; font-size: 24rpx;
font-family: ArialMT; font-family: ArialMT;
margin-top: 4rpx; margin-top: 3rpx;
line-height: 28rpx; line-height: 28rpx;
color: #999999; color: #999999;
} }
.order_status { .order_status {
margin-top: 7rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
...@@ -376,7 +377,7 @@ export default { ...@@ -376,7 +377,7 @@ export default {
} }
.goods_item { .goods_item {
margin-top: 42rpx; margin-top: 41rpx;
display: flex; display: flex;
// align-items: center; // align-items: center;
...@@ -439,7 +440,7 @@ export default { ...@@ -439,7 +440,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-top: 40rpx; margin-top: 39rpx;
.total { .total {
font-size: 28rpx; font-size: 28rpx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment