diff --git a/jvue-front/assets/logo.png b/jvue-front/assets/logo.png new file mode 100644 index 0000000..8e3f2eb Binary files /dev/null and b/jvue-front/assets/logo.png differ diff --git a/jvue-front/assets/mp-qrcode.png b/jvue-front/assets/mp-qrcode.png new file mode 100644 index 0000000..0616cae Binary files /dev/null and b/jvue-front/assets/mp-qrcode.png differ diff --git a/jvue-front/components/themes/default/Aside.vue b/jvue-front/components/themes/default/Aside.vue new file mode 100644 index 0000000..3c4178c --- /dev/null +++ b/jvue-front/components/themes/default/Aside.vue @@ -0,0 +1,52 @@ + + + + diff --git a/jvue-front/components/themes/default/Body.vue b/jvue-front/components/themes/default/Body.vue index 9f38791..e146aef 100644 --- a/jvue-front/components/themes/default/Body.vue +++ b/jvue-front/components/themes/default/Body.vue @@ -1,42 +1,27 @@ - + diff --git a/jvue-front/components/themes/default/Footer.vue b/jvue-front/components/themes/default/Footer.vue index 1de5a77..c4494b1 100644 --- a/jvue-front/components/themes/default/Footer.vue +++ b/jvue-front/components/themes/default/Footer.vue @@ -1,44 +1,238 @@ diff --git a/jvue-front/components/themes/default/FriendLink.vue b/jvue-front/components/themes/default/FriendLink.vue index b912a62..7174738 100644 --- a/jvue-front/components/themes/default/FriendLink.vue +++ b/jvue-front/components/themes/default/FriendLink.vue @@ -1,10 +1,25 @@ @@ -16,27 +31,30 @@ export default { diff --git a/jvue-front/components/themes/default/Header.vue b/jvue-front/components/themes/default/Header.vue index b6b9d88..b30cb53 100644 --- a/jvue-front/components/themes/default/Header.vue +++ b/jvue-front/components/themes/default/Header.vue @@ -1,46 +1,100 @@ - diff --git a/jvue-front/components/themes/default/HeaderMenu.vue b/jvue-front/components/themes/default/HeaderMenu.vue new file mode 100644 index 0000000..2f41655 --- /dev/null +++ b/jvue-front/components/themes/default/HeaderMenu.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/jvue-front/components/themes/default/HeaderTime.vue b/jvue-front/components/themes/default/HeaderTime.vue new file mode 100644 index 0000000..740464a --- /dev/null +++ b/jvue-front/components/themes/default/HeaderTime.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/jvue-front/components/themes/default/PostList.vue b/jvue-front/components/themes/default/PostList.vue new file mode 100644 index 0000000..df09de4 --- /dev/null +++ b/jvue-front/components/themes/default/PostList.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/jvue-front/components/themes/default/style.css b/jvue-front/components/themes/default/style.css new file mode 100644 index 0000000..2659eb4 --- /dev/null +++ b/jvue-front/components/themes/default/style.css @@ -0,0 +1,55 @@ +/*! + * Theme Name: terwer + * Theme URL: http://www.terwergreen.com + * Description: 本主题是一款适合博客、新闻资讯、自媒体的主题模板。基于bootstrap响应式布局,自适应PC、手机、平板等多种设备浏览。包含普通文章、专题、视频、图集、下载五中文章类型,多种文章页模板。自带前端用户中心,前端登录注册、资料编辑、投稿、文章编辑、评论管理、收藏管理、用户关注一应俱全。文章列表及评论列表AJAX加载。视频支持本地上传、视频链接及视频平台视频。 + * Author: 倚楼听雨 + * Author URI: http://www.terwergreen.com + * Tags:blog + * Version: 1.0 + */ +body { + font-family: "Microsoft Yahei", Helvetica, Arial, Verdana, Tahoma, sans-serif !important; + color: #666 !important; +} +body, +* { + box-sizing: border-box; +} +body a { + text-decoration: none; + color: #00a4ff; +} +body a:hover{ + color: orangered; +} +.el-header, +.el-footer { + background-color: #fff; + color: #333; + line-height: 60px; + padding: 0; + height: auto !important; +} +.el-main { + background-color: #fff; + color: #333; + text-align: left; + line-height: 45px; + padding: 0; + overflow: hidden; +} +body > .el-container { + margin-bottom: 40px; +} +.hide { + display: none; +} +/*! + * 遮罩层 + */ +.mask { + position:fixed; + top: 0;right: 0;left: 0;bottom: 0; + background:rgba(0,0,0,0.6); + z-index: 999999; +} diff --git a/jvue-front/nuxt.config.js b/jvue-front/nuxt.config.js index 0b1a1de..d9fc3ed 100644 --- a/jvue-front/nuxt.config.js +++ b/jvue-front/nuxt.config.js @@ -24,12 +24,20 @@ module.exports = { /* ** Global CSS */ - css: ["element-ui/lib/theme-chalk/index.css"], + css: [], /* ** Plugins to load before mounting the App */ - plugins: ["@/plugins/element-ui", "~/plugins/axios"], + plugins: [ + "~/plugins/element-ui", + "~/plugins/font-awesome", + "~/plugins/axios", + { + src: "~/plugins/vue-uweb", + ssr: false // 只在客户端打包 + } + ], /* ** Nuxt.js modules diff --git a/jvue-front/package-lock.json b/jvue-front/package-lock.json index 96577b0..a452a5b 100644 --- a/jvue-front/package-lock.json +++ b/jvue-front/package-lock.json @@ -3091,6 +3091,11 @@ "resolved": "http://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, + "deep-equal": { + "version": "1.0.1", + "resolved": "http://registry.npm.taobao.org/deep-equal/download/deep-equal-1.0.1.tgz", + "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=" + }, "deep-extend": { "version": "0.6.0", "resolved": "http://registry.npm.taobao.org/deep-extend/download/deep-extend-0.6.0.tgz", @@ -4298,6 +4303,11 @@ "debug": "^3.2.6" } }, + "font-awesome": { + "version": "4.7.0", + "resolved": "http://registry.npm.taobao.org/font-awesome/download/font-awesome-4.7.0.tgz", + "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=" + }, "for-in": { "version": "1.0.2", "resolved": "http://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz", @@ -10493,6 +10503,14 @@ "resolved": "http://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.9.1.tgz", "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=" }, + "vue-uweb": { + "version": "0.2.1", + "resolved": "http://registry.npm.taobao.org/vue-uweb/download/vue-uweb-0.2.1.tgz", + "integrity": "sha1-Iu8IZ7a178MSpLkLLfzLj1wsW3A=", + "requires": { + "deep-equal": "^1.0.1" + } + }, "vuex": { "version": "3.1.0", "resolved": "http://registry.npm.taobao.org/vuex/download/vuex-3.1.0.tgz", diff --git a/jvue-front/package.json b/jvue-front/package.json index 77f9537..afa7e05 100644 --- a/jvue-front/package.json +++ b/jvue-front/package.json @@ -16,7 +16,9 @@ "cross-env": "^5.2.0", "element-ui": "^2.4.11", "express": "^4.16.4", - "nuxt": "^2.4.0" + "font-awesome": "^4.7.0", + "nuxt": "^2.4.0", + "vue-uweb": "^0.2.1" }, "devDependencies": { "@nuxtjs/eslint-config": "^0.0.1", diff --git a/jvue-front/pages/about.vue b/jvue-front/pages/about.vue new file mode 100644 index 0000000..e0073cc --- /dev/null +++ b/jvue-front/pages/about.vue @@ -0,0 +1,116 @@ + + + + + diff --git a/jvue-front/pages/index.vue b/jvue-front/pages/index.vue index 13d8d54..79a0094 100644 --- a/jvue-front/pages/index.vue +++ b/jvue-front/pages/index.vue @@ -8,11 +8,14 @@ + + +
- + @@ -24,7 +27,7 @@ -