diff --git a/README.md b/README.md index 9663d0f..04ea99c 100644 --- a/README.md +++ b/README.md @@ -116,6 +116,7 @@ cnpm run build - wangeditor - cropperjs - @antv/g6 +- qrcodejs #### 特别感谢 diff --git a/package.json b/package.json index a48b78e..8d60aa4 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "axios": "^0.21.1", - "clipboard": "^2.0.6", + "clipboard": "^2.0.7", "countup.js": "^2.0.7", "cropperjs": "^1.5.11", "echarts": "^5.0.2", @@ -25,7 +25,7 @@ "devDependencies": { "@types/axios": "^0.14.0", "@types/clipboard": "^2.0.1", - "@types/node": "^14.14.31", + "@types/node": "^14.14.32", "@types/nprogress": "^0.2.0", "@types/sortablejs": "^1.10.6", "@vitejs/plugin-vue": "^1.1.5", diff --git a/src/router/index.ts b/src/router/index.ts index d0e4cf7..7fd25e6 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -421,6 +421,21 @@ export const dynamicRoutes = [ auth: ['admin', 'test'], icon: 'iconfont icon-siweidaotu' } + }, + { + path: '/fun/qrcode', + name: 'qrcode', + component: () => import('/@/views/fun/qrcode/index.vue'), + meta: { + title: 'qrcode 二维码生成', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + auth: ['admin', 'test'], + icon: 'iconfont icon-ico' + } } ] }, @@ -515,6 +530,36 @@ export const dynamicRoutes = [ icon: 'iconfont icon-jiliandongxuanzeqi' } }, + { + path: '/pages/formAdapt', + name: 'formAdapt', + component: () => import('/@/views/pages/formAdapt/index.vue'), + meta: { + title: '表单自适应', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + auth: ['admin', 'test'], + icon: 'iconfont icon-biaodan' + } + }, + { + path: '/pages/listAdapt', + name: 'listAdapt', + component: () => import('/@/views/pages/listAdapt/index.vue'), + meta: { + title: '列表自适应', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + auth: ['admin', 'test'], + icon: 'iconfont icon-chazhaobiaodanliebiao' + } + }, ] }, { diff --git a/src/utils/setIconfont.ts b/src/utils/setIconfont.ts index 0f26d9a..c69fa57 100644 --- a/src/utils/setIconfont.ts +++ b/src/utils/setIconfont.ts @@ -1,11 +1,12 @@ // 字体图标 url const cssCdnUrlList: Array = [ - '//at.alicdn.com/t/font_2298093_eee6zjvjt5a.css', + '//at.alicdn.com/t/font_2298093_n459lh5kpoh.css', '//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css' ] // 第三方 js url const jsCdnUrlList: Array = [ - 'https://gw.alipayobjects.com/os/antv/pkg/_antv.g6-3.8.1/dist/g6.min.js' + 'https://gw.alipayobjects.com/os/antv/pkg/_antv.g6-3.8.1/dist/g6.min.js', + 'http://static.runoob.com/assets/qrcode/qrcode.min.js' ] // 动态设置字体图标 diff --git a/src/views/fun/qrcode/index.vue b/src/views/fun/qrcode/index.vue new file mode 100644 index 0000000..da2b4db --- /dev/null +++ b/src/views/fun/qrcode/index.vue @@ -0,0 +1,67 @@ + + + + + \ No newline at end of file diff --git a/src/views/pages/formAdapt/index.vue b/src/views/pages/formAdapt/index.vue new file mode 100644 index 0000000..e69fc41 --- /dev/null +++ b/src/views/pages/formAdapt/index.vue @@ -0,0 +1,97 @@ + + + \ No newline at end of file diff --git a/src/views/pages/listAdapt/index.vue b/src/views/pages/listAdapt/index.vue new file mode 100644 index 0000000..f42ff21 --- /dev/null +++ b/src/views/pages/listAdapt/index.vue @@ -0,0 +1,170 @@ + + + + + \ No newline at end of file diff --git a/src/views/pages/listAdapt/mock.ts b/src/views/pages/listAdapt/mock.ts new file mode 100644 index 0000000..a8df529 --- /dev/null +++ b/src/views/pages/listAdapt/mock.ts @@ -0,0 +1,114 @@ +// 列表数据 +export const filterList = [ + { + img: + "https://news.sznews.com/pic/2021-03/09/e37326cc-4583-48f3-aa00-ecc2392d319d.jpg", + title: "36分钟，深圳平均通勤时间出炉！GDP10强城市中仅输杭州", + evaluate: (Math.random() * 10).toFixed(2), + collection: (Math.random() * 100).toFixed(2), + price: (Math.random() * 10).toFixed(2), + monSales: (Math.random() * 20).toFixed(2), + id: 1, + isShowMore: false + }, + { + img: + "http://news.sznews.com/pic/2021-03/09/78cf72b6-e2d9-459d-a368-470414a027f4679cf4ea-26fa-48c8-9fee-c2d092a91400.png", + title: "为爱而动，“红色鹊桥”三八妇女节交友联谊活动助力深圳女孩脱单", + evaluate: (Math.random() * 10).toFixed(2), + collection: (Math.random() * 100).toFixed(2), + price: (Math.random() * 10).toFixed(2), + monSales: (Math.random() * 20).toFixed(2), + id: 2, + isShowMore: false + }, + { + img: + "http://news.sznews.com/pic/2021-03/09/1faf3c6e-1250-4e6b-b072-4a331553e027.jpg", + title: + "粤桂协作“背水一战” 解决广西大化县3.7万人饮水难题", + evaluate: (Math.random() * 10).toFixed(2), + collection: (Math.random() * 100).toFixed(2), + price: (Math.random() * 10).toFixed(2), + monSales: (Math.random() * 20).toFixed(2), + id: 3, + isShowMore: false + }, + { + img: + "https://news.sznews.com/pic/2021-03/09/9fcf6dd4-1e80-4497-bdc9-83dc7246d170.jpg.2", + title: "城镇就业女性平均薪酬6847元 女性职场渗透率提升", + evaluate: (Math.random() * 10).toFixed(2), + collection: (Math.random() * 100).toFixed(2), + price: (Math.random() * 10).toFixed(2), + monSales: (Math.random() * 20).toFixed(2), + id: 4, + isShowMore: false + }, + { + img: + "https://news.sznews.com/pic/2021-03/09/1bd78227-4126-4a43-bdf6-48ead6edd1bf.jpg.2", + title: "深圳：实现“从0到1”源头创新，推进大湾区综合性国家科学中心建设！", + evaluate: (Math.random() * 10).toFixed(2), + collection: (Math.random() * 100).toFixed(2), + price: (Math.random() * 10).toFixed(2), + monSales: (Math.random() * 20).toFixed(2), + id: 5, + isShowMore: false + }, + { + img: + "http://news.sznews.com/pic/2021-03/08/9ea943a3-3ae8-4f49-8296-711ec36ef8c6_watermark.png", + title: "煖声音第126期|愿你有诗酒趁年华的洒脱，也有岁月沉淀后的坚定从容", + evaluate: (Math.random() * 10).toFixed(2), + collection: (Math.random() * 100).toFixed(2), + price: (Math.random() * 10).toFixed(2), + monSales: (Math.random() * 20).toFixed(2), + id: 6, + isShowMore: false + }, + { + img: + "https://news.sznews.com/pic/2021-03/08/a95ba232-1422-4f7e-b85f-c61d486c8659.jpg.2", + title: "姐妹们一起来吐槽，最不能接受男人的缺点！", + evaluate: (Math.random() * 10).toFixed(2), + collection: (Math.random() * 100).toFixed(2), + price: (Math.random() * 10).toFixed(2), + monSales: (Math.random() * 20).toFixed(2), + id: 7, + isShowMore: false + }, + { + img: + "http://news.sznews.com/pic/2021-03/08/76816bf0-3899-4c7e-bc6e-079b5ba8725e.jpg", + title: "民生小事 | 手机遗落出租车 热心民警帮找回", + evaluate: (Math.random() * 10).toFixed(2), + collection: (Math.random() * 100).toFixed(2), + price: (Math.random() * 10).toFixed(2), + monSales: (Math.random() * 20).toFixed(2), + id: 8, + isShowMore: false + }, + { + img: + "https://news.sznews.com/pic/2021-03/08/28ed70d4-71f5-4abb-bf7b-0294bece9e43.jpg.2", + title: "“十三五”：深圳交上靓丽答卷 发展动力加快转换", + evaluate: (Math.random() * 10).toFixed(2), + collection: (Math.random() * 100).toFixed(2), + price: (Math.random() * 10).toFixed(2), + monSales: (Math.random() * 20).toFixed(2), + id: 9, + isShowMore: false + }, + { + img: + "http://news.sznews.com/pic/2021-03/05/d13ae31f-fd45-431a-b48e-c5895bbc193e.png", + title: "深圳湾公园一女子落水，三名男子接力及时施救", + evaluate: (Math.random() * 10).toFixed(2), + collection: (Math.random() * 100).toFixed(2), + price: (Math.random() * 10).toFixed(2), + monSales: (Math.random() * 20).toFixed(2), + id: 10, + isShowMore: false + }, +]; diff --git a/src/views/personal/index.vue b/src/views/personal/index.vue index b7cea54..76538bb 100644 --- a/src/views/personal/index.vue +++ b/src/views/personal/index.vue @@ -125,7 +125,7 @@ - 更新个人信息 + 更新个人信息