Skip to content

M
marketing
Commit 70b1dc09 by zhangmeng
Options

fix:找你马游戏bug

parent 32d4c322
Showing with 38 additions and 37 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.7e266d5b2a47788a791aff7808dc040d.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.0d0cf2dff971ab70b0c0.js></script><script type=text/javascript src=/marketing/static/js/app.301e0f511379e1486d31.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.7e5924ccbe59110f3fcdb16aaddb4de4.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.0d0cf2dff971ab70b0c0.js></script><script type=text/javascript src=/marketing/static/js/app.0996aec4e6bad96a0744.js></script></body></html>
\ No newline at end of file
dist/static/js/app.0996aec4e6bad96a0744.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.301e0f511379e1486d31.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
package-lock.json
......@@ -360,9 +360,9 @@
}
},
"@gic-test/vue-gic-header": {
"version": "1.3.37",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-header/download/@gic-test/vue-gic-header-1.3.37.tgz",
"integrity": "sha1-i183KJyzzYSALY6IFH9gAzX0wJg=",
"version": "1.4.1",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-header/download/@gic-test/vue-gic-header-1.4.1.tgz",
"integrity": "sha1-Q/+l6KNeOfMpw/K4TAHex+p0vl8=",
"requires": {
"axios": "^0.18.0",
"vue": "^2.5.11"
......
src/assets/style/base/index.scss
......@@ -47,6 +47,12 @@
margin-top: 10px;
margin-right: 32px;
}
&--icon {
font-size:14px;
padding-left:4px;
vertical-align: middle;
color:#909399;
}
}
.dm-title__label--outer {
......
src/assets/theme.zip
No preview for this file type
src/assets/theme/index.css
......@@ -44463,5 +44463,7 @@
}
.w200 {
width:200px;
}
src/router/modules/recharge.js
......@@ -27,7 +27,7 @@ export default {
},
{
path: 'do',
name: '充值中心',
name: '充值',
component: rechargeDo
}
]
......
src/views/ecm/form.vue
......@@ -12,7 +12,7 @@
<el-select style="width:262px;" v-model="form.effectTime" v-if="form.effectType" placeholder="请选择时间">
<el-option v-for="(v, i) in dayOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<div class="layout--tips" v-if="form.effectType">
<div class="layout--tips mt10" v-if="form.effectType">
<!-- <i class="el-icon-info inline-block"></i> -->
<div class="layout--tips__content">
<p><span class="dm-status--primary pl10"></span>每天发送<b class="bold">图文、文本、图片</b>将使用微信群发接口，占用每个用户每月4条的群发次数</p>
......@@ -58,7 +58,7 @@
<section class="dm-form__wrap" v-if="!form.effectType && form.effectAction === 'consume'">
<h3 class="dm-title__label">
消费触发配置
<i class="iconfont icon-xinxixianshi pl5 gray"></i>
<i class="dm-title__label--icon iconfont icon-xinxixianshi"></i>
<span class="gray fz13">仅适用于线下单笔消费</span>
</h3>
<el-form-item label="最低消费金额"> <el-input-number controls-position="right" :min="0" style="width:244px;" v-model="form.lowest_cost"></el-input-number> 元 </el-form-item>
......@@ -87,7 +87,7 @@
<section class="dm-form__wrap" v-if="!form.effectType && (form.effectAction === 'consume' || form.effectAction === 'upgrade' || form.effectAction === 'degrade')">
<h3 class="dm-title__label">
营销次数配置
<i class="iconfont icon-xinxixianshi pl5 gray"></i>
<i class="dm-title__label--icon iconfont icon-xinxixianshi"></i>
<span class="gray fz13">设置本营销计划对同个会员的触发次数</span>
</h3>
<el-form-item label="营销次数配置" prop="marketingTimesType">
......@@ -395,10 +395,12 @@ export default {
},
created() {
// 设置面包屑
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '智能营销', path: '/ecm' }, { name: '智能营销管理', path: '' }]);
let breadcrumbName = '智能营销编辑';
if (this.isAdd) {
this.sceneSettingList();
breadcrumbName = '智能营销新增';
}
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '智能营销', path: '/ecm' }, { name: breadcrumbName, path: '' }]);
this.listTemplateVariables();
},
methods: {
......@@ -441,19 +443,16 @@ export default {
this.form.effectAction = result.effectAction;
this.form.sceneSettingId = result.sceneSettingId;
this.form.sceneSettingName = result.sceneSettingName;
this.form.memberType = result.memberType;
this.form.expireType = result.expireType;
//处理会员等级
this.form.gradeIds = (result.gradeIds && result.gradeIds.split(',').filter(v => v)) || [];
//营销次数配置
this.form.marketingTimesType = result.marketingTimesType || 0;
this.form.marketingTimes = result.marketingTimes || 1;
//'0-不通知 1-微信对话框 2-模板消息 补发通知 0-不补发 1-补发'
this.form.cardNoticeType = result.cardNoticeType || 0;
this.form.templateNoticeFlag = result.templateNoticeFlag || 0;
// 判断回显
if (this.form.memberType === 0) {
this.form.memberSearchDTO = result.filterJson;
......@@ -462,7 +461,6 @@ export default {
this.form.memberGroupIds = result.filterJson || '';
this.defaltSelected = res.result.tagGroupList || [];
}
if (this.form.expireType) {
this.form.beginDate = result.beginDate || '';
this.form.endDate = result.endDate || '';
......@@ -487,11 +485,9 @@ export default {
this.ecmPlanId = res.result.templateEcmPlanId || '';
}
this.form.templateUseEnable = res.result.templateUseEnable;
this.$nextTick(_ => {
this.effectActionChange(true);
});
// 处理消费触发
if (consumTrigger) {
this.form.lowest_cost = consumTrigger.lowest_cost || 0; /** 最低消费 0: 无限制 **/
......@@ -499,7 +495,6 @@ export default {
this.form.store_mode = consumTrigger.store_mode || 0; /** 门店类型: 0: 所有门店, 1: 部分(包含部分门店, 部分分组等) **/
this.form.order_store = consumTrigger.order_store || ''; /** 消费门店key值 **/
}
// 触发门店初始化
if (this.form.effectAction === 'consume' && this.form.store_mode) {
this.$nextTick(_ => {
......
src/views/game/klfl/strategy.vue
......@@ -188,6 +188,8 @@ export default {
resetParams(this.form);
this.form.prizeReferType = 1;
this.hasSearchData = '';
this.form.crowdFilter = '';
this.getSaveData = '';
}
},
close() {
......
src/views/game/ptyx/form.vue
......@@ -36,11 +36,6 @@
<dm-upload-avatar :model.sync="scope.row.prizeImg" label="上传图片" width="40" height="40" tips="" class-name="block-center" :disabled="isInfo"></dm-upload-avatar>
</template>
</el-table-column>
<!-- <el-table-column prop="prizeQuantity" label="商品数量" align="left" width="80">
<template slot-scope="scope">
{{scope.row.rankEnd}}件
</template>
</el-table-column> -->
<el-table-column prop="date" label="操作" align="left" width="60">
<template slot-scope="scope">
<el-button type="text" v-if="scope.$index > 2" @click="delItem(scope.$index)" :disabled="isInfo">删除</el-button>
......@@ -298,8 +293,8 @@ export default {
try {
let res = await getGameSystemMusic();
if (res.errorCode === 0) {
this.gameMusicOptions = res.result || [];
this.gameMusicOptions = this.gameMusicOptions.map(v => ({ isPlay: false, ...v }));
let list = res.result || [];
this.gameMusicOptions = list.map(v => ({ isPlay: false, ...v }));
console.log(this.gameMusicOptions);
}
} catch (err) {
......
src/views/game/znm/strategy.vue
......@@ -109,7 +109,9 @@ export default {
this.hasSearchData = strategy.crowdFilter;
} else {
resetParams(this.form);
this.form.crowdFilter = '';
this.hasSearchData = '';
this.getSaveData = '';
this.cardObj.cardName = '';
this.cardObj.coupCardId = '';
}
......
src/views/recharge/recharge.vue
......@@ -10,12 +10,6 @@
</div>
</div>
<article v-if="step === 0">
<div class="step0-tips">
<p class="fz12 gray line-height2">1、我们提供在线充值服务（目前仅支持微信）</p>
<p class="fz12 gray line-height2">2、请尽量保障账户余额大于您日常使用的额度，避免因余额不足导致业务中断</p>
<p class="fz12 gray line-height2">3、若未能及时充值或其他问题，请联系客户经理或客服人员</p>
<p class="fz12 gray line-height2">4、各项服务单价：短信验证码{{ allUnitFee.smsfee }}元/条，语音验证码{{ allUnitFee.voiceIfee }}元/条，双向呼叫{{ allUnitFee.callfee }}元/分钟</p>
</div>
<div class="step0-box">
<div>
<span class="fz14 w80 inline-block text-right">余额</span>
......@@ -33,6 +27,12 @@
<el-button type="primary" @click="toStep1">下一步</el-button>
</div>
</div>
<div class="step0-tips">
<p class="fz12 gray line-height2">1、我们提供在线充值服务（目前仅支持微信）</p>
<p class="fz12 gray line-height2">2、请尽量保障账户余额大于您日常使用的额度，避免因余额不足导致业务中断</p>
<p class="fz12 gray line-height2">3、若未能及时充值或其他问题，请联系客户经理或客服人员</p>
<p class="fz12 gray line-height2">4、各项服务单价：短信验证码{{ allUnitFee.smsfee }}元/条，语音验证码{{ allUnitFee.voiceIfee }}元/条，双向呼叫{{ allUnitFee.callfee }}元/分钟</p>
</div>
</article>
<article v-if="step === 1">
<div class="mt20 mb20">
......@@ -184,21 +184,20 @@ export default {
<style lang="scss" scoped>
.step-wrap {
width: calc(100% + 40px);
width: calc(100% + 48px);
height: 100px;
margin-left:-24px;
border-bottom: 1px solid #dcdfe6;
margin-left: -20px;
margin-top: 20px;
.step {
width: 100%;
.step-inner {
width: 60%;
width: 750px;
margin: 0 auto;
}
}
}
.step0-tips {
width: 60%;
// width: 60%;
margin: 20px auto;
}
.step0-box {
......
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