Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
This commit is contained in:
commit
f6717bbb44
|
@ -192,12 +192,12 @@
|
|||
.delete-view{
|
||||
width: 120rpx;
|
||||
text-align: center;
|
||||
background: #e5e7eb;
|
||||
background: #d7f2ee;
|
||||
border-radius: 30rpx;
|
||||
border: 1px solid #cdd2db;
|
||||
border: 1px solid #8ccfc5;
|
||||
font-weight: 400;
|
||||
font-size: 30rpx;
|
||||
color: #666;
|
||||
color: #029d88;
|
||||
padding: 8rpx 10rpx;
|
||||
}
|
||||
.address-list-img{
|
||||
|
|
|
@ -99,9 +99,9 @@
|
|||
<style lang="less">
|
||||
.img-span{
|
||||
display: block;
|
||||
padding: 1px 5px;
|
||||
padding: 2px 8px;
|
||||
font-weight: 400;
|
||||
font-size: 8px;
|
||||
font-size: 11px;
|
||||
color: #FFFFFF;
|
||||
background: linear-gradient(-90deg, #FF6F48, #FF9E69);
|
||||
border-radius: 10px 0px 10px 0px;
|
||||
|
@ -156,7 +156,7 @@
|
|||
background: #FFFFFF;
|
||||
border-radius: 21rpx;
|
||||
padding: 15px;
|
||||
margin-top: 20px;
|
||||
margin-top: 12px;
|
||||
}
|
||||
.content-mian{
|
||||
width: 95%;
|
||||
|
|
|
@ -14,8 +14,8 @@
|
|||
<view v-if="goods.length > 0" class="margin-sm bg" v-for="(item,index) in goods" :key='index'
|
||||
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)" style="border-radius: 20rpx;padding: 36rpx;">
|
||||
<view class="flex justify-between">
|
||||
<view class="flex align-center">
|
||||
<image src="../../static/logo.png" style="width: 48rpx;height: 48rpx;border-radius: 50%;">
|
||||
<view class="flex align-center profile-img">
|
||||
<image src="../../static/logo.png" style="width: 55rpx;height: 55rpx;border: 1px solid#d7f2ee;border-radius: 50%;">
|
||||
</image>
|
||||
<view class="margin-left-xs ">{{item.artificerName}}</view>
|
||||
</view>
|
||||
|
@ -37,7 +37,7 @@
|
|||
<view class="u-m-r-10">
|
||||
<u-avatar
|
||||
:src="(item.ordersMassageList && item.ordersMassageList.length > 0 && item.ordersMassageList[0].massageType && item.ordersMassageList[0].massageType.massageImg)?item.ordersMassageList[0].massageType.massageImg: '../../static/logo.png'"
|
||||
mode="square" size="100" style="height: 132rpx;width: 132rpx;flex: 0 0 132rpx;">
|
||||
mode="square" size="100"style="height: 132rpx;width: 132rpx;flex: 0 0 132rpx;">
|
||||
</u-avatar>
|
||||
</view>
|
||||
<view class="u-flex-1" style="margin-left: 20rpx;">
|
||||
|
@ -650,11 +650,18 @@
|
|||
/deep/.u-size-default{
|
||||
margin-top: 5px !important;
|
||||
}
|
||||
/deep/.justify-between{
|
||||
height: 60rpx;
|
||||
}
|
||||
.gengduo{
|
||||
font-weight: 400;
|
||||
font-size: 25rpx;
|
||||
color: #7D7D7D;
|
||||
}
|
||||
.profile-img{
|
||||
margin-top: -20rpx;
|
||||
|
||||
}
|
||||
.showBtn-view{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
|
Loading…
Reference in New Issue