Merge branch 'master' of http://www.jiyou-tech.com:3000/chenming/561_jiexin

src/router/index.js

           name: 'high-allDetails',
           component: () => import('../views/twoCart/high-allDetails.vue')
       },//二轮车-高产-全部物料
+      {
+          path: '/appliances_high_compliance',
+          name: 'appliances_high_compliance',
+          component: () => import('../views/appliances_high_compliance.vue')
+      },//家电-高产-合规物料
+      {
+          path: '/appliances_standard_compliance',
+          name: 'appliances_standard_compliance',
+          component: () => import('../views/appliances_standard_compliance.vue')
+      },//家电-标准-合规物料
+      {
+          path: '/phone_standard_compliance',
+          name: 'phone_standard_compliance',
+          component: () => import('../views/phone_standard_compliance.vue')
+      },//手机-标准-合规物料
+      {
+          path: '/phone_high_compliance',
+          name: 'phone_high_compliance',
+          component: () => import('../views/phone_high_compliance.vue')
+      },//手机-高产-合规物料
 ]
 
 const router = new VueRouter({

src/store/index.js

 		imgBaseUrl: '',
 		pagePath: [
 			[
-				{'店外':'/phone_standard_outside','店内':'/phone_standard_within','柜台':'/phone_standard_counter','展示区':'','收银台':'/phone_standard_pay','合规物料':'/compliance','浏览全部物料':'/allMaterials_phone_standard'},//标准
-				{'店外':'/phone_high_outside','店内':'/phone_high_within','柜台':'/phone_high_counter','展示区':'','收银台':'/phone_high_pay','合规物料':'/compliance','浏览全部物料':'/allMaterials_phone_high'},//高产
+				{'店外':'/phone_standard_outside','店内':'/phone_standard_within','柜台':'/phone_standard_counter','展示区':'','收银台':'/phone_standard_pay','合规物料':'/phone_standard_compliance','浏览全部物料':'/allMaterials_phone_standard'},//标准
+				{'店外':'/phone_high_outside','店内':'/phone_high_within','柜台':'/phone_high_counter','展示区':'','收银台':'/phone_high_pay','合规物料':'/phone_high_compliance','浏览全部物料':'/allMaterials_phone_high'},//高产
 			], //手机店
 			[
-				{'店外':'/appliances_standard_outside','店内':'','柜台':'','展示区':'/appliances_standard_exhibition','收银台':'/appliances_standard_pay','合规物料':'/compliance','浏览全部物料':'/allMaterials_appliances_standard'},//标准
-				{'店外':'/appliances_high_outside','店内':'','柜台':'','展示区':'/appliances_high_exhibition','收银台':'/appliances_high_pay','合规物料':'/compliance','浏览全部物料':'/allMaterials_appliances_high'},//高产
+				{'店外':'/appliances_standard_outside','店内':'','柜台':'','展示区':'/appliances_standard_exhibition','收银台':'/appliances_standard_pay','合规物料':'/appliances_standard_compliance','浏览全部物料':'/allMaterials_appliances_standard'},//标准
+				{'店外':'/appliances_high_outside','店内':'','柜台':'','展示区':'/appliances_high_exhibition','收银台':'/appliances_high_pay','合规物料':'/appliances_high_compliance','浏览全部物料':'/allMaterials_appliances_high'},//高产
 			], //家电
 			[
 				{'店外':'/criterion-shop','店内':'','柜台':'','展示区':'/criterion-showarea','收银台':'/criterion-money','合规物料':'/criterion-compliance','浏览全部物料':'/criterion-allDetails'},//标准

src/views/appliances_high_compliance.vue

+<template>
+    <compliance></compliance>
+</template>
+<style scoped>
+
+</style>
+<script>
+    import compliance from './twoCart/compliance'
+    export default {
+        name: 'appliances_high_compliance',
+        props: [],
+        components: {
+            compliance
+        },
+        data() {
+            return {}
+        },
+        created() {
+
+        },
+        mounted() {
+
+        }
+    }
+</script>

src/views/appliances_standard_compliance.vue

+<template>
+    <compliance></compliance>
+</template>
+<style scoped>
+
+</style>
+<script>
+    import compliance from './twoCart/compliance'
+    export default {
+        name: 'appliances_standard_compliance',
+        props: [],
+        components: {
+            compliance
+        },
+        data() {
+            return {}
+        },
+        created() {
+
+        },
+        mounted() {
+
+        }
+    }
+</script>

src/views/phone_high_compliance.vue

+<template>
+    <compliance></compliance>
+</template>
+<style scoped>
+
+</style>
+<script>
+    import compliance from './twoCart/compliance'
+    export default {
+        name: 'phone_high_compliance',
+        props: [],
+        components: {
+            compliance
+        },
+        data() {
+            return {}
+        },
+        created() {
+
+        },
+        mounted() {
+
+        }
+    }
+</script>

src/views/phone_standard_compliance.vue

+<template>
+    <compliance></compliance>
+</template>
+<style scoped>
+
+</style>
+<script>
+    import compliance from './twoCart/compliance'
+    export default {
+        name: 'phone_standard_compliance',
+        props: [],
+        components: {
+            compliance
+        },
+        data() {
+            return {}
+        },
+        created() {
+
+        },
+        mounted() {
+
+        }
+    }
+</script>