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

src/views/Member/index.vue

@@ -110,6 +110,7 @@ export default {
       button{
           border-radius: 4px;
       }
+      margin-bottom: 10px;
 
     }
     .listStyle-title{

src/views/News/MCommerce.vue

@@ -12,7 +12,7 @@
       </div>
 
         
-      <!-- <list :list="list" /> -->
+      <list :list="list" @getInfo='getInfo' />
 
       
     </div>
@@ -23,8 +23,7 @@ import cate from "../comps/cate.vue";
 import Title from "../comps/title.vue";
 import list from "./comps/list.vue";
 import list2 from "./comps/list2.vue";
-import { mapState } from "vuex";
-
+import { mapState,mapMutations} from "vuex";
 
 export default {
   components: {
@@ -45,17 +44,58 @@ export default {
     list2:[],
       list: [
         {
+          id:'6790',
           title: "移动商务领域新标准—电子优惠券管理",
-         
         },
         {
           title: "越来越多的消费者通过移动终端浏览商品",
-         
+          directpath:'http://www.199it.com/archives/92087.html'
         },
         {
           title: "二维码进入医院 挂号、导诊、就医一条龙",
-        
+          directpath:'http://healthcare.ancc.org.cn/Webhug/Article.aspx?&id=4223'
+        },
+        {
+          title: "中国移动电子商务市场上半年经营数据",
+          directpath:'http://www.100ec.cn/detail--6053393.html'
+        },
+        {
+          title: "从移动电子商务看移动社交的发展",
+          directpath:'http://www.100ec.cn/detail--6054434.html'
+        },
+        {
+          title: "移动商务是否会取代电子商务",
+          directpath:'http://zixun.tuan800.com/a/yejieweiboiwenzhai/2012/0822/37381.html'
+        },
+        {
+          title: "2011年全球移动互联网趋势报告",
+          directpath:'http://b2b.netsun.com/detail--6025691.html'
+        },
+        {
+          title: "2011年我国电子商务发展十大特征与趋势",
+          directpath:'http://stock.sohu.com/20120313/n337552124.shtml'
+        },
+        {
+          title: "2011年第2季度中国网民电子商务行为研究报告",
+          directpath:'http://baike.baidu.com/view/6192825.htm'
+        },
+        {
+          id:'6247',
+          title: "GS1 2011移动商务/B2C日于6月29日举行",
+        },
+        {
+          title: "移动电子商务一季度市场规模同比增358.7%",
+          directpath:'http://it.sohu.com/20110602/n309076363.shtml'
+        },
+        {
+          title: "移动互联网：随时随地 便利生活",
+          directpath:'http://www.chinadaily.com.cn/micro-reading/dzh/2011-04-07/content_2227561.html'
+        },{
+          title: "2011 SYBASE移动电子商务指南”为金融机构、企业和移动运营商提供全球市场机会",
+          directpath:'http://www.sybase.com/detail?id=1093286'
         },
+
+        
       ],
       
       
@@ -70,10 +110,32 @@ export default {
       ]
   },
   methods: {
+     ...mapMutations({
+      setMatche: "setMatche",
+    }),
     goDown(id,url){
         if(url&&url!==''){
           window.open(url,'_blank');
         }
+      },
+      // 详情
+    getInfo(id,directpath){
+      if(directpath&&directpath!==''&& directpath.length>0){
+        window.open(directpath,'_blank');
+      }else{
+         const matche = [
+          {
+            name: "移动商务",
+            path: "/News/MCommerce",
+          }
+        ];
+        this.setMatche(matche);
+        let link = this.$router.resolve({
+          path: `/News/msg?id=${id}`,
+        });
+        window.open(link.href,'_blank')
+      }
+   
     }
   },
 };

src/views/Search/gln.vue

@@ -44,6 +44,9 @@
                   header-cell-class-name="search-table-hc"
                   style="width: 100%"
               >
+                <template slot="empty">
+                  <span style="color: #969799;">未查到该信息</span>
+                </template>
                 <el-table-column prop="gepirRequestedKey.requestedKeyValue" label="GLN" width="180"></el-table-column>
                 <el-table-column prop="address.name" label="企业名称（含英文）" width="180">
                 </el-table-column>

src/views/Search/internal.vue

@@ -153,6 +153,9 @@
                 header-cell-class-name="search-table-hc"
                 style="width: 100%"
             >
+              <template slot="empty">
+                <span style="color: #969799;">没有符合条件的记录</span>
+              </template>
               <el-table-column prop="_source.code" label="商品条码" width="180">
                 <template slot-scope="scope">
                   <span type="text" class="hover" size="small">{{

src/views/Search/shortcode.vue

@@ -67,6 +67,9 @@
                 header-cell-class-name="search-table-hc"
                 style="width: 100%"
             >
+              <template slot="empty">
+                <span style="color: #969799;">没有符合条件的记录</span>
+              </template>
               <el-table-column prop="shortCode" label="缩短码" width="80px">
               </el-table-column>
               <el-table-column prop="produceName" label="商品名称" width="170px">