Skip to content

Y
Ygopro Arena Web
Commit 583c37b3 authored by Joe's avatar Joe
Browse files
Options

update

parent 8e63e6d4
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 15 deletions
build/webpack.dev.conf.js
View file @ 583c37b3
...@@ -5,6 +5,7 @@ var merge = require('webpack-merge') ...@@ -5,6 +5,7 @@ var merge = require('webpack-merge')
var baseWebpackConfig = require('./webpack.base.conf') var baseWebpackConfig = require('./webpack.base.conf')
var HtmlWebpackPlugin = require('html-webpack-plugin') var HtmlWebpackPlugin = require('html-webpack-plugin')
var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') var FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
var path = require('path')
// add hot-reload related code to entry chunks // add hot-reload related code to entry chunks
Object.keys(baseWebpackConfig.entry).forEach(function (name) { Object.keys(baseWebpackConfig.entry).forEach(function (name) {
...@@ -28,7 +29,8 @@ module.exports = merge(baseWebpackConfig, { ...@@ -28,7 +29,8 @@ module.exports = merge(baseWebpackConfig, {
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
filename: 'index.html', filename: 'index.html',
template: 'index.html', template: 'index.html',
inject: true inject: true,
favicon: path.resolve('favicon.ico')
}), }),
new FriendlyErrorsPlugin() new FriendlyErrorsPlugin()
] ]
......
build/webpack.prod.conf.js
View file @ 583c37b3
...@@ -53,6 +53,7 @@ var webpackConfig = merge(baseWebpackConfig, { ...@@ -53,6 +53,7 @@ var webpackConfig = merge(baseWebpackConfig, {
filename: config.build.index, filename: config.build.index,
template: 'index.html', template: 'index.html',
inject: true, inject: true,
favicon: path.resolve('favicon.ico'),
minify: { minify: {
removeComments: true, removeComments: true,
collapseWhitespace: true, collapseWhitespace: true,
......
favicon.ico 0 → 100644
View file @ 583c37b3
favicon.ico

24.4 KB

index.html
View file @ 583c37b3
...@@ -4,11 +4,13 @@ ...@@ -4,11 +4,13 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>ygopro</title> <title>MCPro决斗数据库</title>
<link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="assets/css/styles.css"> <link rel="stylesheet" href="assets/css/styles.css">
<link rel="stylesheet" href="assets/css/font-awesome.min.css"> <link rel="stylesheet" href="assets/css/font-awesome.min.css">
<!--<link rel="stylesheet" href="assets/layui/css/layui.css">--> <!--<link rel="stylesheet" href="assets/layui/css/layui.css">-->
<!--<link rel="shortcut icon" href="assets/img/mycardlogo.ico">-->
<link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
</head> </head>
<body> <body>
......
release 0 → 100755
View file @ 583c37b3
source activate py2
cd /Users/joe/Workspace/ygo/OSS_Python_API_20160419
python osscmd uploadfromdir /Users/joe/Workspace/ygo/projects/ygopro-arena-web-new/dist oss://mycard/ygopro --id ztDf0fCxr0eCgSIi --key 11LyGMp38uiHXuM2ok808w2jZVaTda
src/api.js
View file @ 583c37b3
...@@ -143,4 +143,13 @@ export default class Api { ...@@ -143,4 +143,13 @@ export default class Api {
return Vue.http.post(url, opt, { 'emulateJSON': true }); return Vue.http.post(url, opt, { 'emulateJSON': true });
} }
static saveLabel(opt) {
const url = `${URL}/label`
return Vue.http.post(url, opt, { 'emulateJSON': true });
}
static getLabel(opt) {
return Vue.http.get(`${URL}/label`, { 'params': {} });
}
} }
src/components/Ads.vue
View file @ 583c37b3
...@@ -15,6 +15,11 @@ ...@@ -15,6 +15,11 @@
<el-button type="link" @click="firstWin">点我设置</el-button> <el-button type="link" @click="firstWin">点我设置</el-button>
</el-form-item> </el-form-item>
<el-form-item label="竞技匹配活动文字">
<el-input v-model="labelone" placeholder="请输入活动标语，然后保存"></el-input>
<el-button type="link" @click="saveLable">保存</el-button>
</el-form-item>
</el-form> </el-form>
<h4 class="color-blue"><i class="glyphicon glyphicon-filter"></i> 广告素材列表</h4> <h4 class="color-blue"><i class="glyphicon glyphicon-filter"></i> 广告素材列表</h4>
...@@ -319,6 +324,7 @@ ...@@ -319,6 +324,7 @@
}, },
formLabelWidth: '120px', formLabelWidth: '120px',
isClick: false, isClick: false,
labelone: ""
} }
}, },
...@@ -330,6 +336,24 @@ ...@@ -330,6 +336,24 @@
}, },
methods: { methods: {
saveLable: function () {
var param = {
labelone: this.labelone
}
API.saveLabel(param).then((res) => {
this.$notify({
title: '操作成功',
message: '',
type: 'success'
})
}, (res) => {
this.$notify({
title: '操作失败',
message: '',
type: 'success'
})
});
},
firstWin: function () { firstWin: function () {
API.getFirstWin({}).then((res) => { API.getFirstWin({}).then((res) => {
this.firstWinForm.name = res.data.name this.firstWinForm.name = res.data.name
......
src/components/Cards.vue
View file @ 583c37b3
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
<select name="server" class="form-control" id="server" v-on:change="onChange"> <select name="server" class="form-control" id="server" v-on:change="onChange">
<option value="mycard">MCPro</option> <option value="mycard">MCPro</option>
<option value="233">233</option> <option value="233">233</option>
<option value="koishi">Koishi</option>
<option value="koishi_tcg">Koishi_tcg</option>
</select> </select>
</div> </div>
</div> </div>
...@@ -361,7 +363,8 @@ ...@@ -361,7 +363,8 @@
{ {
"render": function (data, type, row) { "render": function (data, type, row) {
// return "<span title='" + data + "'>" + data + "</span>"; // return "<span title='" + data + "'>" + data + "</span>";
return "<a href='?id=" + row[6] + "#/cardinfo'>" + data + "</a>"; // return "<a href='?id=" + row[6] + "#/cardinfo'>" + data + "</a>";
return "<a href='https://www.ourocg.cn/search/" + row[6] + "'>" + data + "</a>";
}, },
"targets": 1 "targets": 1
}, },
......
src/components/Download.vue
View file @ 583c37b3
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
self.downloadUrls['windows'] = "https://mycard.moe" self.downloadUrls['windows'] = "https://mycard.moe"
self.downloadUrls['mac'] = "https://mycard.moe" self.downloadUrls['mac'] = "https://mycard.moe"
// self.downloadUrls['android'] = "https://pan.baidu.com/s/1eRWiWRC" // self.downloadUrls['android'] = "https://pan.baidu.com/s/1eRWiWRC"
self.downloadUrls['android'] = "http://zhushou.360.cn/detail/index/soft_id/2972822" self.downloadUrls['android'] = "http://www.pgyer.com/page/ygomobile"
// API.getDownloadUrls().then((res) => { // API.getDownloadUrls().then((res) => {
// let assets = res.data.assets // let assets = res.data.assets
// for (let i of assets) { // for (let i of assets) {
......
src/components/Footads.vue
View file @ 583c37b3
<template> <template>
<div class="other"> <div>
<footer @click="adClick"> <div v-if="adObj.src" class="ads" @click="adClick" v-bind:style="{ backgroundImage: 'url(' + adObj.src + ')' }">
<div class="row" v-bind:style="{ backgroundImage: 'url(' + adObj.src + ')' }"> <div>
<div class="col-md-4 col-sm-6 footer-navigation">
<h3><a href="#">{{ adObj.name }} </a></h3> <h3><a href="#">{{ adObj.name }} </a></h3>
<p class="links"><a href="#"> {{ adObj.desctext }} </a></p> <p class="links"><a href="#"> {{ adObj.desctext }} </a></p>
<!--<p class="company-name">mycard © 2016 </p>--> <!--<p class="company-name">mycard © 2016 </p>-->
</div> </div>
</div> </div>
</footer>
</div> </div>
</template> </template>
...@@ -89,3 +87,25 @@ ...@@ -89,3 +87,25 @@
} }
</script> </script>
<style scoped>
.ads {
text-align: center;
padding: 25%;
/*padding-left: 200px;
padding-right: 200px;
padding-top: 20%;
padding-bottom: 20%;*/
background-repeat: no-repeat;
/*background-size: cover;*/
background-size: contain;
margin-left: auto;
margin-right: auto;
background-position: center;
}
</style>
\ No newline at end of file
src/components/Ranking.vue
View file @ 583c37b3
<template> <template>
<div class=content> <div class=content>
<div class="container"> <div class="container">
<div class="fck">
<form id="search-form" class="search-form" @submit.prevent="onSubmit">
<div class="form-group" v-bind:class="{ 'has-error': hasError}">
<label class="control-label" for="searchText" v-if="hasError">{{lang.battle.notfound}}</label>
<div class="input-group">
<div class="input-group-addon"><span><i class="glyphicon glyphicon-search"></i></span></div>
<input class="form-control" type="text" id="searchText" v-model="searchText" :placeholder="lang.battle.ph2">
<div class="input-group-btn">
<button class="btn btn-default" type="submit">{{lang.battle.search}}</button>
<button class="btn btn-default" style="display:none" type="submit" id="search">{{lang.battle.search}}</button>
</div>
</div>
</div>
</form>
</div>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#tab-1" role="tab" data-toggle="tab">{{lang.userRank.pointRank}} </a></li> <li class="active"><a href="#tab-1" role="tab" data-toggle="tab">{{lang.userRank.pointRank}} </a></li>
<li><a href="#tab-2" role="tab" data-toggle="tab">{{lang.userRank.expRank}} </a></li> <li><a href="#tab-2" role="tab" data-toggle="tab">{{lang.userRank.expRank}} </a></li>
...@@ -10,7 +27,8 @@ ...@@ -10,7 +27,8 @@
<div role="tabpanel" class="tab-pane active" id="tab-1"> <div role="tabpanel" class="tab-pane active" id="tab-1">
<br> <br>
<p>{{lang.userRank.tableHead2}}</p> <!--<p>{{lang.userRank.tableHead2}}</p>-->
<p>{{labelone}}</p>
<div class="table-responsive" style="width:100%;overflow-x:auto;overflow-y:hidden;"> <div class="table-responsive" style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table class="table table-striped table-bordered table-hover example" id="pt_table" :width="width"></table> <table class="table table-striped table-bordered table-hover example" id="pt_table" :width="width"></table>
</div> </div>
...@@ -63,10 +81,21 @@ ...@@ -63,10 +81,21 @@
var lang = localStorage.getItem('lang') || 'cn'; var lang = localStorage.getItem('lang') || 'cn';
this.init(lang) this.init(lang)
API.getLabel({}).then((res) => {
this.labelone = res.data.text;
}, (res) => {
})
}, },
data() { data() {
return { return {
width: "100%", width: "100%",
searchText: "",
hasError: false,
username: "",
labelone:"",
} }
}, },
...@@ -90,6 +119,10 @@ ...@@ -90,6 +119,10 @@
methods: { methods: {
init: function (lang) { init: function (lang) {
},
onSubmit: function () {
var url = `#/userinfo?username=${encodeURIComponent(this.searchText)}`
window.location.href = url
}, },
init2: function () { init2: function () {
...@@ -215,3 +248,15 @@ ...@@ -215,3 +248,15 @@
} }
</script> </script>
<style scoped>
.fck {
margin-bottom: 20px;
margin-top: -30px;
}
.scroll {
width: 250%;
}
</style>
\ No newline at end of file
src/components/Tabulate.vue
View file @ 583c37b3
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<div ref="print" id="print" style="margin-left: 20%;margin-right: 20%; "> <div ref="print" id="print" style="margin-left: 20%;margin-right: 20%; ">
<!--<p>【胜】VS【负】 </p>--> <!--<p>【胜】VS【负】 </p>-->
<p class="xx"> 比赛： {{form.name1}} VS {{form.name2}}</p> <p class="xx"> 战队： {{form.name1}} VS {{form.name2}}</p>
<p class="xx"> 时间： {{getDate()}}</p> <p class="xx"> 时间： {{getDate()}}</p>
<p class="xx"> 规则： {{form.rule}}</p> <p class="xx"> 规则： {{form.rule}}</p>
<p class="xx"> 地点： {{form.location}}</p> <p class="xx"> 地点： {{form.location}}</p>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
return this.maxlength - x.a.length + 3; return this.maxlength - x.a.length + 3;
}, },
copy() { copy() {
var copytext = "比赛: " + this.form.name1 + " VS " + this.form.name2 + "\r\n"; var copytext = "战队: " + this.form.name1 + " VS " + this.form.name2 + "\r\n";
copytext += "时间: " + this.getDate() + "\r\n"; copytext += "时间: " + this.getDate() + "\r\n";
copytext += "规则: " + this.form.rule + "\r\n"; copytext += "规则: " + this.form.rule + "\r\n";
copytext += "地点: " + this.form.location + "\r\n"; copytext += "地点: " + this.form.location + "\r\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment