Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
高淑倩
7-Eleven
Commits
52205e10
Commit
52205e10
authored
Apr 09, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化商品视频格式
parent
28aeaecc
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
2 deletions
+37
-2
orderDetail.js
src/pages/orderDetail/orderDetail.js
+34
-1
productDetail.wxml
src/pages/productDetail/productDetail.wxml
+2
-0
project.config.json
src/project.config.json
+1
-1
No files found.
src/pages/orderDetail/orderDetail.js
View file @
52205e10
...
@@ -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
:
`确认收货失败!`
,
...
...
src/pages/productDetail/productDetail.wxml
View file @
52205e10
...
@@ -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}}"
...
...
src/project.config.json
View file @
52205e10
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
"id"
:
16
,
"id"
:
16
,
"name"
:
"商品详情页"
,
"name"
:
"商品详情页"
,
"pathName"
:
"pages/productDetail/productDetail"
,
"pathName"
:
"pages/productDetail/productDetail"
,
"query"
:
"id=69
4920880513486848
"
,
"query"
:
"id=69
7828280501407744
"
,
"scene"
:
null
"scene"
:
null
},
},
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment