禅道bug 更改

src/views/Djwh/index.vue

@@ -76,7 +76,7 @@
                         <a href=""> <img src="../../assets/image/djwh/2020122802.jpg" alt=""></a>
                         <a href=""> <img src="../../assets/image/djwh/2020122803.jpg" alt=""></a>
                         <a href=""> <img src="../../assets/image/djwh/2020122804.jpg" alt=""></a> -->
-                        <a v-for="(item,i) in pictureListArr" :key="i" @click="goInfo(item.pictureid,item.directpath)"> <img :src="item.picFile"  ></a>
+                        <a v-for="(item,i) in pictureListArr" :key="i" @click="goInfo(item.articleId,item.directpath)"> <img :src="item.picFile"  ></a>
                       </div>
                     </div>
                   </div>

src/views/Knowledge/Glossary.vue

@@ -8,6 +8,7 @@
           </div>
           <div class="knowledge-top-form  col-lg-24">
             <el-select class="col-lg-3"
+            
                 v-model="chaxun.type"
                 placeholder="请选择"
                 clearable
@@ -21,8 +22,8 @@
                 >
                 </el-option>
               </el-select>
-            <el-input class="col-lg-7" placeholder="请输入内容" clearable v-model="chaxun.keywords" ></el-input>
-            <div class="top-form-btn col-lg-2"  @click="getList()">
+            <el-input class="col-lg-7" placeholder="请输入内容" clearable v-model="chaxun.keywords" style="margin-left:-30px" ></el-input>
+            <div class="top-form-btn col-lg-2"  @click="getList()" style="margin-left:-15px">
               <img src="../../assets/image/home/sousuo-ico1.png" alt="" />
             </div>
           </div>

src/views/Knowledge/index.vue

@@ -20,8 +20,8 @@
               >
               </el-option>
             </el-select>
-          <el-input class="col-lg-8" placeholder="请输入内容" clearable v-model="chaxun.keywords"></el-input>
-          <div class="top-form-btn col-lg-2"  @click="goKnowledgeList">
+          <el-input class="col-lg-8" placeholder="请输入内容" clearable v-model="chaxun.keywords" style="margin-left:-30px"></el-input>
+          <div class="top-form-btn col-lg-2"  @click="goKnowledgeList" style="margin-left:-15px">
             <img src="../../assets/image/home/sousuo-ico1.png" alt="" />
           </div>
         </div>

src/views/News/Center.vue

@@ -4,7 +4,7 @@
       <cate :father="zxhdCate"></cate>
       <div class="container">
         <ul class="picNews-ul">
-          <li v-for="(tmp, i) in pictureListArr" :key="i" @click="getInfo(tmp.pictureid,tmp.jumppath)">
+          <li v-for="(tmp, i) in pictureListArr" :key="i" @click="getInfo(tmp.articleId,tmp.jumppath)">
             <div class="picNews-li-tp">
               <img :src="tmp.picFile" alt="" />
             </div>

src/views/News/ECommerce.vue

@@ -63,10 +63,10 @@
                 </p>
                <div class="list-style">
                    <ul >
-                        <li ><a :href="`${url}/office/uploadFileResource/manage/down/201601Ecomm.pdf`" target="_blank">《电子商务商品条码应用指南》</a></li>
-                        <li ><a :href="`${url}/office/uploadFileResource/manage/down/2016Ecommerce.pdf`" target="_blank">《商品条码在电子商务领域的应用》</a></li>
+                        <li ><a :href="`${urlDown}/office/uploadFileResource/manage/down/201601Ecomm.pdf`" target="_blank">《电子商务商品条码应用指南》</a></li>
+                        <li ><a :href="`${urlDown}/office/uploadFileResource/manage/down/2016Ecommerce.pdf`" target="_blank">《商品条码在电子商务领域的应用》</a></li>
                         <li ><a href="/News/viewsub?id=38" target="_blank">《ebXML标准技术规范——全球电子商务标准》</a></li>
-                        <li ><a :href="`${url}/office/uploadFileResource/manage/down/201204GLN.pdf`" target="_blank">GLN</a></li>
+                        <li ><a :href="`${urlDown}/office/uploadFileResource/manage/down/201204GLN.pdf`" target="_blank">GLN</a></li>
                         </ul>
                </div>
                 
@@ -86,7 +86,7 @@ export default {
    breadcrumb,
   },
   computed: {
-    ...mapState(["urls"]),
+    ...mapState(["url"]),
   },
   data() {
     return {
@@ -164,7 +164,7 @@ export default {
   created(){
     this.initListFn(this.tableResult.currPage);
     this.spListFn()
-    this.url = process.env.VUE_APP_HOST_URL;
+    this.urlDown = process.env.VUE_APP_HOST_URL;
   },
   mounted() {
     // 面包屑单独处理

src/views/News/Ecommerce/download.vue

@@ -18,7 +18,7 @@ export default {
     list,
   },
   computed: {
-    ...mapState(["urls"]),
+    // ...mapState(["url"]),
   },
   data() {
     return {

src/views/News/FoodSafety.vue

@@ -229,7 +229,7 @@ export default {
         border-left: none;
         border-right: none;
         background-color: #FCF8F3;
-        margin: 10px -24px; 
+        margin: 10px -15px; 
         padding-left:40px; 
         padding-bottom: 10px;
         padding-right: 10px;

src/views/News/IoT.vue

@@ -116,7 +116,7 @@ export default {
         border-left: none;
         border-right: none;
         background-color: #FCF8F3;
-        margin: 10px -24px; 
+        margin: 10px -15px; 
         padding-left:40px; 
         padding-bottom: 10px;
         padding-right: 10px;

src/views/News/MCommerce.vue

@@ -4,7 +4,7 @@
     <div class="container">
       <div class="down" style="padding:20px 30px;">
        <p>全世界超过四十亿人正在应用移动电话。移动电话正在成为企业和消费者互动的重要渠道。今天的移动电话可以与条码“对话” ，读取无线射频识别（RFID）标签，并访问互联网。 通过使用移动电话对产品标识的读取，消费者就可获得有关这个产品的服务和信息，在明白消费的同时，增进消费者与品牌信任。</p>
-       <p>移动商务专题：<a :href="`${urlHtml}/2012/MobileCom/index.html`" target="_blank">{{urlHtml}}/2012/MobileCom/index.html</a></p>
+       <p>移动商务专题：<a :href="`${url}/2012/MobileCom/index.html`" target="_blank">{{url}}/2012/MobileCom/index.html</a></p>
       </div>
       <div class="down">
        <span style="margin:0 0 10px;font-size:14px;display:inline-block">资料下载</span>
@@ -33,7 +33,7 @@ export default {
     list2,
   },
   computed: {
-    ...mapState(["urls"]),
+    ...mapState(["url"]),
   },
   data() {
     return {
@@ -103,8 +103,9 @@ export default {
     };
   },
   created() {
-    this.url = process.env.VUE_APP_HOST_URL;
-    this.urlHtml=window.location.host
+    
+    
+    
     
   },
   mounted(){
@@ -114,6 +115,7 @@ export default {
           directpath: `${this.url}/office/uploadFileResource/manage/down/20130620GS1 MobileCom.pdf`
         }
       ]
+      console.log(this.url)
   },
   methods: {
      ...mapMutations({
@@ -174,7 +176,7 @@ export default {
         border-left: none;
         border-right: none;
         background-color: #FCF8F3;
-        margin: 10px -24px; 
+        margin: 10px -15px; 
         padding: 20px 10px 10px 40px;
         p{
           margin: 0px;

src/views/News/Other.vue

@@ -37,7 +37,7 @@ export default {
     pages
   },
   computed: {
-    ...mapState(["urls"]),
+    ...mapState(["url"]),
   },
   data() {
     return {
@@ -59,16 +59,16 @@ export default {
   },
    created() {
     this.initListFn(this.tableResult.currPage);
-    this.url = process.env.VUE_APP_HOST_URL;
+    this.urlDown = process.env.VUE_APP_HOST_URL;
   },
   mounted(){
     this.list2=[{
           title:'《建材行业商品条码应用指南》',
-          directpath: `${this.url}/office/uploadFileResource/manage/down/建材行业商品条码应用指南.pdf`
+          directpath: `${this.urlDown}/office/uploadFileResource/manage/down/建材行业商品条码应用指南.pdf`
         },
         {
           title:' 服装行业商品条码应用指南',
-          directpath: `${this.url}/office/uploadFileResource/manage/down/服装行业商品条码应用指南.pdf`
+          directpath: `${this.urlDown}/office/uploadFileResource/manage/down/服装行业商品条码应用指南.pdf`
         }]
   },
   methods:{
@@ -139,7 +139,7 @@ export default {
         border-left: none;
         border-right: none;
         background-color: #FCF8F3;
-        margin: 10px -24px; 
+        margin: 10px -15px; 
         padding: 20px 10px 10px 40px;
         p{
           margin: 0px;

src/views/News/PicNews.vue

@@ -4,7 +4,7 @@
       <cate :father="tpzxCate"></cate>
       <div class="container">
         <ul class="picNews-ul">
-          <li v-for="(tmp, i) in pictureListArr" :key="i" @click="getInfo(tmp.pictureid,tmp.jumppath)">
+          <li v-for="(tmp, i) in pictureListArr" :key="i" @click="getInfo(tmp.articleId,tmp.jumppath)">
             <div class="picNews-li-tp">
               <img :src="tmp.picFile" alt="" />
             </div>

src/views/News/index.vue

@@ -9,7 +9,7 @@
               <span @click="goNewPic">查看更多>></span>
             </div>
             <div class="tpzx-ul">
-              <div class="tpzx-li" v-for="(tmp, i) in picList.slice(0,3)" :key="i" @click="goInfo(tmp.pictureId,tmp.directpath)">
+              <div class="tpzx-li" v-for="(tmp, i) in picList.slice(0,3)" :key="i" @click="goInfo(tmp.articleId,tmp.jumppath)">
                 <div class="tpzx-li-tp">
                   <img :src="tmp.picFile" alt="" />
                 </div>
@@ -142,7 +142,7 @@ import {
 } from "@/config/constant";
 export default {
   computed: {
-    ...mapState(["urls"]),
+    ...mapState(["url"]),
   },
   data() {
     return {
@@ -317,7 +317,7 @@ export default {
    this.four[5].list=[
         {
           title:'移动商务（宣传折页）',
-          directpath: `${this.urls.gs1cnTwo}Manage/down/20130620GS1 MobileCom.pdf`
+          directpath: `${this.url}/Manage/down/20130620GS1 MobileCom.pdf`
         }
       ]
   },

src/vuex/store.js

@@ -23,6 +23,7 @@ const state = {
         file: window.location.protocol + window.location.hostname + ':9091/office/uploadFileResource/',
     },
     matche: localStorage.getItem('matche') ? JSON.parse(localStorage.getItem('matche')) : [],
+    url:''
 };
 const mutations = {
     [SET_MATCHE](state, data) {
@@ -32,6 +33,7 @@ const mutations = {
     [SET_URL](state, data) {
         console.log(data, 'data');
         // state.urls.gs1cnOne = data[0];
+        state.url = data;
     },
 };