Skip to content

U
user
Commit 89645432 by 宋冰琦
Options

修改页面部分效果

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