fe / yohobuywap-node · Commits

Go to a project

Authored by 陈轩
Commit 010c900a294709290b8555ea9ec3eb115706e96e 1 parent 4722af87

YH-4978

Inline Side-by-side
Showing 7 changed files with 28 additions and 14 deletions
@@ -41,17 +41,26 @@ exports.ensure = (req, res, next) => { @@ -41,17 +41,26 @@ exports.ensure = (req, res, next) => {
41 41
42 // 获取结算 数据 42 // 获取结算 数据
43 let paymentInfo = yield buyNowModel.payment(paymentOption, orderInfo); 43 let paymentInfo = yield buyNowModel.payment(paymentOption, orderInfo);
  44 + let view;
44 45
45 if (paymentInfo.code !== 200) { 46 if (paymentInfo.code !== 200) {
46 - return Promise.reject('结算请求失败'); 47 + if (paymentInfo.message) {
  48 + view = {
  49 + orderEnsure: false,
  50 + message: paymentInfo.message
  51 + };
  52 + } else {
  53 + return Promise.reject(paymentInfo);
  54 + }
  55 + } else {
  56 + // 渲染
  57 + view = Object.assign({
  58 + seckill: skillData,
  59 + orderEnsure: true,
  60 + sku,
  61 + }, paymentInfo.data);
47 } 62 }
48 63
49 - // 渲染  
50 - let view = Object.assign({  
51 - seckill: skillData,  
52 - orderEnsure: true,  
53 - sku,  
54 - }, paymentInfo.data);  
55 64
56 // console.log(view); 65 // console.log(view);
57 res.locals.title = '确认订单'; 66 res.locals.title = '确认订单';
1 <div class="order-ensure-page yoho-page"> 1 <div class="order-ensure-page yoho-page">
2 - {{# orderEnsure}} 2 + {{#if orderEnsure}}
3 {{#if addressInfo}} 3 {{#if addressInfo}}
4 <div class="address block address-wrap {{#if pageHeader.boys}} boys{{/if}}{{#if pageHeader.girls}} girls{{/if}}{{#if pageHeader.kids}} kids{{/if}}{{#if pageHeader.lifeStyle}} life-style{{/if}}" data-id ="{{addressId}}"> 4 <div class="address block address-wrap {{#if pageHeader.boys}} boys{{/if}}{{#if pageHeader.girls}} girls{{/if}}{{#if pageHeader.kids}} kids{{/if}}{{#if pageHeader.lifeStyle}} life-style{{/if}}" data-id ="{{addressId}}">
5 <div class="info"> 5 <div class="info">
@@ -193,5 +193,7 @@ @@ -193,5 +193,7 @@
193 {{#with seckill}} 193 {{#with seckill}}
194 <input type="hidden" id="activity-id" name="activity-id" value="{{activityId}}"> 194 <input type="hidden" id="activity-id" name="activity-id" value="{{activityId}}">
195 {{/with}} 195 {{/with}}
196 - {{/ orderEnsure}} 196 + {{else}}
  197 + {{message}}
  198 + {{/if}}
197 </div> 199 </div>
@@ -115,10 +115,11 @@ const _getOrderData = (params) => { @@ -115,10 +115,11 @@ const _getOrderData = (params) => {
115 const _getOrderStatus = (order, showLogistics) => { 115 const _getOrderStatus = (order, showLogistics) => {
116 let result = {}; 116 let result = {};
117 117
  118 + result.useLimitCode = order.use_limit_code === 'Y';
118 if (order.is_cancel === 'Y') { 119 if (order.is_cancel === 'Y') {
119 - return { 120 + return Object.assign(result, {
120 canceled: true 121 canceled: true
121 - }; 122 + });
122 } 123 }
123 124
124 // 先判断订单付款方式，根据不同的付款方式计算订单状态。（注:货到付款没有待付款状态） 125 // 先判断订单付款方式，根据不同的付款方式计算订单状态。（注:货到付款没有待付款状态）
@@ -294,6 +295,7 @@ const getOrders = (params) => { @@ -294,6 +295,7 @@ const getOrders = (params) => {
294 295
295 /* 订单件数清零 */ 296 /* 订单件数清零 */
296 count = 0; 297 count = 0;
  298 +
297 let perOrder = _getOrderStatus(value); 299 let perOrder = _getOrderStatus(value);
298 300
299 /* 是否是虚拟商品 */ 301 /* 是否是虚拟商品 */
@@ -167,6 +167,7 @@ const orderDetailData = (uid, orderCode) => { @@ -167,6 +167,7 @@ const orderDetailData = (uid, orderCode) => {
167 let status = _getOrderStatus(orderDetail); 167 let status = _getOrderStatus(orderDetail);
168 168
169 orderDetail = _.assign(orderDetail, status); 169 orderDetail = _.assign(orderDetail, status);
  170 + orderDetail.useLimitCode = orderDetail.useLimitCode === 'Y';
170 171
171 if (orderDetail.virtualType && orderDetail.virtualType === 3) { 172 if (orderDetail.virtualType && orderDetail.virtualType === 3) {
172 orderDetail = _.assign(orderDetail, { 173 orderDetail = _.assign(orderDetail, {
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 {{#if isVirtual}} 111 {{#if isVirtual}}
112 <!--虚拟商品--> 112 <!--虚拟商品-->
113 {{else}} 113 {{else}}
114 - <span class="btn btn-rebuy">再次购买</span> 114 + {{#unless useLimitCode}}<span class="btn btn-rebuy">再次购买</span>{{/unless}}
115 {{/if}} 115 {{/if}}
116 {{/unless}} 116 {{/unless}}
117 {{/unless}} 117 {{/unless}}
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 {{#if isVirtual}} 23 {{#if isVirtual}}
24 <!--虚拟商品--> 24 <!--虚拟商品-->
25 {{else}} 25 {{else}}
26 - <span class="btn rebuy">再次购买</span> 26 + {{#unless useLimitCode}}<span class="btn rebuy">再次购买</span>{{/unless}}
27 {{/if}} 27 {{/if}}
28 {{/unless}} 28 {{/unless}}
29 29
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 {{#if isVirtual}} 24 {{#if isVirtual}}
25 <!--虚拟商品--> 25 <!--虚拟商品-->
26 {{else}} 26 {{else}}
27 - <span class="btn rebuy">再次购买</span> 27 + {{#unless useLimitCode}}<span class="btn rebuy">再次购买</span>{{/unless}}
28 {{/if}} 28 {{/if}}
29 {{/unless}} 29 {{/unless}}
30 30