Commit c79fc50d c79fc50da01ecd638e0ca3e64f5513e667cefb4c by zhanghao

commit

1 parent 46c08d87
......@@ -32,6 +32,7 @@
return {
actid: this.$route.query.actid,
phone: this.$route.query.phone,
huanjing: this.$route.query.huanjing,
userActivityAward: []
}
},
......@@ -53,7 +54,8 @@
}
this.$http.get('/tool/testHouLiAward?'+this.$qs.stringify({
actid: this.actid,
phone: this.phone
phone: this.phone,
huanjing: this.huanjing,
}),config).then((res)=>{
console.log(res.data)
this.userActivityAward=res.data.userActivityAward
......
......@@ -709,15 +709,25 @@
<el-form-item>
<el-input placeholder="请输入活动ID" v-model="testHouLi.actid" clearable></el-input>
</el-form-item>
<div style="margin: 15px 0;"></div>
<el-form-item>
<el-input placeholder="请输入吼礼关键词" v-model="testHouLi.keyword" clearable></el-input>
</el-form-item>
<div style="margin: 15px 0;"></div>
<el-form-item>
<el-input placeholder="请输入手机号" v-model="testHouLi.phone" clearable></el-input>
</el-form-item>
<div style="margin: 15px 0;"></div>
<el-form-item>
<el-input placeholder="请输入手机登录验证码" v-model="testHouLi.code" clearable></el-input>
</el-form-item>
<el-form-item>
<el-select v-model="testHouLi.huanjing" placeholder="请选择执行环境">
<el-option
v-for="item in testHouLiOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-tooltip placement="right">
<div slot="content">
......@@ -1064,8 +1074,17 @@
testHouLi: {
actid: '',
keyword: '',
phone: ''
phone: '',
code: '',
huanjing: []
},
testHouLiOptions: [{
value: '0',
label: '测试环境'
},{
value: '1',
label: '线上环境'
}]
// activityConfigRules: {
// id: [
// { required: true, message: '请输入活动ID', trigger: 'blur' }
......@@ -1842,13 +1861,15 @@
this.$http.get('/tool/testHouLi?'+this.$qs.stringify({
actid: this.testHouLi.actid,
keyword: this.testHouLi.keyword.replaceAll(" ",""),
phone: this.testHouLi.phone
phone: this.testHouLi.phone,
code: this.testHouLi.code,
huanjing: this.testHouLi.huanjing.toString()
}),config).then((res)=>{
console.log(res);
loading.close();
if(res.data=='success') {
const {href} = this.$router.resolve({ name:'testHouLi', query:
{actid: this.testHouLi.actid, phone: this.testHouLi.phone}})
{actid: this.testHouLi.actid, phone: this.testHouLi.phone, huanjing: this.testHouLi.huanjing.toString()}})
window.open(href, '_blank')
} else {
this.$message({
......