Merge branch 'v4' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v4

src/pages/shop/index.js

@@ -241,7 +241,7 @@ export default class Shop extends Component {
             <AtTabs scroll tabDirection='horizontal' current={current} tabList={goodsBuilding} onClick={this.handleClick.bind(this)}>
 
               {goodsBuilding.map((l_item, index) => (
-                <AtTabsPane current={current} key={index} index={index} >
+                <AtTabsPane current={current} key={`pane-${index}`} index={index} >
                   <View>
                     {
                       goodsList.map(item => (