提交 c9007f57 编写于 作者: 刘英杰's avatar 刘英杰

20241022 保存

上级 df3b1b5a
流水线 #30127 已失败
...@@ -9,6 +9,6 @@ build: ...@@ -9,6 +9,6 @@ build:
stage: publish stage: publish
script: script:
# - remove-item -Force -Recurse D:/ASC_web/A00021/wx_news/wx* # - remove-item -Force -Recurse D:/ASC_web/A00021/wx_news/wx*
- xcopy "dist" "D:\ASC_web\A00021\wx_news\wx\" /s/e/y/ # - xcopy "dist" "D:\ASC_web\A00021\wx_news\wx\" /s/e/y/
only: only:
- wx - wx
\ No newline at end of file
# 制度文件移动端
...@@ -1781,6 +1781,16 @@ ...@@ -1781,6 +1781,16 @@
"integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=", "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
"dev": true "dev": true
}, },
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"cacache": { "cacache": {
"version": "13.0.1", "version": "13.0.1",
"resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1616431156987&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz", "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1616431156987&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz",
...@@ -1807,6 +1817,53 @@ ...@@ -1807,6 +1817,53 @@
"unique-filename": "^1.1.1" "unique-filename": "^1.1.1"
} }
}, },
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.4",
"resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"source-map": { "source-map": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz?cache=0&sync_timestamp=1571657176668&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.6.1.tgz", "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz?cache=0&sync_timestamp=1571657176668&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.6.1.tgz",
...@@ -1823,6 +1880,16 @@ ...@@ -1823,6 +1880,16 @@
"minipass": "^3.1.1" "minipass": "^3.1.1"
} }
}, },
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
},
"terser-webpack-plugin": { "terser-webpack-plugin": {
"version": "2.3.8", "version": "2.3.8",
"resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz", "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz",
...@@ -1839,6 +1906,18 @@ ...@@ -1839,6 +1906,18 @@
"terser": "^4.6.12", "terser": "^4.6.12",
"webpack-sources": "^1.4.3" "webpack-sources": "^1.4.3"
} }
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
} }
} }
}, },
...@@ -11698,87 +11777,6 @@ ...@@ -11698,87 +11777,6 @@
} }
} }
}, },
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
"integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-qr": { "vue-qr": {
"version": "4.0.6", "version": "4.0.6",
"resolved": "https://registry.npmmirror.com/vue-qr/-/vue-qr-4.0.6.tgz", "resolved": "https://registry.npmmirror.com/vue-qr/-/vue-qr-4.0.6.tgz",
......
...@@ -19,7 +19,8 @@ Vue.prototype.UTIL = util; ...@@ -19,7 +19,8 @@ Vue.prototype.UTIL = util;
import getBankcardinfo from 'bankcardinfo' import getBankcardinfo from 'bankcardinfo'
Vue.prototype.$getBankcardinfo = getBankcardinfo Vue.prototype.$getBankcardinfo = getBankcardinfo
import { Button,Icon,Form,Field,Notify,Card,Panel,Divider,SubmitBar,Tag,Cell, CellGroup,Collapse, CollapseItem,RadioGroup,Radio,Popup,Col, Row,Toast,Dialog,NavBar,Loading,Overlay,Uploader,Search,Picker,Image as VanImage,Skeleton,Tabbar, TabbarItem,ImagePreview,createApp,ActionSheet,Cascader,PullRefresh,NoticeBar,List,Step, Steps,Empty,Area,Switch,Sticky,Popover,Checkbox, CheckboxGroup,Sidebar, SidebarItem } from 'vant'; import { Button,Icon,Form,Field,Notify,Card,Panel,DropdownMenu,
DropdownItem,Divider,SubmitBar,Tag,Cell, CellGroup,Collapse, CollapseItem,RadioGroup,Radio,Popup,Col, Row,Toast,Dialog,NavBar,Loading,Overlay,Uploader,Search,Picker,Image as VanImage,Skeleton,Tabbar, TabbarItem,ImagePreview,createApp,ActionSheet,Cascader,PullRefresh,NoticeBar,List,Step, Steps,Empty,Area,Switch,Sticky,Popover,Checkbox, CheckboxGroup,Sidebar, SidebarItem } from 'vant';
Vue.use(Button); Vue.use(Button);
Vue.use(Icon); Vue.use(Icon);
...@@ -69,6 +70,8 @@ Vue.use(Checkbox); ...@@ -69,6 +70,8 @@ Vue.use(Checkbox);
Vue.use(CheckboxGroup); Vue.use(CheckboxGroup);
Vue.use(Sidebar); Vue.use(Sidebar);
Vue.use(SidebarItem); Vue.use(SidebarItem);
Vue.use(DropdownMenu);
Vue.use(DropdownItem);
//Toast.setDefaultOptions({ duration: 2000 }); //Toast.setDefaultOptions({ duration: 2000 });
// 生成签名插件 // 生成签名插件
......
...@@ -40,6 +40,24 @@ const routes = [ ...@@ -40,6 +40,24 @@ const routes = [
keepAlive: false, keepAlive: false,
} }
}, },
{
path: "/newsList",
name: "newsList",
component: () => import('@/views/newsList/index'),
meta: {
title: '文件列表',
keepAlive: false,
}
},
{
path: "/newsDetails",
name: "newsDetails",
component: () => import('@/views/newsDetails/index'),
meta: {
title: '文件查看',
keepAlive: false,
}
},
]; ];
const router = new VueRouter({ const router = new VueRouter({
......
...@@ -39,7 +39,6 @@ export default { ...@@ -39,7 +39,6 @@ export default {
`REFRESHJWT-COLLECTOR`, `REFRESHJWT-COLLECTOR`,
resp.refresh_token.token_content resp.refresh_token.token_content
); //刷新token ); //刷新token
//解析token //解析token
GetTokenInfo().then((resp) => { GetTokenInfo().then((resp) => {
console.log('token',resp) console.log('token',resp)
...@@ -61,10 +60,10 @@ export default { ...@@ -61,10 +60,10 @@ export default {
window.localStorage.setItem("userInfo", JSON.stringify(userInfo)); window.localStorage.setItem("userInfo", JSON.stringify(userInfo));
//路由跳转 //路由跳转
this.$router.push({ this.$router.push({
path: "/", /* path: "/",*/
path: "newsList",
//query: {applyId: applyId,column:1}, //query: {applyId: applyId,column:1},
}); });
}) })
}).catch((err) => { }).catch((err) => {
......
.cardList {
box-sizing: border-box;
width: 100vw;
height: calc(100vh - 46px);
overflow: auto;
.cardListItem:nth-child(1) {
/*文章标题*/
width: 100%;
height: 120px;
background: #ffffff;
padding: 15px;
display: flex;
flex-wrap: wrap;
p {
margin: 0;
font-family: 黑体;
}
}
.cardListItem:nth-child(2) {
width: 100%;
height: 13px;
background: #F6F7F9;
}
.cardListItem:nth-child(3) {
/*文章内容*/
width: 100%;
min-height: 300px;
background: #ffffff;
padding: 15px;
box-sizing: border-box;
p {
text-align: justify
}
}
.cardListItem:nth-child(4) {
width: 100%;
height: 43px;
background: #F6F7F9;
display: flex;
align-items: center;
padding: 15px;
color: #8997A4;
}
.cardListItem:nth-child(5) {
width: 100%;
min-height: 100px;
background: #ffffff;
}
}
\ No newline at end of file
此差异已折叠。
此差异已折叠。
...@@ -2,9 +2,9 @@ module.exports = { ...@@ -2,9 +2,9 @@ module.exports = {
// 启动配置 // 启动配置
devServer: { devServer: {
host: 'localhost',
port: 8086, port: 8086,
host:'192.168.1.83', host:'0.0.0.0',
// 跨域配置 // 跨域配置
proxy: { proxy: {
'/wx_news': { '/wx_news': {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或