Merge branch 'ljm_news'

src/filters/formate.js

 import Util from '../util/index'
 import Util from '../util/index'
 
 
 /**
 /**
- * 格式化日期
+ * /PTAG处理
  * @param value
  * @param value
- * @returns {string}
+ * @param ptag
+ * @returns {*|string}
  */
  */
- //PTAG处理
-export const urlPatg = (value,ptag) => {
-  var val=value;
+export const urlPatg = (value, ptag) => {
+  var val = value;
   if (val.indexOf('ptag') == -1) {
   if (val.indexOf('ptag') == -1) {
     if (val.indexOf('?') > -1) {
     if (val.indexOf('?') > -1) {
-      val=val + '&ptag='+ptag;
+      val = val + '&ptag=' + ptag;
     } else {
     } else {
-      val=val + '?ptag='+ptag;
+      val = val + '?ptag=' + ptag;
     }
     }
   }
   }
   
   
@@ -32,19 +32,21 @@ export const urlParams = (value) => {
  * @param value
  * @param value
  * @returns {string}
  * @returns {string}
  */
  */
-export const dateTimeFormate = (value) => {
-  var date = new Date();
-  date.setTime(value * 1000);
-  var y = date.getFullYear();
-  var m = date.getMonth() + 1;
-  m = m < 10 ? ('0' + m) : m;
-  var d = date.getDate();
-  d = d < 10 ? ('0' + d) : d;
-  var h = date.getHours();
-  h = h < 10 ? ('0' + h) : h;
-  var minute = date.getMinutes();
-  var second = date.getSeconds();
-  minute = minute < 10 ? ('0' + minute) : minute;
-  second = second < 10 ? ('0' + second) : second;
-  return y + '-' + m + '-' + d + ' ';
+export const dateTimeFormate = (value, params) => {
+  var time = new Date(value * 1000);
+  
+  function timeAdd0(str) {
+    if (str < 10) {
+      str = '0' + str;
+    }
+    return str
+  }
+  
+  var y = time.getFullYear();
+  var m = time.getMonth() + 1;
+  var d = time.getDate();
+  var h = time.getHours();
+  var mm = time.getMinutes();
+  var s = time.getSeconds();
+  return y + '-' + timeAdd0(m) + '-' + timeAdd0(d) + ' ' + timeAdd0(h) + ':' + timeAdd0(mm) + ':' + timeAdd0(s);
 }
 }

src/views/news/Detail.vue

@@ -6,7 +6,7 @@
             <div class="bar">
             <div class="bar">
                 <span class="f20">{{newsDetailObj.current_info.art_type_text}}</span>
                 <span class="f20">{{newsDetailObj.current_info.art_type_text}}</span>
                 <span class="f24">来源：</span>
                 <span class="f24">来源：</span>
-                <span class="f24">{{newsDetailObj.current_info.writer}}&nbsp;&nbsp;&nbsp;{{newsDetailObj.current_info.publish_time}}</span>
+                <span class="f24">{{newsDetailObj.current_info.writer}}&nbsp;&nbsp;&nbsp;{{newsDetailObj.current_info.publish_time | dateTimeFormate}}</span>
             </div>
             </div>
             <template v-if="newsDetailAd.news_details_ad">
             <template v-if="newsDetailAd.news_details_ad">
                 <template v-if="newsDetailAd.news_details_ad.header">
                 <template v-if="newsDetailAd.news_details_ad.header">

view/css/chunk-2082c960.81be4797.css

-.menu-fade{position:fixed;z-index:998;top:0;right:0;bottom:0;left:0;width:100%;height:100%;background-color:rgba(0,0,0,.3)}.menu{position:fixed;right:10px;top:10px;z-index:999}.menu b{font-size:18px;color:#666}.menu .popover-arrow{position:absolute;z-index:1000;top:11px;right:0;overflow:hidden;width:26px;height:26px}.menu .popover-arrow:after{position:absolute;top:19px;left:0;width:26px;height:26px;content:" ";-webkit-transform:rotate(45deg);transform:rotate(45deg);border-radius:3px;background:#333}.menu .menu-view{margin-top:36px;background:#333;font-size:15px;border-radius:2px;max-height:300px}.menu .menu-view li{position:relative;overflow:hidden;padding:11px 15px;-webkit-transform-style:preserve-3d;transform-style:preserve-3d}.menu .menu-view li a{color:#fff}.menu .menu-view li a i{margin-right:.1rem}body{padding-top:40px}.header-page{height:40px;width:100%;padding:0 .2rem;position:fixed;z-index:998;top:0;background:#fafafa}.header-page i{font-size:18px;margin-top:10px;color:#666}.header-page h3{font-size:16px;color:#333;width:68%;line-height:40px;text-align:center;height:40px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:0 10%!important}.news-detail .bar,.news-detail .content-newsdetail,.news-detail .title{padding:0 10px}.news-detail .content-newsdetail img{max-width:100%!important}.news-detail h1.title{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;color:#333;font-size:22px;font-weight:700;line-height:30px;margin-top:10px}.news-detail .bar{height:16px;clear:both;font-size:12px;color:#999;margin-top:10px;margin-bottom:10px}.news-detail .bar span{line-height:16px;height:16px;float:left}.news-detail .bar .f24{color:#333}.news-detail .bar .f20{font-size:12px;padding-left:5px;padding-right:5px;border-radius:2px;border:1px solid #ccc;margin-right:10px}.news-detail .detail-pop{width:8.66rem;height:7.44rem;position:fixed;top:50%;left:50%;margin-left:-4.33rem;margin-top:-3.72rem}.news-detail .detail-pop img{width:100%;height:100%}.news-detail .closexdetailad{font-size:26px;float:right;color:#ccc}.news-detail .adbox{padding:0 10px}
\ No newline at end of file

view/css/chunk-274950a5.c0f345b7.css

-.menu-fade{position:fixed;z-index:998;top:0;right:0;bottom:0;left:0;width:100%;height:100%;background-color:rgba(0,0,0,.3)}.menu{position:fixed;right:10px;top:10px;z-index:999}.menu b{font-size:18px;color:#666}.menu .popover-arrow{position:absolute;z-index:1000;top:11px;right:0;overflow:hidden;width:26px;height:26px}.menu .popover-arrow:after{position:absolute;top:19px;left:0;width:26px;height:26px;content:" ";-webkit-transform:rotate(45deg);transform:rotate(45deg);border-radius:3px;background:#333}.menu .menu-view{margin-top:36px;background:#333;font-size:15px;border-radius:2px;max-height:300px}.menu .menu-view li{position:relative;overflow:hidden;padding:11px 15px;-webkit-transform-style:preserve-3d;transform-style:preserve-3d}.menu .menu-view li a{color:#fff}.menu .menu-view li a i{margin-right:.1rem}body{padding-top:40px}.header-page{height:40px;width:100%;padding:0 .2rem;position:fixed;z-index:998;top:0;background:#fafafa}.header-page i{font-size:18px;margin-top:10px;color:#666}.header-page h3{font-size:16px;color:#333;width:68%;line-height:40px;text-align:center;height:40px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:0 10%!important}.wxlist{height:100%;background:#f8f8f8}.wxlist .wxlist-content .menu-title{color:#333;font-size:18px;height:47px;line-height:47px;padding-left:.2rem}.wxlist .wxlist-content .wxlist-banner{padding:0 .2rem}.wxlist .wxlist-content .wxlist-banner .banner-header{padding:10px}.banner-box{background:#fff;border-radius:4px;min-height:275px}.banner-header .banner-title{font-size:19px;color:#333}.banner-header .banner-img{width:.8rem;height:.8rem;margin-right:10px}.banner-header .banner-img img{width:100%;height:100%;width:.8rem;height:.8rem;border-radius:50%;display:block}.banner-body img{width:100%;height:4.8rem}.banner-footer{font-size:16px;line-height:20px;color:#666;padding:.4rem .28rem}.banner-footer a{color:#666}.banner-footer span{color:#999}.wxlist-data{padding:10px}.wxlist-data-box{background:#fff;border-radius:4px}.group-right{width:2rem;height:60px}.group-left-box{height:50px;width:6.347rem;font-size:16px;color:#333;line-height:25px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}.group-left{width:6.347rem;border-bottom:1px solid #e5e5e5;padding-top:.1rem;padding-bottom:.5rem}.data-group{padding:.25rem;display:block}
\ No newline at end of file

view/css/chunk-e0f97f78.e7092472.css

-.menu-fade{position:fixed;z-index:998;top:0;right:0;bottom:0;left:0;width:100%;height:100%;background-color:rgba(0,0,0,.3)}.menu{position:fixed;right:10px;top:10px;z-index:999}.menu b{font-size:18px;color:#666}.menu .popover-arrow{position:absolute;z-index:1000;top:11px;right:0;overflow:hidden;width:26px;height:26px}.menu .popover-arrow:after{position:absolute;top:19px;left:0;width:26px;height:26px;content:" ";-webkit-transform:rotate(45deg);transform:rotate(45deg);border-radius:3px;background:#333}.menu .menu-view{margin-top:36px;background:#333;font-size:15px;border-radius:2px;max-height:300px}.menu .menu-view li{position:relative;overflow:hidden;padding:11px 15px;-webkit-transform-style:preserve-3d;transform-style:preserve-3d}.menu .menu-view li a{color:#fff}.menu .menu-view li a i{margin-right:.1rem}body{padding-top:40px}.header-page{height:40px;width:100%;padding:0 .2rem;position:fixed;z-index:998;top:0;background:#fafafa}.header-page i{font-size:18px;margin-top:10px;color:#666}.header-page h3{font-size:16px;color:#333;width:68%;line-height:40px;text-align:center;height:40px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:0 10%!important}.news li,.news ul{font-family:"\5FAE\8F6F\96C5\9ED1"!important}.news .borderBottom{border-bottom:1px solid #e5e5e5}.news .navList{border-bottom:1px solid #e5e5e5;padding:0 10px;clear:both;height:40px;line-height:40px;font-size:14px;background:#fff;overflow:hidden}.news .navList p{text-align:center;width:33.33%;color:#333;float:left;cursor:pointer;height:40px;line-height:40px}.news .navList p.act{color:#e10601;border-bottom:2px solid #e10601}.news .navListfixed{border-bottom:1px solid #e5e5e5;padding:0 10px;clear:both;height:40px;line-height:40px;font-size:14px;background:#fff;overflow:hidden;position:fixed;top:39px;left:0;right:0}.news .navListfixed p{text-align:center;width:33.33%;color:#333;float:left;cursor:pointer;height:40px;line-height:40px}.news .navListfixed p.act{color:#e10601;border-bottom:2px solid #e10601}.news .navList44 p{width:25%}.news .listBox li{padding:10px;height:100px;border-bottom:1px solid #e5e5e5;-webkit-box-sizing:border-box;box-sizing:border-box}.news .listBox li img{height:75px;width:27%;float:left;border:0;outline:none}.news .listBox li .boxgrt{height:75px;width:66%;float:right}.news .listBox li .boxgrt .title{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;color:#333;font-size:.32rem;font-weight:700;height:50px;line-height:25px}.news .listBox li .boxgrt .titleLook{font-size:14px;color:#999;margin-top:5px}
\ No newline at end of file

view/index.html

-<!DOCTYPE HTML><html lang=zh-CN><head><title></title><meta name=author content=www.ichunt.com><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0,user-scalable=no,minimal-ui"><meta http-equiv=Content-Type content="text/html;charset=utf-8"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><meta name=format-detection content="telephone=no"><meta http-equiv=Expires content=-1><meta http-equiv=Cache-Control content=no-cache><meta http-equiv=Pragma content=no-cache><meta name=full-screen content=yes><meta name=browsermode content=application><meta name=x5-fullscreen content=true><meta name=x5-page-mode content=app><meta name=description content=猎芯网,快速成长的专业电子元器件商城,贸泽(MOUSER)全系产品、e络盟(element14)树莓派系列产品授权经销商,已获得多轮风险投资。为客户提供电子元器件现货,IC采购,进口报关，电子元器件寄售，供应链金融等一站式电子元器件采购服务。><meta name=keywords content=猎芯网,电子元器件采购,电子元器件商城,电子元器件现货,IC采购网,电子元器件寄售,电子元件,元器件商城,元器件采购,电子商城,><link rel=icon href=//h5static.ichunt.com/favicon.ico><link rel=stylesheet href=/v3/dist/res/m/css/font/iconfont.css><script src=/h5/view/get_time.php></script><script>var fwtimes = window.fwtime - (Math.floor((new Date().getTime()) / 1000)); //获取服务器时间差</script><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js charset=utf-8></script><script src=//h5static.ichunt.com/static/js/flexible.min.js charset=utf-8></script><script src=//h5static.ichunt.com/static/js/shence.min.js charset=utf-8></script><link href=//h5static.ichunt.com/css/chunk-1144b73a.43c91bcb.css rel=prefetch><link href=//h5static.ichunt.com/css/chunk-2082c960.81be4797.css rel=prefetch><link href=//h5static.ichunt.com/css/chunk-274950a5.c0f345b7.css rel=prefetch><link href=//h5static.ichunt.com/css/chunk-37ba70a3.d7e46390.css rel=prefetch><link href=//h5static.ichunt.com/css/chunk-67c888a6.927a837d.css rel=prefetch><link href=//h5static.ichunt.com/css/chunk-e0f97f78.e7092472.css rel=prefetch><link href=//h5static.ichunt.com/js/chunk-1144b73a.f25be7eb.js rel=prefetch><link href=//h5static.ichunt.com/js/chunk-2082c960.ea4f3867.js rel=prefetch><link href=//h5static.ichunt.com/js/chunk-274950a5.6d3912ad.js rel=prefetch><link href=//h5static.ichunt.com/js/chunk-37ba70a3.4af4585b.js rel=prefetch><link href=//h5static.ichunt.com/js/chunk-67c888a6.504fb9af.js rel=prefetch><link href=//h5static.ichunt.com/js/chunk-e0f97f78.16dc3612.js rel=prefetch><link href=//h5static.ichunt.com/css/app.adc8e432.css rel=preload as=style><link href=//h5static.ichunt.com/css/chunk-vendors.fa7e75a9.css rel=preload as=style><link href=//h5static.ichunt.com/js/app.04dc792f.js rel=preload as=script><link href=//h5static.ichunt.com/js/chunk-vendors.bec6fa2b.js rel=preload as=script><link href=//h5static.ichunt.com/css/chunk-vendors.fa7e75a9.css rel=stylesheet><link href=//h5static.ichunt.com/css/app.adc8e432.css rel=stylesheet></head><body class=boxsiz><noscript><strong>网站出现了一点小问题，正在紧急修复中.......</strong></noscript><div id=app></div><script>function SetCookie(name, value, time, domain) {
+<!DOCTYPE HTML>
+<html lang="zh-CN">
+
+<head>
+    <title></title>
+    <meta name="author" content="www.ichunt.com">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0,user-scalable=no,minimal-ui">
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="Expires" content="-1">
+    <meta http-equiv="Cache-Control" content="no-cache">
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta name="full-screen" content="yes">
+    <meta name="browsermode" content="application">
+    <meta name="x5-fullscreen" content="true">
+    <meta name="x5-page-mode" content="app">
+    <meta name="description" content="猎芯网,快速成长的专业电子元器件商城,贸泽(MOUSER)全系产品、e络盟(element14)树莓派系列产品授权经销商,已获得多轮风险投资。为客户提供电子元器件现货,IC采购,进口报关，电子元器件寄售，供应链金融等一站式电子元器件采购服务。">
+    <meta name="keywords" content="猎芯网,电子元器件采购,电子元器件商城,电子元器件现货,IC采购网,电子元器件寄售,电子元件,元器件商城,元器件采购,电子商城,">
+    <link rel="icon" href="//szh5static.ichunt.com/favicon.ico">
+    <link rel="stylesheet" href="/v3/dist/res/m/css/font/iconfont.css">
+    <script type="text/javascript" src="/h5/view/get_time.php"></script>
+    <script type="text/javascript">
+      var fwtimes = window.fwtime - (Math.floor((new Date().getTime()) / 1000)); //获取服务器时间差
+    </script>
+    <script src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js" type="text/javascript" charset="utf-8"></script>
+    <script src="//szh5static.ichunt.com/static/js/flexible.min.js" type="text/javascript" charset="utf-8"></script>
+    <script src="//szh5static.ichunt.com/static/js/shence.min.js" type="text/javascript" charset="utf-8"></script>
+<link href="//szh5static.ichunt.com/0.js" rel="prefetch"><link href="//szh5static.ichunt.com/1.js" rel="prefetch"><link href="//szh5static.ichunt.com/2.js" rel="prefetch"><link href="//szh5static.ichunt.com/3.js" rel="prefetch"><link href="//szh5static.ichunt.com/4.js" rel="prefetch"><link href="//szh5static.ichunt.com/5.js" rel="prefetch"><link href="//szh5static.ichunt.com/6.js" rel="prefetch"><link href="//szh5static.ichunt.com/7.js" rel="prefetch"><link href="//szh5static.ichunt.com/app.js" rel="preload" as="script"></head>
+<body class="boxsiz">
+<noscript>
+    <strong>网站出现了一点小问题，正在紧急修复中.......</strong>
+</noscript>
+<div id="app"></div>
+<script type="text/javascript">
+  function SetCookie(name, value, time, domain) {
     domain = domain ? ";domain=" + domain : "";
     domain = domain ? ";domain=" + domain : "";
     var Days = time;
     var Days = time;
     var exp = new Date();
     var exp = new Date();
@@ -114,7 +150,12 @@
         document.getElementsByTagName('head')[0].appendChild(mta);
         document.getElementsByTagName('head')[0].appendChild(mta);
       })();
       })();
     }
     }
-  }</script><script>//神策统计
+  }
+
+</script>
+<script type="text/javascript">
+
+  //神策统计
   var host_v = window.location.host;
   var host_v = window.location.host;
   var __PUBLIC__;
   var __PUBLIC__;
 
 
@@ -224,4 +265,7 @@
       user_rank: '0'
       user_rank: '0'
     });
     });
     sensors.quick('autoTrack');
     sensors.quick('autoTrack');
-  }</script><script src=//h5static.ichunt.com/js/chunk-vendors.bec6fa2b.js></script><script src=//h5static.ichunt.com/js/app.04dc792f.js></script></body></html>
+  }
\ No newline at end of file
+</script>
+<script type="text/javascript" src="//szh5static.ichunt.com/app.js"></script></body>
+</html>