Merge branch 'master' of https://gitee.com/gs1-office-web-sit/gs1

src/components/layout/header/mock.js

@@ -403,7 +403,7 @@ export const nav = [
                     },
                     {
                         id: uuid("gs_nav"),
-                        name: "我要编码",
+                        name: "我要编码（零售商品、非零售商品、物流单元）",
                         index: 2,
                         link: "/Business/Code1",
                         query: {

src/router/service.js

@@ -117,6 +117,13 @@ export const service = {
                     },
                 },
                 {
+                    path: "Partners/caseMsg",
+                    component: () => import("@/views/Service/Partners/caseMsg"),
+                    meta: {
+                        name: "案例介绍",
+                    },
+                },
+                {
                     path: "Partners/content",
                     component: () => import("@/views/Service/Partners/content"),
                     meta: {

src/views/Business/Guide3.vue

@@ -81,6 +81,7 @@
 </template>
 <script>
 import cate from "../comps/cate.vue";
+import { mapState } from "vuex";
 
 export default {
   components: {
@@ -109,6 +110,9 @@ export default {
       immediate: true,
     },
   },
+  computed: {
+    ...mapState(["urls"]),
+  },
   mounted() {
     setTimeout(() => {
       const top = this.$refs[this.$route.query.id].offsetTop;

src/views/Home/comps/list.vue

 <template>
   <div class="list">
-    <div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg">
+    <div v-for="(tmp, i) in list" :key="i" class="row" @click="handelMsg(tmp)">
       <div class="col-9 col-lg-10 list-left">
         <span></span>
-        <span :title="tmp.title">{{tmp.title}}</span>
+        <span :title="tmp.title">{{ tmp.title }}</span>
       </div>
-      <div class="col-3 col-lg-2 list-right">{{tmp.time}}</div>
+      <div class="col-3 col-lg-2 list-right">{{ tmp.time }}</div>
     </div>
     <div class="row">
       <div class="col">
-        <div @click="handelMore" class="more float-end"><span>了解更多</span><img src="../../../assets/image/home/more-arrow.png" alt=""></div>
+        <div @click="handelMore" class="more float-end">
+          <span>了解更多</span
+          ><img src="../../../assets/image/home/more-arrow.png" alt="" />
         </div>
       </div>
-    <p style="text-align:center;padding:30px" v-if="list.length===0">没有符合条件的记录!</p>
+    </div>
+    <p style="text-align: center; padding: 30px" v-if="list.length === 0">
+      没有符合条件的记录!
+    </p>
   </div>
 </template>
 <script>
 export default {
-  props: ['list'],
+  props: ["list"],
   methods: {
-    handelMsg() {
+    handelMsg(obj) {
       this.$router.push({
-        path: '/News/Msg'
+        path: "/News/Msg",
+        query: {
+          id: obj.id,
+        },
       });
     },
     handelMore() {
-      window.open('/News/index', '_blank');
-    }
+      window.open("/News/index", "_blank");
     },
-}
+  },
+};
 </script>
 <style lang="scss" scoped>
 .list {
@@ -62,46 +70,46 @@ export default {
         }
       }
     }
-    .list-right{
+    .list-right {
       text-align: right;
       color: #999999;
       font-size: 16px;
     }
   }
-  .more{
+  .more {
     width: 120px;
     height: 35px;
     display: flex;
     align-items: center;
     cursor: pointer;
-    background: #CD3C0D;
+    background: #cd3c0d;
     border-radius: 4px;
     position: relative;
-    &:hover{
-      background: #A82C05;
-      img{
+    &:hover {
+      background: #a82c05;
+      img {
         right: 17px;
       }
     }
-    &:focus{
-      background: #CD3C0D;
-      img{
+    &:focus {
+      background: #cd3c0d;
+      img {
         right: 20px;
       }
     }
-    &:active{
+    &:active {
       background: #912305;
-      img{
+      img {
         right: 17px;
       }
     }
-    span{
+    span {
       color: #fff;
       font-size: 14px;
       margin-left: 20px;
       // font-family: PingFangSC-Regular, PingFang SC;
     }
-    img{
+    img {
       position: absolute;
       right: 20px;
       top: 50%;

src/views/Home/comps/notice.vue

@@ -21,7 +21,7 @@
               </div>
               <p class="notice-note">
                 为应对疫情，切实减轻企业负担，协助企业复工复产、渡过难关，编码中心决定自2020年3月1日至2021年9月30日，采取阶段性降费措施。<span
-                  >点击查看收费公示表</span
+                  @click="handelJump">点击查看收费公示表</span
                 >
               </p>
               <div class="notice-cont">
@@ -59,13 +59,16 @@
 export default {
   data() {
     return {
-      show: false,
+      show: true,
     };
   },
   methods: {
     handelClose() {
       this.show = false;
     },
+    handelJump() {
+      window.open('/Business/Corppaynew', '_blank');
+    },
   },
 };
 </script>
@@ -94,13 +97,14 @@ export default {
     left: 50%;
     top: 50%;
     transform: translate(-50%, -50%);
-    width: 30%;
+    width: 27%;
     background: #fff;
     border-radius: 8px;
     .notice-close {
       position: absolute;
       right: 19px;
       top: 19px;
+      cursor: pointer;
     }
     .container {
       padding: 0;
@@ -146,12 +150,14 @@ export default {
       }
       .notice-note {
         font-size: 14px;
-        margin-top: 30px;
+        margin-top: 20px;
         span {
           color: rgba(242, 99, 53, 1);
+          cursor: pointer;
         }
       }
       .notice-cont {
+        margin-top: 20px;
         .cont-cate {
           display: flex;
           align-items: center;

src/views/Home/index.vue

@@ -9,7 +9,7 @@
               <div class="row">
                 <div class="col-lg-6 carousel-caption-left">
                   <div class="carousel-title">{{ el.title }}</div>
-                  <p class="carousel-note">
+                  <p class="carousel-note" @click="learnMore(i)">
                     {{ el.brief }}
                   </p>
                   <button
@@ -588,7 +588,7 @@ export default {
       banner: [], // 首页大轮播图
       bannerSettings: {
         arrows: true,
-        autoplay: false,
+        autoplay: true,
         autoplaySpeed: 4000,
         dots: true,
         centerMode: true,
@@ -1260,7 +1260,7 @@ export default {
     },
     // 我要申请商品条码
     wysqsptmHandelClick() {
-      window.open("/Business/Register", "_blank");
+      window.open("http://wsdt.gs1cn.org/anccoh/login.jsp", "_blank");
       // this.$router.push({
       //   path: "/Business/Register",
       // });
@@ -1785,6 +1785,7 @@ export default {
           color: #ffffff;
           line-height: 24px;
           margin: 30px 0;
+          cursor: pointer;
         }
 
         .carousel-btn {

src/views/Knowledge/index.vue

@@ -396,7 +396,7 @@ export default {
           name: "全部问题",
           path: "/Business/Faq",
           query: {
-            type: "",
+            type: "qbwt",
           },
         },
         {

src/views/Service/Partners/caseList.vue

@@ -93,7 +93,7 @@ export default {
       msg.brief = msg.brief.replace(new RegExp('src="/UserFiles/Image', 'g'), `src="${prefix}/UserFiles/Image`);
       this.setPartnersMsg(msg);
       this.$router.push({
-        path: "/Service/Partners/content",
+        path: "/Service/Partners/caseMsg",
       });
     },
     // 接收分页子组件传过来的值

src/views/Service/Partners/caseMsg.vue

+<template>
+  <div class="msg-cont">
+    <div class="container">
+      <div class="msg-title">
+        {{ partnersMsg.title }}
+      </div>
+      <div class="msg-head">
+        <div class="msg-head-left">
+          <!-- <span>作者：{{ partnersMsg.auditor }}</span> -->
+          <span>日期：{{ $moment(partnersMsg.updatedate).format("YYYY-MM-DD") }}</span>
+          <!-- <span>编辑：{{ partnersMsg.editor }}</span> -->
+        </div>
+      </div>
+      <div class="msg-text" v-html="partnersMsg.brief"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  computed: {
+    ...mapState("service", {
+      partnersMsg: "partnersMsg",
+    }),
+  },
+  created() {
+    console.log("TODO QUERY", this.$route.query, this.partnersMsg);
+  },
+  mounted() {
+    // 面包屑单独处理
+    this.$store.commit("system/SET_BREADCRUMB", [
+      {name: "服务中心", path: "/Service/BarcodeV"},
+      {name: "标准服务提供商", path: "/Service/Partners/index"},
+      {name: "服务提供商介绍"},
+    ]);
+  },
+  methods: {},
+};
+</script>
+
+<style lang="scss">
+.msg-cont {
+  @include module-box;
+  padding: 30px 0;
+
+  .msg-title {
+    color: #454545;
+    font-size: 26px;
+    text-align: center;
+  }
+
+  .msg-head {
+    border-bottom: 1px dashed #c5d8ee;
+    padding: 20px 0;
+    display: flex;
+    justify-content: space-between;
+    font-size: 12px;
+    flex-wrap: wrap;
+
+    .msg-head-left {
+      span {
+        margin-right: 25px;
+
+        &:last-child {
+          margin: 0;
+        }
+      }
+    }
+
+    .msg-head-right {
+      display: flex;
+      align-items: center;
+
+      img {
+        margin-left: 14px;
+      }
+    }
+  }
+
+ 
+  .msg-text {
+      margin-top: 20px;
+      line-height: 28px;
+      font-size: 14px;
+      text-indent: 28px;
+      color: #454545;
+      /deep/p{
+        margin: 0 0 10px
+      }
+      img {
+      max-width: 95%;
+    }
+      
+    }
+}
+</style>

src/views/Service/Partners/content.vue

@@ -6,18 +6,49 @@
       </div>
       <div class="msg-head">
         <div class="msg-head-left">
-          <span>作者：{{ partnersMsg.auditor }}</span>
-          <span>日期：{{ partnersMsg.updatedate }}</span>
-          <span>编辑：{{ partnersMsg.editor }}</span>
+          <span>服务行业：{{ partnersMsg.service }}</span>
+          <span>技术领域：{{ partnersMsg.technology }}</span>
+          <!-- <span>编辑：{{ partnersMsg.editor }}</span> -->
+        </div>
+      </div>
+      <div class="msg-text">
+        <img :src="partnersMsg.pic" alt="" />
+        <div class="msg-p" v-html="partnersMsg.brief"></div>
+      </div>
+
+      <div class="row contactInfo">
+        <div class="col-md-6">
+          <i class="glyphicon glyphicon-globe"></i
+          ><span style="font-size: 14px; color: #666; margin-left: 6px"
+            >网址：<span id="Lab_site">{{ partnersMsg.site }}</span></span
+          >
+        </div>
+        <div class="col-md-6">
+          <i class="glyphicon glyphicon-user"></i
+          ><span style="font-size: 14px; color: #666; margin-left: 6px"
+            >联系人：<span id="Lab_name">{{ partnersMsg.firmname }}</span></span
+          >
+        </div>
+        <div class="col-md-6">
+          <i class="glyphicon glyphicon-phone-alt"></i
+          ><span style="font-size: 14px; color: #666; margin-left: 6px"
+            >电话：<span id="Lab_phone">{{ partnersMsg.phone }}</span></span
+          >
+        </div>
+        <div class="col-md-6">
+          <i class="glyphicon glyphicon-envelope"></i>
+          <span style="font-size: 14px; color: #666; margin-left: 6px"
+            >邮箱：
+            <a :href="partnersMsg.email">{{ partnersMsg.email }}</a>
+          </span>
         </div>
       </div>
-      <div class="msg-text" v-html="partnersMsg.brief"></div>
     </div>
   </div>
 </template>
 
 <script>
-import {mapState} from "vuex";
+import { mapState } from "vuex";
 
 export default {
   computed: {
@@ -31,20 +62,25 @@ export default {
   mounted() {
     // 面包屑单独处理
     this.$store.commit("system/SET_BREADCRUMB", [
-      {name: "服务中心", path: "/Service/BarcodeV"},
-      {name: "标准服务提供商", path: "/Service/Partners/index"},
-      {name: "服务提供商介绍"},
+      { name: "服务中心", path: "/Service/BarcodeV" },
+      { name: "标准服务提供商", path: "/Service/Partners/index" },
+      { name: "服务提供商介绍" },
     ]);
   },
   methods: {},
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .msg-cont {
   @include module-box;
   padding: 30px 0;
-
+  a {
+    color: #008dbd;
+    text-decoration: none;
+    font-weight: 500;
+    word-break: break-word;
+  }
   .msg-title {
     color: #454545;
     font-size: 26px;
@@ -78,21 +114,32 @@ export default {
       }
     }
   }
-
- 
   .msg-text {
+    padding-bottom: 30px;
+    overflow: hidden;
     margin-top: 20px;
+    img {
+      width: 150px;
+      float: left;
+      margin-right: 10px;
+      margin-bottom: 10px;
+    }
+    .msg-p {
       line-height: 28px;
       font-size: 14px;
       text-indent: 28px;
+      font-weight: 300;
       color: #454545;
-      /deep/p{
-        margin: 0 0 10px
-      }
       img {
         max-width: 95%;
       }
-      
+    }
+  }
+  .contactInfo {
+    .col-md-6 {
+      padding-top: 6px;
+      padding-bottom: 6px;
+    }
   }
 }
 </style>