Skip to content

M
marketing
Commit 3a944781 by zhangmeng
Options

fix:自定义皮肤，会员分组bug

parent 9439b01d
Showing with 27 additions and 26 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 href=/marketing/static/css/app.18ea705efab87708353a53def54b4c54.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.b52e32600f8f7c7becf9.js></script><script type=text/javascript src=/marketing/static/js/app.f1c093ce4350cf68fae7.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/app.67af1b4f7a69fa8166bd7206b102010b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.b52e32600f8f7c7becf9.js></script><script type=text/javascript src=/marketing/static/js/app.bdcb4f7364a9cce408fc.js></script></body></html>
\ No newline at end of file
dist/static/js/app.bdcb4f7364a9cce408fc.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.f1c093ce4350cf68fae7.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/style/base/index.scss
......@@ -285,5 +285,6 @@
-webkit-line-clamp: 4;
-webkit-box-orient: vertical;
margin: 10px auto;
white-space: pre;
}
}
src/components/wxText/wxText.vue
......@@ -127,7 +127,7 @@
options1: [{
value: 3,
label: '导航tabber页'
label: '导航tabbar页'
}, {
value: 4,
label: '二级功能页'
......@@ -326,7 +326,7 @@
},
// 链接类型
changePreValue(val){
// val==3 导航tabber页 val==4 二级功能页
// val==3 导航tabbar页 val==4 二级功能页
if(val){
this.nextValue = '';
this.getNextList(val)
......
src/components/wxText/wxText1.vue
......@@ -126,7 +126,7 @@
options1: [{
value: 3,
label: '导航tabber页'
label: '导航tabbar页'
}, {
value: 4,
label: '二级功能页'
......@@ -299,7 +299,7 @@
},
// 链接类型
changePreValue(val){
// val==3 导航tabber页 val==4 二级功能页
// val==3 导航tabbar页 val==4 二级功能页
if(val){
this.nextValue = '';
this.getNextList(val)
......
src/service/api/gameApi.js
......@@ -28,11 +28,9 @@ export const ptyxConfigSave = (params) => requests(PREFIX + 'save-puzzle-game-se
//游戏营销--拼图游戏--中奖记录--(参与人数.参与次数.新增关注人数)
export const ptyxCalcTitle = (params) => requests(PREFIX + 'load-game-puzzle-calculate-title', params);
//删除拼图游戏-找你马-口令福利
export const deleteGame = (params) => requests(PREFIX + 'delete-game-activity', params);
//游戏营销--找你马游戏分页列表
export const LoadZnmList = (params) => requests(PREFIX + 'page-znm-game', params);
......@@ -69,10 +67,6 @@ export const znmRankExcel = config.api + PREFIX + 'export-znm-rank-list-excel';
//游戏营销--找你马--导出参与记录Excel
export const znmRecordExcel = config.api + PREFIX + 'export-znm-attend-record-excel';
//游戏营销--找你马游戏分页列表
export const LoadKlflList = (params) => requests(PREFIX + 'page-klfl-game', params);
......@@ -118,14 +112,12 @@ export const klflCodeList = (params) => requests(PREFIX + 'load-game-klfl-code-l
//游戏营销--口令福利--新建/修改游戏--首奖特殊策略/奖项 -- 更改数量
export const updatePrizeStock = (params) => requests(PREFIX + 'update-prize-stock', params);
//游戏营销--找你马--获取游戏详情(点击首次特殊策略--排序)
export const klflStrategySort = (params) => requests(PREFIX + 'sort-game-strategy', params);
//游戏营销--找你马--获取游戏详情(点击首次特殊策略--删除)
export const klflStrategyDel = (params) => requests(PREFIX + 'delete-game-strategy', params);
//游戏营销--抽奖游戏分页列表--(大转盘. 刮刮卡)
export const loadLotteryList = (params) => requests(PREFIX + 'page-lottery-game', params);
......@@ -146,3 +138,9 @@ export const saveLottery = (params) => requests(PREFIX + 'save-update-lottery-ga
//游戏营销--口令福利--新建/修改游戏--首奖特殊策略--保存礼品
export const saveGift = (params) => requests(PREFIX + 'save-game-gift', params);
//游戏营销--获取系统预设的游戏音乐
export const getGameSystemMusic = (params) => requests(PREFIX + 'get-game-system-music', params);
//游戏营销--拼图游戏下载模板
export const downloadPtyxSkinPsd = config.api + PREFIX + 'download-tempskin-psd?requestProject=marketing';
src/test/component/marketingEvent/components/lib-text.vue
......@@ -138,7 +138,7 @@
options1: [{
value: 3,
label: '导航tabber页'
label: '导航tabbar页'
}, {
value: 4,
label: '二级功能页'
......@@ -341,7 +341,7 @@
},
// 链接类型
changePreValue(val){
// val==3 导航tabber页 val==4 二级功能页
// val==3 导航tabbar页 val==4 二级功能页
if(val){
this.nextValue = '';
this.getNextList(val)
......
src/test/component/marketingEvent/components/lib-wxa.vue
......@@ -82,7 +82,7 @@ export default {
nextValue: '',
options1: [{
value: 3,
label: '导航tabber页'
label: '导航tabbar页'
}, {
value: 4,
label: '二级功能页'
......@@ -154,7 +154,7 @@ export default {
},
// 链接类型
changePreValue(val){
// val==3 导航tabber页 val==4 二级功能页
// val==3 导航tabbar页 val==4 二级功能页
if(val){
this.nextValue = '';
this.getNextList(val)
......
src/views/card/group-send.vue
......@@ -212,7 +212,8 @@ export default {
isAdd:this.$route.meta.type === 'send',
defaltSelected:[],
projectName:'marketing',
headerList: [ 'effectiveStatus'] // 表头配置，默认全部，分组名称默认显示不可配置
headerList: ['isRealTime', 'latestUpdateTime', 'updateType', 'effectiveStatus', 'effectiveDate'],
effectiveStatus: 1 // 不传： 所有状态 1： 有效 0： 失效
}
},
computed: {
......
src/views/ecm/form.vue
......@@ -345,7 +345,8 @@ export default {
// 会员分组可传参数
defaltSelected: [], // 默认穿梭窗已选入数据
projectName:'marketing', // 默认是memberTag
headerList: [ 'effectiveStatus'] // 表头配置，默认全部，分组名称默认显示不可配置
headerList: ['isRealTime', 'latestUpdateTime', 'updateType', 'effectiveStatus', 'effectiveDate'],
effectiveStatus: 1 // 不传： 所有状态 1： 有效 0： 失效
}
},
components:{
......
src/views/ecm/marketing-event/components/lib-text的副本.vue
<template>
<template>
......@@ -138,7 +138,7 @@
options1: [{
value: 3,
label: '导航tabber页'
label: '导航tabbar页'
}, {
value: 4,
label: '二级功能页'
......@@ -341,7 +341,7 @@
},
// 链接类型
changePreValue(val){
// val==3 导航tabber页 val==4 二级功能页
// val==3 导航tabbar页 val==4 二级功能页
if(val){
this.nextValue = '';
this.getNextList(val)
......
src/views/ecm/marketing-event/components/lib-wxa.vue
......@@ -82,7 +82,7 @@ export default {
nextValue: '',
options1: [{
value: 3,
label: '导航tabber页'
label: '导航tabbar页'
}, {
value: 4,
label: '二级功能页'
......@@ -154,7 +154,7 @@ export default {
},
// 链接类型
changePreValue(val){
// val==3 导航tabber页 val==4 二级功能页
// val==3 导航tabbar页 val==4 二级功能页
if(val){
this.nextValue = '';
this.getNextList(val)
......
src/views/game/links.vue
......@@ -3,7 +3,7 @@
<div class="links__body">
<div class="links__body--url">{{obj.gameUrl}}</div>
<div class="links__body--btn">
<el-button v-clipboard:text="obj.gameUrl" type="text" icon="iconfont icon-lianjie fz14"> 下载链接</el-button>
<el-button v-clipboard:text="obj.gameUrl" type="text" icon="iconfont icon-lianjie fz14"> 复制链接</el-button>
</div>
</div>
<div class="links__qr">
......
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