Skip to content

visualcloud / Vmatrix-template

Go to a project
Commit 6091747b by hank
Options

fix bug

parent e1b2489b
Showing with 0 additions and 11 deletions
src/templates/retail/schemaData.js
...@@ -9,26 +9,15 @@ export default { ...@@ -9,26 +9,15 @@ export default {
pageList: [ pageList: [
{ {
name: '零售1', name: '零售1',
<<<<<<< HEAD
thumb:
'http://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/template-culture/thumb1.jpg',
=======
thumb: 'http://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/retailone.jpg', thumb: 'http://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/retailone.jpg',
>>>>>>> 7d55b422b8cb91ab3d6ad025c67ddeacc8e73281
component: 'retail1', component: 'retail1',
defaultData: defaultData.retail, defaultData: defaultData.retail,
schemaData: defaultData.retail, schemaData: defaultData.retail,
itemList: itemList.retail itemList: itemList.retail
}, },
{ {
<<<<<<< HEAD
name: '零售1',
thumb:
'http://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/template-culture/thumb1.jpg',
=======
name: '零售2', name: '零售2',
thumb: 'http://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/retailtwo.jpg', thumb: 'http://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/retailtwo.jpg',
>>>>>>> 7d55b422b8cb91ab3d6ad025c67ddeacc8e73281
component: 'retail2', component: 'retail2',
defaultData: defaultData.retail, defaultData: defaultData.retail,
schemaData: defaultData.retail, schemaData: defaultData.retail,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment