Skip to content

U
user
Commit 89645432 by 宋冰琦
Options

修改页面部分效果

parent aed35d1c
Showing with 121 additions and 50 deletions
components/shopCar/shopCar.vue
......@@ -509,17 +509,17 @@ export default {
.badge {
position: absolute;
height: 26rpx;
height: 32rpx;
font-family: Futura-Medium, Futura;
background: #FF72C1;
right: -16rpx;
top: -4rpx;
min-width: 26rpx;
background: #FF63BA;
right: -22rpx;
top: -6rpx;
min-width: 32rpx;
font-weight: 500;
font-size: 20rpx;
font-weight: normal;
color: #FFFFFF;
line-height: 26rpx;
line-height: 32rpx;
display: flex;
justify-content: center;
align-items: center;
......
menuSubPackage/pages/areaSelect/areaSelect.vue
......@@ -93,10 +93,9 @@ export default {
}
.shop_item {
width: 90%;
min-height: 264rpx;
background: #FFFFFF;
border: 1px solid #0050F6;
padding: 25rpx 32rpx;
border: 1px solid #003AE9;
padding: 40rpx 30rpx 40rpx 32rpx;
box-sizing: border-box;
margin: 30rpx auto;
display: flex;
......
menuSubPackage/pages/goodsDetail/goodsDetail.vue
......@@ -51,9 +51,9 @@
<view class="good-select good-select-height" :style="{'padding-bottom':BottomSafeHeight+'px'}">
<view class="good-select-price">
<div>
<text class="good-select-price-normal">￥{{ Utils.isInteger(priceTotal.discount) }}</text>
<text class="good-select-price-small" v-show="priceTotal.price!=priceTotal.discount">￥{{ Utils.isInteger(priceTotal.price) }}</text>
<div class="price">
<view class="good-select-price-normal">￥{{ Utils.isInteger(priceTotal.discount) }}</view>
<view class="good-select-price-small" v-show="priceTotal.price!=priceTotal.discount">￥{{ Utils.isInteger(priceTotal.price) }}</view>
</div>
<div v-if="!size > 0" style="color: orangered">已售罄</div>
<div v-else class="set_size">
......@@ -551,24 +551,31 @@ button[disabled]:not([type]) {
justify-content: space-between;
align-items: center;
padding: 22rpx 32rpx;
}
.good-select-price-normal {
.price{
display: flex;
align-items: flex-end;
justify-content: flex-start;
.good-select-price-normal {
font-family: Futura-Medium, Futura;
letter-spacing: 1px;
font-size: 32rpx;
color: #333333;
margin-right: 12rpx;
font-weight: 500;
}
line-height: 38rpx;
}
.good-select-price-small {
.good-select-price-small {
font-size: 20rpx;
text-decoration: line-through;
font-family: ArialMT;
color: #999999;
}
}
}
.good-select-cont {
display: flex;
flex-direction: row;
......
orderSubPackage/pages/orderInfo/index.vue
......@@ -80,7 +80,7 @@
</div>
<div class="total">
<div class="size">共{{ totalNum }}件商品</div>
<div>
<div class="price">
<span class="paid_in">实付</span>
<span class="money">￥{{ Utils.isInteger(orderInfo.amount) }}</span>
</div>
......@@ -485,7 +485,7 @@ export default {
.shop_info {
margin: 32rpx;
background: #FFFFFF;
padding: 40rpx 30rpx;
padding: 40rpx 30rpx 24rpx 30rpx;
h3 {
font-size: 28rpx;
......@@ -622,9 +622,9 @@ export default {
align-items: center;
display: flex;
justify-content: space-between;
margin-top: 30rpx;
margin-top: 31rpx;
border-top: 1rpx solid #EEEEEE;
padding-top: 30rpx;
padding-top: 24rpx;
.size {
font-size: 28rpx;
......@@ -632,24 +632,26 @@ export default {
font-weight: 400;
color: #666666;
}
.price {
display: flex;
align-items: flex-end;
.paid_in {
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
line-height: 44rpx;
}
.money {
vertical-align: top;
font-size: 36rpx;
font-family: Futura-Medium, Futura;
font-weight: 500;
color: #333333;
}
}
}
}
.order_describe {
......@@ -663,6 +665,8 @@ export default {
font-weight: 500;
color: #333333;
line-height: 40rpx;
border-bottom: 1rpx solid #ECECEC;
padding-bottom: 24rpx;
}
.item {
......
orderSubPackage/pages/settlement/index.vue
......@@ -336,7 +336,7 @@ export default {
background: #FFFFFF;
margin: 0 auto;
margin-top: 32rpx;
padding: 26rpx 32rpx;
padding: 26rpx 32rpx 24rpx 32rpx;
box-sizing: border-box;
......
pages/menu/menu.vue
......@@ -19,7 +19,7 @@
<view class="user-name" v-else>未登录</view>
<view class="dialog">
<view class="content" v-if="userms">如果以后再也见不到你，那就祝你早安</view>
<view class="content" v-if="!userms">请您尽快登录</view>
<view class="content" v-if="!userms">请您尽快登录～</view>
</view>
</view>
<view>
......@@ -364,7 +364,7 @@ export default {
display: flex;
width: 686rpx;
height: 104rpx;
padding:16rpx 32rpx 16rpx 34rpx;
padding:20rpx 30rpx 20rpx 34rpx;
background: #ffffff;
position: absolute;
z-index: 1;
......@@ -426,15 +426,16 @@ export default {
.login-btn {
// width: 114rpx;
height: 48rpx;
background: #006ECF;
border-radius: 4rpx;
font-size: 20rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #FFFFFF;
line-height: 48rpx;
width: 167rpx;
height: 64rpx;
background: #0050F6;
border-radius: 2rpx;
text-align: center;
font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #FFFFFF;
line-height: 64rpx;
}
}
......
pages/mine/mine.vue
......@@ -7,13 +7,27 @@
</view>
<video class="video" autoplay muted loop :controls="false" :enable-progress-gesture="false" objectFit='cover' src="http://songclound.oss-cn-hongkong.aliyuncs.com/2022/06/17/a2aaece8ad026.mp4"></video>
</view>
<view v-if="userms" class="mod11">
<view class="box16">
<image :style="{'width':'100%','height':'100%'}" :src="'../../static/touxiang.png'"></image>
<view class="mod11">
<view class="avatar">
<image :src="'../../static/touxiang.png'"></image>
</view>
<text class="txt6">{{ userInfo.customerName || '我是谁' }}</text>
<view class="user-info" @click="goToMyPage(userms)">
<view class="user-infocontent">
<view class="user-name" v-if="userms">HI！{{ userInfo.customerName || '我是谁' }}</view>
<view class="user-name" v-else>未登录</view>
<view class="dialog">
<view class="content" v-if="userms">如果以后再也见不到你，那就祝你早安</view>
<view class="content" v-if="!userms">请您尽快登录～</view>
</view>
<button class="mod11 flex-col" v-else open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">立刻登录</button>
</view>
<view>
<button class="login-btn" v-if="!userms" open-type="getPhoneNumber"
@getphonenumber="getPhoneNumber">立刻登录
</button>
</view>
</view>
</view>
<!-- <button class="mod11 flex-col" v-else open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">立刻登录</button> -->
<view class="contents" v-if="userms">
<view class="myOrder" @click="goToPage('order')">
<view class="text">我的订单</view>
......@@ -170,7 +184,7 @@ button::after {
.mod11 {
border-radius: 0rpx;
box-sizing: border-box;
padding: 32rpx;
padding: 36rpx 30rpx 36rpx 32rpx;
width: 686rpx;
height: 136rpx;
background: #FFFFFF;
......@@ -183,18 +197,64 @@ button::after {
.txt6 {
.avatar {
display: flex;
justify-items: center;
align-items: center;
width: 72rpx;
height: 72rpx;
margin-right: 31rpx;
border-radius: 4rpx;
image {
width: 100%;
height: 100%;
border-radius: 60rpx;
};
}
.user-info {
display: flex;
align-items: center;
width: 530.55rpx;
justify-content:space-between;
flex-wrap:nowrap;
.user-name {
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #333333;
margin-left: 32rpx;
margin-top: 3.5rpx;
}
.box16 {
width: 72rpx;
height: 72rpx;
border-radius: 50%;
.dialog {
font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #666666;
margin-top: 8rpx;
.content {
flex: 1;
}
}
.arrow-right-select{
width: 9rpx;
height: 22rpx;
}
}
.login-btn {
// width: 114rpx;
width: 167rpx;
height: 64rpx;
background: #0050F6;
border-radius: 2rpx;
text-align: center;
font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #FFFFFF;
line-height: 64rpx;
}
}
.mod11::after{
......
pages/order/order.vue
......@@ -324,7 +324,7 @@ export default {
background: #FFFFFF;
margin: 30rpx auto 0;
box-sizing: border-box;
padding: 25rpx 32rpx;
padding: 25rpx 22rpx 32rpx 32rpx;
.order_header {
display: flex;
......@@ -417,7 +417,7 @@ export default {
}
.goods_spce {
margin-top: 2rpx;
margin-top: 2.6rpx;
font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
......@@ -436,7 +436,7 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 28rpx;
margin-top: 41rpx;
.total {
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