diff --git a/src/App.vue b/src/App.vue index 82ca16efe..abf347695 100644 --- a/src/App.vue +++ b/src/App.vue @@ -253,6 +253,7 @@ export default { && this.$route.name !== 'phoneHome'&& this.$route.name !== 'databaseSearch' && this.$route.name !== 'standDynamics' && this.$route.name !== 'domesticStand' && this.$route.name !== 'domesticDetails' && this.$route.name !== 'LoginVerifyPhone' + && this.$route.name !== 'zlzxDetails' && this.$route.name !== 'LoginVerifyPhone' && this.$route.name !== 'OtherStandardExternalDetails' && this.$route.name !== 'OtherStandardExternalDetails') { this.isBoolean = true } else { diff --git a/src/api/hwh5-cloudonline.js b/src/api/hwh5-cloudonline.js index c04b47ae6..4ccc986dd 100644 --- a/src/api/hwh5-cloudonline.js +++ b/src/api/hwh5-cloudonline.js @@ -1,7 +1,4166 @@ -!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("hwh5",[],t):"object"==typeof exports?exports.hwh5=t():e.hwh5=t()}(window,function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var a=t[r]={i:r,l:!1,exports:{}};return e[r].call(a.exports,a,a.exports,n),a.l=!0,a.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var a in e)n.d(r,a,function(t){return e[t]}.bind(null,a));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=90)}([function(e,t){var n=e.exports={version:"2.5.7"};"number"==typeof __e&&(__e=n)},function(e,t){var n=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(e,t,n){var r=n(51)("wks"),a=n(33),o=n(1).Symbol,i="function"==typeof o;(e.exports=function(e){return r[e]||(r[e]=i&&o[e]||(i?o:a)("Symbol."+e))}).store=r},function(e,t,n){var r=n(1),a=n(0),o=n(9),i=n(10),u=n(13),c=function(e,t,n){var s,f,l,d=e&c.F,p=e&c.G,h=e&c.S,v=e&c.P,m=e&c.B,g=e&c.W,y=p?a:a[t]||(a[t]={}),w=y.prototype,_=p?r:h?r[t]:(r[t]||{}).prototype;for(s in p&&(n=t),n)(f=!d&&_&&void 0!==_[s])&&u(y,s)||(l=f?_[s]:n[s],y[s]=p&&"function"!=typeof _[s]?n[s]:m&&f?o(l,r):g&&_[s]==l?function(e){var t=function(t,n,r){if(this instanceof e){switch(arguments.length){case 0:return new e;case 1:return new e(t);case 2:return new e(t,n)}return new e(t,n,r)}return e.apply(this,arguments)};return t.prototype=e.prototype,t}(l):v&&"function"==typeof l?o(Function.call,l):l,v&&((y.virtual||(y.virtual={}))[s]=l,e&c.R&&w&&!w[s]&&i(w,s,l)))};c.F=1,c.G=2,c.S=4,c.P=8,c.B=16,c.W=32,c.U=64,c.R=128,e.exports=c},function(e,t,n){var r=n(8),a=n(66),o=n(47),i=Object.defineProperty;t.f=n(5)?Object.defineProperty:function(e,t,n){if(r(e),t=o(t,!0),r(n),a)try{return i(e,t,n)}catch(e){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(e[t]=n.value),e}},function(e,t,n){e.exports=!n(12)(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},function(e,t){e.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},function(e,t,n){e.exports={default:n(92),__esModule:!0}},function(e,t,n){var r=n(6);e.exports=function(e){if(!r(e))throw TypeError(e+" is not an object!");return e}},function(e,t,n){var r=n(22);e.exports=function(e,t,n){if(r(e),void 0===t)return e;switch(n){case 1:return function(n){return e.call(t,n)};case 2:return function(n,r){return e.call(t,n,r)};case 3:return function(n,r,a){return e.call(t,n,r,a)}}return function(){return e.apply(t,arguments)}}},function(e,t,n){var r=n(4),a=n(23);e.exports=n(5)?function(e,t,n){return r.f(e,t,a(1,n))}:function(e,t,n){return e[t]=n,e}},function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.globalUserInfo=t.headersGetFun=t.base64ToArrayBuffer=t.arrayBufferToBase64=t.serialize=t.performanceHwa=t.fetchPerformance=t.isIOS=t.emptyFun=t.encode=t.mappingField=t.callBackField=t.processData=t.mappingParameter=t.config=t.cloudonlineCallBack=t.mappingApiName=t.hwaAction=t.getWecodeInfo=t.decode=void 0;var r=m(n(19)),a=m(n(81)),o=m(n(20)),i=m(n(14)),u=m(n(15)),c=m(n(7)),s=m(n(57)),f=m(n(129)),l=m(n(36)),d=m(n(31)),p=n(82),h=n(59),v=n(130);function m(e){return e&&e.__esModule?e:{default:e}}var g=function(e){return e&&"string"==typeof e?s.default.encode(unescape(encodeURIComponent(e))):""},y=function(e){return e&&"string"==typeof e?decodeURIComponent(escape(s.default.decode(e))):""},w=function(e){return Object(e)===e},_={},b=null,k=function(){return new c.default(function(){var t=(0,u.default)(i.default.mark(function t(n){return i.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:if(!b){t.next=3;break}return n(b),t.abrupt("return");case 3:return t.next=5,e.HWH5&&e.HWH5.wecodeInfo&&e.HWH5.wecodeInfo({common_internal_call:!0});case 5:b=t.sent,n(b);case 7:case"end":return t.stop()}},t,void 0)}));return function(e){return t.apply(this,arguments)}}())},x=function(e){var t=(0,o.default)({funcName:"hwa",data:e});HWH5.callMethod(t)},N=function e(t,n){var r=t;return r.data?r.data=e(r.data,n):r=Array.isArray(r)?r.map(function(t){return e(t,n)}):I(r,v.fields,n),r},C=function(e,t){var n={},o=[].concat((0,a.default)(l.default),(0,a.default)(d.default));return(0,r.default)(e).forEach(function(r){var i=!1;o.forEach(function(o){r!==o.nativeName&&r!==o.schema||(function(e){var t=[];return[].concat((0,a.default)(l.default),(0,a.default)(d.default)).forEach(function(n){e!==n.nativeName&&e!==n.schema||t.push(n)}),t}(r).length>1?-1!==t.indexOf(o.apiName)&&(n[o.apiName]=e[r]):n[o.apiName]=e[r],i=!0)}),i||(n[r]=e[r])}),n},I=function(e,t,n){var r=e;return t.forEach(function(t){var n=t.origin,a=t.target;void 0!==e[n]&&void 0===r[a]&&(r[a]=e[n])}),"function"==typeof h.apisAttrInterception[n]?h.apisAttrInterception[n](r):r},S=function(){if(!e.navigator)return!1;var t=e.navigator.userAgent||e.navigator.vendor||e.opera;return!(!/iPad|iPhone|iPod|Mac/.test(t)||e.MSStream)};var P=new function(){var e=null;this.getGlobalUserInfo=function(){return e&&e.corpUserId?c.default.resolve(e):new c.default(function(t){HWH5.getUserInfo({common_internal_call:!0}).then(function(n){t(e=n)})})}};t.decode=y,t.getWecodeInfo=k,t.hwaAction=function(t,n,r,a,i){return new c.default(function(u){if(!n||!n.common_internal_call){if("wecodeInfo"!==r){if(e.HWH5&&!e.HWH5.wecodeInfo){var c={eventId:"WELINK_ONLINE_JSAPI_HWA",eventLabel:"WeLink online JSAPI HWA",extendData:(0,o.default)({apiname:a,payload:i||void 0,jssdk:f.default,time:new Date-0,appId:e.location.href,type:t})};return void x(c)}k().then(function(e){var n={eventId:"WELINK_JSAPI_HWA",eventLabel:"WeLink JSAPI HWA",extendData:(0,o.default)({apiname:a,payload:i||void 0,jssdk:f.default,time:new Date-0,appId:e.appId,type:t})};x(n)})}u()}})},t.mappingApiName=C,t.cloudonlineCallBack=function(e,t,n){var r=t;"config"===e.funcName?(r.data=JSON.parse(r.data),_.status=r.data.status,_.errorCode=r.data.errorCode,_.msg=r.data.msg,"1"===r.data.status?(0,p.emit)("__config_ready__"):(0,p.emit)("__config_error__",_)):(r.data=JSON.parse(r.data),r.data.jsApiList=C(r.data.jsApiList,e.data.apiNameList),n(r.data))},t.config=_,t.mappingParameter=function(e,t){var n=t;return v.params.forEach(function(r){var a=r.funcName,o=r.mapping;a===e&&(n=I(t,o))}),n},t.processData=N,t.callBackField=function(e,t){var n={};try{n=JSON.parse(e)}catch(t){console.log("error occured in callback Native",e,t)}var r=y(n.data),a=w(r);if("string"==typeof r&&"undefined"!==r)try{r=JSON.parse(r),a=w(r)}catch(e){a=!1}return a&&(r=N(r,t),r=g((0,o.default)(r)),n.data=r),n},t.mappingField=I,t.encode=g,t.emptyFun=function(){},t.isIOS=S,t.fetchPerformance={},t.performanceHwa=function(e,t,n,r){k().then(function(a){var i={eventId:"WELINK_JSAPI_HWA_FETCH",eventLabel:"WeLink JSAPI HWA FETCH",extendData:(0,o.default)({apiName:e,url:t,time:n,status:r,appId:a.appId})};x(i)})},t.serialize=function(e){return(0,r.default)(e).map(function(t){return encodeURIComponent(t)+"="+encodeURIComponent(e[t])}).join("&")},t.arrayBufferToBase64=function(e){for(var t="",n=new Uint8Array(e),r=n.byteLength,a=0;a=t.length?{value:void 0,done:!0}:(e=r(t,n),this._i+=e.length,{value:e,done:!1})})},function(e,t){e.exports={}},function(e,t,n){var r=n(49),a=n(44);e.exports=function(e){return r(a(e))}},function(e,t,n){e.exports={default:n(113),__esModule:!0}},function(e,t,n){e.exports={default:n(116),__esModule:!0}},function(e,t){e.exports=!0},function(e,t){e.exports=function(e){if("function"!=typeof e)throw TypeError(e+" is not a function!");return e}},function(e,t){e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},function(e,t,n){var r=n(69),a=n(52);e.exports=Object.keys||function(e){return r(e,a)}},function(e,t){var n={}.toString;e.exports=function(e){return n.call(e).slice(8,-1)}},function(e,t,n){var r=n(4).f,a=n(13),o=n(2)("toStringTag");e.exports=function(e,t,n){e&&!a(e=n?e:e.prototype,o)&&r(e,o,{configurable:!0,value:t})}},function(e,t,n){var r=n(44);e.exports=function(e){return Object(r(e))}},function(e,t,n){n(98);for(var r=n(1),a=n(10),o=n(17),i=n(2)("toStringTag"),u="CSSRuleList,CSSStyleDeclaration,CSSValueList,ClientRectList,DOMRectList,DOMStringList,DOMTokenList,DataTransferItemList,FileList,HTMLAllCollection,HTMLCollection,HTMLFormElement,HTMLSelectElement,MediaList,MimeTypeArray,NamedNodeMap,NodeList,PaintRequestList,Plugin,PluginArray,SVGLengthList,SVGNumberList,SVGPathSegList,SVGPointList,SVGStringList,SVGTransformList,SourceBufferList,StyleSheetList,TextTrackCueList,TextTrackList,TouchList".split(","),c=0;cw;w++)if((m=t?y(i(h=e[w])[0],h[1]):y(e[w]))===s||m===f)return m}else for(v=g.call(e);!(h=v.next()).done;)if((m=a(v,y,h.value,t))===s||m===f)return m}).BREAK=s,t.RETURN=f},function(e,t){var n;n=function(){return this}();try{n=n||Function("return this")()||(0,eval)("this")}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t,n){"use strict";var r=[];r=n(107),e.exports=r},function(e,t,n){var r=n(43),a=Math.min;e.exports=function(e){return e>0?a(r(e),9007199254740991):0}},function(e,t){var n=0,r=Math.random();e.exports=function(e){return"Symbol(".concat(void 0===e?"":e,")_",(++n+r).toString(36))}},function(e,t,n){var r=n(25),a=n(2)("toStringTag"),o="Arguments"==r(function(){return arguments}());e.exports=function(e){var t,n,i;return void 0===e?"Undefined":null===e?"Null":"string"==typeof(n=function(e,t){try{return e[t]}catch(e){}}(t=Object(e),a))?n:o?r(t):"Object"==(i=r(t))&&"function"==typeof t.callee?"Arguments":i}},function(e,t,n){(function(t){var n;n="undefined"!=typeof window?window:void 0!==t?t:"undefined"!=typeof self?self:{},e.exports=n}).call(this,n(30))},function(e,t,n){"use strict";var r=[];r=n(106),e.exports=r},function(e,t,n){"use strict";t.__esModule=!0;var r=i(n(131)),a=i(n(133)),o="function"==typeof a.default&&"symbol"==typeof r.default?function(e){return typeof e}:function(e){return e&&"function"==typeof a.default&&e.constructor===a.default&&e!==a.default.prototype?"symbol":typeof e};function i(e){return e&&e.__esModule?e:{default:e}}t.default="function"==typeof a.default&&"symbol"===o(r.default)?function(e){return void 0===e?"undefined":o(e)}:function(e){return e&&"function"==typeof a.default&&e.constructor===a.default&&e!==a.default.prototype?"symbol":void 0===e?"undefined":o(e)}},function(e,t){t.f={}.propertyIsEnumerable},function(e,t,n){"use strict";t.__esModule=!0;var r=function(e){return e&&e.__esModule?e:{default:e}}(n(144));t.default=r.default||function(e){for(var t=1;t0?r:n)(e)}},function(e,t){e.exports=function(e){if(void 0==e)throw TypeError("Can't call method on "+e);return e}},function(e,t,n){"use strict";var r=n(21),a=n(3),o=n(67),i=n(10),u=n(17),c=n(94),s=n(26),f=n(97),l=n(2)("iterator"),d=!([].keys&&"next"in[].keys()),p=function(){return this};e.exports=function(e,t,n,h,v,m,g){c(n,t,h);var y,w,_,b=function(e){if(!d&&e in C)return C[e];switch(e){case"keys":case"values":return function(){return new n(this,e)}}return function(){return new n(this,e)}},k=t+" Iterator",x="values"==v,N=!1,C=e.prototype,I=C[l]||C["@@iterator"]||v&&C[v],S=I||b(v),P=v?x?b("entries"):S:void 0,E="Array"==t&&C.entries||I;if(E&&(_=f(E.call(new e)))!==Object.prototype&&_.next&&(s(_,k,!0),r||"function"==typeof _[l]||i(_,l,p)),x&&I&&"values"!==I.name&&(N=!0,S=function(){return I.call(this)}),r&&!g||!d&&!N&&C[l]||i(C,l,S),u[t]=S,u[k]=p,v)if(y={values:x?S:b("values"),keys:m?S:b("keys"),entries:P},g)for(w in y)w in C||o(C,w,y[w]);else a(a.P+a.F*(d||N),t,y);return y}},function(e,t,n){var r=n(6),a=n(1).document,o=r(a)&&r(a.createElement);e.exports=function(e){return o?a.createElement(e):{}}},function(e,t,n){var r=n(6);e.exports=function(e,t){if(!r(e))return e;var n,a;if(t&&"function"==typeof(n=e.toString)&&!r(a=n.call(e)))return a;if("function"==typeof(n=e.valueOf)&&!r(a=n.call(e)))return a;if(!t&&"function"==typeof(n=e.toString)&&!r(a=n.call(e)))return a;throw TypeError("Can't convert object to primitive value")}},function(e,t,n){var r=n(8),a=n(68),o=n(52),i=n(50)("IE_PROTO"),u=function(){},c=function(){var e,t=n(46)("iframe"),r=o.length;for(t.style.display="none",n(70).appendChild(t),t.src="javascript:",(e=t.contentWindow.document).open(),e.write(" + + diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index 0b507b8e3..dd4ae132b 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -27,6 +27,10 @@ 企业标准发布 + + 标准化动态 + + 标准问答 @@ -52,6 +56,7 @@ import release from './components/release' import releaseUs from './components/releaseUs' import releaseBuss from './components/releaseBuss' import releaseQA from './components/releaseQA' +import releaseZL from './components/releaseZL' import solicitOpinions from './components/solicitopinions' import navMenu from './components/navMenu' import todoList from './components/todoList' @@ -65,6 +70,7 @@ export default { releaseUs, releaseBuss, releaseQA, + releaseZL, navMenu, todoList, Empennage, diff --git a/src/pages/phone/databaseSearch.vue b/src/pages/phone/databaseSearch.vue index 2c98cd12e..674ea168f 100644 --- a/src/pages/phone/databaseSearch.vue +++ b/src/pages/phone/databaseSearch.vue @@ -109,13 +109,13 @@ export default { },{ _this: this, }, res => { + this.loading = false if(res.data.list.length){ if(this.standList.length){ this.standList = this.standList.concat(res.data.list) }else{ this.standList = res.data.list } - this.loading = false }else{ this.listFlag = true } @@ -139,8 +139,8 @@ export default { },{ _this: this, }, res => { - this.standList = res.data.list this.loading = false + this.standList = res.data.list || [] }, e => { console.log(e) }) diff --git a/src/pages/phone/standDynamics.vue b/src/pages/phone/standDynamics.vue index a718847e4..ffadc7615 100644 --- a/src/pages/phone/standDynamics.vue +++ b/src/pages/phone/standDynamics.vue @@ -6,13 +6,14 @@ < 标准化动态 - + -
+
加载中...
-
+
{{ item.standardName }}
@@ -34,16 +35,17 @@
没有更多数据了...
-
点击加载更多
+
点击加载更多
加载中...
-
+
加载中...
-
+
{{ item.standardName }}
@@ -65,7 +67,43 @@
没有更多数据了...
-
点击加载更多
+
点击加载更多
+ 加载中... +
+ + +
+
+ 加载中... +
+
+
+
+ {{ item.dataTitle && item.dataTitle.length > 40 ? item.dataTitle.slice(0, 39) + "..." : item.dataTitle + }} +
+
+
+
类型: + + {{ item.dataType && item.dataType.length > 30 ? item.dataType.slice(0, 29) + "..." : item.dataType + }} +
+
上传时间: + + {{ $moment(item.dataUploadTime).format("YYYY-MM-DD HH:mm:ss") }} + +
+
+
+
+ +
+
+
+
没有更多数据了...
+
点击加载更多
加载中...
@@ -82,73 +120,145 @@ export default { active: "", messageType: "ZYBZFG", standList: [], + standardReleaseList: [], page: 1, standStateOptions: [], //存放文本状态 textStatusMap: {},// 文本状态id与name对应 loading: true, - scrolled: '', + scrolled: "", moreFlag: false, listFlag: false }; }, methods: { - jumpDetails(item){ - this.$router.push({ - name: 'domesticDetails', - query: { - id: item.id, - pageType: 'FOREIGN_STAND' - } - }) - }, - scroolOne(){ - this.scrolled = this.$refs.cardBoxOne.scrollTop - console.log(this.$refs.cardBoxOne.scrollTop) + scroolOne() { + this.scrolled = this.$refs.cardBoxOne.scrollTop; + console.log(this.$refs.cardBoxOne.scrollTop); //获得可视区的高度 - const windowHeight = this.$refs.cardBoxOne.clientHeight + const windowHeight = this.$refs.cardBoxOne.clientHeight; //获取滚动条的总高度 - const scrollHeight = this.$refs.cardBoxOne.scrollHeight - let windowScrolled = this.scrolled + windowHeight - if(scrollHeight - windowScrolled < 100 && this.scrolled !== 0){ + const scrollHeight = this.$refs.cardBoxOne.scrollHeight; + let windowScrolled = this.scrolled + windowHeight; + if (scrollHeight - windowScrolled < 100 && this.scrolled !== 0) { //把距离顶部的距离加上可视区域的高度 - this.moreFlag = true - }else{ - this.moreFlag = false + this.moreFlag = true; + } else { + this.moreFlag = false; } }, - scroolTwo(){ - this.scrolled = this.$refs.cardBoxTwo.scrollTop - console.log(this.$refs.cardBoxTwo.scrollTop) + scroolTwo() { + this.scrolled = this.$refs.cardBoxTwo.scrollTop; + console.log(this.$refs.cardBoxTwo.scrollTop); //获得可视区的高度 - const windowHeight = this.$refs.cardBoxTwo.clientHeight + const windowHeight = this.$refs.cardBoxTwo.clientHeight; //获取滚动条的总高度 - const scrollHeight = this.$refs.cardBoxTwo.scrollHeight - let windowScrolled = this.scrolled + windowHeight - if(scrollHeight - windowScrolled < 100 && this.scrolled !== 0){ + const scrollHeight = this.$refs.cardBoxTwo.scrollHeight; + let windowScrolled = this.scrolled + windowHeight; + if (scrollHeight - windowScrolled < 100 && this.scrolled !== 0) { //把距离顶部的距离加上可视区域的高度 - this.moreFlag = true - }else{ - this.moreFlag = false + this.moreFlag = true; + } else { + this.moreFlag = false; + } + }, + scroolThree() { + this.scrolled = this.$refs.cardBoxTwo.scrollTop; + console.log(this.$refs.cardBoxTwo.scrollTop); + //获得可视区的高度 + const windowHeight = this.$refs.cardBoxTwo.clientHeight; + //获取滚动条的总高度 + const scrollHeight = this.$refs.cardBoxTwo.scrollHeight; + let windowScrolled = this.scrolled + windowHeight; + if (scrollHeight - windowScrolled < 100 && this.scrolled !== 0) { + //把距离顶部的距离加上可视区域的高度 + this.moreFlag = true; + } else { + this.moreFlag = false; } }, //返回上一个页面 back() { this.$router.push("/phoneHome"); }, - moreList(){ - this.moreFlag = false - this.loadingFlag = true - this.page++ - this.onDynamics() + moreList() { + this.moreFlag = false; + this.loadingFlag = true; + this.page++; + if (this.messageType == "ZLZX") { + this.getAdvice(); + } else { + this.onDynamics(); + } + }, + jumpDetails(item) { + if (this.messageType == "ZYBZFG") { + this.$router.push({ + name: "domesticDetails", + query: { + id: item.standardId, + pageType: "INLAND_STAND" + } + }); + } else if (this.messageType == "GNWBZFG") { + this.$router.push({ + name: "domesticDetails", + query: { + id: item.standardId, + pageType: "INLAND_STAND" + } + }); + } else { + this.$router.push({ + name: "zlzxDetails", + query: { + id: item.id + } + }); + } }, onChange(name) { this.messageType = name; this.page = 1; - this.standList = [] - this.onDynamics(); + this.standList = []; + this.standardReleaseList = []; + if (this.messageType == "ZLZX") { + this.getAdvice(); + } else { + this.onDynamics(); + } }, - onDynamics(){ - this.loading = true + //获取数据 + getAdvice() { + this.$http.get("fileMaterialCenter/file-material/getFileMaterialIndex", { + page: this.page, + pageSize: 10 + }, { + _this: this, loading: "loading" + }, res => { + if (res.ok) { + let mList = res.data; + if (mList.length) { + if (this.standardReleaseList.length) { + this.standardReleaseList = this.standardReleaseList.concat(mList); + } else { + this.standardReleaseList = mList; + } + this.loading = false; + } else { + this.loading = false; + this.listFlag = true; + } + } else { + this.standardReleaseList = []; + this.loading = false; + } + }, e => { + this.standardReleaseList = []; + this.total = 0; + }); + }, + onDynamics() { + this.loading = true; this.$http.get("/lawss/NewsFeed/getNewsFeed", { messageType: this.messageType, page: this.page, @@ -156,21 +266,21 @@ export default { }, { _this: this }, res => { - if(res.ok){ - let msgList= res.data.records - if(msgList.length){ - if(this.standList.length){ - this.standList = this.standList.concat(msgList) - }else{ - this.standList = msgList + if (res.ok) { + let msgList = res.data.records; + if (msgList.length) { + if (this.standList.length) { + this.standList = this.standList.concat(msgList); + } else { + this.standList = msgList; } - this.loading = false - }else{ - this.loading = false - this.listFlag = true + this.loading = false; + } else { + this.loading = false; + this.listFlag = true; } - }else{ - this.standList = [] + } else { + this.standList = []; this.loading = false; } }, e => { @@ -186,6 +296,7 @@ export default { }, mounted() { this.onDynamics(); + this.getAdvice(); //从数据库中查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this @@ -204,6 +315,7 @@ export default { margin: 0; padding: 0; background: #F6F6F6; + .search-head { width: 100%; height: 100px; @@ -228,10 +340,12 @@ export default { .van-tabs { margin-top: 17px; } - /deep/ .van-tabs__content{ + + /deep/ .van-tabs__content { width: 100%; height: 95%; } + .van-tab { color: #3170A8; } @@ -240,17 +354,19 @@ export default { color: #3170A8; font-weight: 600; } + /deep/ .van-tabs__line { - width: 50%; + width: 30%; background-color: #3170A8; } - /deep/ .van-tab__pane{ + + /deep/ .van-tab__pane { height: 95%; position: fixed; width: 100%; } - .card-box{ + .card-box { height: 85%; position: relative; overflow-x: hidden; @@ -258,6 +374,7 @@ export default { top: 10px; } + .card-content { width: 95%; height: auto; @@ -299,21 +416,25 @@ export default { } } } - .bottom-box{ + + .bottom-box { height: 40px; bottom: 0; - padding:40px; + padding: 40px; text-align: center; color: #3170A8; - .list-box{ + + .list-box { color: #3170A8; text-align: center; } + .van-loading { position: absolute; left: 37%; } } + .van-loading { position: absolute; top: 350px; diff --git a/src/pages/phone/zlzxDetails.vue b/src/pages/phone/zlzxDetails.vue new file mode 100644 index 000000000..959e80f64 --- /dev/null +++ b/src/pages/phone/zlzxDetails.vue @@ -0,0 +1,2565 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 174160565..0db6af885 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -3705,7 +3705,8 @@ // 流程提交之后,应该流转至待办任务页面 this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) } else { - this.isSubmit = false + this.$message.warning(res.message) + this.isSubmit = true } }) } else { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 64bfc9447..08ec3fda4 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -244,9 +244,9 @@ label="适用车型" width="90" > - + + + @@ -663,6 +663,7 @@ this.sarProStateEO.standNumber = '' this.sarProStateEO.standName = '' this.sarProStateEO.specificItem = '' + this.sarProStateTotalPage = 1 this.showSarProStateModal = false }, // 关闭查看事件 pageProStateChange (page) { diff --git a/src/router/index.js b/src/router/index.js index b9b5802cc..10ab0fb5b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -120,6 +120,12 @@ const routes = [ component: () => import('@/pages/phone/domesticDetails') }, + { + path: '/zlzxDetails', + name: 'zlzxDetails', + component: () => + import('@/pages/phone/zlzxDetails') + }, { path: '/loginVerify', name: 'LoginVerify',