Skip to content

M
marketing
Commit 7808ec3c by chenxin
Options

fix:修复bug

parent 9996c40f
Showing with 45 additions and 22 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.c3994d6bdd311aec94a3e8ca8ed86afd.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.35.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.10.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.16.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.00.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.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.fe4d85a484115914b2fb.js></script><script type=text/javascript src=/marketing/static/js/vendor.cbb380c2053ab598e892.js></script><script type=text/javascript src=/marketing/static/js/main.009190893fcb12e9c083.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.22ba72d4ea4c9def6d4aef30b22c3833.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.35.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.10.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.16.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.00.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.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.a0400aceee3426ab717f.js></script><script type=text/javascript src=/marketing/static/js/vendor.cbb380c2053ab598e892.js></script><script type=text/javascript src=/marketing/static/js/main.5175384b277b5fe3450d.js></script></body></html>
\ No newline at end of file
dist/static/js/game.bbec1e61dbd1bd80262f.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.e70701b2be8e90df339e.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/manifest.fe4d85a484115914b2fb.js → dist/static/js/manifest.a0400aceee3426ab717f.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,o,a){for(var i,u,f,d=0,s=[];d<t.length;d++)u=t[d],n[u]&&s.push(n[u][0]),n[u]=0;for(i in o)Object.prototype.hasOwnProperty.call(o,i)&&(e[i]=o[i]);for(r&&r(t,o,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)f=c(c.s=a[d]);return f};var t={},n={13:0};function c(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,c),n.l=!0,n.exports}c.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,c){r=n[e]=[t,c]});r[2]=t;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"evaluation",6:"ecm",7:"activity",8:"recharge",9:"msg",10:"calllog"}[e]||e)+"."+{0:"597ccd4266a3a6e9d0fb",1:"e70701b2be8e90df339e",2:"f7ed37cce062dc989937",3:"3e8593d41cf8ca4b96ec",4:"9e42654bdc43f38a3646",5:"dae31f13dcb87d6e487e",6:"dbcb4801b9cce22bc515",7:"d84777d528b9196017cc",8:"983ea8707decbcaf3c7f",9:"0d2b5d488c714e66ec93",10:"2e28c020a9f9c0e96471"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return a.onerror=a.onload=u,o.appendChild(a),t},c.m=e,c.c=t,c.d=function(e,r,t){c.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},c.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(r,"a",r),r},c.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},c.p="/marketing/",c.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,a){for(var i,f,u,d=0,s=[];d<t.length;d++)f=t[d],n[f]&&s.push(n[f][0]),n[f]=0;for(i in o)Object.prototype.hasOwnProperty.call(o,i)&&(e[i]=o[i]);for(r&&r(t,o,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)u=c(c.s=a[d]);return u};var t={},n={13:0};function c(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,c),n.l=!0,n.exports}c.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,c){r=n[e]=[t,c]});r[2]=t;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"evaluation",6:"ecm",7:"activity",8:"recharge",9:"msg",10:"calllog"}[e]||e)+"."+{0:"065def6f73956a4ea969",1:"bbec1e61dbd1bd80262f",2:"fbdf621f12b73d1a30c1",3:"3e8593d41cf8ca4b96ec",4:"9e42654bdc43f38a3646",5:"dae31f13dcb87d6e487e",6:"dbcb4801b9cce22bc515",7:"d84777d528b9196017cc",8:"983ea8707decbcaf3c7f",9:"0d2b5d488c714e66ec93",10:"2e28c020a9f9c0e96471"}[e]+".js";var i=setTimeout(f,12e4);function f(){a.onerror=a.onload=null,clearTimeout(i);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return a.onerror=a.onload=f,o.appendChild(a),t},c.m=e,c.c=t,c.d=function(e,r,t){c.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},c.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(r,"a",r),r},c.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/assets/style/base/reset.scss
......@@ -162,6 +162,9 @@ a:hover {
.mr5{
margin-right: 5px!important;
}
.mr8{
margin-right: 8px!important;
}
.mr10{
margin-right: 10px!important;
}
......@@ -493,8 +496,6 @@ img::after {
font-weight: bold;
}
.flex{
display: -webkit-box;
display: -ms-flexbox;
display: flex;
}
.border-radius__default{
......
src/components/aside-menu/index.vue
......@@ -72,7 +72,7 @@ export default {
handleSelect(key, keyPath) {
var that = this;
// console.log(key, keyPath);
console.log(key);
that.selectMenu = key;
},
......@@ -202,10 +202,12 @@ export default {
var that = this;
// console.log("新数据:",newData,oldData)
that.repProjectName = newData || 'gic-web';
},
$route(val) {
if (val.query.new) {
this.handleSelect(val.path);
}
}
// $route(val) {
// console.log(val);
// }
},
/* 接收数据 */
......
src/components/calculate/index.vue
......@@ -5,7 +5,7 @@
<div class="text-center pt10">
<el-input-number controls-position="right" :min="0" v-model="count" class="w200 block-center" @blur="checkCalc"></el-input-number>
<span class="fz14 pl20">结果：</span>
<span>{{ calculate ? parseInt(totalCount) + parseInt(count) : parseInt(totalCount) - parseInt(count) }}</span>
<span>{{ resNum }}</span>
</div>
<div class="text-center pt10"></div>
<span slot="footer" class="dialog-footer">
......@@ -54,6 +54,12 @@ export default {
calculate: true
};
},
computed: {
resNum() {
const num = this.calculate ? parseInt(this.totalCount) + parseInt(this.count) : parseInt(this.totalCount) - parseInt(this.count);
return isNaN(num) ? 0 : num;
}
},
methods: {
checkCalc() {
if (!this.calculate) {
......
src/views/card/group-send.vue
......@@ -606,13 +606,13 @@ export default {
type: 'warning'
})
.then(() => {
this.$router.push('/card/list');
this.$router.push('/card/record/send?new=1');
})
.catch(err => {
this.getCardPutonDetail();
});
} else {
this.$router.push('/card/list');
this.$router.push('/card/record/send?new=1');
}
} else {
this.$tips({ type: 'error', message: '操作失败' });
......@@ -670,7 +670,13 @@ export default {
}
},
handleDataLeft(selectedData, selectionToRemove) {
console.log(selectedData, selectionToRemove);
// 不可编辑
if (this.form.memberType === 2 && this.isAdd) {
this.form.memberGroupIds = selectedData
.map(v => v.memberTagGroupId)
.filter(v => v)
.join(',');
}
}
},
filters: {
......
src/views/game/dzp/form.vue
......@@ -282,7 +282,7 @@ export default {
totalCount() {
let result = 0;
this.tableList.forEach(v => {
if (v.prizeCount) {
if (v.prizeCount && v.prizeType !== 3) {
result += parseInt(v.prizeCount);
}
});
......
src/views/game/ggk/form.vue
......@@ -91,7 +91,7 @@
</template>
</el-table-column>
<el-table-column prop="date" :render-header="labelTips" align="left" width="100">
<template slot-scope="scope" v-if="scope.row.prizeType !== 3"> {{ (totalCount * scope.row.prizeCount || 0).toFixed(2) }}% </template>
<template slot-scope="scope" v-if="scope.row.prizeType !== 3">{{ (totalCount * scope.row.prizeCount || 0).toFixed(2) }}% </template>
</el-table-column>
<el-table-column prop="date" label="操作" align="left" width="130">
<template slot-scope="scope">
......@@ -247,10 +247,11 @@ export default {
totalCount() {
let result = 0;
this.tableList.forEach(v => {
if (v.prizeCount) {
if (v.prizeCount && v.prizeType !== 3) {
result += parseInt(v.prizeCount);
}
});
console.log(result);
return parseInt(this.form.gameWinningRate) / result;
},
asideShow() {
......@@ -262,7 +263,8 @@ export default {
updateGamePrize(index) {
const current = this.tableList[index];
let count = 0;
if (current.gamePrizeId) {
// console.log(current);
if (!current.prizeId) {
// 编辑的新增
if (current.prizeType == 3) {
// 给目标值
......
src/views/wechat/form.vue
......@@ -3,11 +3,11 @@
<section class="dm-form__wrap">
<activity-select class="mb20" :actId.sync="info.marketingActivityId" colon :readOnly="isEdit || isInfo"></activity-select>
<div class="mb20" v-if="!isAdd && info.sceneSettingName">
<span class="dm-input_label">营销场景：</span>
<span class="dm-input_label mr8">营销场景：</span>
{{ info.sceneSettingName }}
</div>
<div>
<span class="dm-input_label">发送时间：</span>
<span class="dm-input_label mr8">发送时间：</span>
<el-select class="w250" v-model="info.sendType" :disabled="isInfo">
<el-option v-for="(v, i) in sendTypeOptions" :key="i" :value="v.value" :label="v.label"></el-option>
</el-select>
......@@ -280,7 +280,7 @@ export default {
return;
}
if (this.info.contentType === 0 && !this.info.imageTextId) {
this.$tips({ type: 'warning', message: '新先选择一个图文' });
this.$tips({ type: 'warning', message: '请先选择一个图文' });
return;
} else if (this.info.contentType === 1 && !this.info.content) {
this.$tips({ type: 'warning', message: '请填写文本' });
......@@ -543,7 +543,13 @@ export default {
}
},
handleDataLeft(selectedData, selectionToRemove) {
console.log(selectedData, selectionToRemove);
// 不可编辑
if (this.info.memberType === 2 && this.isAdd) {
this.info.memberGroupIds = selectedData
.map(v => v.memberTagGroupId)
.filter(v => v)
.join(',');
}
}
}
};
......
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