Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
This commit is contained in:
commit
d8137ecf53
|
@ -122,9 +122,9 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="detail-foot-title">
|
<!-- <view class="detail-foot-title">
|
||||||
服务项目{{index+1}}
|
服务项目{{index+1}}
|
||||||
</view>
|
</view> -->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view style="height: 100rpx;"></view>
|
<view style="height: 100rpx;"></view>
|
||||||
|
@ -205,15 +205,15 @@
|
||||||
</script>
|
</script>
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.detail-foot-title{
|
.detail-foot-title{
|
||||||
width: 100px;
|
width:80px;
|
||||||
height:24px;
|
height:20px;
|
||||||
background: linear-gradient(90deg, #ffdf96, #feca76);
|
background: linear-gradient(90deg, #ffdf96, #feca76);
|
||||||
border-radius: 0 15rpx 0 30rpx;
|
border-radius: 0 15rpx 0 30rpx;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
color: #a13504;
|
color: #a13504;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
line-height: 24px;
|
line-height:20px;
|
||||||
padding-right: 15px;
|
padding-right: 15px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
|
|
|
@ -62,20 +62,15 @@
|
||||||
</view>-->
|
</view>-->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="headset-line" style="margin-top: 5px;">
|
|
||||||
<span class="label-word" v-for="(item,index) in artificerClassifyList" :key="index">{{item.classifyName}}</span>
|
|
||||||
</view>
|
|
||||||
<view class="oder-mian">
|
<view class="oder-mian">
|
||||||
<view class="oder-mian-left">
|
<view class="oder-mian-left">
|
||||||
<span>ID:{{order.invitationCode}}</span>
|
<span>ID:{{order.invitationCode}}</span>
|
||||||
</view>
|
</view>
|
||||||
<view class="oder-mian-tjia">
|
<view class="oder-mian-tjia">
|
||||||
<!---<span>{{order.collectCount}}人关注</span>-->
|
<!---<span>{{order.collectCount}}人关注</span>-->
|
||||||
|
|
||||||
<view class="shouchang-view" @click="toggle('center')" v-if="order.dskg=='1'">
|
<view class="shouchang-view" @click="toggle('center')" v-if="order.dskg=='1'">
|
||||||
<image class="shouchang-img" src="../../static/orderDetail/technician6.png"></image>
|
<image class="shouchang-img" src="../../static/orderDetail/technician6.png"></image>
|
||||||
<span class="shouchang-text">打赏</span>
|
<span class="shouchang-text">打赏</span>
|
||||||
|
|
||||||
<!-- <image src="../../static/orderDetail/technician6-1.png"
|
<!-- <image src="../../static/orderDetail/technician6-1.png"
|
||||||
style="width: 45rpx;height: 45rpx;position: relative;top: 4upx;" v-else></image> -->
|
style="width: 45rpx;height: 45rpx;position: relative;top: 4upx;" v-else></image> -->
|
||||||
</view>
|
</view>
|
||||||
|
@ -88,6 +83,9 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="headset-line" style="margin-top: 5px;">
|
||||||
|
<span class="label-word" v-for="(item,index) in artificerClassifyList" :key="index">{{item.classifyName}}</span>
|
||||||
|
</view>
|
||||||
<view class="flex" style="margin-top: 20rpx;">
|
<view class="flex" style="margin-top: 20rpx;">
|
||||||
<view class="flex order-sname" v-if="order.consortiaName">
|
<view class="flex order-sname" v-if="order.consortiaName">
|
||||||
<image class="order-sname-img" src="../../static/orderDetail/chengchi.png" mode=""></image>
|
<image class="order-sname-img" src="../../static/orderDetail/chengchi.png" mode=""></image>
|
||||||
|
@ -1361,7 +1359,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.view-head{
|
.view-head{
|
||||||
padding-bottom: 15px;
|
padding-bottom: 5px;
|
||||||
margin: 15px 24px 0px 24px;
|
margin: 15px 24px 0px 24px;
|
||||||
}
|
}
|
||||||
.jian-view-right span{
|
.jian-view-right span{
|
||||||
|
@ -1517,12 +1515,12 @@
|
||||||
.label-word{
|
.label-word{
|
||||||
background: #f9f1e7;
|
background: #f9f1e7;
|
||||||
color: #9b7a6e;
|
color: #9b7a6e;
|
||||||
border-radius: 30rpx;
|
border-radius:5rpx;
|
||||||
padding: 0 14rpx;
|
padding: 0 14rpx;
|
||||||
line-height:34rpx;
|
line-height:34rpx;
|
||||||
border: 1px solid #9b7a6e;
|
border: 1px solid #9b7a6e;
|
||||||
font-size: 22rpx;
|
font-size: 22rpx;
|
||||||
margin-left: 10rpx;
|
margin-right: 10rpx;
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
|
@ -1349,7 +1349,7 @@
|
||||||
// }
|
// }
|
||||||
.item-view-jianjie{
|
.item-view-jianjie{
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 26rpx;
|
font-size: 24rpx;
|
||||||
color: #999;
|
color: #999;
|
||||||
display: -webkit-box;
|
display: -webkit-box;
|
||||||
-webkit-box-orient: vertical;
|
-webkit-box-orient: vertical;
|
||||||
|
@ -1633,7 +1633,7 @@
|
||||||
}
|
}
|
||||||
.list-view{
|
.list-view{
|
||||||
// margin-top: 52px;
|
// margin-top: 52px;
|
||||||
padding: 0 30rpx;
|
padding: 0 20rpx;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
@ -1724,7 +1724,7 @@
|
||||||
border-radius: 30rpx;
|
border-radius: 30rpx;
|
||||||
height: 42rpx;
|
height: 42rpx;
|
||||||
line-height: 42rpx;
|
line-height: 42rpx;
|
||||||
font-size: 24rpx;
|
font-size: 22rpx;
|
||||||
margin-left: 10rpx;
|
margin-left: 10rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue