Merge branch 'dev' of http://test16.zhongdianyun.com/zrqx-wy/CPPC into dev

b93d2954 · 方远 · 42930db9 · e7b1ee64 · b93d2954 · b93d2954
--- a/pages/details/article.vue
+++ b/pages/details/article.vue
@@ -9,7 +9,7 @@
 		<view class="title">
 			<h6>{{articleData.name}}</h6>
 			<view class="readNum">
-				<text class="time">2019-07-24 21:04:47 </text>
+				<!-- <text class="time">2019-07-24 21:04:47 </text> -->
 				<text class="source">来源：{{articleData.source}}</text>
 				<text class="read">阅读量：{{articleData.browseNum}}</text>
 			</view>

--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>中国政协杂志社</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.0004de39.js></script><script src=./static/js/index.c25fc2df.js></script></body></html>
\ No newline at end of file
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.0004de39.js></script><script src=./static/js/index.44f34bd7.js></script></body></html>
\ No newline at end of file
--- a/unpackage/dist/build/h5/static/js/pages-details-article.5f6f907b.js
+++ b/unpackage/dist/build/h5/static/js/pages-details-article.5f6f907b.js
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-details-article"],{"1d6a":function(e,t,a){e.exports=a.p+"static/img/banner.f92e01db.png"},"1de5":function(e,t,a){"use strict";e.exports=function(e,t){return t||(t={}),e=e&&e.__esModule?e.default:e,"string"!==typeof e?e:(/^['"].*['"]$/.test(e)&&(e=e.slice(1,-1)),t.hash&&(e+=t.hash),/["'() \t\n]/.test(e)||t.needQuotes?'"'.concat(e.replace(/"/g,'\\"').replace(/\n/g,"\\n"),'"'):e)}},"1e99":function(e,t,a){"use strict";a.r(t);var r=a("1fd4"),i=a("d102");for(var n in i)"default"!==n&&function(e){a.d(t,e,(function(){return i[e]}))}(n);a("d876");var o,c=a("f0c5"),u=Object(c["a"])(i["default"],r["b"],r["c"],!1,null,"18ba2de4",null,!1,r["a"],o);t["default"]=u.exports},"1fd4":function(e,t,a){"use strict";var r;a.d(t,"b",(function(){return i})),a.d(t,"c",(function(){return n})),a.d(t,"a",(function(){return r}));var i=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("v-uni-view",{staticClass:"article_page"},[r("v-uni-view",{staticClass:"searchHeader"},[r("v-uni-view",{staticClass:"backImgBox",on:{click:function(t){arguments[0]=t=e.$handleEvent(t),e.goBack()}}},[r("v-uni-image",{staticClass:"back",attrs:{src:a("fafe"),mode:""}})],1),r("v-uni-view",{staticClass:"ipt"},[e._v("阅读")])],1),r("v-uni-view",{staticClass:"title"},[r("h6",[e._v(e._s(e.articleData.name))]),r("v-uni-view",{staticClass:"readNum"},[r("v-uni-text",{staticClass:"time"},[e._v("2019-07-24 21:04:47")]),r("v-uni-text",{staticClass:"source"},[e._v("来源："+e._s(e.articleData.source))]),r("v-uni-text",{staticClass:"read"},[e._v("阅读量："+e._s(e.articleData.browseNum))])],1)],1),r("v-uni-view",{staticClass:"articleCon",domProps:{innerHTML:e._s(e.articleData.text)}})],1)},n=[]},"39f3":function(e,t,a){var r=a("24fb"),i=a("1de5"),n=a("1d6a");t=r(!1);var o=i(n);t.push([e.i,".articleCon[data-v-18ba2de4] h1{display:none}.article_page .searchHeader[data-v-18ba2de4]{padding:%?16?% %?30?% %?10?% %?24?%;display:flex;align-items:center;height:%?68?%;background:url("+o+") no-repeat;background-size:100%}.article_page .searchHeader .backImgBox[data-v-18ba2de4]{height:100%}.article_page .searchHeader .back[data-v-18ba2de4]{height:%?38?%;width:%?21?%;margin-right:%?27?%;vertical-align:middle;margin-top:%?6?%}.article_page .searchHeader .ipt[data-v-18ba2de4]{height:%?68?%;width:%?574?%;color:#fff;text-align:center;line-height:%?68?%;font-size:18px;margin-right:%?18?%}.article_page .searchHeader .search[data-v-18ba2de4]{height:%?38?%;width:%?38?%}.article_page .title[data-v-18ba2de4]{margin:%?58?% %?32?% 0;border-bottom:1px solid #e6e6e6}.article_page .title h6[data-v-18ba2de4]{font-size:20px}.article_page .title .readNum[data-v-18ba2de4]{margin:%?46?% 0 %?32?%;display:flex;justify-content:space-between;font-size:12px;color:#c8cad2}.article_page .title .read[data-v-18ba2de4]{color:#f55827}.article_page .articleCon[data-v-18ba2de4]{padding:%?48?% %?34?%;color:#333;text-indent:%?32?%;font-size:16px}",""]),e.exports=t},ab23:function(e,t,a){"use strict";a("d3b7"),Object.defineProperty(t,"__esModule",{value:!0}),t.upload=t.requestPath=t.ajax=void 0;var r=a("b26b"),i={common:"/sysuser/wap",book:"/book/wap",content:"content/wap",stock:"/repertory/wap",marketing:"/marketing/wap",order:"/order/wap",resource:"/resource/wap",third:"/third",file:"/file/file/",works:"/works/wap",ftp:"/file/ftp",statistics:"/statistics/wap",sysuser:"/sysuser/fg",pdf:"/pdf/file"};t.requestPath=i;var n=function(e){return e=e||{},e.url=e.url||"",e.method=e.method||"GET",e.header=e.header||{"Content-Type":"application/json"},e.success=e.success||function(){},new Promise((function(t,a){console.log(r.ApiUrl+e.url,"0000"),uni.request({url:r.ApiUrl+e.url,data:e.data,method:e.method,header:e.header,dataType:"json",success:function(e){t(e)},fail:function(e){a()}})}))};t.ajax=n;var o=function(e){return e=e||{},e.url=e.url||"",e.filePath=e.filePath||null,e.name=e.name||null,e.success=e.success||function(){},new Promise((function(t,a){uni.uploadFile({url:r.ApiUrl+e.url,filePath:e.filePath,name:e.name,formData:e.formData,success:function(e){t(e)},fail:function(e){a(uni.showToast({title:"请稍后重试",icon:"none",duration:12e3}))}})}))};t.upload=o},aeb9:function(e,t,a){"use strict";a("c975"),Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=a("f23b"),i={data:function(){return{id:"",articleData:{}}},onLoad:function(e){this.id=e.id,this.getDetail()},methods:{goBack:function(){window.history.back(-1)},getDetail:function(){var e=this;(0,r.getArticleAPI)(this.id).then((function(t){if(0==t.data.code){e.articleData=t.data.data;var a=e.articleData.text,r="";while(-1!=a.indexOf("<img"))r+=a.substring("0",a.indexOf("<img")+4),a=a.substring(a.indexOf("<img")+4),-1!=a.indexOf("style=")&&a.indexOf("style=")<a.indexOf(">")?(r+=a.substring(0,a.indexOf('style="')+7)+"max-width:100% !important;height:auto !important;margin:0 auto;transform: translateX(-16px);",a=a.substring(a.indexOf('style="')+7)):r+=' style="max-width:100% !important;height:auto !important;margin:0 auto;transform: translateX(-16px);" ';r+=a,e.articleData.text=r}}))}}};t.default=i},d102:function(e,t,a){"use strict";a.r(t);var r=a("aeb9"),i=a.n(r);for(var n in r)"default"!==n&&function(e){a.d(t,e,(function(){return r[e]}))}(n);t["default"]=i.a},d876:function(e,t,a){"use strict";var r=a("fd3e"),i=a.n(r);i.a},f23b:function(e,t,a){"use strict";a("99af"),Object.defineProperty(t,"__esModule",{value:!0}),t.getSubjectAPI=i,t.getNewsAPI=n,t.getYearAPI=o,t.getListAPI=c,t.getEbookAPI=u,t.gethotsAPI=s,t.getArticleAPI=d,t.getIndexLbAPI=l,t.getEbookNewAPI=f,t.getSpecialAPI=g,t.getRecommendAPI=h,t.getSpecialListAPI=p,t.getSpecialRelationAPI=m,t.getSpecialDetailAPI=b,t.getMusicDetailAPI=v,t.getVideoDetailAPI=A,t.getFileAPI=P,t.getBookCatalogApi=x,t.getBookArticleApi=w,t.updateVideoPlayNumApi=y,t.updateAudioPlayNumApi=j,t.errorCorrectionApi=k;var r=a("ab23");function i(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/ebookMainBody/list"),method:"get"})}function n(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/ebook/index?oid=").concat(e),method:"get"})}function o(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/ebookMainBody/year?oid=").concat(e),method:"get"})}function c(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/ebook/page-book"),method:"get",data:e})}function u(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/ebook/get?id=").concat(e),method:"get"})}function s(e){return(0,r.ajax)({url:"".concat(r.requestPath.sysuser,"/hotsw/list?num=10"),method:"get"})}function d(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/article-library/get/").concat(e),method:"get"})}function l(e){return(0,r.ajax)({url:"".concat(r.requestPath.sysuser,"/adspace/signvalue"),method:"get",data:e})}function f(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/ebook/new/index"),method:"get"})}function g(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/project-library/list"),method:"get"})}function h(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/recommend/content/list"),method:"get",data:e})}function p(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/project-library/page"),method:"get",data:e})}function m(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/project-library/page/resource"),method:"get",data:e})}function b(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/project-library/get/").concat(e),method:"get"})}function v(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/audio-library/getwap/").concat(e),method:"get"})}function A(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/video-library/getwap/").concat(e),method:"get"})}function P(e){return(0,r.ajax)({url:"".concat(r.requestPath.file,"/getFilePath"),method:"get",data:e})}function x(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/article-library/directory"),method:"get",data:e})}function w(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/article-library/get"),method:"get",data:e})}function y(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/video-library/update/video-library"),method:"post",data:e})}function j(e){return(0,r.ajax)({url:"".concat(r.requestPath.resource,"/audio-library/update/video-library"),method:"post",data:e})}function k(e){return(0,r.ajax)({url:"".concat(r.requestPath.sysuser,"/error-correct/save"),method:"post",data:e})}},fafe:function(e,t){e.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAABKCAYAAADNN8YBAAACE0lEQVRoQ9Xbu03EQBAG4H8kRCkExCByaAEK4CUiEjIaICUhIQAyqIIGoAACSkEwaE8+686Hz/uYFxfb8qeRd3Zmb0wI9GPmPQD7HemViN7mPIrgZOYNAPcATgaeBwAXRPTtDu2QLwAOR4J2RUS3rtAMZLJ/EtGWGzQTmaBfRLTpAi1AJugHEW2bQwuRCXpJRHem0ArkE4BTImIzaCXyPKWmFFYTaCvSBCqBVIdKIVWhkkg1qDRSBaqBFIdqIUWhmkgxqDZSBGqBbIZaIZuglshqqDWyCtohnwEcZTaGqVTrq6DMe1YuK6qevJBFEfVEZkO9kVnQCMhJaBTkWmgk5Ci0EnlGRD+16WfqvpX0FBG5EtGoyCVoZGQPjY5chKYD0+Eh6tj7nfZu1YXz14OJmXcB9EfQE6vPBTmLKDNfA7iZSg8A3JD/DroD4D0joukSt6jOEj4zPwI4joydQ9PfJ6VVu+nK77fQ6Ll0aa+PjP2fRcl8MUWM7GgXWoltbovHMs/adjkSdrKvj4KdhHYbQk2eFX0NsqARsNlQb2wR1BNbDF3ArptaGGaZ5hO9KqgHthpqjW2CWmKboVZYEagFVgyqjRWFamLFoVpYFagGVg0qjVWFSmLVoVJYE6gE1gzagLUdeRu04iUlov0QYSXWZyyzAus36FqI9R0dLsD6D2MPsLHH2xe7wO6DgYN0CA5g6YOBX9mRsVpaU9F1AAAAAElFTkSuQmCC"},fd3e:function(e,t,a){var r=a("39f3");"string"===typeof r&&(r=[[e.i,r,""]]),r.locals&&(e.exports=r.locals);var i=a("4f06").default;i("46335792",r,!0,{sourceMap:!1,shadowMode:!1})}}]);
\ No newline at end of file