fe / yohobuywap-node · Commits

Go to a project

Authored by 李奇
Commit 0adcb0146fa4362c89bed62fa7101f2308544cb7 2 parents df03daa8 abb4a261

Merge branch 'feature/group-buy' into 'release/313' 

替换资源码、升级版本号



See merge request !1716
Inline Side-by-side
Showing 3 changed files with 7 additions and 7 deletions
@@ -7,14 +7,14 @@ const contentCodes = { @@ -7,14 +7,14 @@ const contentCodes = {
7 test: { 7 test: {
8 home: 'ae00dffeb10f417887c433057b0af8bb', 8 home: 'ae00dffeb10f417887c433057b0af8bb',
9 ready: '89141506b9926010f28915a82b3db61d', 9 ready: '89141506b9926010f28915a82b3db61d',
10 - result: 'cea0efae77f4e04c935beb1e87181247',  
11 - detail: '3c3a94fd6c6e19508b6921acd7f6cbad' 10 + result: '3c3a94fd6c6e19508b6921acd7f6cbad',
  11 + detail: 'cea0efae77f4e04c935beb1e87181247'
12 }, 12 },
13 production: { 13 production: {
14 home: '4b24541678c9fe0ca12c8fd205a6d427', 14 home: '4b24541678c9fe0ca12c8fd205a6d427',
15 ready: '89141506b9926010f28915a82b3db61d', 15 ready: '89141506b9926010f28915a82b3db61d',
16 - result: 'cea0efae77f4e04c935beb1e87181247',  
17 - detail: '3c3a94fd6c6e19508b6921acd7f6cbad' 16 + result: '3c3a94fd6c6e19508b6921acd7f6cbad',
  17 + detail: 'cea0efae77f4e04c935beb1e87181247'
18 } 18 }
19 } [isProd ? 'production' : 'test']; 19 } [isProd ? 'production' : 'test'];
20 20
@@ -114,8 +114,8 @@ @@ -114,8 +114,8 @@
114 {{#ifcond template_name "==" 'focus'}} 114 {{#ifcond template_name "==" 'focus'}}
115 {{> group/resources/focus}} 115 {{> group/resources/focus}}
116 {{/ifcond}} 116 {{/ifcond}}
117 - {{#ifcond template_name "==" 'newSingleImage'}}  
118 - {{> group/resources/new-single-image}} 117 + {{#ifcond template_name "==" 'single_image'}}
  118 + {{> group/resources/single-image}}
119 {{/ifcond}} 119 {{/ifcond}}
120 {{#ifcond template_name "==" 'twoPicture'}} 120 {{#ifcond template_name "==" 'twoPicture'}}
121 {{> group/resources/two-image}} 121 {{> group/resources/two-image}}
1 { 1 {
2 "name": "yohobuywap-node", 2 "name": "yohobuywap-node",
3 - "version": "6.8.80-6", 3 + "version": "6.8.80-7",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {