wxd / MShopWeApp

Commit 0875fe93deb1043c96020704062c266553d0390b

Authored by yvan.ni
1 parent a9154ac9

order_list 订单列表， order_detail 订单详情的修改

Inline Side-by-side
Showing 5 changed files with 70 additions and 13 deletions
pages/user/order_detail/order_detail.js
  View file @0875fe9
... ... @@ -108,6 +108,8 @@ Page({
108 108 //2.退款被拒绝就要显示可以退款
109 109 //3.退款已经完成
110 110 r['is_all_return'] = 0;
  111 + var rt_ok_num=0;
  112 +
111 113 if(r['order_status'] == 1 && r['pay_status'] == 1) {
112 114 goodslist.forEach(function (eeb, iii) {
113 115 goodslist[iii]['return_btn'] = 1;
... ... @@ -120,7 +122,7 @@ Page({
120 122 case 1://退款处理中
121 123 goodslist[iii]['return_btn'] = 2; break;
122 124 case 2://退款完成
123   - goodslist[iii]['return_btn'] = 4; break;
  125 + goodslist[iii]['return_btn'] = 4;rt_ok_num++; break;
124 126 case 3://已拒绝，重新退款
125 127 goodslist[iii]['return_btn'] = 3; break;
126 128 default:
... ... @@ -134,6 +136,10 @@ Page({
134 136 }
135 137 }
136 138  
  139 + //--如果是全部退款，也就可以删除--
  140 + if(rt_ok_num==goodslist.length){
  141 + r['is_all_return_status']=2;
  142 + }
137 143 r['order_goods'] = goodslist;
138 144 var g_num = 0;
139 145 goodslist.forEach(function (ee, ii) {
... ... @@ -320,6 +326,28 @@ Page({
320 326 });
321 327 },
322 328  
  329 + //-----删除订单-----
  330 + deleteOrderData: function(t) {
  331 + var th=this;
  332 + var order_id=t.currentTarget.dataset.order_id;
  333 + wx.showModal({
  334 + title: "是否取消订单？",
  335 + success: function(tt) {
  336 + t.confirm && rq.put("/api/weshop/order/updatebyId", {
  337 + data: {
  338 + order_id: a, order_status: 5
  339 + },
  340 + success: function (t) {
  341 + getApp().my_warnning("删除成功",1,th);
  342 + setTimeout(function () {
  343 + getApp().goto("/pages/user/order_list/order_list");
  344 + },1000);
  345 + }
  346 + })
  347 + }
  348 + });
  349 + },
  350 +
323 351  
324 352  
325 353 });
326 354 \ No newline at end of file
... ...
pages/user/order_detail/order_detail.json
  View file @0875fe9
1 1 {
2 2 "navigationBarTitleText": "订单详情",
3   - "enablePullDownRefresh": false
  3 + "enablePullDownRefresh": false,
  4 + "usingComponents": {
  5 + "warn": "/components/long_warn/long_warn"
  6 + }
4 7 }
5 8 \ No newline at end of file
... ...
pages/user/order_detail/order_detail.wxml
  View file @0875fe9
... ... @@ -140,9 +140,12 @@
140 140 <navigator class="tips-btn" hidden="{{!(order.order_status==1&&order.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
141 141 </block>
142 142 <block wx:else>
  143 + <view class="tips-btn" wx:if="{{order.is_all_return_status==2}}" bindtap="deleteOrderData" order_id="{{order.order_id}}" >删除订单</view>
143 144 <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
144 145 <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
145 146 url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
146 147 </block>
147 148 </view>
148 149 </view>
  150 +
  151 +<warn id="warn"></warn>
... ...
pages/user/order_list/order_list.js
  View file @0875fe9
... ... @@ -31,11 +31,12 @@ Page({
31 31 },
32 32 onLoad: function(t) {
33 33 var e = void 0 === t.type ? this.data.activeCategoryId : t.type;
34   - s.init(this, "", "orderList"), this.requestOrderList(e), wx.removeStorageSync("order:order_list:update");
  34 + s.init(this, "", "orderList");
  35 + //this.requestOrderList(e), wx.removeStorageSync("order:order_list:update");
35 36 },
36 37 onShow: function() {
37   - wx.getStorageSync("order:order_list:update") && (wx.setStorageSync("order:order_list:update", !1),
38   - this.resetData(), this.requestOrderList(this.data.activeCategoryId));
  38 + //wx.getStorageSync("order:order_list:update") && (wx.setStorageSync("order:order_list:update", !1),
  39 + this.resetData(), this.requestOrderList(this.data.activeCategoryId);
39 40 },
40 41 changeTab: function(t) {
41 42 this.resetData(), this.requestOrderList(t.currentTarget.id);
... ... @@ -46,7 +47,8 @@ Page({
46 47  
47 48 /*---------获取订单列表--------*/
48 49 requestOrderList: function(t) {
49   - var e = this,th=e, r = e.data.url + "/api/weshop/order/page?1=1", a = "";
  50 + var rd=Math.random()*100;
  51 + var e = this,th=e, r = e.data.url + "/api/weshop/order/page?rd="+rd, a = "";
50 52 switch(t){
51 53 case "1":
52 54 r += "&wait_status=0"; break;
... ... @@ -116,6 +118,8 @@ Page({
116 118 //2.退款被拒绝就要显示可以退款
117 119 //3.退款已经完成
118 120 data[ind]['is_all_return'] = 0;
  121 + var rt_ok_num=0;
  122 +
119 123 if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
120 124 goodslist.forEach(function (eeb, iii) {
121 125 goodslist[iii]['return_btn'] = 1;
... ... @@ -128,7 +132,7 @@ Page({
128 132 case 1://退款处理中
129 133 goodslist[iii]['return_btn'] = 2; break;
130 134 case 2://退款完成
131   - goodslist[iii]['return_btn'] = 4; break;
  135 + goodslist[iii]['return_btn'] = 4; rt_ok_num++; break;
132 136 case 3://已拒绝，重新退款
133 137 goodslist[iii]['return_btn'] = 3; break;
134 138 default:
... ... @@ -141,6 +145,11 @@ Page({
141 145 }
142 146 }
143 147 }
  148 +
  149 + //--如果是全部退款，也就可以删除--
  150 + if(rt_ok_num==goodslist.length){
  151 + data[ind]['is_all_return_status']=2;
  152 + }
144 153  
145 154 data[ind]['order_goods'] = goodslist;
146 155 var g_num = 0;
... ... @@ -240,12 +249,25 @@ Page({
240 249  
241 250 //-----删除订单-----
242 251 deleteOrderData: function(t) {
243   - for (var e = 0; e < this.data.orderList.length; e++) if (this.data.orderList[e].order_id == t) {
244   - this.data.orderList.splice(e, 1), this.setData({
245   - orderList: this.data.orderList
246   - });
247   - break;
248   - }
  252 + var order_id=t.currentTarget.dataset.order_id;
  253 + wx.showModal({
  254 + title: "是否取消订单？",
  255 + success: function(tt) {
  256 + t.confirm && rq.put("/api/weshop/order/updatebyId", {
  257 + data: {
  258 + order_id: a, order_status: 5
  259 + },
  260 + success: function (t) {
  261 + for (var e = 0; e < this.data.orderList.length; e++) if (this.data.orderList[e].order_id == t) {
  262 + this.data.orderList.splice(e, 1), this.setData({
  263 + orderList: this.data.orderList
  264 + });
  265 + break;
  266 + }
  267 + }
  268 + })
  269 + }
  270 + });
249 271 },
250 272  
251 273 //---判断是不是有退款-----
... ...
pages/user/order_list/order_list.wxml
  View file @0875fe9
... ... @@ -83,6 +83,7 @@
83 83 <navigator class="order-btn" hidden="{{!(item.order_status==1&&item.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
84 84 </block>
85 85 <block wx:else>
  86 + <view class="order-btn" wx:if="{{item.is_all_return_status==2}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}" >删除订单</view>
86 87 <navigator class="order-btn" wx:if="{{item.is_all_return_status==3}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>
87 88 <navigator class="order-btn" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}"
88 89 url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
... ...