Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
This commit is contained in:
commit
d362777f0e
|
@ -26,13 +26,12 @@
|
|||
<view class="text-bold text-30 margin-right-xs" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
|
||||
{{item.artificerName}}
|
||||
</view>
|
||||
<image class="dituzhaoren" src="../../static/dituzhaoren2.png" mode=""></image>
|
||||
</view>
|
||||
<view class="shou-top">
|
||||
<view class="shou-top-btn" :class="[item.state == 1 || item.state == 2?'kfw_view':'byy_view']">
|
||||
<view class="keyuyue">
|
||||
<view class="[item.state == 1 || item.state == 2?'kfw_view':'byy_view']">
|
||||
{{item.state == 1?'可服务':item.state == 2?'可预约':'休息中'}}
|
||||
</view>
|
||||
<view class="zz_view" v-if="item.status == 1 && item.time">
|
||||
<view v-if="item.status == 1 && item.time">
|
||||
{{item.time}}
|
||||
</view>
|
||||
</view>
|
||||
|
@ -261,6 +260,20 @@
|
|||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.keyuyue{
|
||||
// width: 160rpx;
|
||||
height: 20px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
background: linear-gradient(90deg, #fee9ca, #fde4c6);
|
||||
border: 1px #decbae solid;
|
||||
border-radius: 30rpx 30rpx 30rpx 2rpx;
|
||||
padding: 3rpx 18rpx;
|
||||
color:#8d500f;
|
||||
font-size: 22rpx;
|
||||
margin-left: 15rpx;
|
||||
}
|
||||
.icon-text{
|
||||
margin-left: 2px;
|
||||
font-weight: 400;
|
||||
|
|
|
@ -447,6 +447,7 @@
|
|||
border-radius: 21rpx;
|
||||
padding: 15px;
|
||||
margin-bottom: 10px;
|
||||
position: relative;
|
||||
}
|
||||
.jianjie{
|
||||
font-weight: 400;
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
<view class="item-view">
|
||||
<view class="view-cata">
|
||||
<view class="item-view-title">{{item.title}}门店名称</view>
|
||||
<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
|
||||
<span class="xiaoer">{{item.classifyName}}</span>
|
||||
</view>
|
||||
|
||||
<view class="item-view-bottom-qian">
|
||||
|
@ -293,7 +293,6 @@
|
|||
text-overflow: ellipsis;
|
||||
}
|
||||
.item-view-biao{
|
||||
padding: 1px 5px;
|
||||
border-radius: 15rpx 3rpx 15rpx 3rpx;
|
||||
}
|
||||
.tuina{
|
||||
|
@ -303,6 +302,9 @@
|
|||
.xiaoer{
|
||||
background-color:#f1f8d7;
|
||||
color: #58b314;
|
||||
font-size: 22rpx;
|
||||
padding: 3rpx 3rpx;
|
||||
border-radius: 15rpx 15rpx 2rpx 2rpx;
|
||||
}
|
||||
.taishi{
|
||||
background-color:#e5d5c6;
|
||||
|
@ -330,7 +332,7 @@
|
|||
align-items: flex-end;
|
||||
}
|
||||
.item-view-title{
|
||||
width: 76%;
|
||||
width: 75%;
|
||||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
|
|
Loading…
Reference in New Issue