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

.env.production

@@ -3,5 +3,5 @@ VUE_APP_CURRENTMODE = "production"
 VUE_APP_HOST_URL = "http://192.168.0.77:9091"
 VUE_APP_API_URL = "http://192.168.0.77:9091"
 VUE_APP_GDS_URL = "http://data-studio.gds.org.cn"
-VUE_APP_CHINATM_URL = "http://192.168.0.77:8080/chinatm"
+VUE_APP_CHINATM_URL = "http://192.168.0.77:80/chinatm"
 VUE_APP_LOG = false

src/views/Business/Training.vue

@@ -3,7 +3,7 @@
     <div class="row">
       <div class="col-lg-8">
         <div class="training-bj pxjh">
-          <cate :father="pxjhCate"></cate>
+          <cate2 :father="pxjhCate"></cate2>
           <div class="container">
             <p>
               为更好的开展我国商品条码系统成员教育培训工作，使我国商品条码系统成员第一时间了解各地区分支机构培训时间及培训内容，现将中国物品编码中心全国分支机构培训计划进行公布。
@@ -57,7 +57,7 @@
       <div class="col-lg-4">
         <div class="training-bj">
           <div class="pxspkc">
-            <cate :father="pxspkcCate"></cate>
+            <cate2 :father="pxspkcCate"></cate2>
             <div class="container">
               <p>
                 系统成员可登录中国商品信息服务平台的成员专区选择在线学习服务培训视频教程，即可简单、有效、快速的学习到实用的商品条码知识，了解GS1系统并按标准使用商品条码，如需了解请按下方提示点击进入。
@@ -85,8 +85,8 @@
               <p>尊敬的中国商品条码系统成员：</p>
               <p class="xspxgg-note">
                 当前，新冠病毒肺炎疫情已进入关键阶段，为进一步做好疫情防控，有序推进我们的技术服务工作，中国物品编码中心全国分支机构暂停现场培训，同时为系统成员提供免费的线上培训课程和相关学习资料，请点击<a
-                  :href="`${urls.gs1cnTwo}news/article_admin.aspx?Id=9766`"
-                  >{{urls.gs1cnTwo}}news/article_admin.aspx?Id=9766</a
+                  :href="`${urls.origin}/News/msg?id=9766`"
+                  >{{urls.origin}}/News/msg?id=9766</a
                 >进行查看。
               </p>
             </div>
@@ -98,6 +98,7 @@
 </template>
 <script>
 import cate from "../comps/cate.vue";
+import cate2 from "../comps/cate2.vue";
 import fzzx from "./copms/fzzx.vue";
 import { nav } from "@/components/layout/header/mock";
 import { deepFindBreadcrumb } from "@/utils/utils";
@@ -107,6 +108,7 @@ import { mapState } from "vuex";
 export default {
   components: {
     cate,
+    cate2,
     fzzx,
   },
   computed: {

src/views/Org/BranchMsg.vue

@@ -48,9 +48,7 @@
           </li>
           <li class="row">
             <div class="col-lg-2 col-4">简&nbsp;&nbsp;&nbsp;&nbsp;介:</div>
-            <div class="col-lg-10 col-8">
-              {{msg.description}}
-            </div>
+            <div class="col-lg-10 col-8" v-html="msg.description"></div>
           </li>
         </ul>
       </div>

src/views/comps/cate.vue

@@ -20,7 +20,7 @@ export default {
   },
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .zxcxgj-cate {
   font-size: 18px;
   color: #454545;

src/views/comps/cate2.vue

+<template>
+  <div class="zxcxgj-cate">
+    <div class="container">
+      <div class="cate-left">
+        <img :src="father.ico" v-if="father.ico" /><span>{{ father.name }}</span>
+      </div>
+      <div class="cate-right">
+        <slot v-solt="right"></slot>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: ["father"],
+};
+</script>
+<style lang="scss" scoped>
+.zxcxgj-cate {
+  font-size: 24px;
+  color: #C60;
+  border-bottom: 1px solid #c5d8ee;
+  padding: 14px 0;
+  font-weight: bold;
+  >div {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .cate-left{
+      flex: 1;
+      text-align: center;
+    }
+  }
+  img {
+    margin-right: 9px;
+  }
+}
+</style>
\ No newline at end of file