Skip to content

M
marketing
Commit 3598a127 by zhangmeng
Options

fix:人群筛选器测试环境测试

parent b35685fa
Showing with 30 additions and 28 deletions
dist.zip
No preview for this file type
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.e390f1a7b79f7d0ecdc00de8ca1464a2.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.66eed37ef79aa0fd6d4f.js></script><script type=text/javascript src=/marketing/static/js/app.e204ce5ec2d13f3ce2ef.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.cf98acb6e587cee6b0414700732ad584.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.9e35c0c27bdd4cd7cad2.js></script><script type=text/javascript src=/marketing/static/js/app.fc65ed07334c0e1b3d6f.js></script></body></html>
\ No newline at end of file
dist/static/js/app.e204ce5ec2d13f3ce2ef.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/app.fc65ed07334c0e1b3d6f.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/goods-input/index.vue
......@@ -21,7 +21,6 @@
<span class="suggest-item__lt">{{option.label}} </span>
</div>
</el-option>
</bd-select>
</div>
</template>
......
src/main.js
......@@ -5,7 +5,7 @@ import store from './store';
import {axios} from './service/api/index';
import directives from './directives';
import ElementUI from 'element-ui';
import vueGicHeader from '@gic-test/vue-gic-header/src/lib';
import vueGicHeader from '@gic-test/vue-gic-header';
import vueGicFooter from '@gic-test/vue-gic-footer';
import vueGicAsideMenu from '@/components/aside-menu';
import vueGicCard from '@gic-test/vue-gic-card';
......
src/router/routes.js
......@@ -4,7 +4,7 @@ import page403 from '@/views/error/403'
import page404 from '@/views/error/404'
import page500 from '@/views/error/500'
import test from './modules/test'
// import test from './modules/test'
//微信营销
import wechat from './modules/wechat'
......@@ -66,5 +66,5 @@ export default [
name: '未知领域',
component: page404
},
test
// test
]
src/views/card/group-send.vue
......@@ -35,7 +35,7 @@
<el-button size="small" @click="cancelFilter">取 消</el-button>
</div>
</div>
<vue-gic-confirm-people v-show="form.memberType === 1" idType="memberId" :onlyWxMember="1" @get-data="getConfirmData" :list="memberList"></vue-gic-confirm-people>
<vue-gic-confirm-people v-show="form.memberType === 1" idType="memberId" sendType="card" @get-data="getConfirmData" :list="memberList"></vue-gic-confirm-people>
<vue-gic-member-group v-if="form.memberType === 2" :defaltSelected="defaltSelected" :height='500' :projectName="projectName" :headerList='headerList' @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
</div>
<!-- 只有存在卡券的情况下出现卡券通知方式 -->
......
src/views/ecm/form.vue
......@@ -75,7 +75,7 @@
<vue-gic-store-card class="pt10" v-show="form.store_mode" ref="storeCard" :uuid.sync="form.order_store"></vue-gic-store-card>
</section>
<!-- 会员卡升/降级触发设置 -->
<section class="dm-form__wrap" v-if="form.effectAction === 'degrade' || form.effectAction === 'upgrade'">
<section class="dm-form__wrap" v-if="!form.effectType && (form.effectAction === 'degrade' || form.effectAction === 'upgrade')">
<h3 class="dm-title__label">会员卡{{form.effectAction === 'degrade'?'降':'升'}}级触发设置</h3>
<el-form-item :label="`会员卡${form.effectAction === 'degrade'?'降':'升'}级至`">
<el-select v-model="form.gradeIds" multiple placeholder="请选择" class="w300">
......@@ -130,7 +130,7 @@
</div>
<vue-gic-member-group v-if="form.memberType === 1" :defaltSelected="defaltSelected" :height='500' :projectName="projectName" :headerList='headerList' @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
</section>
<!-- 营销事件 -->
<!-- 营销事件组件 -->
<section class="dm-form__wrap">
<h3 class="dm-title__label">营销事件</h3>
<marketing-event ref="marketingEvent" @has-card="hasCard" v-if="ecmPlanId" :ecmPlanId="ecmPlanId" :isSupportVar="form.effectType === 0" :code="code" :enabledMessageState="enabledMessageState"></marketing-event>
......@@ -207,13 +207,14 @@
</div>
</el-form-item>
</section>
<!-- 操作区 -->
<div class="btn-wrap_fixed" :class="{'on':asideShow}">
<el-button type="primary" @click="submit('form')">保 存</el-button>
<el-button @click="$router.go(-1)">返 回</el-button>
</div>
<!-- 变量弹窗 -->
<var-dialog :options="options" :show.sync="varDialogShow" @get-data="insetVar"></var-dialog>
<!-- 模板消息修改弹窗 -->
<el-dialog title="修改模板消息" :visible.sync="editDialogShow" width="600px" :before-close="close">
<div class="ecm-msg__edit">
<div class="ecm-msg__edit--inner">
......@@ -253,7 +254,7 @@ import {getEcmInfo,saveEcmInfo} from '@/service/api/ecmApi.js';
import {listTemplateVariables} from '@/service/api/msgApi.js';
import {sceneSettingList} from '@/service/api/commonApi.js';
import {checkMessageSendCount} from '@/service/api/messageApi.js';
import {klflStrategy} from '@/service/api/gameApi.js'; // 会员列表接口
import {klflStrategy} from '@/service/api/gameApi.js'; // 会员等级列表接口
import marketingEvent from './marketing-event/index.vue';
import {formateDateTimeByType} from '@/utils/index.js'
import itemCard from './partials/item-card.vue';
......
src/views/evaluation/suggestion.vue
......@@ -77,6 +77,8 @@ export default {
}
},
created() {
this.listParams.status = Number(this.$route.query.status) || '';
this.pageSuggestionsList();
this.$store.commit('mutations_breadcrumb',[{name:'企业管理',path:''},{name:'服务监督',path:'/evaluation'},{name:'投诉与建议',path:'/suggestion'}])
},
......
src/views/game/dzp/form.vue
......@@ -298,7 +298,7 @@ export default {
return;
}
if (this.form.dateTime[0] < Date.now()) {
if (this.form.dateTime[0] < Date.now() && this.isAdd) {
this.$tips({type:'warning',message:`开始时间不能小于当前时间`});
return;
};
......
src/views/game/ggk/form.vue
......@@ -275,7 +275,7 @@ export default {
}
if (flag) return;
});
if (this.form.dateTime[0] < Date.now()) {
if (this.form.dateTime[0] < Date.now() && this.isAdd) {
this.$tips({type:'warning',message:`开始时间不能小于当前时间`});
return;
};
......
src/views/game/klfl/form.vue
......@@ -524,7 +524,7 @@ export default {
},
//提交保存
async klflSave (formName) {
if (this.form.dateTime[0] < Date.now()) {
if (this.form.dateTime[0] < Date.now() && this.isAdd) {
this.$tips({type:'warning',message:`开始时间不能小于当前时间`});
return;
};
......
src/views/game/ptyx/form.vue
......@@ -430,7 +430,7 @@ export default {
})
if (flag) return;
if (this.form.dateTime[0] < Date.now()) {
if (this.form.dateTime[0] < Date.now() && this.isAdd) {
this.$tips({type:'warning',message:`开始时间不能小于当前时间`});
return;
};
......
src/views/game/znm/form.vue
......@@ -236,7 +236,7 @@ export default {
return;
}
if (this.form.dateTime[0] < Date.now()) {
if (this.form.dateTime[0] < Date.now() && this.isAdd) {
this.$tips({type:'warning',message:`开始时间不能小于当前时间`});
return;
};
......
src/views/message/addRecord.vue
......@@ -29,7 +29,7 @@
<el-button size="small" @click="cancelFilter">取 消</el-button>
</div>
</div>
<vue-gic-confirm-people v-if="info.memberType === 1" idType="memberId" :onlyWxMember="0" :isMessage="true" @get-data="getConfirmData"></vue-gic-confirm-people>
<vue-gic-confirm-people v-if="info.memberType === 1" idType="memberId" sendType="message" @get-data="getConfirmData"></vue-gic-confirm-people>
<vue-gic-member-group v-if="info.memberType === 2" :defaltSelected="defaltSelected" :height='500' :projectName="projectName" :headerList='headerList' @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
</section>
<section class="dm-form__wrap">
......
src/views/message/detail.vue
......@@ -119,14 +119,14 @@ import filterAvatar from '@/mixins/filterAvater.js';
return formateDateTimeByType(row.backTime,'yyyy-MM-dd-HH-mm-ss');
}},
{label:'发送状态',prop:'backStatus',width:'80',align:'left',formatter:function(row){
return row.backStatus === 0 ? '接收失败' : (row.backStatus?'接收成功' : '--')
return row.backStatus === 0 ? '接收失败' : (row.backStatus ? '接收成功' : '--')
}}],
listParams:{
sendStatus:'',
smsId:this.$route.params.id,
memberName:'',
currentPage:1,
pageSize:20
listParams: {
sendStatus: '',
smsId: this.$route.params.id,
memberName: '',
currentPage: 1,
pageSize: 20
},
total:0,
sendStatusOptions:[{value:'',label:'所有状态'},{value:0,label:'成功'},{value:1,label:'未发送'},{value:2,label:'失败'}],
......
src/views/recharge/consume.vue
......@@ -14,7 +14,7 @@
<div class="dm-form__wrap">
<div class="pb22" style="overflow:hidden;line-height:40px;">
<el-select v-if="$route.params.type ==='call'" class="dm-select" v-model="taskType" placeholder="选择发送状态" @change="loadAll(true)">
<el-option v-for="item in taskTypeOptions" :key="item.taskType" :label="item.taskType" :value="item.ecmName"></el-option>
<el-option v-for="item in taskTypeOptions" :key="item.taskType" :label="item.ecmName" :value="item.taskType"></el-option>
</el-select>
<el-input v-model="listParams.searchParam" class="w250" :placeholder="placeholder" clearable @change="loadAll(true)"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
</div>
......
src/views/recharge/recharge.vue
......@@ -23,7 +23,7 @@
</div>
<div class="pt20">
<span class="fz14 w80 inline-block text-right">充值金额</span>
<el-input-number controls-position="right" class="w200 ml10" v-model="count" :precision="0" :min="100" placeholder="填写大于100的整数"></el-input-number>
<el-input-number controls-position="right" class="w200 ml10" v-model="count" :precision="0" :min="100" :max="10000000" placeholder="填写大于100的整数"></el-input-number>
</div>
<div class="pt20">
<span class="fz14 w80 inline-block text-right">充值方式</span>
......
src/views/wechat/addRecord.vue
......@@ -34,7 +34,7 @@
<el-button size="small" @click="cancelFilter">取 消</el-button>
</div>
</div>
<vue-gic-confirm-people v-show="info.memberType === 1" @get-data="getConfirmData" :list="memberList"></vue-gic-confirm-people>
<vue-gic-confirm-people v-show="info.memberType === 1" sendType="wechat" @get-data="getConfirmData" :list="memberList"></vue-gic-confirm-people>
<vue-gic-member-group v-if="info.memberType === 2" :defaltSelected="defaltSelected" :height='500' :projectName="projectName" :headerList='headerList' @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
</section>
<section class="dm-form__wrap" v-if="$route.meta.type !== 'imgText'">
......
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