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
a6547afa
Commit
a6547afa
authored
Aug 24, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add: 退单列表状态
parent
6feb8e69
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
102 additions
and
27 deletions
+102
-27
order.js
src/pages/order/order.js
+19
-0
order.wxml
src/pages/order/order.wxml
+80
-27
order.wxss
src/pages/order/order.wxss
+3
-0
No files found.
src/pages/order/order.js
View file @
a6547afa
...
...
@@ -151,11 +151,30 @@ wxService.page({
}
})
},
// 查看详情
handelCheckRfDetail
(
e
){
const
{
id
}
=
e
.
currentTarget
.
dataset
},
// 退货寄回
handelCheckRfSend
(
e
){
const
{
id
}
=
e
.
currentTarget
.
dataset
},
// 取消退款
handelCancelRefund
(
e
){
const
{
id
}
=
e
.
currentTarget
.
dataset
},
// 订单详情
handelDetail
(
e
)
{
// const {detail} = e.currentTarget.dataset
const
{
id
}
=
e
.
currentTarget
.
dataset
wxService
.
router
(
`/pages/orderDetail/orderDetail?id=
${
id
}
`
)
},
// 退单详情
handelDetailRf
(
e
)
{
const
{
id
}
=
e
.
currentTarget
.
dataset
console
.
log
(
'id'
,
id
)
// wxService.router(`/pages/orderDetail/orderDetail?id=${id}`)
},
//点击切换tab
switchTab
(
e
)
{
const
{
type
,
status
}
=
e
.
currentTarget
.
dataset
...
...
src/pages/order/order.wxml
View file @
a6547afa
...
...
@@ -28,7 +28,11 @@
<!--订单状态(C:取消;N:新建,P:已支付;D:已发货;R:已收货) 关闭 取消 新建 待付款 已支付 待发货 已发货 待收货 已完成 已收货 交易关闭 取消-->
<!--退单状态(C:取消;N:新建,A:已审核;R:退货已发R货;D:退货已收货)-->
<view wx:if="{{currentIndex == 5}}">
<text class="order-status" wx-if="{{item.status == 'N'}}">N</text>
<text class="order-status" wx-if="{{item.status == 'C'}}">退款取消</text>
<text class="order-status" wx-if="{{item.status == 'N'}}">待审核</text>
<text class="order-status" wx-if="{{item.status == 'A'}}">待寄回</text>
<text class="order-status" wx-if="{{item.status == 'R'}}">退货中</text>
<text class="order-status" wx-if="{{item.status == 'D'}}">退款成功</text>
</view>
<view wx:else>
<text class="order-status" wx-if="{{item.status == 'C'}}">交易关闭</text>
...
...
@@ -38,38 +42,87 @@
<text class="order-status" wx-if="{{item.status == 'R'}}">已完成</text>
</view>
</view>
<view
class="pro-list"
data-detail="{{item}}"
data-id="{{item.id}}"
bindtap="handelDetail"
>
<scroll-view scroll-x="true">
<view class="uploadWrap" scroll-x="true">
<block wx:for='{{item.skuVOList}}' wx:for-item="sub" wx:key="s">
<view class="upload_Item">
<image
class="upload_Item_img"
src="{{sub.mainImgUrl}}"
bindtap='goProDetail'
data-id='{{sub.goodsId}}'
/>
</view>
</block>
<!-- 类型 -->
<view wx:if="{{currentIndex == 5}}">
<view
class="pro-list"
data-detail="{{item}}"
data-id="{{item.id}}"
bindtap="handelDetailRf"
>
<scroll-view scroll-x="true">
<view class="uploadWrap" scroll-x="true">
<block wx:for='{{item.tradeVO.skuVOList}}' wx:for-item="sub" wx:key="s">
<view class="upload_Item">
<image
class="upload_Item_img"
src="{{sub.mainImgUrl}}"
bindtap='goProDetail'
data-id='{{sub.goodsId}}'
/>
</view>
</block>
</view>
</scroll-view>
</view>
<view class="pro-number">
<text class="total-pro">共{{item.count}}件商品</text>
<view class="total-price">
实付
<text class="price">¥{{item.amount}}</text>
</view>
</
scroll-
view>
</view>
</view>
<view class="pro-number">
<text class="total-pro">共{{item.skuCount}}件商品</text>
<view class="total-price">
实付
<text class="price">¥{{item.payAmount}}</text>
<view wx:else>
<view
class="pro-list"
data-detail="{{item}}"
data-id="{{item.id}}"
bindtap="handelDetail"
>
<scroll-view scroll-x="true">
<view class="uploadWrap" scroll-x="true">
<block wx:for='{{item.skuVOList}}' wx:for-item="sub" wx:key="s">
<view class="upload_Item">
<image
class="upload_Item_img"
src="{{sub.mainImgUrl}}"
bindtap='goProDetail'
data-id='{{sub.goodsId}}'
/>
</view>
</block>
</view>
</scroll-view>
</view>
<view class="pro-number">
<text class="total-pro">共{{item.skuCount}}件商品</text>
<view class="total-price">
实付
<text class="price">¥{{item.payAmount}}</text>
</view>
</view>
</view>
<view wx:if="{{currentIndex == 5}}">
<view class="btn-group">
<view class="order-status" wx-if="{{item.status == 'N'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelDelOrder">nnnnn</button>
<!--退单状态(C:取消;N:新建,A:已审核;R:退货已发R货;D:退货已收货)-->
<view class="order-status-rf" wx-if="{{item.status == 'C'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
</view>
<view class="order-status-rf" wx-if="{{item.status == 'N'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfSend">退货寄回</button>
<button class="btn btn-sm btn-primary btn-outline" data-id="{{item.id}}" bindtap="handelCancelRefund">取消退款</button>
</view>
<view class="order-status-rf" wx-if="{{item.status == 'A'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
</view>
<view class="order-status-rf" wx-if="{{item.status == 'R'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
</view>
<view class="order-status-rf" wx-if="{{item.status == 'D'}}">
<button class="btn btn-sm btn-default" data-id="{{item.id}}" bindtap="handelCheckRfDetail">查看详情</button>
</view>
</view>
</view>
...
...
src/pages/order/order.wxss
View file @
a6547afa
...
...
@@ -55,6 +55,9 @@ scroll-view{
font-size: 26rpx;
color: #333333;
}
.order-status-rf {
display: flex;
}
.pro-list{
margin-top: 16rpx;
}
...
...
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