Skip to content

M
marketing
Commit 043f0dfe by chenxin
Options

Merge branch 'dev' into 'master' 

fix: 一些优化

See merge request !89
parents a210e132 61edbb07
Showing with 33 additions and 14 deletions
dist/index.html
<!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/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.5ed283bf21f824d7cdfd3b36586748c7.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/components/element.2.12.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.36.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.12.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.2.22.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.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.42.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=/marketing/static/js/manifest.8e3423b8acf5c184190e.js></script><script type=text/javascript src=/marketing/static/js/vendor.b30a466c3b2d11195801.js></script><script type=text/javascript src=/marketing/static/js/main.983d8c93498b0211a83c.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/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.86d44ea3d7fb4c547d6201baa06880d7.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/components/element.2.12.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.36.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.12.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.2.22.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.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.42.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=/marketing/static/js/manifest.aafa0cb27913c3101b73.js></script><script type=text/javascript src=/marketing/static/js/vendor.b30a466c3b2d11195801.js></script><script type=text/javascript src=/marketing/static/js/main.983d8c93498b0211a83c.js></script></body></html>
\ No newline at end of file
dist/static/js/game.3cb4b68110d7a5f82305.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.c88d43396b286b0180c7.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.8e3423b8acf5c184190e.js → dist/static/js/manifest.aafa0cb27913c3101b73.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,o,c){for(var f,i,u,d=0,s=[];d<t.length;d++)i=t[d],n[i]&&s.push(n[i][0]),n[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(r&&r(t,o,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=a(a.s=c[d]);return u};var t={},n={14:0};function a(r){if(t[r])return t[r].exports;var n=t[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,a),n.l=!0,n.exports}a.e=function(e){var r=n[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var t=new Promise(function(t,a){r=n[e]=[t,a]});r[2]=t;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"ecm",6:"evaluation",7:"activity",8:"cdKey",9:"recharge",10:"msg",11:"calllog"}[e]||e)+"."+{0:"dd3ac859900ae743db61",1:"3cb4b68110d7a5f82305",2:"2d264b414d0a06c05e42",3:"09ad5a1095e8730e681b",4:"391130c8f773cb8775d6",5:"491243074338b011232f",6:"6178547f1a240cc6cd6a",7:"ee32d4c23554dfbff609",8:"b887a9e6b988aa2fd816",9:"d0c7fdeaae259a8befad",10:"98da8a6dab5340ff1ff4",11:"07f9326e2a68fd201646"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),t},a.m=e,a.c=t,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,o,c){for(var f,d,i,u=0,s=[];u<t.length;u++)d=t[u],n[d]&&s.push(n[d][0]),n[d]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(r&&r(t,o,c);s.length;)s.shift()();if(c)for(u=0;u<c.length;u++)i=a(a.s=c[u]);return i};var t={},n={14:0};function a(r){if(t[r])return t[r].exports;var n=t[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,a),n.l=!0,n.exports}a.e=function(e){var r=n[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var t=new Promise(function(t,a){r=n[e]=[t,a]});r[2]=t;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"ecm",6:"evaluation",7:"activity",8:"cdKey",9:"recharge",10:"msg",11:"calllog"}[e]||e)+"."+{0:"dd3ac859900ae743db61",1:"c88d43396b286b0180c7",2:"2d264b414d0a06c05e42",3:"09ad5a1095e8730e681b",4:"391130c8f773cb8775d6",5:"5d9299dd2b0dab71fe38",6:"6178547f1a240cc6cd6a",7:"ee32d4c23554dfbff609",8:"1b65b2f302fcdc52029a",9:"d0c7fdeaae259a8befad",10:"98da8a6dab5340ff1ff4",11:"07f9326e2a68fd201646"}[e]+".js";var f=setTimeout(d,12e4);function d(){c.onerror=c.onload=null,clearTimeout(f);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return c.onerror=c.onload=d,o.appendChild(c),t},a.m=e,a.c=t,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/views/cdkey/form.vue
......@@ -55,7 +55,10 @@
<span>{{ ruleForm.cdkeyContentDescribe }}</span>
</el-tooltip>
<el-button v-if="canEdit" type="text" @click="cleanCard" class="ml10">删除</el-button>
<span v-if="!isAdd && relatedInfo.stock <= 0" class="ml10 fz12" style="color:#f56c6c"><i class="el-icon-warning fz12 mr5"></i>库存不足</span>
<template v-if="!isAdd">
<span v-if="relatedInfo.status == 0" class="ml10 fz12" style="color:#f56c6c"><i class="el-icon-warning fz12 mr5"></i>已删除</span>
<span v-else-if="relatedInfo.stock <= 0" class="ml10 fz12" style="color:#f56c6c"><i class="el-icon-warning fz12 mr5"></i>库存不足</span>
</template>
</div>
</el-form-item>
<el-form-item>
......@@ -180,7 +183,8 @@ export default {
dateTime: [],
// 兑换内容的详情，一般是库存什么的，详情和编辑需要提示库存不足的情况
relatedInfo: {
stock: 0
stock: 100,
status: 1
},
// 导出
projectName: 'marketing', // 当前项目名
......@@ -372,7 +376,7 @@ export default {
},
created() {
const name = this.isAdd ? '新建兑换码' : this.isEdit ? '编辑兑换码' : '兑换码详情';
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '兑换码', path: '' }, { name, path: '' }]); // eslint-disable-line
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '兑换码', path: '/cdKey/list' }, { name, path: '' }]); // eslint-disable-line
}
};
</script>
......
src/views/ecm/form.vue
......@@ -52,7 +52,7 @@
<el-form-item label="营销场景" v-if="!isAdd && form.sceneSettingName">
<el-input class="w400" disabled v-model="form.sceneSettingName"></el-input>
</el-form-item>
<el-form-item label="营销活动" v-if="!isAdd && form.sceneSettingName">
<el-form-item label="营销活动">
<activity-select :actId.sync="form.marketingActivityId" :readOnly="!isAdd"></activity-select>
</el-form-item>
</section>
......
src/views/game/dzp/record.vue
......@@ -8,7 +8,7 @@
<el-input v-model="listParams.searchParam" class="w200" placeholder="会员昵称/手机号/卡号" clearable @change="loadLotteryRecordList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox border class="pl10" v-model="listParams.freeFlag" :true-label="1" :false-label="0" @change="loadLotteryRecordList">免费抽奖</el-checkbox>
<el-button :disabled="disabledDownload" icon="iconfont icon-icon_yunxiazai fz14 mr5" type="primary" class="fr" @click="exportLotteryExcel">
<el-tooltip :open-delay="300" content="当前数据量过大无法一次性导出，请调整筛选条件" effect="dark" v-if="disabledDownload">
<el-tooltip :open-delay="300" :content="tips" effect="dark" v-if="disabledDownload">
<span>下载Excel</span>
</el-tooltip>
<span v-else>下载Excel</span>
......@@ -160,6 +160,9 @@ export default {
computed: {
disabledDownload() {
return this.total > maxCanExportcount;
},
tips() {
return this.total > maxCanExportcount ? `当前数据量过大无法一次性导出（最大值${maxCanExportcount / 10000}万条），请调整筛选条件。` : '';
}
}
};
......
src/views/game/ggk/record.vue
......@@ -8,7 +8,7 @@
<el-input v-model="listParams.searchParam" class="w200" placeholder="会员昵称/手机号/卡号" clearable @change="loadLotteryRecordList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-checkbox border class="pl10" v-model="listParams.freeFlag" :true-label="1" :false-label="0" @change="loadLotteryRecordList">免费抽奖</el-checkbox>
<el-button :disabled="disabledDownload" icon="iconfont icon-icon_yunxiazai fz14 mr5" type="primary" class="fr" @click="exportLotteryExcel">
<el-tooltip :open-delay="300" content="当前数据量过大无法一次性导出，请调整筛选条件" effect="dark" v-if="disabledDownload">
<el-tooltip :open-delay="300" :content="tips" effect="dark" v-if="disabledDownload">
<span>下载Excel</span>
</el-tooltip>
<span v-else>下载Excel</span>
......@@ -160,6 +160,9 @@ export default {
disabledDownload() {
return this.total > maxCanExportcount;
}
},
tips() {
return this.total > maxCanExportcount ? `当前数据量过大无法一次性导出（最大值${maxCanExportcount / 10000}万条），请调整筛选条件。` : '';
}
};
</script>
src/views/game/klfl/record.vue
......@@ -10,7 +10,7 @@
<el-date-picker :clearable="false" @change="klflReportList" v-model="date" class="w250" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-input v-model="listParams.searchParam" class="w200" placeholder="会员昵称/手机号/卡号" clearable @change="klflReportList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button :disabled="disabledDownload" icon="iconfont icon-icon_yunxiazai fz14 mr5" type="primary" class="fr" @click="klflRecordExcel">
<el-tooltip :open-delay="300" content="当前数据量过大无法一次性导出，请调整筛选条件" effect="dark" v-if="disabledDownload">
<el-tooltip :open-delay="300" :content="tips" effect="dark" v-if="disabledDownload">
<span>下载Excel</span>
</el-tooltip>
<span v-else>下载Excel</span>
......@@ -156,6 +156,9 @@ export default {
computed: {
disabledDownload() {
return this.total > maxCanExportcount;
},
tips() {
return this.total > maxCanExportcount ? `当前数据量过大无法一次性导出（最大值${maxCanExportcount / 10000}万条），请调整筛选条件。` : '';
}
}
};
......
src/views/game/ptyx/record.vue
......@@ -12,7 +12,7 @@
<!-- eslint-disable-next-line -->
<el-input v-model="listParams.searchParam" class="w200" placeholder="会员昵称/手机号/卡号" clearable @change="listParams.currentPage = 1;LoadPtyxRecordList()"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button :disabled="disabledDownload" icon="iconfont icon-icon_yunxiazai fz14 mr5" type="primary" class="fr" @click="exportPtyxExcel">
<el-tooltip :open-delay="300" content="当前数据量过大无法一次性导出，请调整筛选条件" effect="dark" v-if="disabledDownload">
<el-tooltip :open-delay="300" :content="tips" effect="dark" v-if="disabledDownload">
<span>下载Excel</span>
</el-tooltip>
<span v-else>下载Excel</span>
......@@ -182,6 +182,9 @@ export default {
computed: {
disabledDownload() {
return this.total > maxCanExportcount;
},
tips() {
return this.total > maxCanExportcount ? `当前数据量过大无法一次性导出（最大值${maxCanExportcount / 10000}万条），请调整筛选条件。` : '';
}
}
};
......
src/views/game/znm/record.vue
......@@ -6,7 +6,7 @@
<div class="pb22 clearfix">
<el-input v-model="listParams.searchParam" class="w200" placeholder="会员昵称/手机号/卡号" clearable @change="znmReportList"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button :disabled="disabledDownload" icon="iconfont icon-icon_yunxiazai fz14 mr5" type="primary" class="fr" @click="znmRankExcel">
<el-tooltip :open-delay="300" content="当前数据量过大无法一次性导出，请调整筛选条件" effect="dark" v-if="disabledDownload">
<el-tooltip :open-delay="300" :content="tips" effect="dark" v-if="disabledDownload">
<span>下载Excel</span>
</el-tooltip>
<span v-else>下载Excel</span>
......@@ -37,7 +37,7 @@
</el-select>
<el-input v-model="listParams1.searchParam" class="w200" placeholder="会员昵称/卡号" clearable @change="znmReportList1"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-button :disabled="disabledDownload1" icon="iconfont icon-icon_yunxiazai fz14 mr5" type="primary" class="fr" @click="znmRecordExcel">
<el-tooltip :open-delay="300" content="当前数据量过大无法一次性导出，请调整筛选条件" effect="dark" v-if="disabledDownload1">
<el-tooltip :open-delay="300" :content="tips" effect="dark" v-if="disabledDownload1">
<span>下载Excel</span>
</el-tooltip>
<span v-else>下载Excel</span>
......@@ -226,6 +226,9 @@ export default {
},
disabledDownload1() {
return this.total1 > maxCanExportcount;
},
tips() {
return this.total > maxCanExportcount ? `当前数据量过大无法一次性导出（最大值${maxCanExportcount / 10000}万条），请调整筛选条件。` : '';
}
}
};
......
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