fe / yoho-activity-platform · Commits

Go to a project

Authored by 李奇
Commit 525dd76350b4f140aacba85fb5139b200610f6a0 1 parent dba6f84b

初步引入vue

Inline Side-by-side
Showing 12 changed files with 121 additions and 53 deletions
/**
* 大转盘活动controller
* @author: leo <qi.li@yoho.cn>
* @date: 26/09/2018
*/
const wheelSurfModel = require('../models/wheel-surf');
const whSurfController = {
page(req, res) {
res.render('activity/wheel-surf', {
bodyClass: 'nav-md',
module: 'admin',
page: 'wheel-surf'
});
}
};
module.exports = whSurfController;
... ...
/* eslint-disable array-callback-return */
const { ActWheelSurfConf, ActWheelSurfPrize } = require('../../../db');
class ActWheelSurfModel extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
}
module.exports = ActWheelSurfModel;
... ...
... ... @@ -11,6 +11,7 @@ const user = require('./controllers/user');
const coupon = require('./controllers/coupon');
const multipart = require('connect-multiparty');
const guochao = require('./controllers/guochao');
const wheelSurf = require('./controllers/wheel-surf');
const mutilpartMiddleware = multipart();
// 管理员[page]
... ... @@ -90,4 +91,7 @@ router.get('/api/user/exportUserList', user.exportUserList);
router.get('/api/user/exportPrizeUserList', user.exportPrizeUserList);
router.get('/api/user/exportInfoUserList', user.exportInfoUserList);
// 大转盘活动管理
router.get('/wheelSurf', wheelSurf.page);
module.exports = router;
... ...
<!-- page content -->
<div class="right_col" role="main">
<div id="app">
<wheel-surf></wheel-surf>
</div>
</div>
<!-- /page content -->
... ...
... ... @@ -88,6 +88,11 @@ module.exports = (env) => {
loader: 'happypack/loader?id=js'
}]
}, {
test: /\.vue$/,
use: [{
loader: 'vue-loader'
}]
}, {
test: /\.css$/,
use: cssLoader(env, 'css')
}]
... ... @@ -96,8 +101,12 @@ module.exports = (env) => {
modules: [
path.join(__dirname, '../node_modules'),
path.join(__dirname, '../public/scss'),
path.join(__dirname, '../public/js')
]
path.join(__dirname, '../public/js'),
path.join(__dirname, '../public/vue')
],
alias:{
'vue$':'vue/dist/vue.js'
}
},
stats: {
children: false
... ...
... ... @@ -80,6 +80,10 @@ module.exports = function(Sequelize, DataTypes) {
status: {
type: DataTypes.INTEGER(8),
allowNull: true
},
create_time: {
type: DataTypes.DATE,
defaultValue: Sequelize.NOW
}
}, Object.assign(options, {tableName: 'act_wheel_surf_conf'}));
... ...
... ... @@ -53,7 +53,7 @@
<li><a href="/admin/activity/create">活动创建</a></li>
<li><a href="/admin/activity/upload_excel">上传Y100excel</a></li>
<li><a href="/admin/activity/zerobuy">0元购</a></li>
<li><a href="/admin/activity/wheel">大转盘</a></li>
<li><a href="/admin/wheelSurf">大转盘</a></li>
</ul>
</li>
<li><a><i class="fa fa-users"></i> 用户管理 <span class="fa fa-chevron-down"></span></a>
... ...
... ... @@ -56,7 +56,6 @@
"memory-cache": "^0.1.6",
"moment": "^2.18.1",
"mysql": "^2.13.0",
"sequelize": "^4.38.0",
"mysql2": "^1.6.1",
"nodemailer": "^4.4.1",
"nodemailer-smtp-transport": "^2.7.4",
... ... @@ -73,6 +72,7 @@
"request": "^2.81.0",
"request-promise": "^4.2.1",
"semver": "^5.3.0",
"sequelize": "^4.38.0",
"serve-favicon": "^2.4.3",
"sitemap": "^1.12.0",
"url": "^0.11.0",
... ... @@ -147,7 +147,7 @@
"stylelint-webpack-plugin": "^0.7.0",
"uglifyjs-webpack-plugin": "^0.4.6",
"vue": "^2.3.3",
"vue-loader": "^12.2.1",
"vue-loader": "^13.7.0",
"vue-template-compiler": "^2.3.3",
"webpack": "^2.6.1",
"webpack-bundle-analyzer": "^2.8.2",
... ...
import Vue from 'vue';
import wheelSurf from 'wheel-surf.vue';
require('admin/wheel-surf.page.css');
new Vue({
el: '#app',
components: {
wheelSurf
}
});
... ...
<template>
<div>
<div>{{test}}</div>
<input type="text" v-model="test">
</div>
</template>
<script>
module.exports = {
data() {
return {
test: 1
};
}
}
</script>
<style>
</style>
... ...
... ... @@ -1054,7 +1054,7 @@ block-stream@*:
dependencies:
inherits "~2.0.0"
bluebird@3.x.x, bluebird@^3.0.5, bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@~3.5.1:
bluebird@3.x.x, bluebird@^3.0.6, bluebird@^3.1.1, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3.5.1, bluebird@~3.5.1:
version "3.5.1"
resolved "http://npm.yohops.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
... ... @@ -1861,7 +1861,7 @@ concat-with-sourcemaps@^1.0.0:
dependencies:
source-map "^0.6.1"
config-chain@~1.1.11, config-chain@~1.1.5:
config-chain@~1.1.11:
version "1.1.11"
resolved "http://npm.yohops.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
dependencies:
... ... @@ -1914,7 +1914,7 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
consolidate@^0.14.0:
version "0.14.5"
resolved "http://npm.yohops.com/consolidate/-/consolidate-0.14.5.tgz#5a25047bc76f73072667c8cb52c989888f494c63"
resolved "http://registry.npm.taobao.org/consolidate/download/consolidate-0.14.5.tgz#5a25047bc76f73072667c8cb52c989888f494c63"
dependencies:
bluebird "^3.1.1"
... ... @@ -2668,16 +2668,6 @@ editor@~1.0.0:
version "1.0.0"
resolved "http://npm.yohops.com/editor/-/editor-1.0.0.tgz#60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"
editorconfig@^0.13.2:
version "0.13.3"
resolved "http://npm.yohops.com/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34"
dependencies:
bluebird "^3.0.5"
commander "^2.9.0"
lru-cache "^3.2.0"
semver "^5.1.0"
sigmund "^1.0.1"
ee-first@1.1.1, ee-first@~1.1.1:
version "1.1.1"
resolved "http://npm.yohops.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
... ... @@ -4972,15 +4962,6 @@ js-base64@^2.1.8, js-base64@^2.1.9:
version "2.4.3"
resolved "http://npm.yohops.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
js-beautify@^1.6.3:
version "1.7.5"
resolved "http://npm.yohops.com/js-beautify/-/js-beautify-1.7.5.tgz#69d9651ef60dbb649f65527b53674950138a7919"
dependencies:
config-chain "~1.1.5"
editorconfig "^0.13.2"
mkdirp "~0.5.0"
nopt "~3.0.1"
js-tokens@^3.0.0, js-tokens@^3.0.2:
version "3.0.2"
resolved "http://npm.yohops.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
... ... @@ -5633,12 +5614,6 @@ lru-cache@4.1.1, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@~4.1.1:
pseudomap "^1.0.2"
yallist "^2.1.2"
lru-cache@^3.2.0:
version "3.2.0"
resolved "http://npm.yohops.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
dependencies:
pseudomap "^1.0.1"
mOxie@^1.5.5:
version "1.5.7"
resolved "http://npm.yohops.com/mOxie/-/mOxie-1.5.7.tgz#eab89d529dee074a709f99622ab43cf10a6abfbf"
... ... @@ -6303,7 +6278,7 @@ nodemon@^1.11.0:
undefsafe "^2.0.1"
update-notifier "^2.3.0"
"nopt@2 || 3", nopt@~3.0.1:
"nopt@2 || 3":
version "3.0.6"
resolved "http://npm.yohops.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
dependencies:
... ... @@ -7908,6 +7883,10 @@ preserve@^0.2.0:
version "0.2.0"
resolved "http://npm.yohops.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
prettier@^1.7.0:
version "1.14.3"
resolved "http://registry.npm.taobao.org/prettier/download/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895"
pretty-hrtime@^1.0.0:
version "1.0.3"
resolved "http://npm.yohops.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
... ... @@ -7980,7 +7959,7 @@ ps-tree@^1.1.0:
dependencies:
event-stream "~3.3.0"
pseudomap@^1.0.1, pseudomap@^1.0.2:
pseudomap@^1.0.2:
version "1.0.2"
resolved "http://npm.yohops.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
... ... @@ -8718,12 +8697,18 @@ resolve-url@^0.2.1:
version "0.2.1"
resolved "http://npm.yohops.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.3:
resolve@^1.1.6, resolve@^1.1.7:
version "1.5.0"
resolved "http://npm.yohops.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
dependencies:
path-parse "^1.0.5"
resolve@^1.4.0:
version "1.8.1"
resolved "http://registry.npm.taobao.org/resolve/download/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
dependencies:
path-parse "^1.0.5"
restore-cursor@^1.0.1:
version "1.0.1"
resolved "http://npm.yohops.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
... ... @@ -9045,7 +9030,7 @@ shimmer@^1.1.0:
version "1.2.0"
resolved "http://registry.npm.taobao.org/shimmer/download/shimmer-1.2.0.tgz#f966f7555789763e74d8841193685a5e78736665"
sigmund@^1.0.1, sigmund@~1.0.0:
sigmund@~1.0.0:
version "1.0.1"
resolved "http://npm.yohops.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
... ... @@ -10497,31 +10482,31 @@ voc@~1.0.0:
version "1.0.0"
resolved "http://npm.yohops.com/voc/-/voc-1.0.0.tgz#5465c0ce11d0881f7d8e36d8ca587043f33a25ae"
vue-hot-reload-api@^2.1.0:
version "2.2.4"
resolved "http://npm.yohops.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz#683bd1d026c0d3b3c937d5875679e9a87ec6cd8f"
vue-hot-reload-api@^2.2.0:
version "2.3.1"
resolved "http://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2"
vue-loader@^12.2.1:
version "12.2.2"
resolved "http://npm.yohops.com/vue-loader/-/vue-loader-12.2.2.tgz#2b3a764f27018f975bc78cb8b1f55137548ee2d7"
vue-loader@^13.7.0:
version "13.7.3"
resolved "http://registry.npm.taobao.org/vue-loader/download/vue-loader-13.7.3.tgz#e07440f78230a639d00ada4da7b96d0e9d62037f"
dependencies:
consolidate "^0.14.0"
hash-sum "^1.0.2"
js-beautify "^1.6.3"
loader-utils "^1.1.0"
lru-cache "^4.0.1"
postcss "^5.0.21"
lru-cache "^4.1.1"
postcss "^6.0.8"
postcss-load-config "^1.1.0"
postcss-selector-parser "^2.0.0"
resolve "^1.3.3"
source-map "^0.5.6"
vue-hot-reload-api "^2.1.0"
prettier "^1.7.0"
resolve "^1.4.0"
source-map "^0.6.1"
vue-hot-reload-api "^2.2.0"
vue-style-loader "^3.0.0"
vue-template-es2015-compiler "^1.2.2"
vue-template-es2015-compiler "^1.6.0"
vue-style-loader@^3.0.0:
version "3.1.2"
resolved "http://npm.yohops.com/vue-style-loader/-/vue-style-loader-3.1.2.tgz#6b66ad34998fc9520c2f1e4d5fa4091641c1597a"
resolved "http://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-3.1.2.tgz#6b66ad34998fc9520c2f1e4d5fa4091641c1597a"
dependencies:
hash-sum "^1.0.2"
loader-utils "^1.0.2"
... ... @@ -10533,9 +10518,9 @@ vue-template-compiler@^2.3.3:
de-indent "^1.0.2"
he "^1.1.0"
vue-template-es2015-compiler@^1.2.2:
vue-template-es2015-compiler@^1.6.0:
version "1.6.0"
resolved "http://npm.yohops.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
resolved "http://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
vue@^2.3.3:
version "2.5.13"
... ...