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
5db6ff71
Commit
5db6ff71
authored
Jan 03, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单提交修改
parent
7ef7e73e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
2 deletions
+47
-2
confirmOrder.js
src/pages/confirmOrder/confirmOrder.js
+12
-1
confirmOrder.wxml
src/pages/confirmOrder/confirmOrder.wxml
+6
-0
confirmOrder.wxss
src/pages/confirmOrder/confirmOrder.wxss
+28
-0
orderDetail.wxml
src/pages/orderDetail/orderDetail.wxml
+1
-1
No files found.
src/pages/confirmOrder/confirmOrder.js
View file @
5db6ff71
...
...
@@ -36,6 +36,7 @@ wxService.page({
defalutCouponId
:
''
,
// 默认第一项
addressId
:
''
,
// 收货地址id
totalGoodsPrice
:
0
,
buyerRemark
:
''
,
//备注信息
},
/**
...
...
@@ -64,6 +65,13 @@ wxService.page({
this
.
getAddressList
()
});
},
//订单备注输入
onBuyerRemarkInput
(
e
){
this
.
data
.
buyerRemark
=
e
.
detail
.
value
;
this
.
setData
({
buyerRemark
:
this
.
data
.
buyerRemark
});
},
// select 传过来
updateCoupon
(
e
)
{
// faceAmount 抵用多少钱(分) 1 抵用券 2 折扣券
...
...
@@ -474,7 +482,10 @@ wxService.page({
wx
.
showLoading
({
title
:
'加载中'
})
const
{
isSelect
}
=
this
.
data
const
{
isSelect
}
=
this
.
data
;
//增加订单备注信息
params
.
buyerRemark
=
this
.
data
.
buyerRemark
;
let
url
=
isSelect
?
'/sale/payment/merged/buyer/bill'
:
'/sale/trade/buyer/bill'
wxService
.
post
(
`
${
url
}
`
,
params
).
then
(
res
=>
{
if
(
res
)
{
...
...
src/pages/confirmOrder/confirmOrder.wxml
View file @
5db6ff71
...
...
@@ -158,6 +158,12 @@
<text class="total-label">小计:</text>
<text class="total-numer">¥186</text>
</view> -->
<!-- <view class='buyer-remark'>
<view class='remark-title'>备注信息</view>
<textarea placeholder='请输入您的备注信息,快递信息,订单备注。。。'
show-confirm-bar="{{true}}"
value='{{buyerRemark}}' bindinput='onBuyerRemarkInput'></textarea>
</view> -->
</view>
</view>
...
...
src/pages/confirmOrder/confirmOrder.wxss
View file @
5db6ff71
...
...
@@ -290,4 +290,31 @@
width: 100rpx;
height: 55rpx;
right: 33rpx;
}
.buyer-remark{
box-sizing: border-box;
-webkit-box-sizing: border-box;
width: 100%;
height: auto;
padding: 0 10rpx 30rpx 10rpx;
}
.buyer-remark .remark-title{
font-size: 28rpx;
color: #333333;
padding: 20rpx 0;
padding-top: 25rpx;
}
.buyer-remark textarea{
border: solid 2rpx #eeeeee;
min-height: 120rpx;
width: 100%;
box-sizing: border-box;
-webkit-box-sizing: border-box;
padding: 10rpx;
font-size: 28rpx;
color: #333333;
border-radius: 6rpx;
}
\ No newline at end of file
src/pages/orderDetail/orderDetail.wxml
View file @
5db6ff71
...
...
@@ -16,7 +16,7 @@
<!--订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货) -->
<view class="order-status" wx-if="{{detail.status == 'C'}}">
<view class="status">交易关闭</view>
<view class="desc">
{{detail.status == '订单已取消' || detail.status == '退货完成'}}
</view>
<view class="desc">
订单已取消
</view>
</view>
<view class="order-status" wx-if="{{detail.status == 'PR'}}">
<view class="status">退货中</view>
...
...
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