wxd / MShopWeApp

Commit aabb1e6ee9dccdf408d4323e961e20849e6bc085

Authored by 后端研发-苏明海
2 parents 84ae444e 6374408e

Merge branch 'test' into 'qa' 

Test

See merge request !67
Inline Side-by-side
Showing 2 changed files with 10 additions and 8 deletions
pages/user/order_detail/order_detail.js
  View file @aabb1e6
... ... @@ -122,9 +122,9 @@ Page({
122 122 r['is_all_return'] = 0;
123 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 126 goodslist.forEach(function (eeb, iii) {
127   - goodslist[iii]['return_btn'] = 1;
  127 + //goodslist[iii]['return_btn'] = 1;
128 128 ttd.data.data.pageData.forEach(function (eea, ii) {
129 129 var st = eea.status;
130 130 if (eea.goods_id == eeb.goods_id){
... ... @@ -139,13 +139,14 @@ Page({
139 139 case 3://已拒绝，重新退款
140 140 goodslist[iii]['return_btn'] = 3; break;
141 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 145 return;
145 146 }
146 147 });
147 148 });
148   - }
  149 + //}
149 150 }
150 151 }
151 152  
... ...
pages/user/order_list/order_list.js
  View file @aabb1e6
... ... @@ -137,9 +137,9 @@ Page({
137 137 data[ind]['is_all_return'] = 0;
138 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 141 goodslist.forEach(function (eeb, iii) {
142   - goodslist[iii]['return_btn'] = 1;
  142 + //goodslist[iii]['return_btn'] = 1;
143 143 ttd.data.data.pageData.forEach(function (eea, ii) {
144 144 var st = eea.status;
145 145 if (eea.goods_id == eeb.goods_id){
... ... @@ -153,13 +153,14 @@ Page({
153 153 case 3://已拒绝，重新退款
154 154 goodslist[iii]['return_btn'] = 3; break;
155 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 159 return;
159 160 }
160 161 });
161 162 });
162   - }
  163 + //}
163 164 }
164 165 }
165 166  
... ...