diff --git a/packageA/pages/distribution/commision/commision.js b/packageA/pages/distribution/commision/commision.js index 277dc75..c4972c9 100644 --- a/packageA/pages/distribution/commision/commision.js +++ b/packageA/pages/distribution/commision/commision.js @@ -10,7 +10,7 @@ Page({ data: { isHiddenDropdown: true,//控制下拉菜单显隐 dropdownArr: ['综合','未付款','已付款','待分成','已分成','已取消'], - statusArr: ['未付款', '已付款', '等待分成', '已分成', '已取消'], + statusArr: ['未付款', '已付款', '等待分成', '已分成', '已取消','已退款'], currentSelect: '',//记录当前下拉菜单选中项 isInputFocus: false,//记录搜索输入框是否聚焦 inputVal: '',//记录搜索输入框的内容 diff --git a/packageA/pages/distribution/commision/commision.wxml b/packageA/pages/distribution/commision/commision.wxml index 11d99c3..c9b44e6 100644 --- a/packageA/pages/distribution/commision/commision.wxml +++ b/packageA/pages/distribution/commision/commision.wxml @@ -31,7 +31,7 @@ {{filter.format_time(item.create_time, 1)}} - {{filter.status(item.status, statusArr)}} + {{filter.status(item.status, statusArr,item.order_status)}} 订单号:{{item.order_sn}} diff --git a/utils/filter.wxs b/utils/filter.wxs index 83c952b..c74dce0 100644 --- a/utils/filter.wxs +++ b/utils/filter.wxs @@ -115,7 +115,7 @@ var filters = { // num:状态数值, // arr: 状态文字数组, // 文字顺序必须跟状态数值对应 - status: function (num, arr) { + status: function (num, arr,order_status) { // var text = ''; // if(num == 0) { // text = '未付款'; @@ -126,6 +126,8 @@ var filters = { // } else if(num == 3) { // text = '已完成'; // }; + + if(order_status==6) return '已退款'; return arr[num]; },