1 participants
-
Status changed to merged
-
mentioned in commit 6374408edc923e9339e68d13c6bfaf188efe1f64
Showing
2 changed files
pages/user/order_detail/order_detail.js
| @@ -122,9 +122,9 @@ Page({ | @@ -122,9 +122,9 @@ Page({ | ||
| 122 | r['is_all_return'] = 0; | 122 | r['is_all_return'] = 0; |
| 123 | var rt_ok_num=0; | 123 | var rt_ok_num=0; |
| 124 | 124 | ||
| 125 | - if(r['order_status'] == 1 && r['pay_status'] == 1) { | 125 | + //if(r['order_status'] == 1 && r['pay_status'] == 1) { |
| 126 | goodslist.forEach(function (eeb, iii) { | 126 | goodslist.forEach(function (eeb, iii) { |
| 127 | - goodslist[iii]['return_btn'] = 1; | 127 | + //goodslist[iii]['return_btn'] = 1; |
| 128 | ttd.data.data.pageData.forEach(function (eea, ii) { | 128 | ttd.data.data.pageData.forEach(function (eea, ii) { |
| 129 | var st = eea.status; | 129 | var st = eea.status; |
| 130 | if (eea.goods_id == eeb.goods_id){ | 130 | if (eea.goods_id == eeb.goods_id){ |
| @@ -139,13 +139,14 @@ Page({ | @@ -139,13 +139,14 @@ Page({ | ||
| 139 | case 3://已拒绝，重新退款 | 139 | case 3://已拒绝，重新退款 |
| 140 | goodslist[iii]['return_btn'] = 3; break; | 140 | goodslist[iii]['return_btn'] = 3; break; |
| 141 | default: | 141 | default: |
| 142 | - goodslist[iii]['return_btn'] = 1; //申请退款 | 142 | + if(r['order_status'] == 1 && r['pay_status'] == 1) |
| 143 | + goodslist[iii]['return_btn'] = 1; //申请退款 | ||
| 143 | } | 144 | } |
| 144 | return; | 145 | return; |
| 145 | } | 146 | } |
| 146 | }); | 147 | }); |
| 147 | }); | 148 | }); |
| 148 | - } | 149 | + //} |
| 149 | } | 150 | } |
| 150 | } | 151 | } |
| 151 | 152 |
pages/user/order_list/order_list.js
| @@ -137,9 +137,9 @@ Page({ | @@ -137,9 +137,9 @@ Page({ | ||
| 137 | data[ind]['is_all_return'] = 0; | 137 | data[ind]['is_all_return'] = 0; |
| 138 | var rt_ok_num=0; | 138 | var rt_ok_num=0; |
| 139 | 139 | ||
| 140 | - if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) { | 140 | + //if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) { |
| 141 | goodslist.forEach(function (eeb, iii) { | 141 | goodslist.forEach(function (eeb, iii) { |
| 142 | - goodslist[iii]['return_btn'] = 1; | 142 | + //goodslist[iii]['return_btn'] = 1; |
| 143 | ttd.data.data.pageData.forEach(function (eea, ii) { | 143 | ttd.data.data.pageData.forEach(function (eea, ii) { |
| 144 | var st = eea.status; | 144 | var st = eea.status; |
| 145 | if (eea.goods_id == eeb.goods_id){ | 145 | if (eea.goods_id == eeb.goods_id){ |
| @@ -153,13 +153,14 @@ Page({ | @@ -153,13 +153,14 @@ Page({ | ||
| 153 | case 3://已拒绝，重新退款 | 153 | case 3://已拒绝，重新退款 |
| 154 | goodslist[iii]['return_btn'] = 3; break; | 154 | goodslist[iii]['return_btn'] = 3; break; |
| 155 | default: | 155 | default: |
| 156 | - goodslist[iii]['return_btn'] = 1; //申请退款 | 156 | + if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) |
| 157 | + goodslist[iii]['return_btn'] = 1; //申请退款 | ||
| 157 | } | 158 | } |
| 158 | return; | 159 | return; |
| 159 | } | 160 | } |
| 160 | }); | 161 | }); |
| 161 | }); | 162 | }); |
| 162 | - } | 163 | + //} |
| 163 | } | 164 | } |
| 164 | } | 165 | } |
| 165 | 166 |