Skip to content

U
user
Commit aed35d1c by 宋冰琦
Options

修改部分样式问题

parent f83e0934
Showing with 70 additions and 47 deletions
App.vue
...@@ -21,7 +21,7 @@ export default { ...@@ -21,7 +21,7 @@ export default {
wx.getSystemInfo({ wx.getSystemInfo({
success: res => { success: res => {
const BottomSafeHeight = res.screenHeight - res.safeArea.bottom const BottomSafeHeight = res.screenHeight - res.safeArea.bottom
uni.setStorage({ key: 'BottomSafeHeight', data: BottomSafeHeight }); uni.setStorage({ key: 'BottomSafeHeight', data: BottomSafeHeight?BottomSafeHeight+10:0 });
} }
}) })
......
components/menuAssembly/index.vue
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</view> </view>
<view class="addbox"> <view class="addbox">
<image v-if="getSku(item).state==1" @click.stop="getallNum(item, category)" class="add" :src="'../../static/imgs/jiahao.png'" /> <image v-if="getSku(item).state==1" @click.stop="getallNum(item, category)" class="add" :src="'../../static/imgs/jiahao.png'" />
<!-- <u-icon class="add" name="plus-circle-fill" color="#003AE9" @click.stop="getallNum(item, category)" size="22"></u-icon> --> <!-- <u-icon class="add" name="plus-circle-fill" color="#0050F6" @click.stop="getallNum(item, category)" size="22"></u-icon> -->
<div v-if="getSku(item).state!=1" style="color: #858585;font-size: 20rpx;">已售罄</div> <div v-if="getSku(item).state!=1" style="color: #858585;font-size: 20rpx;">已售罄</div>
</view> </view>
</view> </view>
...@@ -606,9 +606,9 @@ export default { ...@@ -606,9 +606,9 @@ export default {
right: 0rpx; right: 0rpx;
box-sizing:border-box; box-sizing:border-box;
top: 0; top: 0;
background: #003AE9; background: #0050F6;
z-index: 1; z-index: 1;
border: 2rpx solid #003AE9; border: 2rpx solid #0050F6;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
......
menuSubPackage/pages/areaSelect/areaSelect.vue
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
width: 90%; width: 90%;
min-height: 264rpx; min-height: 264rpx;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #003AE9; border: 1px solid #0050F6;
padding: 25rpx 32rpx; padding: 25rpx 32rpx;
box-sizing: border-box; box-sizing: border-box;
margin: 30rpx auto; margin: 30rpx auto;
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
.goshop { .goshop {
width: 167rpx; width: 167rpx;
height: 64rpx; height: 64rpx;
background: #003AE9; background: #0050F6;
border-radius: 2rpx; border-radius: 2rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
......
menuSubPackage/pages/goodsDetail/goodsDetail.vue
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<view class="good-spec-name">{{ specItem.specName }}</view> <view class="good-spec-name">{{ specItem.specName }}</view>
<view class="good-spec-rule"> <view class="good-spec-rule">
<div v-for="specItemRule in specItem.rules" class="div_item" :key="specItemRule.ruleId"> <div v-for="specItemRule in specItem.rules" class="div_item" :key="specItemRule.ruleId">
<div v-if="specItemRule.isRecommend=='1'" class="default">推荐</div> <div v-if="specItemRule.isRecommend=='1'" :class="[UseIt(specItemRule.ruleId)?'disabledStyle':'']" class="default"></div>
<button class="good-spec-rule-item" :disabled="UseIt(specItemRule.ruleId)" <button class="good-spec-rule-item" :disabled="UseIt(specItemRule.ruleId)"
@click="selectRoles(specItemRule, specItem)" @click="selectRoles(specItemRule, specItem)"
:class="{ active: isActvie(specItemRule) }"> :class="{ active: isActvie(specItemRule) }">
...@@ -419,7 +419,7 @@ export default { ...@@ -419,7 +419,7 @@ export default {
} }
.good-spec-name { .good-spec-name {
margin-top: 51rpx; margin-top: 28.98rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
color: #999999; color: #999999;
font-weight: 400; font-weight: 400;
...@@ -445,17 +445,14 @@ export default { ...@@ -445,17 +445,14 @@ export default {
.default { .default {
width: 42rpx; width: 45rpx;
height: 25rpx; height: 38rpx;
background-color: #ed79c5; background: url('@/static/imgs/tuijian.png') center center no-repeat;
background-size: 100%;
position: absolute; position: absolute;
right: -17rpx; right: -17rpx;
top: -15rpx; top: -15rpx;
z-index: 9; z-index: 9;
font-size: 13rpx;
line-height: 25rpx;
text-align: center;
color: white;
} }
} }
...@@ -483,7 +480,7 @@ export default { ...@@ -483,7 +480,7 @@ export default {
&.active { &.active {
font-weight: 400; font-weight: 400;
padding: 0rpx 20rpx; padding: 0rpx 20rpx;
background: #003AE9; background: #0050F6;
color: #fff; color: #fff;
border-radius: 0rpx; border-radius: 0rpx;
border: 0rpx; border: 0rpx;
...@@ -496,9 +493,10 @@ export default { ...@@ -496,9 +493,10 @@ export default {
border: 0rpx; border: 0rpx;
} }
// button[disabled]:not([type]) { button[disabled]:not([type]) {
// background: red; background: url('@/static/imgs/shouqingsku.png') center center no-repeat;
// } background-size: 100%;
}
.spec-detail { .spec-detail {
width: 100%; width: 100%;
...@@ -511,16 +509,20 @@ export default { ...@@ -511,16 +509,20 @@ export default {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
color: #333333; color: #333333;
line-height: 40px; padding-top:42rpx !important;
padding-bottom:22rpx !important
} }
.spec-detail-img { .spec-detail-img {
margin-top: 55rpx;
margin-left: 30rpx; margin-left: 30rpx;
margin-right: 30rpx; margin-right: 30rpx;
height: 500rpx; height: 500rpx;
} }
.spec-detail-img:last-child{
margin-bottom: 115rpx;
}
.spec-detail-img-item { .spec-detail-img-item {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -579,11 +581,11 @@ export default { ...@@ -579,11 +581,11 @@ export default {
.good-select-btn1 { .good-select-btn1 {
width: 328rpx; width: 328rpx;
height: 104rpx; height: 104rpx;
border: 2rpx solid #003AE9; border: 2rpx solid #0050F6;
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: #003AE9; color: #0050F6;
border-radius: 2px; border-radius: 2px;
line-height: 104rpx; line-height: 104rpx;
text-align: center; text-align: center;
...@@ -596,7 +598,7 @@ export default { ...@@ -596,7 +598,7 @@ export default {
border-radius: 2px; border-radius: 2px;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
background: #003AE9; background: #0050F6;
line-height: 104rpx; line-height: 104rpx;
text-align: center; text-align: center;
color: #fff; color: #fff;
......
mineSubPackage/pages/msg/index.vue
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
border-radius: 2rpx; border-radius: 2rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
background: #003AE9; background: #0050F6;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 64rpx; line-height: 64rpx;
......
orderSubPackage/pages/orderInfo/index.vue
...@@ -370,7 +370,7 @@ export default { ...@@ -370,7 +370,7 @@ export default {
font-size: 32rpx; font-size: 32rpx;
font-family: Futura Medium, Arial, sans-serif; font-family: Futura Medium, Arial, sans-serif;
font-weight: normal; font-weight: normal;
color: #003AE9; color: #0050F6;
margin: 0 16rpx; margin: 0 16rpx;
} }
} }
...@@ -395,7 +395,7 @@ export default { ...@@ -395,7 +395,7 @@ export default {
width: 167rpx; width: 167rpx;
height: 64rpx; height: 64rpx;
background: #003AE9; background: #0050F6;
border-radius: 2rpx; border-radius: 2rpx;
} }
.btn_cancel { .btn_cancel {
...@@ -403,12 +403,12 @@ export default { ...@@ -403,12 +403,12 @@ export default {
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #003AE9; color: #0050F6;
width: 167rpx; width: 167rpx;
height: 64rpx; height: 64rpx;
border-radius: 2rpx; border-radius: 2rpx;
border: 2rpx solid #003AE9; border: 2rpx solid #0050F6;
} }
} }
......
orderSubPackage/pages/settlement/index.vue
...@@ -7,13 +7,14 @@ ...@@ -7,13 +7,14 @@
<div v-if="shopData.distance && shopData.distance!=-1" class="address_2">距您{{ shopData.distance }}，请确定门店后下单</div> <div v-if="shopData.distance && shopData.distance!=-1" class="address_2">距您{{ shopData.distance }}，请确定门店后下单</div>
<div v-else class="address_2">请确定门店后下单</div> <div v-else class="address_2">请确定门店后下单</div>
</div> </div>
<div class="take_order"> <div class="take_order"></div>
<div>
<div class="title">取单时间</div> <div class="title">取单时间</div>
<div class="time">现在下单，预计 <span class="min">{{ duration }}</span> 分钟后取餐</div> <div class="time">现在下单，预计 <span class="min">{{ duration }}</span> 分钟后取餐</div>
</div> </div>
</div> </div>
<div class="goods_info"> <div class="goods_info">
<h3>商品详情</h3> <h3>商品详细</h3>
<div class="goods" v-for="item in goods" :key="item.goodsId"> <div class="goods" v-for="item in goods" :key="item.goodsId">
<div class="goods_item"> <div class="goods_item">
<image mode="aspectFit" v-if="item.pics.thumbnailApplet" class="goods_img" <image mode="aspectFit" v-if="item.pics.thumbnailApplet" class="goods_img"
...@@ -266,7 +267,6 @@ export default { ...@@ -266,7 +267,6 @@ export default {
.shop_info { .shop_info {
width: 686rpx; width: 686rpx;
height: 306rpx;
background: #FFFFFF; background: #FFFFFF;
margin: 0 auto; margin: 0 auto;
margin-top: 32rpx; margin-top: 32rpx;
...@@ -304,10 +304,10 @@ export default { ...@@ -304,10 +304,10 @@ export default {
.take_order { .take_order {
margin-top: 25rpx; margin-top: 25rpx;
padding-top: 25rpx; padding-top: 23.83rpx;
border-top: 1rpx solid #ECECEC; border-top: 2rpx solid #ECECEC;
height: 2rpx; height: 2rpx;
}
.title { .title {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
...@@ -322,14 +322,13 @@ export default { ...@@ -322,14 +322,13 @@ export default {
color: #999999; color: #999999;
.min { .min {
color: #003AE9; color: #0050F6;
font-size: 28rpx; font-size: 28rpx;
font-weight: 700; font-weight: 700;
margin: 0 5rpx; margin: 0 8rpx;
display: inline-block; display: inline-block;
} }
} }
}
} }
.goods_info { .goods_info {
...@@ -451,7 +450,7 @@ export default { ...@@ -451,7 +450,7 @@ export default {
align-items: center; align-items: center;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-top: 25rpx; margin-top: 24rpx;
.size { .size {
font-size: 28rpx; font-size: 28rpx;
...@@ -460,9 +459,28 @@ export default { ...@@ -460,9 +459,28 @@ export default {
color: #666666; color: #666666;
} }
.the_sum{
display: flex;
align-items: flex-end;
.paid_in {
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
}
.money {
font-weight: 500;
font-size: 36rpx;
font-family: Futura-Medium, Futura;
color: #333333;
// vertical-align: middle;
line-height: 40rpx;
}
}
.priceBox{ .priceBox{
display: flex; display: flex;
align-items: center; align-items: flex-end;
.paid_in { .paid_in {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
...@@ -473,8 +491,10 @@ export default { ...@@ -473,8 +491,10 @@ export default {
.money { .money {
font-weight: 500; font-weight: 500;
font-size: 36rpx; font-size: 36rpx;
font-family: Futura-Medium, Futura;
color: #333333; color: #333333;
vertical-align: middle; // vertical-align: middle;
line-height: 40rpx;
} }
} }
...@@ -525,7 +545,7 @@ export default { ...@@ -525,7 +545,7 @@ export default {
.the_sum { .the_sum {
display: flex; display: flex;
align-items: center; align-items: flex-end;
.name { .name {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
...@@ -539,6 +559,7 @@ export default { ...@@ -539,6 +559,7 @@ export default {
font-family: Futura-Medium, Futura; font-family: Futura-Medium, Futura;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
line-height: 40rpx;
} }
} }
......
pages.json
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
"tabBar": { "tabBar": {
"custom": true, "custom": true,
"color": "#999999", "color": "#999999",
"selectedColor": "#003AE9", "selectedColor": "#0050F6",
"iconWidth": "30rpx", "iconWidth": "30rpx",
"borderStyle":"white", "borderStyle":"white",
"list": [ "list": [
......
pages/menu/menu.vue
...@@ -488,7 +488,7 @@ export default { ...@@ -488,7 +488,7 @@ export default {
font-size: 32rpx; font-size: 32rpx;
font-family: Futura Medium, Arial, sans-serif; font-family: Futura Medium, Arial, sans-serif;
font-weight: normal; font-weight: normal;
color: #003AE9; color: #0050F6;
margin: 0 16rpx; margin: 0 16rpx;
} }
} }
......
pages/order/order.vue
...@@ -266,7 +266,7 @@ export default { ...@@ -266,7 +266,7 @@ export default {
border-radius: 2rpx; border-radius: 2rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
background: #003AE9; background: #0050F6;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 64rpx; line-height: 64rpx;
...@@ -305,7 +305,7 @@ export default { ...@@ -305,7 +305,7 @@ export default {
border-radius: 2rpx; border-radius: 2rpx;
font-size: 24rpx; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
background: #003AE9; background: #0050F6;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
line-height: 64rpx; line-height: 64rpx;
...@@ -458,7 +458,7 @@ export default { ...@@ -458,7 +458,7 @@ export default {
height: 64rpx; height: 64rpx;
line-height: 64rpx; line-height: 64rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
background: #003AE9; background: #0050F6;
font-size: 24rpx; font-size: 24rpx;
margin: 0; margin: 0;
color: #fff; color: #fff;
......
static/imgs/duigouxuanzhong.png
static/imgs/duigouxuanzhong.png

2.14 KB | W: | H:

static/imgs/duigouxuanzhong.png

2.86 KB | W: | H:

static/imgs/duigouxuanzhong.png
static/imgs/duigouxuanzhong.png
static/imgs/duigouxuanzhong.png
static/imgs/duigouxuanzhong.png
  • 2-up
  • Swipe
  • Onion skin
static/imgs/jiahao.png
static/imgs/jiahao.png

7.91 KB | W: | H:

static/imgs/jiahao.png

2.34 KB | W: | H:

static/imgs/jiahao.png
static/imgs/jiahao.png
static/imgs/jiahao.png
static/imgs/jiahao.png
  • 2-up
  • Swipe
  • Onion skin
static/imgs/jianhao.png
static/imgs/jianhao.png

2.47 KB | W: | H:

static/imgs/jianhao.png

2.92 KB | W: | H:

static/imgs/jianhao.png
static/imgs/jianhao.png
static/imgs/jianhao.png
static/imgs/jianhao.png
  • 2-up
  • Swipe
  • Onion skin
static/imgs/weixuanzhong.png
static/imgs/weixuanzhong.png

2.3 KB | W: | H:

static/imgs/weixuanzhong.png

2.87 KB | W: | H:

static/imgs/weixuanzhong.png
static/imgs/weixuanzhong.png
static/imgs/weixuanzhong.png
static/imgs/weixuanzhong.png
  • 2-up
  • Swipe
  • Onion skin
static/touxiang.png
static/touxiang.png

2.31 KB | W: | H:

static/touxiang.png

15.9 KB | W: | H:

static/touxiang.png
static/touxiang.png
static/touxiang.png
static/touxiang.png
  • 2-up
  • Swipe
  • Onion skin
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