merge

src/templates/retail/defaultData/index.js

-import welcome from './welcome'
-import notice from './notice'
-import schedule from './schedule'
+import retail from './retail'
 export default {
-  welcome,
-  notice,
-  schedule
+  retail,
 }

src/templates/retail/defaultData/notice.js

-export default {
-  companyLogo: {
-    value: 'http://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/template-culture/logo1.png'
-  },
-  companyName: {
-    value: '迈动互联（北京）信息科技有限公司'
-  },
-  noticeTitle: {
-    value: '2019年端午节放假通知'
-  },
-  noticeContent: {
-    value: '根据国家2019年部分节假日安排，结合公司实际情况，劳动节放假时间安排如下：2019年6月7日至6月9日放假，共3天。6月10（星期一）上班。\r\n注意事项：\r\n 1、放假期间，请各部门自行妥善安排好放假前工作，做好安全防范措施。\r\n2、放假期间外出的员工，请注意人身财产安全.\r\n \r\n \r\n       \t   特此通知，请知悉。'
-  },
-  noticeNickName: {
-    value: 'Dear All：'
-  }
-}

src/templates/retail/defaultData/retail.js

+export default {
+	texture: {
+		value: "https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/texture.jpg"
+	},
+	mlxg: {
+		value: "https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/mlxg.png"
+	},
+	picture: {
+		value: "https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/picture.png"
+	},
+	decorate: {
+		value: "https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/decorate.png"
+	},
+	leftright: {
+		value: "https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/Left-right.png"
+	},
+	code: {
+		value: "https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/code.png"
+	},
+	price:{
+		value:"https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/price.png"
+	},
+	line:{
+		value:"https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/line.png"
+	},
+	titleitem:{
+		value:"https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/Title%20item.png"
+	},
+	newsummer:{
+		value:"https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/New%20Summer.png"
+	},
+	textleft:{
+		value:"https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/textlleft.png"
+	},
+	textright:{
+		value:"https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/textright.png"
+	},
+	drinkswave:{
+		value:"https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/Drinks%20Wave.png"
+	},
+	bean:{
+		value:"https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/bean.png"
+	},
+	tableitem:{
+		value:"https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/table%20item.png"
+	},
+	background:{
+		value:"https://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/background.jpg"
+	}
+}
\ No newline at end of file

src/templates/retail/defaultData/schedule.js

-export default {
-  companyLogo: {
-    value: 'http://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/template-culture/logo1.png'
-  },
-  companyName: {
-    value: '迈动互联（北京）信息科技有限公司'
-  },
-  scheduleList: [
-    {
-      content: '龙湖地产来访',
-      address: '22-1会议室',
-      department: '智慧营销',
-      time: '09:30 AM -12:00 AM',
-      index: 1,
-      schemaIndex: 0
-    },
-    {
-      content: 'Vmatrix研发进度',
-      address: '21-03会议室',
-      department: '数字理想',
-      time: '09:30 AM -10:00 AM',
-      index: 2,
-      schemaIndex: 0
-    },
-    {
-      content: '数字理想前端面试',
-      address: '22-1会议室',
-      department: '数字理想',
-      time: '09:30 AM -12:00 AM',
-      index: 3,
-      schemaIndex: 0
-    },
-    {
-      content: '销售总监面试',
-      address: '22-1会议室',
-      department: '总经办',
-      time: '09:30 AM -12:00 AM',
-      index: 4,
-      schemaIndex: 0
-    }
-  ]
-}

src/templates/retail/defaultData/welcome.js

-export default {
-  companyLogo: {
-    value: 'http://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/template-culture/logo1.png'
-  },
-  companyName: {
-    value: '迈动互联（北京）信息科技有限公司'
-  },
-  companyNameEn: {
-    value: 'MAXROCKY'
-  },
-  welcomeWordZh: {
-    value: '欢迎龙湖信息中心领导参观指导'
-  },
-  welcomeWordEn: {
-    value: 'WELCOME'
-  },
-  imgurl: {
-  	value: require('../../../assets/code.png')
-  }
-}

src/templates/retail/index.vue

@@ -94,7 +94,7 @@ export default {
   },
   beforeDestroy () {},
   mounted () {
-    /* Scene.EventBus.on("leaveBefore", e => {
+     Scene.EventBus.on("leaveBefore", e => {
       console.log("leaveBefore");
       this.$refs["child" + this.sliderActiveIndex][0].leave().then(() => {
         console.log("leaveBefore then");
@@ -108,7 +108,7 @@ export default {
     });
     // this.$refs['child'][0].enter().then(() => {
 
-    // }) */
+    // }) 
   },
   created () {
     var vm = this

src/templates/retail/mixin.js

 import data from './schemaData.js'
 import editMethod from './editMethod.js'
 import requireIcons from '@/icons/requireIcons'
-// console.log(JSON.stringify(data))
+   console.log(JSON.stringify(data))
 
 export default {
   data: function () {

src/templates/retail/pages/retail2.vue

 <template>
 	<div class="container2">
-	<img class="titleitem" src="../../../assets/Title item.png"  />
-	<img class="newsummer" ref='newsummer' src="../../../assets/New Summer.png" />
-    <img class="textleft" src="../../../assets/textlleft.png" />
-    <img class="textright" src="../../../assets/textright.png" />
-    <img class="drinkswave" src="../../../assets/Drinks Wave.png" />
-    <img class="bean" src="../../../assets/bean.png" />
-    <img class="tableitem" ref="tableitem" src="../../../assets/table item.png" />
+	<img class="titleitem" :src="getValue('titleitem')"  />
+	<img class="newsummer" ref='newsummer' :src="getValue('newsummer')" />
+    <img class="textleft" :src="getValue('textleft')" />
+    <img class="textright" :src="getValue('textright')" />
+    <img class="drinkswave" ref="drinkswave" :src="getValue('drinkswave')" />
+    <img class="bean" :src="getValue('bean')" />
+    <img class="tableitem" ref="tableitem" :src="getValue('tableitem')" />
 	</div>
 </template>
 
@@ -15,7 +15,7 @@ import methods from '../methods'
 import anime from 'animejs/lib/anime.es.js'
 import Scene from '@/framework/utils/sence'
 export default {
-  name: 'welcome',
+  name: 'retail',
   props: ['schemaData', 'page', 'isEditMode', 'cancelEdit'],
   mixins: [methods],
   components: {
@@ -67,7 +67,7 @@ export default {
           easing: 'easeInOutQuad'
         }).finished,
         anime({
-          targets: this.$refs['decorate'],
+          targets: this.$refs['drinkswave'],
           translateX: 0,
           opacity: 1,
           duration: 1000,
@@ -126,7 +126,7 @@ export default {
         duration: 0
       })
       anime({
-        targets: this.$refs['price'],
+        targets: this.$refs['drinkswave'],
         translateX: 2000,
         opacity: 0,
         duration: 0
@@ -172,7 +172,7 @@ export default {
 }
 </script>
 <style>
-.container2{background: url(../../../assets/background.png) no-repeat;background-size: 100% 100%;width: 100%;height: 100%;}
+.container2{background: url(http://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/background.jpg) no-repeat;background-size: 100% 100%;width: 100%;height: 100%;}
 .titleitem{width: 80%;height: 63%;display: block;position: absolute;top: 60px;left: 50%;margin-left: -40%;}
 .newsummer{width: 546px;height: 470px;display: block;position: absolute;top: 106px;margin-left: 156px;}
 .textleft{width: 50px;height: 420px;display: block;position: absolute;top: 700px;margin-left: 80px;}

src/templates/retail/schemaData.js

@@ -9,21 +9,30 @@ export default {
   pageList: [
     {
       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',
+>>>>>>> 7d55b422b8cb91ab3d6ad025c67ddeacc8e73281
       component: 'retail1',
-      defaultData: defaultData.welcome,
-      schemaData: defaultData.welcome,
-      itemList: itemList.welcome
+      defaultData: defaultData.retail,
+      schemaData: defaultData.retail,
+      itemList: itemList.retail
     },
     {
+<<<<<<< HEAD
       name: '零售1',
       thumb:
         'http://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/template-culture/thumb1.jpg',
+=======
+      name: '零售2',
+      thumb: 'http://visual-clouds.oss-cn-beijing.aliyuncs.com/resource/retail/retailtwo.jpg',
+>>>>>>> 7d55b422b8cb91ab3d6ad025c67ddeacc8e73281
       component: 'retail2',
-      defaultData: defaultData.welcome,
-      schemaData: defaultData.welcome,
-      itemList: itemList.welcome
+      defaultData: defaultData.retail,
+      schemaData: defaultData.retail,
+      itemList: itemList.retail
     }
   ]
 }