Commit 52205e10 by 谢中龙

优化商品视频格式

parent 28aeaecc
...@@ -425,6 +425,16 @@ wxService.page({ ...@@ -425,6 +425,16 @@ wxService.page({
mask: true mask: true
}); });
//兼容老数据
if(parcelId){
this.packageConfirmReceive(id,parcelId);
}
else{
this.oldVersionConfirmReceive(id);
}
},
//包裹的确认收货
packageConfirmReceive(findId, parcelId){
wxService.post(`/sale/trade/buyer/parcelConfirm?findId=${id}&parcelId=${parcelId}`).then(res => { wxService.post(`/sale/trade/buyer/parcelConfirm?findId=${id}&parcelId=${parcelId}`).then(res => {
if (res) { if (res) {
const { result, data } = res.data const { result, data } = res.data
...@@ -436,7 +446,30 @@ wxService.page({ ...@@ -436,7 +446,30 @@ wxService.page({
}) })
setTimeout(() => { setTimeout(() => {
this.getOrderDetail(this.data.id); this.getOrderDetail(this.data.id);
}, 100); }, 200)
} else {
wx.showToast({
title: `确认收货失败!`,
icon: 'none'
})
}
}
})
},
//兼容以前老数据进行确认收货
oldVersionConfirmReceive(id){
wxService.post(`/sale/trade/buyer/confirm/${id}`).then(res => {
if (res) {
const { result, data } = res.data
if (result == 0) {
wx.hideLoading()
wx.showToast({
title: `您已确认收货!`,
icon: 'none'
})
setTimeout(() => {
this.getOrderDetail(this.data.id);
}, 200)
} else { } else {
wx.showToast({ wx.showToast({
title: `确认收货失败!`, title: `确认收货失败!`,
......
...@@ -19,9 +19,11 @@ ...@@ -19,9 +19,11 @@
wx:if="{{!utils.isVideo(item)}}" wx:if="{{!utils.isVideo(item)}}"
lazy-load/> lazy-load/>
<!-- object-fit="fill" -->
<video id="myVideo{{index}}" <video id="myVideo{{index}}"
class="swiper-image video-cover" class="swiper-image video-cover"
src="{{item}}" src="{{item}}"
object-fit="cover"
play-btn-position="center" play-btn-position="center"
enable-play-gesture="{{true}}" enable-play-gesture="{{true}}"
data-index="{{index}}" data-index="{{index}}"
......
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
"id": 16, "id": 16,
"name": "商品详情页", "name": "商品详情页",
"pathName": "pages/productDetail/productDetail", "pathName": "pages/productDetail/productDetail",
"query": "id=694920880513486848", "query": "id=697828280501407744",
"scene": null "scene": null
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment