liwj提交

src/components/layout/englishFoor.vue

@@ -96,3 +96,6 @@
     </div>
   </footer>
 </template>
+<style scoped lang="scss" >
+@import "@/assets/css/english";
+</style>

src/components/layout/englishHeader/HeaderDropdown.vue

@@ -72,18 +72,23 @@ export default {
       if(nav.class){
         classNames.push(...nav.class)
       }
+      // return (
+      //   <div class={classNames.join(" ").trim()} style={{...nav.style}}>
+      //   <div
+      //       class="rect-title gs-hover"
+      //       vOn:click={() => {
+      //         this.$emit("itemClick", { ...nav, root: { ...this.nav } });
+      //       }}
+      //     >
+      //       <span class="pointer">
+      //         {nav.nameInHeaderNav ? nav.nameInHeaderNav : nav.name}
+      //       </span>
+      //     </div>
+      //     <div class="rect-body">{children}</div>
+      //   </div>
+      // );
        return (
         <div class={classNames.join(" ").trim()} style={{...nav.style}}>
-          <div
-            class="rect-title gs-hover"
-            vOn:click={() => {
-              this.$emit("itemClick", { ...nav, root: { ...this.nav } });
-            }}
-          >
-            <span class="pointer">
-              {nav.nameInHeaderNav ? nav.nameInHeaderNav : nav.name}
-            </span>
-          </div>
           <div class="rect-body">{children}</div>
         </div>
       );

src/components/layout/englishHeader/mock.js

@@ -19,9 +19,9 @@ export const nav = [
                 name: "About us",
                 nameInHeaderNav: "About us",
                 index: 0,
-                link: "/Org",
+                link: "/SecondaryMenu/Introduction",
                 style: { flex: '1 0 auto' },
-                breadcrumb: [{ name: "About us", path: "/Org" }, { name: "Introduction" }],
+                breadcrumb: [{ name: "Home", path: "/EnglishHome" }, { name: "About us" }],
                 children: [
                     {
                         id: uuid("gs_nav"),
@@ -30,7 +30,7 @@ export const nav = [
                         link: "/SecondaryMenu/Introduction",
                         style: { paddingRight: '160px' },
                         breadcrumb: [
-                            { name: "About us", path: "/Org" },
+                            { name: "Home", path: "/EnglishHome" },
                             { name: "Introduction" },
                         ],
                     },
@@ -40,7 +40,7 @@ export const nav = [
                         index: 0,
                         link: "/SecondaryMenu/Structure",
                         breadcrumb: [
-                            { name: "About us", path: "/Org" },
+                            { name: "Home", path: "/EnglishHome" },
                             { name: "Structure" },
                         ],
                     },
@@ -48,11 +48,166 @@ export const nav = [
                         id: uuid("gs_nav"),
                         name: "Contact Us",
                         index: 0,
-                        link: "/ContactUs",
+                        link: "/SecondaryMenu/ContactUs",
+                        breadcrumb: [
+                            { name: "Home", path: "/EnglishHome" },
+                            { name: "Contact Us" },
+                        ],
+                    }
+                ],
+            },
+        ],
+    },
+    {
+        id: "2",
+        name: "Business Brief",
+        index: 2,
+        link: "/Org",
+        rowNum: 7,
+        children: [
+            {
+                id: uuid("gs_nav"),
+                name: "Business Brief",
+                nameInHeaderNav: "Business Brief",
+                index: 0,
+                link: "/SecondaryMenu/Barcode",
+                style: { flex: '1 0 auto' },
+                breadcrumb: [{ name: "Home", path: "/Home" }, { name: "Business Brief" }],
+                children: [
+                    {
+                        id: uuid("gs_nav"),
+                        name: "BarCodes",
+                        index: 0,
+                        link: "/SecondaryMenu/Barcode",
+                        style: { paddingRight: '160px' },
+                        breadcrumb: [
+                            { name: "Home", path: "/EnglishHome" },
+                            { name: "BarCodes" },
+                        ],
+                    },
+                    {
+                        id: uuid("gs_nav"),
+                        name: "EPC",
+                        index: 0,
+                        link: "/SecondaryMenu/EPC",
+                        breadcrumb: [
+                            { name: "Home", path: "/EnglishHome" },
+                            { name: "EPC" },
+                        ],
+                    },
+                    {
+                        id: uuid("gs_nav"),
+                        name: "GDSN",
+                        index: 0,
+                        link: "/SecondaryMenu/GDSN",
+                        breadcrumb: [
+                            { name: "Home", path: "/EnglishHome" },
+                            { name: "GDSN" },
+                        ],
+                    },
+                    {
+                        id: uuid("gs_nav"),
+                        name: "ECommerce",
+                        index: 0,
+                        link: "/SecondaryMenu/ECommerce",
+                        breadcrumb: [
+                            { name: "Home", path: "/EnglishHome" },
+                            { name: "ECommerce" },
+                        ],
+                    },
+                    {
+                        id: uuid("gs_nav"),
+                        name: "Han Xin Code",
+                        index: 0,
+                        link: "/SecondaryMenu/HanXinCode",
+                        breadcrumb: [
+                            { name: "Home", path: "/EnglishHome" },
+                            { name: "Han Xin Code" },
+                        ],
+                    },
+                    {
+                        id: uuid("gs_nav"),
+                        name: "Innovative Sectors",
+                        index: 0,
+                        link: "/SecondaryMenu/InnovativeSectors",
+                        breadcrumb: [
+                            { name: "Home", path: "/EnglishHome" },
+                            { name: "Innovative Sectors" },
+                        ],
+                    },
+                    {
+                        id: uuid("gs_nav"),
+                        name: "Industry Promotion",
+                        index: 0,
+                        link: "/SecondaryMenu/industryPromotion",
+                        breadcrumb: [
+                            { name: "Home", path: "/EnglishHome" },
+                            { name: "Industry Promotion" },
+                        ],
+                    }
+                ],
+            },
+        ],
+    },
+    {
+        id: "3",
+        name: "Training & Learning",
+        index: 3,
+        link: "/Org",
+        rowNum: 2,
+        children: [
+            {
+                id: uuid("gs_nav"),
+                name: "Training & Learning",
+                nameInHeaderNav: "Training & Learning",
+                index: 0,
+                link: "/SecondaryMenu/eLearning",
+                style: { flex: '1 0 auto' },
+                breadcrumb: [{ name: "Home", path: "/EnglishHome" }, { name: "Training & Learning" }],
+                children: [
+                    {
+                        id: uuid("gs_nav"),
+                        name: "E-Learning",
+                        index: 0,
+                        link: "/SecondaryMenu/eLearning",
+                        style: { paddingRight: '160px' },
                         breadcrumb: [
-                            { name: "About us", path: "/Org" },
-                            { name: "ContactUs" },
+                            { name: "Home", path: "/EnglishHome" },
+                            { name: "E-Learning" },
+                        ],
+                    },
+                    {
+                        id: uuid("gs_nav"),
+                        name: "Glossary",
+                        index: 2,
+                        link: "http://ocp.gs1.org/sites/glossary/en-gb",
+                    },
                 ],
+            },
+        ],
+    },
+    {
+        id: "4",
+        name: "Events",
+        index: 4,
+        link: "http://www.gs1.org/news-events",
+    },
+    {
+        id: "5",
+        name: "Useful Links",
+        index: 5,
+        children: [
+            {
+                id: uuid("gs_nav"),
+                name: "GS1 Member Links",
+                style: { flex: '1 0 auto' },
+                index: 0,
+                children: [
+                    {
+                        id: uuid("gs_nav"),
+                        name: "GS1 Member Links",
+                        index: 0,
+                        link: "http://www.gs1.org/contact/overview",
                     }
                 ],
             },

src/router/index.js

@@ -1326,7 +1326,7 @@ const routes = [{
     path: "/SecondaryMenu",
     name: "SecondaryMenu",
     component: blankMain,
-    redirect: '/SecondaryMenu/industryPromotion',
+    // redirect: '/SecondaryMenu/industryPromotion',
     children: [{
         path: "/SecondaryMenu/industryPromotion",
         name: "IndustryPromotion",
@@ -1381,11 +1381,14 @@ const routes = [{
         path: "/SecondaryMenu/eLearning",
         name: "eLearning",
         component: () => import("@/views/English/SecondaryMenu/eLearning"),
-      }
+      },
+      {
+        path: "/IndustryPromotion/FoodSafety",
+        name: "FoodSafety",
+        component: () => import("@/views/English/TertiaryMenu/IndustryPromotion/FoodSafety"),
+      },
     ]
-  }
-
-
+  },
 ];
 const router = new VueRouter({
   mode: "history",

src/views/English/Home/components/columnFourList.vue

@@ -5,7 +5,7 @@
         <div class="content-module-container">
           <h4>
             <a
-              href="/GS1ChinaEN/GS1ChinaENTest/foodsafety.aspx"
+              @click="handleGo('/IndustryPromotion/FoodSafety')"
               target="_blank"
               style="text-decoration: none; color: #002c6c"
               >Food safety</a
@@ -146,9 +146,18 @@
 </template>
 <script>
 export default {
+    data(){
+      return{
 
+      }
+    },
+    methods:{
+      handleGo(val){
+         this.$router.push({path: val})
+      }
+    }
 }
 </script>
-<style scoped>
-
+<style scoped lang="scss" >
+@import "@/assets/css/english";
 </style>

src/views/English/Home/components/trodList.vue

@@ -101,4 +101,6 @@
 <script>
 export default {};
 </script>
-<style scoped></style>
+<style lang="scss" scoped>
+@import "@/assets/css/english";
+</style>

src/views/English/Home/index.vue

@@ -68,6 +68,6 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
+<style scoped lang="scss" >
 @import "@/assets/css/english";
 </style>

src/views/English/SecondaryMenu/Barcode.vue

@@ -98,3 +98,6 @@
     </div>
   </div>
 </template>
+<style scoped lang="scss" >
+@import "@/assets/css/english";
+</style>

src/views/English/SecondaryMenu/ContactUs.vue

@@ -61,3 +61,6 @@
     </div>
   </div>
 </template>
+<style scoped lang="scss" >
+@import "@/assets/css/english";
+</style>

src/views/English/SecondaryMenu/ECommerce.vue

@@ -86,3 +86,6 @@
     </div>
   </div>
 </template>
+<style scoped lang="scss" >
+@import "@/assets/css/english";
+</style>

src/views/English/SecondaryMenu/EPC.vue

@@ -74,3 +74,6 @@
     </div>
   </div>
 </template>
+<style scoped lang="scss" >
+@import "@/assets/css/english";
+</style>

src/views/English/SecondaryMenu/GDSN.vue

@@ -81,3 +81,6 @@
     </div>
   </div>
 </template>
+<style scoped lang="scss" >
+@import "@/assets/css/english";
+</style>

src/views/English/SecondaryMenu/HanXinCode.vue

@@ -160,3 +160,6 @@
     </div>
   </div>
 </template>
+<style scoped lang="scss" >
+@import "@/assets/css/english";
+</style>

src/views/English/SecondaryMenu/InnovativeSectors.vue

@@ -146,3 +146,6 @@
     </div>
   </div>
 </template>
+<style scoped lang="scss" >
+@import "@/assets/css/english";
+</style>

src/views/English/SecondaryMenu/Introduction.vue

@@ -67,5 +67,6 @@
     </div>
   </div>
 </template>
-<style lang="scss">
+<style scoped lang="scss" >
+@import "@/assets/css/english";
 </style>

src/views/English/SecondaryMenu/Structure.vue

@@ -46,3 +46,6 @@
     </div>
   </div>
 </template>
+<style scoped lang="scss" >
+@import "@/assets/css/english";
+</style>

src/views/English/SecondaryMenu/eLearning.vue

@@ -101,3 +101,6 @@
     </div>
   </div>
 </template>
+<style scoped lang="scss" >
+@import "@/assets/css/english";
+</style>

src/views/English/SecondaryMenu/industryPromotion.vue

@@ -79,3 +79,6 @@
     </div>
   </div>
 </template>
+<style scoped lang="scss" >
+@import "@/assets/css/english";
+</style>

src/views/English/TertiaryMenu/IndustryPromotion/FoodSafety.vue

+<template>
+  <div class="container site-content flush-outside">
+    <div class="container">
+      <section>
+        <div class="row">
+          <div class="col-md-12">
+            <ul class="nav navbar-nav mm-float1">
+              <ol class="breadcrumb" style="background-color: #f4f4f4">
+                <li>
+                  <a href="/GS1ChinaEN/GS1ChinaENTest/index.aspx">Home</a>
+                </li>
+                <li>
+                  <a href="/GS1ChinaEN/GS1ChinaENTest/promotion.aspx"
+                    >Industry Promotion</a
+                  >
+                </li>
+                <li class="active">Food safety</li>
+              </ol>
+            </ul>
+          </div>
+        </div>
+      </section>
+      <section>
+        <div class="row">
+          <div class="col-sm-9">
+            <h1>Food safety</h1>
+            <p class="small" style="padding-top: 20px">
+              In recent years, food safety standards received widespread concern
+              throughout the world. Through efforts, GS1 China obtained
+              significant achievements in food tracking and tracing, which
+              contributed to the national product quality and food safety
+              initiative set forth by government.
+            </p>
+            <p class="small" style="padding-top: 20px">
+              To promote the application of the barcode in the food safety
+              tracking and tracing for the Olympic Games, GS1 China signed an
+              agreement with the Administration of Industry and Commerce and
+              Beijing Food safety Inspection Coordination Office called the
+              "Beijing Olympic food tracking and tracing system ". In addition,
+              GS1 China developed "Coding rule for Food Safety Tracking and
+              Tracing for the Olympic Games" and "Catalogue Norm of Food Safety
+              Data for the Olympic Games" with its Beijing Branch.
+            </p>
+            <p class="small" style="padding-top: 20px">
+              During the Barcode Technology Promotion Week in 2007, a food
+              safety tracking and tracing conference was held which allowed
+              domestic and international experts in the field to exchange their
+              experiences. In order to promote the awareness of GS1 system in
+              the area of food safety, we held a press conference for the GS1
+              Traceability System in China at the GS1 Advisory Council Meeting
+              in Beijing.
+            </p>
+            <p class="small" style="padding-top: 20px">
+              Barcode applications have been extended to the food safety area
+              with great efforts and a number of food safety tracking and
+              tracing system demonstrations have been established on a range of
+              products such as Shandong seafood, Xinjiang cantaloupe, Yunnan
+              pork, Sichuan tea, and the Hetian chicken of Fujian, this
+              consolidates the critical role the barcode plays in our national
+              food safety tracking and tracing system.
+            </p>
+          </div>
+          <div class="col-sm-3" style="padding-top: 85px">
+            <img
+              class="img-responsive center-block"
+              src="@/assets/image/english/FS-2.jpg"
+              alt="Food satety"
+            />
+          </div>
+        </div>
+      </section>
+    </div>
+  </div>
+</template>
+<style scoped lang="scss" >
+@import "@/assets/css/english";
+</style>

src/views/English/blankMain.vue

 <template>
   <div class="toolkit" style="background-color: #f4f4f4">
+    <TopBanner></TopBanner>
     <Header></Header>
+    <div>
       <router-view></router-view>
+    </div>
     <Footer></Footer>
   </div>
 </template>
 <script>
+import TopBanner from '@/components/layout/topBanner.vue'
 import Header from '@/components/layout/englishHeader'
 import Footer from "@/components/layout/englishFoor.vue"
 export default {
   components: {
     Footer,
-    Header
+    Header,
+    TopBanner
   },
 }
 </script>