Merge branch 'master' into share-lib

This commit is contained in:
yulixing 2019-07-04 17:28:24 +08:00
commit f603906409

View File

@ -401,6 +401,7 @@ export default {
const dataType = this.isDev ? 'dev' : 'pro'
this.isLoaded = true
getRewards({
uid: this.gameInfo._id,
game_id: this.gameInfo.game_id,
currentPage: this.currentPage,
pageSize: this.pageSize,
@ -470,6 +471,7 @@ export default {
this.modalForm.game_id = this.gameInfo.game_id
this.modalForm.isDev = true
this.modalForm.published = false
this.modalForm.uid = this.gameInfo._id
delete this.modalForm.keysStr
@ -493,6 +495,9 @@ export default {
const devData = JSON.parse(JSON.stringify(row))
const proData = JSON.parse(JSON.stringify(row))
devData.uid = this.gameInfo._id
proData.uid = this.gameInfo._id
devData.isDev = true
devData.published = true
proData.isDev = false
@ -518,6 +523,7 @@ export default {
})
.then(() => {
switchRewardsState({
uid: this.gameInfo._id,
ids: [row._id],
type: true,
isDev: this.isDev
@ -545,6 +551,7 @@ export default {
})
.then(() => {
switchRewardsState({
uid: this.gameInfo._id,
ids: [row._id],
type: false,
isDev: this.isDev
@ -572,6 +579,7 @@ export default {
})
.then(() => {
delRewards({
uid: this.gameInfo._id,
ids: [row._id],
isDev: this.isDev
})
@ -609,6 +617,7 @@ export default {
)
.then(() => {
switchRewardsState({
uid: this.gameInfo._id,
ids: ids,
type: true,
isDev: this.isDev
@ -647,6 +656,7 @@ export default {
)
.then(() => {
switchRewardsState({
uid: this.gameInfo._id,
ids: ids,
type: false,
isDev: this.isDev
@ -685,6 +695,7 @@ export default {
)
.then(() => {
delRewards({
uid: this.gameInfo._id,
ids: ids,
isDev: this.isDev
})