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
e4393b79
Commit
e4393b79
authored
Sep 20, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
物流_确认收货
parent
e3e661c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
logistics.js
src/pages/logistics/logistics.js
+12
-7
order.wxml
src/pages/order/order.wxml
+2
-2
No files found.
src/pages/logistics/logistics.js
View file @
e4393b79
...
@@ -10,7 +10,8 @@ wxService.page({
...
@@ -10,7 +10,8 @@ wxService.page({
* 页面的初始数据
* 页面的初始数据
*/
*/
data
:
{
data
:
{
logisData
:[]
logisData
:[],
orderId
:
''
},
},
/**
/**
...
@@ -24,20 +25,24 @@ wxService.page({
...
@@ -24,20 +25,24 @@ wxService.page({
* 生命周期函数--监听页面显示
* 生命周期函数--监听页面显示
*/
*/
onShow
:
function
()
{
onShow
:
function
()
{
const
{
code
,
logisticsNo
}
=
this
.
options
const
{
code
,
logisticsNo
,
id
}
=
this
.
options
console
.
log
(
'-----code----'
,
code
)
console
.
log
(
'-----code----'
,
code
,
id
)
if
(
code
){
if
(
code
){
this
.
getLogisticsInfo
(
code
,
logisticsNo
)
this
.
setData
({
orderId
:
id
},()
=>
{
this
.
getLogisticsInfo
(
code
,
logisticsNo
)
})
}
}
},
},
// 确认收货
// 确认收货
handelConfirmReceipt
(
e
)
{
handelConfirmReceipt
()
{
const
{
id
}
=
e
.
currentTarget
.
dataset
const
{
orderId
}
=
this
.
data
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中'
,
title
:
'加载中'
,
mask
:
true
mask
:
true
})
})
wxService
.
post
(
`/sale/trade/buyer/confirm/
${
i
d
}
`
).
then
(
res
=>
{
wxService
.
post
(
`/sale/trade/buyer/confirm/
${
orderI
d
}
`
).
then
(
res
=>
{
if
(
res
)
{
if
(
res
)
{
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
if
(
result
==
0
)
{
...
...
src/pages/order/order.wxml
View file @
e4393b79
...
@@ -140,12 +140,12 @@
...
@@ -140,12 +140,12 @@
<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelToPay">立即支付</button>
<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelToPay">立即支付</button>
</view>
</view>
<view class="order-status" wx-if="{{item.status == 'P'}}">
<view class="order-status" wx-if="{{item.status == 'P'}}">
<navigator url="/pages/logistics/logistics?code={{item.logistic.supplierCode}}&logisticsNo={{item.logistic.code}}" hover-class="none">
<navigator url="/pages/logistics/logistics?code={{item.logistic.supplierCode}}&logisticsNo={{item.logistic.code}}
&id={{item.id}}
" hover-class="none">
<button class="btn btn-sm btn-default" data-id="{{item.id}}">查看物流</button>
<button class="btn btn-sm btn-default" data-id="{{item.id}}">查看物流</button>
</navigator>
</navigator>
</view>
</view>
<view class="order-status" wx-if="{{item.status == 'D'}}">
<view class="order-status" wx-if="{{item.status == 'D'}}">
<navigator url="/pages/logistics/logistics?code={{item.logistic.supplierCode}}&logisticsNo={{item.logistic.code}}" hover-class="none">
<navigator url="/pages/logistics/logistics?code={{item.logistic.supplierCode}}&logisticsNo={{item.logistic.code}}
&id={{item.id}}
" hover-class="none">
<button class="btn btn-sm btn-default" data-id="{{item.id}}">查看物流</button>
<button class="btn btn-sm btn-default" data-id="{{item.id}}">查看物流</button>
</navigator>
</navigator>
<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelConfirmReceipt">确认收货</button>
<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelConfirmReceipt">确认收货</button>
...
...
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