fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 01df9f28325abb657e19b44a7862735b39f3f1ad 1 parent c5242f44

fix

Inline Side-by-side
Showing 3 changed files with 8 additions and 7 deletions
@@ -740,6 +740,7 @@ const _getOrderDetail = co(function * (uid, orderId) { @@ -740,6 +740,7 @@ const _getOrderDetail = co(function * (uid, orderId) {
740 detail.orderInfo.offlineByExpress = true; 740 detail.orderInfo.offlineByExpress = true;
741 } 741 }
742 742
  743 + detail.offline = true;
743 detail.orderInfo.offlineStore = _.get(orderDetail, 'offline_store', ''); 744 detail.orderInfo.offlineStore = _.get(orderDetail, 'offline_store', '');
744 } else { 745 } else {
745 detail.orderInfo.normal = true; 746 detail.orderInfo.normal = true;
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 订单编号： 12 订单编号：
13 <em>{{orderNum}}</em> 13 <em>{{orderNum}}</em>
14 </p> 14 </p>
15 - <p class="cur-status clearfix"> 15 + <p class="cur-status clearfix {{#if offline}}hide{{/if}}">
16 当前状态：{{statusStr}} 16 当前状态：{{statusStr}}
17 {{#if operation.goPay}} 17 {{#if operation.goPay}}
18 <a class="go-pay oo-btn" href="{{operation.goPay}}">立即付款</a> 18 <a class="go-pay oo-btn" href="{{operation.goPay}}">立即付款</a>
@@ -11,15 +11,15 @@ const isTest = process.env.NODE_ENV === 'test'; @@ -11,15 +11,15 @@ const isTest = process.env.NODE_ENV === 'test';
11 11
12 module.exports = { 12 module.exports = {
13 app: 'web', 13 app: 'web',
14 - appVersion: '5.5.0', // 调用api的版本 14 + appVersion: '5.6.0', // 调用api的版本
15 port: 6002, 15 port: 6002,
16 siteUrl: 'http://www.yohobuy.com', 16 siteUrl: 'http://www.yohobuy.com',
17 cookieDomain: '.yohobuy.com', 17 cookieDomain: '.yohobuy.com',
18 domains: { 18 domains: {
19 // test3 19 // test3
20 - // singleApi: 'http://api-test3.yohops.com:9999/',  
21 - // api: 'http://api-test3.yohops.com:9999/',  
22 - // service: 'http://service-test3.yohops.com:9999/', 20 + singleApi: 'http://api-test3.yohops.com:9999/',
  21 + api: 'http://api-test3.yohops.com:9999/',
  22 + service: 'http://service-test3.yohops.com:9999/',
23 23
24 // prod 24 // prod
25 //singleApi: 'http://single.yoho.cn/', 25 //singleApi: 'http://single.yoho.cn/',
@@ -32,8 +32,8 @@ module.exports = { @@ -32,8 +32,8 @@ module.exports = {
32 // service: 'http://service.gray.yohops.com/', 32 // service: 'http://service.gray.yohops.com/',
33 33
34 // dev 34 // dev
35 - api: 'http://dev-api.yohops.com:9999/',  
36 - service: 'http://dev-service.yohops.com:9999/', 35 + // api: 'http://dev-api.yohops.com:9999/',
  36 + // service: 'http://dev-service.yohops.com:9999/',
37 37
38 imSocket: 'ws://socket.yohobuy.com:10240', 38 imSocket: 'ws://socket.yohobuy.com:10240',
39 imCs: 'http://im.yohobuy.com/api', 39 imCs: 'http://im.yohobuy.com/api',