|
@@ -35,9 +35,10 @@
|
|
|
</van-skeleton>
|
|
</van-skeleton>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="discount">
|
|
<div class="discount">
|
|
|
|
|
+ <!--
|
|
|
<van-skeleton :row="1" :loading="loading">
|
|
<van-skeleton :row="1" :loading="loading">
|
|
|
<span>{{$t('detailTtoBePaid.surplus')}}{{oderData.stock}}</span>
|
|
<span>{{$t('detailTtoBePaid.surplus')}}{{oderData.stock}}</span>
|
|
|
- </van-skeleton>
|
|
|
|
|
|
|
+ </van-skeleton>-->
|
|
|
<!-- <div class="discountBox"><span>已领取50元优惠券</span></div>
|
|
<!-- <div class="discountBox"><span>已领取50元优惠券</span></div>
|
|
|
<div class="delBox">
|
|
<div class="delBox">
|
|
|
<van-icon name="delete-o" color="#999999" size="14" />
|
|
<van-icon name="delete-o" color="#999999" size="14" />
|
|
@@ -121,6 +122,7 @@
|
|
|
<span>{{oderData.orderNo}}</span>
|
|
<span>{{oderData.orderNo}}</span>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+ <!--
|
|
|
<div class="bottomCell">
|
|
<div class="bottomCell">
|
|
|
<div>
|
|
<div>
|
|
|
<span>{{$t('detailTtoBePaid.zfbNum')}}</span>
|
|
<span>{{$t('detailTtoBePaid.zfbNum')}}</span>
|
|
@@ -129,7 +131,7 @@
|
|
|
<span>{{oderData.zfBtransactionNum}}</span>
|
|
<span>{{oderData.zfBtransactionNum}}</span>
|
|
|
<span id="copySpan" :data-clipboard-text="oderData.zfBtransactionNum" style="color:#999999">{{$t('detailTtoBePaid.copy')}}</span>
|
|
<span id="copySpan" :data-clipboard-text="oderData.zfBtransactionNum" style="color:#999999">{{$t('detailTtoBePaid.copy')}}</span>
|
|
|
</div>
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div>-->
|
|
|
<div class="bottomCell">
|
|
<div class="bottomCell">
|
|
|
<!-- 待付款详情和已退款详情为创建时间 -->
|
|
<!-- 待付款详情和已退款详情为创建时间 -->
|
|
|
<template v-if="pageType==1||pageType==4">
|
|
<template v-if="pageType==1||pageType==4">
|
|
@@ -353,7 +355,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
//拿到需要展示的商品参数 接口依赖
|
|
//拿到需要展示的商品参数 接口依赖
|
|
|
this.productData = this.$store.state.home.product;
|
|
this.productData = this.$store.state.home.product;
|
|
|
- console.log(this.$store.state.home.product, "1111111111111");
|
|
|
|
|
|
|
+ //console.log(this.$store.state.home.product, "1111111111111");
|
|
|
this.getData();
|
|
this.getData();
|
|
|
},
|
|
},
|
|
|
computed: {
|
|
computed: {
|
|
@@ -395,15 +397,15 @@ export default {
|
|
|
this.oderData.createTime =
|
|
this.oderData.createTime =
|
|
|
this.productData.createTime;
|
|
this.productData.createTime;
|
|
|
this.oderData.zfBtransactionNum = "ZFB2342324242";
|
|
this.oderData.zfBtransactionNum = "ZFB2342324242";
|
|
|
- this.oderData.orderEvaluateList =
|
|
|
|
|
- res1.data.orderEvaluate.map((item) => {
|
|
|
|
|
- item.rebackContent =
|
|
|
|
|
- item.rebackContent.replace(
|
|
|
|
|
- /\<img/g,
|
|
|
|
|
- '<img style="width:auto;height:auto;max-width:100%;display:block"'
|
|
|
|
|
- );
|
|
|
|
|
- return item;
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ this.oderData.orderEvaluateList = res1.data.orderEvaluate;
|
|
|
|
|
+ //res1.data.orderEvaluate.map((item) => {
|
|
|
|
|
+ // item.rebackContent =
|
|
|
|
|
+ // item.rebackContent.replace(
|
|
|
|
|
+ // /\<img/g,
|
|
|
|
|
+ // '<img style="width:auto;height:auto;max-width:100%;display:block"'
|
|
|
|
|
+ // );
|
|
|
|
|
+ // return item;
|
|
|
|
|
+ //});
|
|
|
this.loading = false;
|
|
this.loading = false;
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|