Commit c79fc50d c79fc50da01ecd638e0ca3e64f5513e667cefb4c by zhanghao

commit

1 parent 46c08d87
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
32 return { 32 return {
33 actid: this.$route.query.actid, 33 actid: this.$route.query.actid,
34 phone: this.$route.query.phone, 34 phone: this.$route.query.phone,
35 huanjing: this.$route.query.huanjing,
35 userActivityAward: [] 36 userActivityAward: []
36 } 37 }
37 }, 38 },
...@@ -53,7 +54,8 @@ ...@@ -53,7 +54,8 @@
53 } 54 }
54 this.$http.get('/tool/testHouLiAward?'+this.$qs.stringify({ 55 this.$http.get('/tool/testHouLiAward?'+this.$qs.stringify({
55 actid: this.actid, 56 actid: this.actid,
56 phone: this.phone 57 phone: this.phone,
58 huanjing: this.huanjing,
57 }),config).then((res)=>{ 59 }),config).then((res)=>{
58 console.log(res.data) 60 console.log(res.data)
59 this.userActivityAward=res.data.userActivityAward 61 this.userActivityAward=res.data.userActivityAward
......
...@@ -709,15 +709,25 @@ ...@@ -709,15 +709,25 @@
709 <el-form-item> 709 <el-form-item>
710 <el-input placeholder="请输入活动ID" v-model="testHouLi.actid" clearable></el-input> 710 <el-input placeholder="请输入活动ID" v-model="testHouLi.actid" clearable></el-input>
711 </el-form-item> 711 </el-form-item>
712 <div style="margin: 15px 0;"></div>
713 <el-form-item> 712 <el-form-item>
714 <el-input placeholder="请输入吼礼关键词" v-model="testHouLi.keyword" clearable></el-input> 713 <el-input placeholder="请输入吼礼关键词" v-model="testHouLi.keyword" clearable></el-input>
715 </el-form-item> 714 </el-form-item>
716 <div style="margin: 15px 0;"></div>
717 <el-form-item> 715 <el-form-item>
718 <el-input placeholder="请输入手机号" v-model="testHouLi.phone" clearable></el-input> 716 <el-input placeholder="请输入手机号" v-model="testHouLi.phone" clearable></el-input>
719 </el-form-item> 717 </el-form-item>
720 <div style="margin: 15px 0;"></div> 718 <el-form-item>
719 <el-input placeholder="请输入手机登录验证码" v-model="testHouLi.code" clearable></el-input>
720 </el-form-item>
721 <el-form-item>
722 <el-select v-model="testHouLi.huanjing" placeholder="请选择执行环境">
723 <el-option
724 v-for="item in testHouLiOptions"
725 :key="item.value"
726 :label="item.label"
727 :value="item.value">
728 </el-option>
729 </el-select>
730 </el-form-item>
721 <el-form-item> 731 <el-form-item>
722 <el-tooltip placement="right"> 732 <el-tooltip placement="right">
723 <div slot="content"> 733 <div slot="content">
...@@ -1064,8 +1074,17 @@ ...@@ -1064,8 +1074,17 @@
1064 testHouLi: { 1074 testHouLi: {
1065 actid: '', 1075 actid: '',
1066 keyword: '', 1076 keyword: '',
1067 phone: '' 1077 phone: '',
1078 code: '',
1079 huanjing: []
1068 }, 1080 },
1081 testHouLiOptions: [{
1082 value: '0',
1083 label: '测试环境'
1084 },{
1085 value: '1',
1086 label: '线上环境'
1087 }]
1069 // activityConfigRules: { 1088 // activityConfigRules: {
1070 // id: [ 1089 // id: [
1071 // { required: true, message: '请输入活动ID', trigger: 'blur' } 1090 // { required: true, message: '请输入活动ID', trigger: 'blur' }
...@@ -1842,13 +1861,15 @@ ...@@ -1842,13 +1861,15 @@
1842 this.$http.get('/tool/testHouLi?'+this.$qs.stringify({ 1861 this.$http.get('/tool/testHouLi?'+this.$qs.stringify({
1843 actid: this.testHouLi.actid, 1862 actid: this.testHouLi.actid,
1844 keyword: this.testHouLi.keyword.replaceAll(" ",""), 1863 keyword: this.testHouLi.keyword.replaceAll(" ",""),
1845 phone: this.testHouLi.phone 1864 phone: this.testHouLi.phone,
1865 code: this.testHouLi.code,
1866 huanjing: this.testHouLi.huanjing.toString()
1846 }),config).then((res)=>{ 1867 }),config).then((res)=>{
1847 console.log(res); 1868 console.log(res);
1848 loading.close(); 1869 loading.close();
1849 if(res.data=='success') { 1870 if(res.data=='success') {
1850 const {href} = this.$router.resolve({ name:'testHouLi', query: 1871 const {href} = this.$router.resolve({ name:'testHouLi', query:
1851 {actid: this.testHouLi.actid, phone: this.testHouLi.phone}}) 1872 {actid: this.testHouLi.actid, phone: this.testHouLi.phone, huanjing: this.testHouLi.huanjing.toString()}})
1852 window.open(href, '_blank') 1873 window.open(href, '_blank')
1853 } else { 1874 } else {
1854 this.$message({ 1875 this.$message({
......