fe / yohobuywap-node · Commits

Go to a project

Authored by QC-L
Commit f7bf7be2590882b7fcb645b1f9b72f6bf1997d53 1 parent bd28aff6

添加我的拼团跳转订单详情

Inline Side-by-side
Showing 3 changed files with 9 additions and 5 deletions
@@ -165,7 +165,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -165,7 +165,7 @@ module.exports = class extends global.yoho.BaseModel {
165 orderBtn.push({ 165 orderBtn.push({
166 groupInvite: true, 166 groupInvite: true,
167 link: helpers.urlFormat('/activity/group/progress', { 167 link: helpers.urlFormat('/activity/group/progress', {
168 - groupNo: order.group_no, 168 + groupNo: order.group_no || '',
169 activityId: order.activity_id, 169 activityId: order.activity_id,
170 }) 170 })
171 }); 171 });
@@ -94,6 +94,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -94,6 +94,7 @@ module.exports = class extends global.yoho.BaseModel {
94 请在<i class="hours new-hours hide">${countTime}</i>内完成支付，超时订单自动取消`; 94 请在<i class="hours new-hours hide">${countTime}</i>内完成支付，超时订单自动取消`;
95 } 95 }
96 96
  97 + console.log(order);
97 _.each(order.links, (val) => { 98 _.each(order.links, (val) => {
98 switch (val) { 99 switch (val) {
99 case 'refundApply':// 申请退款 100 case 'refundApply':// 申请退款
@@ -117,8 +118,8 @@ module.exports = class extends global.yoho.BaseModel { @@ -117,8 +118,8 @@ module.exports = class extends global.yoho.BaseModel {
117 orderBtn.push({ 118 orderBtn.push({
118 groupInvite: true, 119 groupInvite: true,
119 link: helpers.urlFormat('/activity/group/progress', { 120 link: helpers.urlFormat('/activity/group/progress', {
120 - groupNo: order.order_extInfo.group_no,  
121 - activityId: order.order_extInfo.activity_id, 121 + groupNo: order.orderExtInfo.groupNo || '',
  122 + activityId: order.orderExtInfo.activityId || '',
122 }) 123 })
123 }); 124 });
124 break; 125 break;
@@ -102,8 +102,11 @@ $('#group-order').on('click', function(e) { @@ -102,8 +102,11 @@ $('#group-order').on('click', function(e) {
102 102
103 // $reaMask.data('orderId', id); 103 // $reaMask.data('orderId', id);
104 // $refundReaMask.data('orderId', id); 104 // $refundReaMask.data('orderId', id);
105 -  
106 - if ($cur.closest('.del').length > 0) { 105 + if ($cur.closest('.list-cell-content').length > 0) {
  106 + window.location.href = `/home/orderdetail?order_code=${id}`;
  107 + } else if ($cur.closest('.list-cell-footer').length > 0) {
  108 + window.location.href = `/home/orderdetail?order_code=${id}`;
  109 + } else if ($cur.closest('.del').length > 0) {
107 110
108 // Order delete 111 // Order delete
109 dialog.showDialog({ 112 dialog.showDialog({