|
|
@@ -2,7 +2,7 @@
|
|
|
<view class="page">
|
|
|
<c-nav-bar1 title="订单详情" bgColor="transparent"></c-nav-bar1>
|
|
|
<view class="bg"></view>
|
|
|
- <view class="content" :style="{'height':(h-mt)+'px','top':(mt+20)+'px'}">
|
|
|
+ <view class="content" :style="{'height':(h-mt)+'px','top':mt+'px'}">
|
|
|
<view class="head">
|
|
|
<text class="status disabled" v-if="getalllist.orderStatus=='0'">待支付</text>
|
|
|
<text class="status disabled" v-if="getalllist.orderStatus=='-1'">已取消</text>
|
|
|
@@ -20,13 +20,12 @@
|
|
|
{{getalllist.productName}}
|
|
|
</view>
|
|
|
<view class="taoxxq2">
|
|
|
- 周一至周日 · 需提前预约
|
|
|
+ {{getalllist.notice|delNotice}}
|
|
|
</view>
|
|
|
<view class="taoxxq3">
|
|
|
<view class="jiage1">
|
|
|
<span>￥</span> {{getalllist.realityPay}}
|
|
|
</view>
|
|
|
-
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -167,6 +166,14 @@
|
|
|
hexiaodata: {},
|
|
|
|
|
|
}
|
|
|
+ },
|
|
|
+ filters: {
|
|
|
+ delNotice(val){
|
|
|
+ if (val) {
|
|
|
+ return JSON.parse(val)[0].notice
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
onLoad(option) {
|
|
|
this.hexiaodata = JSON.parse(option.list);
|
|
|
@@ -849,7 +856,8 @@
|
|
|
.content {
|
|
|
position: relative;
|
|
|
z-index: 3;
|
|
|
- padding-bottom: 160rpx;
|
|
|
+ padding-bottom: 180rpx;
|
|
|
+ box-sizing: border-box;
|
|
|
overflow-y: auto;
|
|
|
|
|
|
.hand-title {
|
|
|
@@ -1179,7 +1187,7 @@
|
|
|
|
|
|
.head {
|
|
|
box-sizing: border-box;
|
|
|
- padding: 34rpx 24rpx 30rpx;
|
|
|
+ padding: 14rpx 24rpx 30rpx;
|
|
|
display: flex;
|
|
|
position: relative;
|
|
|
z-index: 2;
|
