Commit 58b40ef8dc6ba4cbe5e58feb8c2afb2afeb9fb44
Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa
Showing
2 changed files
with
7 additions
and
1 deletions
pages/index/index/index.js
| @@ -389,7 +389,7 @@ Page({ | @@ -389,7 +389,7 @@ Page({ | ||
| 389 | console.log('....................'); | 389 | console.log('....................'); |
| 390 | }, | 390 | }, |
| 391 | 391 | ||
| 392 | - //获取商品模块实例 | 392 | + //获取商品模块实例 |
| 393 | newGoodsGroup() { | 393 | newGoodsGroup() { |
| 394 | let arr = [] | 394 | let arr = [] |
| 395 | if (this.data.template_arr.length == 0) { | 395 | if (this.data.template_arr.length == 0) { |
| @@ -399,6 +399,9 @@ Page({ | @@ -399,6 +399,9 @@ Page({ | ||
| 399 | if (item.ename == 'goodsGroup') { | 399 | if (item.ename == 'goodsGroup') { |
| 400 | arr.push(`goodsGroup${index}`) | 400 | arr.push(`goodsGroup${index}`) |
| 401 | } | 401 | } |
| 402 | + if (item.ename == 'goodsGroupNew') { | ||
| 403 | + arr.push(`goodsGroup${index}`) | ||
| 404 | + } | ||
| 402 | }) | 405 | }) |
| 403 | if (arr.length > 0) { | 406 | if (arr.length > 0) { |
| 404 | this.setData({ | 407 | this.setData({ |
pages/template/index.js
| @@ -92,6 +92,9 @@ Page({ | @@ -92,6 +92,9 @@ Page({ | ||
| 92 | if (item.ename == 'goodsGroup') { | 92 | if (item.ename == 'goodsGroup') { |
| 93 | arr.push(`goodsGroup${index}`) | 93 | arr.push(`goodsGroup${index}`) |
| 94 | } | 94 | } |
| 95 | + if (item.ename == 'goodsGroupNew') { | ||
| 96 | + arr.push(`goodsGroup${index}`) | ||
| 97 | + } | ||
| 95 | }) | 98 | }) |
| 96 | if (arr.length > 0) { | 99 | if (arr.length > 0) { |
| 97 | this.setData({ | 100 | this.setData({ |