diff --git a/README.md b/README.md index 3621af2..0579d52 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,15 @@ # code-review-web +CodeReview is a professional platform for code review, communication, and sharing. Engineers can submit their code for expert review to improve the quality of their code. It was founded by 6 Internet lovers, including me. + +![img](./img/cr1.jpg) + +![img](./img/cr2.jpg) + +# Projects + +* [code-review-server](https://github.com/lzwjava/code-review-server) +* [code-review-web](https://github.com/lzwjava/code-review-web) ### Building @@ -16,6 +26,16 @@ git submodule init git submodule update ``` -### 本地调试 +### Debug 将 apitest.conf 复制到 /usr/local/nginx/conf/sites/ 下面。在 nginx.conf 中引入 sites/*.conf。重启 nginx。 + +### Contributors + +| author | commits | +| ------------- | ------------- | +| lzwjava | 302 | +| LeslieYQ | 73 | +|Martin|52| +|zangqilong|4| + diff --git a/build/html.plugin.conf.js b/build/html.plugin.conf.js index b200f6c..1775407 100644 --- a/build/html.plugin.conf.js +++ b/build/html.plugin.conf.js @@ -9,7 +9,8 @@ var HtmlWebpackPlugin = require('html-webpack-plugin') var path = require('path') var devConfig = ['index.html', 'case.html', 'article.html', 'order.html', 'reviewer.html', 'setting.html', -'statement.html', 'write-review.html', 'reviewers.html', 'belief.html', 'paid.html', 'video.html', 'notifications.html']; +'statement.html', 'write-review.html', 'reviewers.html', 'belief.html', 'paid.html', 'video.html', +'notifications.html', 'event.html', 'workshop.html']; function HtmlWebpackPluginConfig(type) { var filePath = ''; diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 1d88194..af7c419 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -17,7 +17,9 @@ module.exports = { belief: ['./src/belief.js'], paid: ['./src/paid.js'], video: ['./src/video.js'], - notifications: ['./src/notifications.js'] + notifications: ['./src/notifications.js'], + event: ['./src/event.js'], + workshop: ['./src/workshop.js'] }, output: { path: path.resolve(__dirname, '../dist/static/'), @@ -49,6 +51,10 @@ module.exports = { test: /\.(png|jpg|gif)$/, loader: 'url-loader?limit=8190' }, + { + test: /\.(mp4|webm)/, + loader: 'file-loader' + }, { test: /\.css$/, loader: "style-loader!css-loader" }, diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 5846fc6..c827bfd 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -1,3 +1,4 @@ +var webpack = require('webpack') var config = require('./webpack.base.conf') var path = require('path') var htmlConfig = require('./html.plugin.conf') @@ -18,6 +19,12 @@ config.devServer = { // when serving the html from in-memory config.output.publicPath = '/' -config.plugins = (config.plugins || []).concat(htmlConfig('dev')) +config.plugins = (config.plugins || []).concat([ + new webpack.DefinePlugin({ + 'process.env': { + NODE_ENV: '"local"' + } + }) +]).concat(htmlConfig('dev')) module.exports = config diff --git a/img/cr1.jpg b/img/cr1.jpg new file mode 100644 index 0000000..360f461 Binary files /dev/null and b/img/cr1.jpg differ diff --git a/img/cr2.jpg b/img/cr2.jpg new file mode 100644 index 0000000..4cf9c1a Binary files /dev/null and b/img/cr2.jpg differ diff --git a/index.html b/index.html new file mode 100644 index 0000000..6858ebe --- /dev/null +++ b/index.html @@ -0,0 +1,11 @@ + + + + + Simple HTML Page + + +

Hello, World!

+

This is a simple HTML page.

+ + \ No newline at end of file diff --git a/package.json b/package.json index d396c5e..18b2098 100644 --- a/package.json +++ b/package.json @@ -50,10 +50,12 @@ "font-awesome": "^4.5.0", "github-markdown-css": "^2.1.1", "highlight.js": "^9.1.0", + "jeet": "^6.1.2", "jquery": "^2.1.4", "marked": "^0.3.5", "moment": "^2.11.0", "qiniu-js-sdk": "0.0.2", + "rupture": "^0.6.1", "sprintf-js": "^1.0.3", "vue": "^1.0.10", "vue-router": "^0.7.5", diff --git a/src/common/serviceUrl.js b/src/common/serviceUrl.js index 014312a..5448af4 100644 --- a/src/common/serviceUrl.js +++ b/src/common/serviceUrl.js @@ -36,5 +36,13 @@ export default { commentsGet: 'reviews/:id/comments', commentCreate: 'reviews/:id/comments', requestResetPassword: 'user/requestResetPassword', - resetPassword: 'user/resetPassword' + resetPassword: 'user/resetPassword', + eventGet: 'events/:id', + attendanceGet: 'attendances/:id', + eventAttend: 'events/:id/attend', + eventPay: 'events/:id/pay', + attendancesGetEvent: 'events/:id/attendances', + workshopGet: 'workshops/:id', + workshopEnrollments: 'workshops/:id/enrollments', + workshopPay: 'workshops/:id/pay' } diff --git a/src/common/util.js b/src/common/util.js index 2f7ced1..e9fa7f8 100644 --- a/src/common/util.js +++ b/src/common/util.js @@ -71,9 +71,14 @@ exports.configVue = (Vue) => { require('font-awesome/css/font-awesome.css'); // 这里是 debug 模块调试，有用的，不用移除 - localStorage.debug = 'api,user,components,setting,reviewer-list,home,reviewer-detail,order-form,' - + 'order,write-review,tag,markdown-area,markdown,article,reward-form,loading,order-detail,case,article-item,belief,' - + 'notifications,comment-list,reset-password'; + console.log('env ' + process.env.NODE_ENV) + if (process.env.NODE_ENV === 'production') { + localStorage.debug = '' + } else { + localStorage.debug = 'api,user,components,setting,reviewer-list,home,reviewer-detail,order-form,' + + 'order,write-review,tag,markdown-area,markdown,article,reward-form,loading,order-detail,case,article-item,belief,' + + 'notifications,comment-list,reset-password,event,event-form,workshop,workshop-form'; + } // register filters globally for(let k in filters){ @@ -89,3 +94,9 @@ exports.getLocalUser = () => { return {}; } } + +exports.mobileCheck = () => { + var check = false; + (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4)))check = true})(navigator.userAgent||navigator.vendor||window.opera); + return check; +} diff --git a/src/components/article-item.vue b/src/components/article-item.vue index 3840222..25dd73a 100644 --- a/src/components/article-item.vue +++ b/src/components/article-item.vue @@ -43,7 +43,7 @@ flex 0 1 auto padding-left 40px position relative - + .date-tags font-size 0.88rem color rgba(40,47,49,.6) @@ -52,7 +52,10 @@ margin-right 10px .data margin-right 20px - font-family Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,WenQuanYi Micro Hei,Arial,Microsoft Yahei,Verdana,sans-serif + font-family Helvetica Neue,Helvetica + h6 + height 60px + overflow hidden .title font-size 1.5rem line-height 60px @@ -63,7 +66,7 @@ color rgba(40,47,49,.6) position absolute bottom 0 - font-family Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,WenQuanYi Micro Hei,Arial,Microsoft Yahei,Verdana,sans-serif + font-family Helvetica Neue,Helvetica span margin-right 30px .article-logo diff --git a/src/components/comment-list.vue b/src/components/comment-list.vue index 3f1362e..0d28fb0 100644 --- a/src/components/comment-list.vue +++ b/src/components/comment-list.vue @@ -297,6 +297,8 @@ export default { font-size 16px padding 10px font-weight 100 + &:focus + border 1px solid #1CB2EF .markdown-actions position relative float left diff --git a/src/components/event-form.vue b/src/components/event-form.vue new file mode 100644 index 0000000..ac11180 --- /dev/null +++ b/src/components/event-form.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/components/login.vue b/src/components/login.vue index 2a3df5f..bded7b8 100644 --- a/src/components/login.vue +++ b/src/components/login.vue @@ -68,6 +68,8 @@ diff --git a/src/components/order-form.vue b/src/components/order-form.vue index aa24626..1291c37 100644 --- a/src/components/order-form.vue +++ b/src/components/order-form.vue @@ -128,9 +128,6 @@ module.exports = { } }); - // this.qrcode = resp.data.credential.alipay_qr; - // this.$broadcast('loaded'); - //window.open(this.qrcode, '_blank'); }, util.httpErrorFn(this)) } }, diff --git a/src/components/qrcode.vue b/src/components/qrcode.vue new file mode 100644 index 0000000..97db92b --- /dev/null +++ b/src/components/qrcode.vue @@ -0,0 +1,28 @@ + + + + + + diff --git a/src/components/signup.vue b/src/components/signup.vue index a65e2b1..85f3023 100644 --- a/src/components/signup.vue +++ b/src/components/signup.vue @@ -9,8 +9,7 @@
-
- +
@@ -187,5 +186,35 @@ + .icon color #08B1F6 opacity 1 - +@media only screen and (max-width: 700px) + .sign-up + width 90% + max-height 90% + margin-left -45% + padding 9% + height auto + .cancel + right 10px + top 10px + .row + height 40px + input + height 35px + text-indent 43px + .icon + font-size 26px + margin-top -31px + margin-left 10px + .form + .code + .row + width 50% + .send + width 30% + height 35px + font-size 12px + line-height 35px + .gbutton + margin-top 30px + margin-bottom 20px diff --git a/src/components/user-avatar.vue b/src/components/user-avatar.vue index face5a7..9031e6a 100644 --- a/src/components/user-avatar.vue +++ b/src/components/user-avatar.vue @@ -1,6 +1,6 @@ diff --git a/src/components/workshop-form.vue b/src/components/workshop-form.vue new file mode 100644 index 0000000..06f3466 --- /dev/null +++ b/src/components/workshop-form.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/src/event.html b/src/event.html new file mode 100644 index 0000000..8e0cdaa --- /dev/null +++ b/src/event.html @@ -0,0 +1,34 @@ + + + + + + + CodeReview一个专业的代码审查交流分享平台 + + + + + + + + + + + + + + + + diff --git a/src/event.js b/src/event.js new file mode 100644 index 0000000..25e6d4e --- /dev/null +++ b/src/event.js @@ -0,0 +1,13 @@ +import Vue from 'vue' +import Nav from './views/nav.vue' +import MainBody from './views/event.vue' +import util from './common/util' +util.configVue(Vue) + +let reviewer = new Vue({ + el: 'html', + components:{ + 'my-nav': Nav, + 'main-body': MainBody + } +}); diff --git a/src/img/event/MartinRGB.jpg b/src/img/event/MartinRGB.jpg new file mode 100644 index 0000000..9ecc1f5 Binary files /dev/null and b/src/img/event/MartinRGB.jpg differ diff --git a/src/img/event/agenda_bg.png b/src/img/event/agenda_bg.png new file mode 100644 index 0000000..bfa3715 Binary files /dev/null and b/src/img/event/agenda_bg.png differ diff --git a/src/img/event/biao.jpg b/src/img/event/biao.jpg new file mode 100644 index 0000000..f9b52b4 Binary files /dev/null and b/src/img/event/biao.jpg differ diff --git a/src/img/event/event_qrcode.jpg b/src/img/event/event_qrcode.jpg new file mode 100644 index 0000000..5038f5f Binary files /dev/null and b/src/img/event/event_qrcode.jpg differ diff --git a/src/img/event/info_bg.jpg b/src/img/event/info_bg.jpg new file mode 100644 index 0000000..06dcd95 Binary files /dev/null and b/src/img/event/info_bg.jpg differ diff --git a/src/img/event/intro_bg.png b/src/img/event/intro_bg.png new file mode 100644 index 0000000..9cef7ed Binary files /dev/null and b/src/img/event/intro_bg.png differ diff --git a/src/img/event/ios_programmer.jpg b/src/img/event/ios_programmer.jpg new file mode 100644 index 0000000..469e69a Binary files /dev/null and b/src/img/event/ios_programmer.jpg differ diff --git a/src/img/event/lzwjava_avatar.jpg b/src/img/event/lzwjava_avatar.jpg new file mode 100644 index 0000000..82c6e3e Binary files /dev/null and b/src/img/event/lzwjava_avatar.jpg differ diff --git a/src/img/event/map_3w.jpg b/src/img/event/map_3w.jpg new file mode 100644 index 0000000..7c03e7b Binary files /dev/null and b/src/img/event/map_3w.jpg differ diff --git a/src/img/event/mount.jpg b/src/img/event/mount.jpg new file mode 100644 index 0000000..4481ba7 Binary files /dev/null and b/src/img/event/mount.jpg differ diff --git a/src/img/event/speaker_bg.png b/src/img/event/speaker_bg.png new file mode 100644 index 0000000..86dea96 Binary files /dev/null and b/src/img/event/speaker_bg.png differ diff --git a/src/img/event/ticket_bg.png b/src/img/event/ticket_bg.png new file mode 100644 index 0000000..323f067 Binary files /dev/null and b/src/img/event/ticket_bg.png differ diff --git a/src/img/event/wenhan.jpg b/src/img/event/wenhan.jpg new file mode 100644 index 0000000..174babe Binary files /dev/null and b/src/img/event/wenhan.jpg differ diff --git a/src/img/event/yanrui.jpg b/src/img/event/yanrui.jpg new file mode 100644 index 0000000..46d0fdd Binary files /dev/null and b/src/img/event/yanrui.jpg differ diff --git a/src/img/event/yeguchen.jpg b/src/img/event/yeguchen.jpg new file mode 100644 index 0000000..3daa5d0 Binary files /dev/null and b/src/img/event/yeguchen.jpg differ diff --git a/src/img/qrcode.png b/src/img/qrcode.png deleted file mode 100644 index 583289e..0000000 Binary files a/src/img/qrcode.png and /dev/null differ diff --git a/src/img/workshop/beijing_bg.png b/src/img/workshop/beijing_bg.png new file mode 100644 index 0000000..d493113 Binary files /dev/null and b/src/img/workshop/beijing_bg.png differ diff --git a/src/img/workshop/big-calendar.svg b/src/img/workshop/big-calendar.svg new file mode 100644 index 0000000..29ef9b6 --- /dev/null +++ b/src/img/workshop/big-calendar.svg @@ -0,0 +1,20 @@ + + + + big-calendar + Created with Sketch. + + + + + + + + + + + + + + + diff --git a/src/img/workshop/big-location.svg b/src/img/workshop/big-location.svg new file mode 100644 index 0000000..2a61f8d --- /dev/null +++ b/src/img/workshop/big-location.svg @@ -0,0 +1,20 @@ + + + + big-location + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/img/workshop/big-swift.svg b/src/img/workshop/big-swift.svg new file mode 100644 index 0000000..e10c0a0 --- /dev/null +++ b/src/img/workshop/big-swift.svg @@ -0,0 +1,20 @@ + + + + big-swift + Created with Sketch. + + + + + + + + + + + + + + + diff --git a/src/img/workshop/intro_bg.jpg b/src/img/workshop/intro_bg.jpg new file mode 100644 index 0000000..89e3190 Binary files /dev/null and b/src/img/workshop/intro_bg.jpg differ diff --git a/src/img/workshop/intro_bg1.png b/src/img/workshop/intro_bg1.png new file mode 100644 index 0000000..3fdae64 Binary files /dev/null and b/src/img/workshop/intro_bg1.png differ diff --git a/src/img/workshop/iphoneblack.png b/src/img/workshop/iphoneblack.png new file mode 100644 index 0000000..d58d76f Binary files /dev/null and b/src/img/workshop/iphoneblack.png differ diff --git a/src/img/workshop/photo-eiffeltower.jpg b/src/img/workshop/photo-eiffeltower.jpg new file mode 100644 index 0000000..1ca5443 Binary files /dev/null and b/src/img/workshop/photo-eiffeltower.jpg differ diff --git a/src/img/workshop/photo-louvre.jpg b/src/img/workshop/photo-louvre.jpg new file mode 100644 index 0000000..8af9c32 Binary files /dev/null and b/src/img/workshop/photo-louvre.jpg differ diff --git a/src/img/workshop/screen-iphone6.png b/src/img/workshop/screen-iphone6.png new file mode 100644 index 0000000..13e1929 Binary files /dev/null and b/src/img/workshop/screen-iphone6.png differ diff --git a/src/img/workshop/screen-swift.png b/src/img/workshop/screen-swift.png new file mode 100644 index 0000000..af6a607 Binary files /dev/null and b/src/img/workshop/screen-swift.png differ diff --git a/src/img/workshop/storehouse.mp4 b/src/img/workshop/storehouse.mp4 new file mode 100644 index 0000000..762bdf3 Binary files /dev/null and b/src/img/workshop/storehouse.mp4 differ diff --git a/src/img/workshop/workshop_qrcode.jpg b/src/img/workshop/workshop_qrcode.jpg new file mode 100644 index 0000000..94a0daf Binary files /dev/null and b/src/img/workshop/workshop_qrcode.jpg differ diff --git a/src/stylus/base.styl b/src/stylus/base.styl index 02fa355..eb36fe7 100644 --- a/src/stylus/base.styl +++ b/src/stylus/base.styl @@ -1,43 +1,14 @@ @import "variables.styl" @import "reset.styl" -*{ - box-sizing: border-box; -} - -@font-face - font-family Raleway-Regular - src url('../font/Raleway-Regular.ttf') - -@font-face - font-family Raleway-Light - src url('../font/Raleway-Light.ttf') - -@font-face - font-family Raleway-ExtraLight - src url('../font/Raleway-ExtraLight.ttf') - -@font-face - font-family Raleway-SemiBold - src url('../font/Raleway-SemiBold.ttf') - -.raleway-first-font - font-family Raleway-Regular,"Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","WenQuanYi Micro Hei",Arial,"Microsoft Yahei",Verdana,sans-serif - -.pingfang-first-font - font-family "PingFang SC","Helvetica Neue",Helvetica,"Hiragino Sans GB","WenQuanYi Micro Hei",Arial,"Microsoft Yahei",Verdana,sans-serif - -.raleway-regular-font - font-family Raleway-Regular,"Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","WenQuanYi Micro Hei",Arial,"Microsoft Yahei",Verdana,sans-serif +* + box-sizing border-box html, body, a - @extend .raleway-first-font + font-family Helvetica,"Helvetica Neue","PingFang","Hiragino Sans GB","WenQuanYi Micro Hei",Arial,"Microsoft Yahei",Verdana,sans-serif color textColor text-decoration none -h2 - font-family Raleway-Regular - body background #F1F5F6 @@ -58,6 +29,7 @@ ul.list a:hover opacity 0.8 + transition .5s .btn-common margin 5px @@ -70,8 +42,12 @@ a:hover .btn-blue background #00BDEF - box-shadow 0px 1px 4px 0px rgba(0,0,0,0.50) color #fff + -webkit-box-shadow 0px 1px 0px rgba(255,255,255,0.15) inset,0px 1px 2px rgba(0,0,0,0.15) + box-shadow 0px 1px 0px rgba(255,255,255,0.15) inset,0px 1px 2px rgba(0,0,0,0.15) + &:hover + background #00ABD8 + transition .5s .btn-green background #33C96F @@ -102,7 +78,6 @@ h1 font-size 3.75rem font-weight 100 h2 - @extend .pingfang-first-font font-size 1.5rem font-weight 100 h3 @@ -110,27 +85,9 @@ h3 h4 font-size 1rem font-weight 600 - @extend .pingfang-first-font h5 font-size 20px -.setting .tags .tags-content .select-content select - &:focus - border 1px solid #1CB2EF -.setting .form .row input - &:focus - border 1px solid #1CB2EF -.setting .form .row textarea - &:focus - border 1px solid #1CB2EF -.comment-container .comment-list .comment-form .form-main .form-right .markdown-area textarea - &:focus - border 1px solid #1CB2EF -.write-container .item .input-row input - &:focus - border 1px solid #1CB2EF -.write-container .item .edit-area textarea - &:focus - border 1px solid #1CB2EF + input, textarea, select &:focus border none diff --git a/src/views/case.vue b/src/views/case.vue index 9b5448b..1356159 100755 --- a/src/views/case.vue +++ b/src/views/case.vue @@ -89,12 +89,12 @@ margin 0 auto h1 margin-top 30px - font-size 60px - width 440px + font-size 50px + width 600px font-weight 100 margin-left -20px font-family Raleway-Light,PingFang-SC - line-height 84px + line-height 70px .detail margin-left -20px height 40px diff --git a/src/views/event.vue b/src/views/event.vue new file mode 100644 index 0000000..c9cb8ba --- /dev/null +++ b/src/views/event.vue @@ -0,0 +1,632 @@ + + + + + + diff --git a/src/views/footer.vue b/src/views/footer.vue index db8370f..4a2b312 100644 --- a/src/views/footer.vue +++ b/src/views/footer.vue @@ -96,10 +96,10 @@ components: { margin-bottom 20px font-size 24px .rfont1 - font-family Raleway-Light + font-family Helvetica font-weight lighter .rfont2 - font-family Raleway-SemiBold + font-family Helvetica font-weight bold .detail2 opacity 0.6 @@ -108,13 +108,13 @@ components: { font-weight normal p color white - font-family Raleway + font-family Helvetica margin-top: -5px; .year - font-family Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,WenQuanYi Micro Hei,Arial,Microsoft Yahei,Verdana,sans-serif + font-family Helvetica Neue,Helvetica .ICP color white - font-family Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,WenQuanYi Micro Hei,Arial,Microsoft Yahei,Verdana,sans-serif + font-family Helvetica Neue,Helvetica li text-align left diff --git a/src/views/home.vue b/src/views/home.vue index 8f73557..df3b6f3 100755 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -334,7 +334,7 @@ #header2 font-size 1.5rem font-weight 100 - font-family Raleway-ExtraLight,"Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","WenQuanYi Micro Hei",Arial,"Microsoft Yahei",Verdana,sans-serif + font-family "Helvetica Neue",Helvetica .navbar position fixed z-index 8 // signup login overlay = 9 @@ -365,7 +365,6 @@ height 80px margin-top 60px .help - @extend .raleway-regular-font height 50px width 240px background #1CB2EF @@ -374,9 +373,7 @@ margin-top 70px color white border 1px solid #00A3E6 - -webkit-box-shadow 0px 1px 0px rgba(255,255,255,0.15) inset,0px 1px 2px rgba(0,0,0,0.15) - box-shadow 0px 1px 0px rgba(255,255,255,0.15) inset,0px 1px 2px rgba(0,0,0,0.15) - font-family Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,WenQuanYi Micro Hei,Arial,Microsoft Yahei,Verdana,sans-serif + font-family Helvetica Neue,Helvetica .feature height 450px padding 125px 0 @@ -416,7 +413,7 @@ line-height 180% font-size 0.88rem .review-document - font-family Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,WenQuanYi Micro Hei,Arial,Microsoft Yahei,Verdana,sans-serif + font-family Helvetica Neue,Helvetica .reviewer height 800px; position relative @@ -589,7 +586,7 @@ h6 width 200px word-break break-word - font-family "PingFang SC","Hiragino Sans GB","WenQuanYi Micro Hei",Arial,"Microsoft Yahei",Verdana,sans-serif + font-family "PingFang SC" .title font-size 1.5rem line-height 2rem diff --git a/src/views/nav.vue b/src/views/nav.vue index 29768cc..6ae7877 100644 --- a/src/views/nav.vue +++ b/src/views/nav.vue @@ -20,6 +20,8 @@
  • 发现大神
    •
  • 精彩案例
    •
  • 直播视频
    •  +
  • 线下活动
    •  +
  • 研讨班
    •
  • 注册
  • 登录
  • diff --git a/src/views/order-list.vue b/src/views/order-list.vue index 9c58b2e..a5ade27 100644 --- a/src/views/order-list.vue +++ b/src/views/order-list.vue @@ -245,7 +245,7 @@ border 1px solid rgba(0,0,0,.15) box-shadow inset 0 1px 0 hsla(0,0%,100%,.15),0 1px 2px rgba(0,0,0,.15) -webkit-box-shadow 0 1px 0 hsla(0,0%,100%,.15) inset,0 1px 2px rgba(0,0,0,.15) - font-family "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "WenQuanYi Micro Hei", Arial, "Microsoft Yahei", Verdana, sans-serif + font-family "Helvetica Neue", Helvetica .list-row display: table-row background: rgba(255,255,255,0.03) diff --git a/src/views/paid.vue b/src/views/paid.vue index cdea658..e6b392a 100644 --- a/src/views/paid.vue +++ b/src/views/paid.vue @@ -1,7 +1,20 @@ @@ -19,15 +32,18 @@ export default { }, data () { return { + type: 'order' } }, computed: { - }, methods: { }, created() { - + var params = util.getSearchParameters(); + if (params.type) { + this.type = params.type; + } } } @@ -36,10 +52,16 @@ export default { diff --git a/src/views/reviewer-detail.vue b/src/views/reviewer-detail.vue index 6e59269..48a7f91 100755 --- a/src/views/reviewer-detail.vue +++ b/src/views/reviewer-detail.vue @@ -1,7 +1,7 @@