Skip to content

M
marketing
Commit 90a4340c by chenxin
Options

fix:klfl bug

parents 10b17eea 3497e352
Showing with 41 additions and 20 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/css/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.0729efd0d183481ab741c4fd513ffcc8.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.31.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.02.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.13.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.37.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.12.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.1.91.js></script><script type=text/javascript src=/marketing/static/js/manifest.928e772c661c1239ad76.js></script><script type=text/javascript src=/marketing/static/js/vendor.f6e5442e18ed1c7d4a4d.js></script><script type=text/javascript src=/marketing/static/js/main.535c61982b38fce8797c.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 rel=stylesheet href=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.c8993af672a874b9157111e76d41d18f.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.31.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.02.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.13.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.37.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.12.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.1.91.js></script><script type=text/javascript src=/marketing/static/js/manifest.3842961089075a90b65f.js></script><script type=text/javascript src=/marketing/static/js/vendor.f6e5442e18ed1c7d4a4d.js></script><script type=text/javascript src=/marketing/static/js/main.535c61982b38fce8797c.js></script></body></html>
\ No newline at end of file
dist/static/js/game.083a5b72add6de59024f.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.27d6348877fad22dc7db.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.928e772c661c1239ad76.js → dist/static/js/manifest.3842961089075a90b65f.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,a,c){for(var i,u,f,d=0,s=[];d<n.length;d++)u=n[d],t[u]&&s.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(n,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)f=o(o.s=c[d]);return f};var n={},t={12:0};function o(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,o){r=t[e]=[n,o]});r[2]=n;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+({0:"game",1:"card",2:"wechat",3:"ewash",4:"evaluation",5:"message",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"27d6348877fad22dc7db",1:"31602c32289ae2816c8e",2:"069e52fb11803263b16a",3:"412babd99d8107d89a48",4:"82b6062b9f7c9e15698f",5:"040c5edae738dc44ee28",6:"6566c902c100b2a16e48",7:"6dfebb35a2cb22f7489d",8:"9d07cccbb79a189af24d",9:"925a34b416ed002007fe"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),n},o.m=e,o.c=n,o.d=function(e,r,n){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},o.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(r,"a",r),r},o.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},o.p="/marketing/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,a,c){for(var i,u,f,d=0,s=[];d<n.length;d++)u=n[d],t[u]&&s.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(n,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)f=o(o.s=c[d]);return f};var n={},t={12:0};function o(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,o){r=t[e]=[n,o]});r[2]=n;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+({0:"game",1:"card",2:"wechat",3:"ewash",4:"evaluation",5:"message",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"083a5b72add6de59024f",1:"31602c32289ae2816c8e",2:"069e52fb11803263b16a",3:"412babd99d8107d89a48",4:"82b6062b9f7c9e15698f",5:"040c5edae738dc44ee28",6:"6566c902c100b2a16e48",7:"6dfebb35a2cb22f7489d",8:"9d07cccbb79a189af24d",9:"925a34b416ed002007fe"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),n},o.m=e,o.c=n,o.d=function(e,r,n){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},o.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(r,"a",r),r},o.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},o.p="/marketing/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/calculate/index.vue
......@@ -42,6 +42,10 @@ export default {
useStrategy: {
type: Number,
default: 1
},
gameId: {
type: [String, Number],
default: ''
}
},
data() {
......@@ -78,7 +82,8 @@ export default {
prizeReferType: this.prizeReferType, // 是 int 奖品类型: 积分: 1; 卡券: 2; 礼品: 3
useStrategy: this.useStrategy, //是 int 首奖特殊策略: 1; 奖项设置: 0
prizeReferId: this.prizeReferType === 1 ? null : this.prizeReferId, //是 string 卡券, 礼品都存在, 积分传null
prizeId: this.prizeId
prizeId: this.prizeId,
gameId: this.gameId
};
updatePrizeStock(params).then(res => {
this.$emit('countRefresh', { calc: this.calculate, num: this.count });
......
src/views/game/klfl/form.vue
......@@ -177,8 +177,8 @@
<el-button @click="$router.go(-1)">返 回</el-button>
</div>
<vue-gic-card :showCardDialog="showCardDialog" @selectCard="selectCard" :cardLimit="3" :cardType="null"></vue-gic-card>
<calculate :show.sync="calculateShow" :totalCount="currentObj.prizeCount" :prizeId="currentObj.prizeId" :prizeReferType="currentObj.prizeReferType" :prizeReferId="currentObj.prizeReferId" :useStrategy="0" @countRefresh="countRefresh"></calculate>
<strategy :show.sync="strategyShow" :strategyType="strategyType" :dataId="gamePrizeStrategyId" :gameActivityId="form.gameActivityId" :cardObj="strategyDialog" @set-data="setStrategyCard" @refesh="klflStrategyList"></strategy>
<calculate :show.sync="calculateShow" :gameId="form.gameActivityId" :totalCount="currentObj.prizeCount" :prizeId="currentObj.prizeId" :prizeReferType="currentObj.prizeReferType" :prizeReferId="currentObj.prizeReferId" :useStrategy="0" @countRefresh="countRefresh"></calculate>
<strategy :show.sync="strategyShow" :gameId="form.gameActivityId" :strategyType="strategyType" :dataId="gamePrizeStrategyId" :gameActivityId="form.gameActivityId" :cardObj="strategyDialog" @set-data="setStrategyCard" @refesh="klflStrategyList"></strategy>
<code-dialog :show.sync="codeDialogShow" :id="form.gameActivityId" @selectedCode="selectedCode"></code-dialog>
</el-form>
</template>
......@@ -663,6 +663,8 @@ export default {
}
let gameCodePrizeList = [];
let flag = false;
let prize_error_msg = ''; // 奖品错误信息
this.prizeList.map((v, i) => {
if (v.prizeReferType == 1) {
// 积分
......@@ -676,18 +678,23 @@ export default {
prizeStock: v.prizeStock // 奖品设置 库存数 = 数量
});
} else if (v.prizeReferType == 2) {
// 卡券
gameCodePrizeList.push({
codeId: this.form.codeType == 1 ? '' : v.codeId || '', // 口令ID, 唯一口令为null, 多个口令 load-game-code-list中选择的 gameWinCodeId, 多个口令每个只能匹配一个奖项
prizeReferType: 2, // 奖品类型: 卡券 类型 1: '积分'; 2: '卡券'; 3: '礼品'
prizeIntegral: 0,
prizeReferId: v.card.coupCardId || '', // 奖项设置 所选卡券主键ID
prizeSort: i, // 奖品排序
gameActivityId: this.isEdit ? this.form.gameActivityId : '', // 新建游戏为空
prizeCount: v.prizeId ? v.prizeCount : v.prizeStock, // 奖品设置 数量
prizeStock: v.prizeStock // 奖品设置 库存数 = 数量
});
console.log(v);
if (v.card && v.card.coupCardId) {
// 卡券
gameCodePrizeList.push({
codeId: this.form.codeType == 1 ? '' : v.codeId || '', // 口令ID, 唯一口令为null, 多个口令 load-game-code-list中选择的 gameWinCodeId, 多个口令每个只能匹配一个奖项
prizeReferType: 2, // 奖品类型: 卡券 类型 1: '积分'; 2: '卡券'; 3: '礼品'
prizeIntegral: 0,
prizeReferId: v.card.coupCardId || '', // 奖项设置 所选卡券主键ID
prizeSort: i, // 奖品排序
gameActivityId: this.isEdit ? this.form.gameActivityId : '', // 新建游戏为空
prizeCount: v.prizeId ? v.prizeCount : v.prizeStock, // 奖品设置 数量
prizeStock: v.prizeStock // 奖品设置 库存数 = 数量
});
} else {
// 选择卡券时必选卡券
flag = true;
prize_error_msg = '奖品填写不完整，请选择卡券';
}
} else if (v.prizeReferType == 3) {
// 礼品
gameCodePrizeList.push({
......@@ -707,6 +714,11 @@ export default {
});
}
});
if (flag) {
// 奖品设置有问题
this.$tips({ message: prize_error_msg, type: 'error' });
return;
}
params.gameCodePrizeList = gameCodePrizeList;
const postParam = {
reqData: JSON.stringify(params),
......
src/views/game/klfl/strategy.vue
......@@ -29,7 +29,7 @@
<el-button type="primary" @click="submit('form')">保 存</el-button>
</span>
<prize-set ref="gift" :info.sync="prizeSetInfo" :show.sync="prizeSetShow"></prize-set>
<calculate :show.sync="calculateShow" :prizeId="dataId" :prizeReferId="form.prizeReferType === 2 ? cardObj.coupCardId : form.proGiftId" :prizeReferType="form.prizeReferType" :totalCount="parseInt(form.prizeCount)" @countRefresh="countRefresh"></calculate>
<calculate :show.sync="calculateShow" :gameId="gameId" :prizeId="dataId" :prizeReferId="form.prizeReferType === 2 ? cardObj.coupCardId : form.proGiftId" :prizeReferType="form.prizeReferType" :totalCount="parseInt(form.prizeCount)" @countRefresh="countRefresh"></calculate>
</el-dialog>
</template>
<script>
......@@ -48,6 +48,10 @@ export default {
type: String,
default: ''
},
gameId: {
type: String,
default: ''
},
gameActivityId: {
type: String,
default: ''
......
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