Commit 3caccf25 by chenxin

update:一些修改

parent 19f3c48f
'use strict'
'use strict';
// Template version: 1.3.1
// see http://vuejs-templates.github.io/webpack for documentation.
const path = require('path')
const path = require('path');
module.exports = {
dev: {
// Paths
assetsSubDirectory: 'static',
assetsPublicPath: '/',
......@@ -44,9 +43,6 @@ module.exports = {
// https://webpack.js.org/configuration/devtool/#development
// devtool: 'cheap-module-eval-source-map',
devtool: 'eval-source-map',
// If you have problems debugging vue-files in devtools,
// set this to false - it *may* help
// https://vue-loader.vuejs.org/en/options.html#cachebusting
......@@ -85,4 +81,4 @@ module.exports = {
// Set to `true` or `false` to always turn it on or off
bundleAnalyzerReport: process.env.npm_config_report
}
}
};
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/main.22b50c33249d8975f3e29fa7f34e6ea8.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.07.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.bd99622c6e1180650eeb.js></script><script type=text/javascript src=/marketing/static/js/main.99fe9fad14d35beb5c4f.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/main.8ce26202a5818d2582855010d34beb8a.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.09.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.41e915fffb6fa2b1b49e.js></script><script type=text/javascript src=/marketing/static/js/main.799a9ffc0d992190e2b3.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
<template>
<div id="app">
<dm-udesk></dm-udesk>
<keep-alive :include="include">
<router-view></router-view>
</keep-alive>
......
......@@ -116,12 +116,15 @@ a:hover {
.ml100{
margin-left: 100px!important;
}
.mt20{
margin-top: 20px!important;
.mt5{
margin-top: 5px!important;
}
.mt10{
margin-top: 10px!important;
}
.mt20{
margin-top: 20px!important;
}
.ml5{
margin-left: 5px!important;
}
......@@ -438,6 +441,8 @@ img::after {
font-weight: bold;
}
.flex{
display: -webkit-box;
display: -ms-flexbox;
display: flex;
}
.border-radius__default{
......
......@@ -5,10 +5,10 @@ import store from './store';
import { axios } from './service/api/index';
import directives from './directives';
Vue.config.productionTip = false;
// Vue.config.devtools = true;
Vue.prototype.axios = axios;
Vue.prototype.axios.withCredentials = true;
Object.keys(directives).map(item => Vue.directive(item, directives[item]));
window.$bus = new Vue();
let flag = false;
Vue.prototype.$tips = function({ message = '提示', type = 'success' }) {
......
......@@ -9,13 +9,19 @@
<el-date-picker :picker-options="pickerOptions" class="w400" :default-time="['00:00:00', '23:59:59']" v-model="form.dateTime" :disabled="isInfo" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item label="皮肤设置">
<el-radio v-model="form.skinType" :label="0" :disabled="isInfo">自定义</el-radio>
<el-radio v-model="form.skinType" :label="1" :disabled="isInfo">黑金</el-radio>
<el-radio v-model="form.skinType" :label="2" :disabled="isInfo">红色</el-radio>
<el-radio v-model="form.skinType" :label="3" :disabled="isInfo">霓虹灯</el-radio>
<el-radio v-model="form.skinType" :label="0" :disabled="isInfo">自定义</el-radio>
<span class="regular-font-color pl20">
<b class="blue cursor-pointer">模板皮肤下载</b>
<el-popover placement="top-start" width="200" trigger="hover" title="banner图片定制化:" content="下载后修改为需要使用的样式,重新上传banner图的图片">
<i class="el-icon-question fz16 blue el-popover__reference" slot="reference"></i>
</el-popover>
</span>
</el-form-item>
<el-form-item label="banner图片" prop="gameImage">
<dm-upload-avatar v-if="form.skinType === 0" :model.sync="form.gameImage" :disabled="isInfo" width="220" height="103" label="上传图片" tips="图片建议尺寸:750*350"></dm-upload-avatar>
<dm-upload-avatar v-if="form.skinType === 0" :model.sync="form.gameImage" :disabled="isInfo" width="220" height="103" label="上传图片" :limit="{limit: true, width: 750, height: 350}" tips="图片建议尺寸:750*350"></dm-upload-avatar>
<img class="skin-box" v-if="form.skinType === 1" src="../../../assets/img/1.1.jpg" alt="" srcset="" />
<img class="skin-box" v-if="form.skinType === 2" src="../../../assets/img/1.2.jpg" alt="" srcset="" />
<img class="skin-box" v-if="form.skinType === 3" src="../../../assets/img/1.3.jpg" alt="" srcset="" />
......@@ -137,7 +143,7 @@ export default {
gameFreeCount: '',
gameFreeDay: '',
ruleList: [{ ruleId: '', prizeId: '', gameId: null, ruleSort: 0, ruleStatus: 0, prizeSort: null }],
skinType: 0
skinType: 1
},
endRuleObj: { ruleId: '', prizeId: '', gameId: null, ruleSort: 0, ruleStatus: 0, prizeSort: null },
prizeReferTypeOptions: [{ value: 1, label: '积分' }, { value: 2, label: '卡券' }, { value: 3, label: '谢谢参与' }],
......
......@@ -9,10 +9,16 @@
<el-date-picker class="w400" v-model="form.dateTime" :disabled="isInfo" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
</el-form-item>
<el-form-item label="皮肤设置">
<el-radio v-model="form.skinType" :label="0" :disabled="isInfo">自定义</el-radio>
<el-radio v-model="form.skinType" :label="1" :disabled="isInfo">黑金</el-radio>
<el-radio v-model="form.skinType" :label="2" :disabled="isInfo">红色</el-radio>
<el-radio v-model="form.skinType" :label="3" :disabled="isInfo">霓虹灯</el-radio>
<el-radio v-model="form.skinType" :label="0" :disabled="isInfo">自定义</el-radio>
<span class="regular-font-color pl20">
<b class="blue cursor-pointer">模板皮肤下载</b>
<el-popover placement="top-start" width="200" trigger="hover" title="banner图片定制化:" content="下载后修改为需要使用的样式,重新上传banner图的图片">
<i class="el-icon-question fz16 blue el-popover__reference" slot="reference"></i>
</el-popover>
</span>
</el-form-item>
<el-form-item label="banner图片" class="width50" prop="gameImage">
<dm-upload-avatar v-if="form.skinType === 0" :model.sync="form.gameImage" :disabled="isInfo" width="220" height="103" label="上传图片" tips="图片建议尺寸:750*350"></dm-upload-avatar>
......@@ -126,7 +132,7 @@ export default {
gameLimitDay: '',
gameFreeCount: '',
gameFreeDay: '',
skinType: 0
skinType: 1
},
prizeReferTypeOptions: [{ value: 1, label: '积分' }, { value: 2, label: '卡券' }, { value: 3, label: '谢谢参与' }],
dataTest: {
......
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