diff --git a/mock/role/admin-role.ts b/mock/role/admin-role.ts index e3cefab..73a8335 100644 --- a/mock/role/admin-role.ts +++ b/mock/role/admin-role.ts @@ -46,6 +46,10 @@ export const checkedNodes = [{ 'path': '/components-demo/detail', 'title': '详情组件', 'name': 'DetailDemo' + }, { + 'path': '/components-demo/qrcode', + 'title': '二维码组件', + 'name': 'QrcodeDemo' }] }, { 'path': '/components-demo/echarts', @@ -91,6 +95,10 @@ export const checkedNodes = [{ 'path': '/components-demo/detail', 'title': '详情组件', 'name': 'DetailDemo' +}, { + 'path': '/components-demo/qrcode', + 'title': '二维码组件', + 'name': 'QrcodeDemo' }, { 'path': '/table-demo', 'title': '表格', @@ -407,7 +415,7 @@ export const checkedNodes = [{ export const checkedkeys = ['/components-demo', '/components-demo/echarts', '/components-demo/preview', '/components-demo/button', '/components-demo/message', '/components-demo/count-to', '/components-demo/search', '/components-demo/editor', '/components-demo/markdown', '/components-demo/dialog', '/components-demo/more', - '/components-demo/detail', '/table-demo', '/table-demo/basic-table', '/table-demo/page-table', + '/components-demo/detail', '/components-demo/qrcode', '/table-demo', '/table-demo/basic-table', '/table-demo/page-table', '/table-demo/stripe-table', '/table-demo/border-table', '/table-demo/state-table', '/table-demo/fixed-header', '/table-demo/fixed-column', '/table-demo/fixed-column-header', '/table-demo/fluid-height', '/table-demo/multi-header', '/table-demo/single-choice', '/table-demo/multiple-choice', '/table-demo/sort-table', diff --git a/mock/role/test-role.ts b/mock/role/test-role.ts index 04adaa2..4af7473 100644 --- a/mock/role/test-role.ts +++ b/mock/role/test-role.ts @@ -97,6 +97,14 @@ export const checkedRoleNodes = [ meta: { title: '详情组件' } + }, + { + path: 'qrcode', + component: 'pages/index/views/components-demo/qrcode/index', + name: 'QrcodeDemo', + meta: { + title: '二维码组件' + } } ] }, diff --git a/package.json b/package.json index 0a93932..152f23f 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "normalize.css": "^8.0.1", "nprogress": "^0.2.0", "path-to-regexp": "^6.2.0", + "qrcode": "^1.4.4", "qs": "^6.9.4", "screenfull": "^5.0.2", "vditor": "^3.7.0", @@ -46,6 +47,7 @@ "@types/lodash-es": "^4.17.3", "@types/mockjs": "^1.0.3", "@types/nprogress": "^0.2.0", + "@types/qrcode": "^1.3.5", "@typescript-eslint/eslint-plugin": "^4.5.0", "@typescript-eslint/parser": "^4.5.0", "@vue/cli-plugin-babel": "^4.5.9", diff --git a/public/index.html b/public/index.html index 4123528..fecea01 100644 --- a/public/index.html +++ b/public/index.html @@ -11,7 +11,126 @@ -
+
+ +
+
+
+ +
<%= htmlWebpackPlugin.options.title %>
+
+
+
+
+
+
+
+
diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000..e8a8d6b Binary files /dev/null and b/public/logo.png differ diff --git a/src/components/Qrcode/index.vue b/src/components/Qrcode/index.vue new file mode 100644 index 0000000..4b72b85 --- /dev/null +++ b/src/components/Qrcode/index.vue @@ -0,0 +1,274 @@ + + + + + diff --git a/src/components/Qrcode/types.ts b/src/components/Qrcode/types.ts new file mode 100644 index 0000000..86edb6f --- /dev/null +++ b/src/components/Qrcode/types.ts @@ -0,0 +1,9 @@ +export interface LogoTypes { + src?: string + logoSize?: number + bgColor?: string + borderSize?: number + crossOrigin?: string + borderRadius?: number + logoRadius?: number +} diff --git a/src/pages/index/router/index.ts b/src/pages/index/router/index.ts index 1b5e78d..6b24ac1 100644 --- a/src/pages/index/router/index.ts +++ b/src/pages/index/router/index.ts @@ -197,6 +197,14 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [ meta: { title: '详情组件' } + }, + { + path: 'qrcode', + component: () => import('_p/index/views/components-demo/qrcode/index.vue'), + name: 'QrcodeDemo', + meta: { + title: '二维码组件' + } } ] }, diff --git a/src/pages/index/views/components-demo/qrcode/index.vue b/src/pages/index/views/components-demo/qrcode/index.vue new file mode 100644 index 0000000..8b0c1e8 --- /dev/null +++ b/src/pages/index/views/components-demo/qrcode/index.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/pages/index/views/login/index.vue b/src/pages/index/views/login/index.vue index 1d1a41e..506cdab 100644 --- a/src/pages/index/views/login/index.vue +++ b/src/pages/index/views/login/index.vue @@ -1,5 +1,5 @@