|
|
@ -74,19 +74,19 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view v-if="row.productType == 12" class="width96 height22 mart10"> |
|
|
|
<view v-if="row.productType == 12" class="width96 mart10"> |
|
|
|
<view class="width70 flleft fotlt "> |
|
|
|
<view class="width100 "> |
|
|
|
<view class="font16 fontwig6 fcor333 alijusstart"> |
|
|
|
<view class="font16 fontwig6 fcor333 alijusstart"> |
|
|
|
|
|
|
|
<image mode="widthFix" :src="imageUrl+'orderLogo/goods.png'" class="marglerig" |
|
|
|
<image mode="widthFix" :src="imageUrl+'orderLogo/goods.png'" class="marglerig" style="width: 50rpx;height: 50rpx;"> |
|
|
|
style="width: 50rpx;height: 50rpx;"> |
|
|
|
</image> |
|
|
|
</image> |
|
|
|
<!-- <view class="width100 text1" v-if="row.productType != 12">{{row.title}}</view> --> |
|
|
|
<view class="width100 text1">{{row.title}}</view> |
|
|
|
|
|
|
|
</view> |
|
|
|
<!-- <view class="po-ra" v-if="row.productType == 12&&row.ext6.split(',').length>1"> |
|
|
|
<view class="po-ra width100 mart10" v-if="row.productType == 12&&row.ext6.length>1"> |
|
|
|
<scroll-view class="settle-goods" scroll-x="true"> |
|
|
|
<scroll-view class="settle-goods" scroll-x="true"> |
|
|
|
<view class="settle-con"> |
|
|
|
<view class="settle-con"> |
|
|
|
<view class="settle-img" v-for="item in row.ext6.split(',')"> |
|
|
|
<view class="settle-img" v-for="item in row.ext6"> |
|
|
|
<image class="st-img" :src="imageUrl+'item'" mode="aspectFill"></image> |
|
|
|
<image class="st-img" :src="imageUrl+item" mode="aspectFill"></image> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
|
|
</view> |
|
|
|
</view> |
|
|
@ -100,8 +100,6 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
|
|
|
|
|
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> --> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<!-- <view class="width30 flright fotrt fcor666 font15 fotrt"> |
|
|
|
<!-- <view class="width30 flright fotrt fcor666 font15 fotrt"> |
|
|
@ -216,6 +214,10 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
this.list = this.orderList[this.typeId]; |
|
|
|
this.list = this.orderList[this.typeId]; |
|
|
|
this.tabbarIndex = tbIndex; |
|
|
|
this.tabbarIndex = tbIndex; |
|
|
|
|
|
|
|
// this.getUserOrderList(); |
|
|
|
|
|
|
|
// this.getDictionaryByCodeType(); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
onShow(){ |
|
|
|
this.getUserOrderList(); |
|
|
|
this.getUserOrderList(); |
|
|
|
this.getDictionaryByCodeType(); |
|
|
|
this.getDictionaryByCodeType(); |
|
|
|
}, |
|
|
|
}, |
|
|
@ -289,7 +291,21 @@ |
|
|
|
if (res.return_data.total == (this.pageNum * this.pageSize)) { |
|
|
|
if (res.return_data.total == (this.pageNum * this.pageSize)) { |
|
|
|
this.isNoMoreData = true; |
|
|
|
this.isNoMoreData = true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (res.return_data.list.length > 0) { |
|
|
|
|
|
|
|
res.return_data.list.map(item => { |
|
|
|
|
|
|
|
if (item.ext6) { |
|
|
|
|
|
|
|
item.ext6 = item.ext6.split(",") |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.orderList = this.orderList.concat(res.return_data.list); |
|
|
|
this.orderList = this.orderList.concat(res.return_data.list); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//处理图片 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum; |
|
|
|
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
this.orderList = []; |
|
|
|
this.orderList = []; |
|
|
|