Commit 77959fdbcda411f460cda6e1c895e2eb01039182
1 parent
334e150f
最新2
Showing
9 changed files
with
113 additions
and
100 deletions
admin-web-master/src/components/editor/index.vue
admin-web-master/src/layout/index.vue
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 | <span class="user-name">{{ name }}</span> |
| 28 | 28 | </div> |
| 29 | 29 | </div> |
| 30 | - | |
| 30 | + | |
| 31 | 31 | <!-- <el-dropdown trigger="click"> |
| 32 | 32 | <div class="avatar-wrapper" style="margin-left: 20px"> |
| 33 | 33 | <img :src="userAvatar" class="user-avatar"> |
| ... | ... | @@ -716,9 +716,9 @@ |
| 716 | 716 | gzt() { |
| 717 | 717 | |
| 718 | 718 | // window.location.href = 'https://admin-uat.028wlkj.com:1020/application-manage' |
| 719 | - window.location.href = 'https://zhgw.028wlkj.com:20443/home' | |
| 719 | + window.location.href = 'https://zhgw-uat.028wlkj.com/home' | |
| 720 | 720 | // window.location.href = 'http://128.10.9.151:5173/home' |
| 721 | - | |
| 721 | + | |
| 722 | 722 | |
| 723 | 723 | }, |
| 724 | 724 | findMatchingNames(List, msg) { |
| ... | ... | @@ -782,7 +782,7 @@ |
| 782 | 782 | ] |
| 783 | 783 | // this.getMemu() |
| 784 | 784 | // this.waibu() |
| 785 | - | |
| 785 | + | |
| 786 | 786 | this.neibu() |
| 787 | 787 | this.list = this.mumeList |
| 788 | 788 | }, |
| ... | ... | @@ -1044,4 +1044,4 @@ |
| 1044 | 1044 | .el-menu { |
| 1045 | 1045 | padding: 12px 0; |
| 1046 | 1046 | } |
| 1047 | -</style> | |
| 1048 | 1047 | \ No newline at end of file |
| 1048 | +</style> | ... | ... |
admin-web-master/src/utils/request.js
| ... | ... | @@ -18,7 +18,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost |
| 18 | 18 | |
| 19 | 19 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; |
| 20 | 20 | // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; |
| 21 | - baseURL = 'http://128.10.250.218:9003'; | |
| 21 | + baseURL = 'http://128.10.249.21:9003'; | |
| 22 | 22 | |
| 23 | 23 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; |
| 24 | 24 | // baseURL = 'http://192.168.2.225:9003'; | ... | ... |
admin-web-master/src/views/customer/yixiang/index.vue
| ... | ... | @@ -8,16 +8,13 @@ |
| 8 | 8 | <div> |
| 9 | 9 | <!-- 搜索 --> |
| 10 | 10 | <div class="formSearch"> |
| 11 | - <el-form :inline="true" :model="formSel"> | |
| 11 | + <!-- <el-form :inline="true" :model="formSel"> | |
| 12 | 12 | <el-form-item label="意向客户名称"> |
| 13 | 13 | <el-input v-model="formSel.intentCustomerName" placeholder="请输入" class="moren" style="width:168px" /> |
| 14 | 14 | </el-form-item> |
| 15 | 15 | <el-form-item label="意向资源名称"> |
| 16 | 16 | <el-input v-model="formSel.intentionalStoreName" placeholder="请输入" class="moren" style="width:168px" /> |
| 17 | 17 | </el-form-item> |
| 18 | - <!-- <el-form-item label="编号"> | |
| 19 | - <el-input v-model="formSel.id" placeholder="请输入" class="moren" style="width:168px" /> | |
| 20 | - </el-form-item> --> | |
| 21 | 18 | <el-form-item label="意向资源类型"> |
| 22 | 19 | <el-select v-model="formSel.intentionalBusinessType" placeholder="请选择" style="width:168px"> |
| 23 | 20 | <el-option label="商铺" value="商铺" /> |
| ... | ... | @@ -27,14 +24,14 @@ |
| 27 | 24 | </el-form-item> |
| 28 | 25 | |
| 29 | 26 | |
| 30 | - </el-form> | |
| 31 | - <div> | |
| 27 | + </el-form> --> | |
| 28 | + <!-- <div> | |
| 32 | 29 | <el-button style="background-color: #3F9B6A;color: #fff" @click="onSubmit">查询 |
| 33 | 30 | </el-button> |
| 34 | 31 | <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" |
| 35 | 32 | @click="resetting">重置 |
| 36 | 33 | </el-button> |
| 37 | - </div> | |
| 34 | + </div> --> | |
| 38 | 35 | |
| 39 | 36 | </div> |
| 40 | 37 | <div style="margin-bottom:20px;"> |
| ... | ... | @@ -55,7 +52,7 @@ |
| 55 | 52 | <el-table-column label="意向租金(月)" prop="rentalRent" min-width="120" /> |
| 56 | 53 | <el-table-column label="意向区域" prop="intentionRegion" min-width="150" /> |
| 57 | 54 | |
| 58 | - <el-table-column label="操作" min-width="200" fixed="right"> | |
| 55 | + <el-table-column label="操作" min-width="100" fixed="right"> | |
| 59 | 56 | <template slot-scope="scope"> |
| 60 | 57 | <div class="tableBtn greens" @click="handleEditForm(scope.row)"> |
| 61 | 58 | 查看 |
| ... | ... | @@ -63,9 +60,9 @@ |
| 63 | 60 | <div class="tableBtn greens" @click="bianjilist(scope.row)" > |
| 64 | 61 | 编辑 |
| 65 | 62 | </div> |
| 66 | - <div class="tableBtn greens" @click="pipei(scope.row)" > | |
| 63 | + <!-- <div class="tableBtn greens" @click="pipei(scope.row)" > | |
| 67 | 64 | 一键匹配 |
| 68 | - </div> | |
| 65 | + </div> --> | |
| 69 | 66 | </template> |
| 70 | 67 | </el-table-column> |
| 71 | 68 | </el-table> |
| ... | ... | @@ -76,7 +73,7 @@ |
| 76 | 73 | @current-change="handleCurrentChange" /> |
| 77 | 74 | </div> |
| 78 | 75 | |
| 79 | - | |
| 76 | + | |
| 80 | 77 | <!-- 详情框 :visible.sync="detbox" --> |
| 81 | 78 | <!-- <div v-show="detbox" class="dialog_css_Xq " style="padding: 0;width:85%"> --> |
| 82 | 79 | <el-dialog :visible.sync="detbox" custom-class="tongyong_css" style="padding: 0" width="55%" center |
| ... | ... | @@ -291,8 +288,8 @@ |
| 291 | 288 | </div> |
| 292 | 289 | </div> |
| 293 | 290 | </el-dialog> |
| 294 | - | |
| 295 | - | |
| 291 | + | |
| 292 | + | |
| 296 | 293 | </div> |
| 297 | 294 | </div> |
| 298 | 295 | <!-- 一键匹配 --> |
| ... | ... | @@ -317,7 +314,7 @@ |
| 317 | 314 | <el-option label="广告位" value="gg" /> |
| 318 | 315 | <el-option label="场地" value="cd" /> |
| 319 | 316 | </el-select> |
| 320 | - | |
| 317 | + | |
| 321 | 318 | </el-form-item> |
| 322 | 319 | <el-form-item label="租期"> |
| 323 | 320 | <el-select v-model="pipeiSel.resources.cereRentalPolicies.leaseTerm" style="width: 90%;"> |
| ... | ... | @@ -342,7 +339,7 @@ |
| 342 | 339 | @click="pipeiClose">重置</el-button> |
| 343 | 340 | <el-button style="background-color: #3F9B6A;color: #fff" |
| 344 | 341 | @click="pipeiBtn">查询</el-button> |
| 345 | - | |
| 342 | + | |
| 346 | 343 | </div> |
| 347 | 344 | </div> |
| 348 | 345 | </div> | ... | ... |
ceres-uniapp-master/config/api.js
| 1 | 1 | |
| 2 | 2 | const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' |
| 3 | 3 | const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' |
| 4 | +const TIAOZHUAN = 'https://jy.scjysm.asia:18086/cdwlMall/' | |
| 4 | 5 | // const DOMAIN_PREFIXPING = 'http://128.10.250.134:9003' |
| 5 | 6 | // const DOMAIN_PREFIX = 'http://128.10.250.134:9007' |
| 6 | 7 | const LIULIANG = 'https://jy.scjysm.asia:18086/liuliang' |
| ... | ... | @@ -44,7 +45,7 @@ module.exports = { |
| 44 | 45 | terminal: TERMINAL, // 画布设备 1 小程序，2 H5，3 App 4 电脑 |
| 45 | 46 | SettledMerchantPrefix: 'https://jy.scjysm.asia:18086/cdwlMall/settled-merchant', //商家入驻链接 |
| 46 | 47 | |
| 47 | - shareLink: DOMAIN_PREFIX + '/cdwlMall/meh5', // 分享地址 | |
| 48 | + shareLink: TIAOZHUAN + 'meh5', // 分享地址 | |
| 48 | 49 | // shareLink: 'http://172.16.61.123:9007/h5', // 分享地址 |
| 49 | 50 | |
| 50 | 51 | ... | ... |
wenjuan-h5/config/api.js
| 1 | 1 | |
| 2 | -// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/admin-server' | |
| 3 | -// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/api' | |
| 4 | -// let DOMAIN_PREFIXPING = 'http://172.16.61.125:9003' | |
| 5 | -// let DOMAIN_PREFIX = 'http://172.16.61.125:9007' | |
| 6 | - | |
| 7 | - | |
| 8 | -// const DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/meserver/admin-server' | |
| 9 | -// const DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/meserver/api' | |
| 10 | -// const DOMAIN_PREFIXPING = 'http://172.16.61.123:80/cdwlMall/admin-server' | |
| 11 | -// const DOMAIN_PREFIX = 'http://172.16.61.123:80/cdwlMall/api' | |
| 12 | - | |
| 13 | -// const host = `${window.location.protocol}//${window.location.host}` | |
| 14 | -// const DOMAIN_PREFIXPING = `${host}/cdwlMall/admin-server` | |
| 15 | -// const DOMAIN_PREFIX =`${host}/cdwlMall/meserver/api` | |
| 16 | 2 | |
| 17 | 3 | let DOMAIN_PREFIXPING = `http://10.0.0.41:9003` |
| 18 | 4 | let DOMAIN_PREFIX = 'http://10.0.0.41:9007' |
| 19 | 5 | |
| 20 | 6 | let host = window.location.host; |
| 21 | 7 | let hostall = window.location.href; |
| 22 | -if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { | |
| 8 | +if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:8082'|| host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { | |
| 23 | 9 | |
| 24 | - DOMAIN_PREFIXPING = 'http://10.0.0.41:9003' | |
| 25 | - DOMAIN_PREFIX = 'http://10.0.0.41:9007' | |
| 10 | + // DOMAIN_PREFIXPING = 'http://10.0.0.41:9003' | |
| 11 | + DOMAIN_PREFIXPING = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' | |
| 12 | + DOMAIN_PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' | |
| 13 | + // DOMAIN_PREFIX = 'http://10.0.0.41:9007' | |
| 26 | 14 | |
| 27 | 15 | } else { |
| 28 | 16 | let c1 = hostall.split('cdwlMall')[0]; |
| 29 | 17 | DOMAIN_PREFIXPING = `${c1}/cdwlMall/admin-server` |
| 30 | - DOMAIN_PREFIX =`${c1}/cdwlMall/meserver/api` | |
| 18 | + DOMAIN_PREFIX =`${c1}/cdwlMall/meserver/api` | |
| 31 | 19 | } |
| 32 | 20 | // #ifndef H5 |
| 33 | 21 | const WX_API_BASE = DOMAIN_PREFIX // app | ... | ... |
wenjuan-h5/pages_category_page1/question/question.vue
| ... | ... | @@ -702,7 +702,9 @@ |
| 702 | 702 | |
| 703 | 703 | NET.request(API.wenjuanUp, tijiaoObj, 'post').then(res => { |
| 704 | 704 | // this.show =true |
| 705 | - | |
| 705 | + // if(){ | |
| 706 | + // https://jy.scjysm.asia:18086/h5-web/#/activity/pages/lottery/index?detailId=1892112909937541122&style=2 | |
| 707 | + // } | |
| 706 | 708 | if (res.data == 'false') { |
| 707 | 709 | uni.reLaunch({ |
| 708 | 710 | url: `/pages_category_page1/question/succe?chonfu=true` | ... | ... |
wenjuan-pc/src/utils/request.js
| ... | ... | @@ -21,8 +21,8 @@ let hostall = window.location.href; |
| 21 | 21 | if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { |
| 22 | 22 | |
| 23 | 23 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; |
| 24 | - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; | |
| 25 | - // baseURL = 'http://172.16.61.123:9003'; | |
| 24 | + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; | |
| 25 | + baseURL = 'http://128.10.249.21:9003'; | |
| 26 | 26 | // baseURL = 'http://172.16.61.125:9003'; |
| 27 | 27 | // baseURL = 'http://192.168.2.36:9003'; |
| 28 | 28 | // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; | ... | ... |
wenjuan-pc/src/views/investigation/index.vue
| ... | ... | @@ -359,19 +359,22 @@ |
| 359 | 359 | <!-- <img :src="secondData.coverImage" alt="" style="width:25%" /> --> |
| 360 | 360 | </div> |
| 361 | 361 | <div style="padding: 20px 0 ;">参与答卷奖励</div> |
| 362 | - <el-descriptions class="margin-top" :column="3" border :label-style="labelStyle" | |
| 363 | - :content-style="contentStyle"> | |
| 362 | + <el-descriptions class="margin-top" :column="3" border :label-style="labelStylejiang" | |
| 363 | + :content-style="contentStylejiang"> | |
| 364 | 364 | <el-descriptions-item> |
| 365 | 365 | <template slot="label"> |
| 366 | 366 | 提交问卷后 |
| 367 | 367 | </template> |
| 368 | - {{ secondData.rewardForParticipation }} | |
| 368 | + {{ secondData.rewardForParticipation!=''?'转盘抽奖':'不设置奖励'}} | |
| 369 | 369 | </el-descriptions-item> |
| 370 | 370 | <el-descriptions-item> |
| 371 | 371 | <template slot="label"> |
| 372 | 372 | 奖励 |
| 373 | 373 | </template> |
| 374 | - | |
| 374 | + <div> | |
| 375 | + <span>{{ secondData.rewardForParticipation!=''?'转盘抽奖活动':''}}</span> | |
| 376 | + <span v-if="jiangli.id && jiangli.id!=''" style="padding: 0 20px;color: #3F9B6A;cursor: pointer;" @click="actGo(1)">查看</span> | |
| 377 | + </div> | |
| 375 | 378 | </el-descriptions-item> |
| 376 | 379 | </el-descriptions> |
| 377 | 380 | <div style="padding: 20px 0 ;">问卷题目</div> |
| ... | ... | @@ -566,7 +569,7 @@ |
| 566 | 569 | </div> |
| 567 | 570 | <el-form ref="form" :model="formInline" label-width="140px" |
| 568 | 571 | style="padding:20px;"> |
| 569 | - <el-radio-group v-model="formInline.rewardForParticipation" | |
| 572 | + <el-radio-group v-model="radioreward" | |
| 570 | 573 | @change="radioClick"> |
| 571 | 574 | <el-radio label="不设置奖励" value="不设置奖励">不设置奖励</el-radio> |
| 572 | 575 | <!-- <el-radio label="奖励积分" value="奖励积分">奖励积分</el-radio> --> |
| ... | ... | @@ -580,16 +583,15 @@ |
| 580 | 583 | 奖励 <el-input v-model="jifen" style="width:50px;" />积分 |
| 581 | 584 | </div> |
| 582 | 585 | </div> --> |
| 583 | - <div v-if="formInline.rewardForParticipation === '转盘抽奖'" | |
| 586 | + <div v-if="radioreward === '转盘抽奖'" | |
| 584 | 587 | style="padding: 0 0 20px 20px;"> |
| 585 | - | |
| 586 | - <div v-if="jiangli && jiangli.id" style="padding: 10px 0;"> | |
| 588 | + <div v-if="jiangli.id && jiangli.id!=''" style="padding: 10px 0;"> | |
| 587 | 589 | <span>{{jiangli.name}}</span> |
| 588 | 590 | <span style="padding: 0 20px;color: #3F9B6A;cursor: pointer;" @click="actGo(1)">查看</span> |
| 589 | 591 | <span style="color: #3F9B6A;cursor: pointer;" @click="actGo(2)">编辑</span> |
| 590 | 592 | </div> |
| 591 | 593 | <div v-else> |
| 592 | - <el-button class="buttonHover" | |
| 594 | + <el-button | |
| 593 | 595 | style="color: #fff;background-color: #3F9B6A;" |
| 594 | 596 | @click="actGo(0)">创建活动</el-button> |
| 595 | 597 | </div> |
| ... | ... | @@ -606,15 +608,7 @@ |
| 606 | 608 | |
| 607 | 609 | </div> |
| 608 | 610 | </div> |
| 609 | - <el-dialog :visible.sync="iframaShow" title="创建活动" width="90%" center top="1%" | |
| 610 | - :close-on-click-modal="false" append-to-body> | |
| 611 | - <div style="padding:20px;"> | |
| 612 | - <iframe :src="iframaUrl" ref="iframe" frameborder="0" width="100%" height="700px" /> | |
| 613 | - <div style="padding-top:20px;display:flex;justify-content: flex-end;"> | |
| 614 | - </div> | |
| 615 | - </div> | |
| 616 | 611 | |
| 617 | - </el-dialog> | |
| 618 | 612 | </el-tab-pane> |
| 619 | 613 | <el-tab-pane label="问卷内容" name="second"> |
| 620 | 614 | <div style="width: 100%"> |
| ... | ... | @@ -1002,27 +996,27 @@ |
| 1002 | 996 | <div>参与答卷奖励</div> |
| 1003 | 997 | </div> |
| 1004 | 998 | <el-form ref="form" :model="secondData" label-width="140px" style="padding:20px;"> |
| 1005 | - <el-radio-group v-model="secondData.rewardForParticipation" | |
| 999 | + <el-radio-group v-model="radioreward" | |
| 1006 | 1000 | @change="radioClick"> |
| 1007 | 1001 | <el-radio label="不设置奖励" value="不设置奖励">不设置奖励</el-radio> |
| 1008 | 1002 | <!-- <el-radio label="奖励积分" value="奖励积分">奖励积分</el-radio> --> |
| 1009 | 1003 | <el-radio label="转盘抽奖" value="转盘抽奖">转盘抽奖</el-radio> |
| 1010 | 1004 | <!-- <el-radio label="优惠券" value="优惠券">优惠券</el-radio> --> |
| 1011 | 1005 | </el-radio-group> |
| 1012 | - <div v-if="secondData.rewardForParticipation === '转盘抽奖'" | |
| 1006 | + <div v-if="radioreward === '转盘抽奖'" | |
| 1013 | 1007 | style="padding: 0 0 20px 20px;"> |
| 1014 | - <div v-if="jiangli && jiangli.id" style="padding: 10px 0;"> | |
| 1008 | + <div v-if="jiangli.id && jiangli.id!=''" style="padding: 10px 0;"> | |
| 1015 | 1009 | <span>{{jiangli.name}}</span> |
| 1016 | 1010 | <span style="padding: 0 20px;color: #3F9B6A;cursor: pointer;" @click="actGo(1)">查看</span> |
| 1017 | 1011 | <span style="color: #3F9B6A;cursor: pointer;" @click="actGo(2)">编辑</span> |
| 1018 | 1012 | </div> |
| 1019 | 1013 | <div v-else> |
| 1020 | - <el-button class="buttonHover" | |
| 1014 | + <el-button | |
| 1021 | 1015 | style="color: #fff;background-color: #3F9B6A;" |
| 1022 | 1016 | @click="actGo(0)">创建活动</el-button> |
| 1023 | 1017 | </div> |
| 1024 | - | |
| 1025 | - | |
| 1018 | + | |
| 1019 | + | |
| 1026 | 1020 | </div> |
| 1027 | 1021 | </el-form> |
| 1028 | 1022 | </div> |
| ... | ... | @@ -1458,6 +1452,15 @@ |
| 1458 | 1452 | </div> |
| 1459 | 1453 | </div> |
| 1460 | 1454 | </el-dialog> |
| 1455 | + <el-dialog :visible.sync="iframaShow" title="创建活动" width="90%" center top="1%" | |
| 1456 | + :close-on-click-modal="false" append-to-body> | |
| 1457 | + <div style="padding:20px;"> | |
| 1458 | + <iframe :src="iframaUrl" ref="iframe" frameborder="0" width="100%" height="700px" /> | |
| 1459 | + <div style="padding-top:20px;display:flex;justify-content: flex-end;"> | |
| 1460 | + </div> | |
| 1461 | + </div> | |
| 1462 | + | |
| 1463 | + </el-dialog> | |
| 1461 | 1464 | </div> |
| 1462 | 1465 | |
| 1463 | 1466 | </template> |
| ... | ... | @@ -1526,7 +1529,7 @@ |
| 1526 | 1529 | filler: '', |
| 1527 | 1530 | fillingConditions: '可重复填写', |
| 1528 | 1531 | coverImage: '', |
| 1529 | - rewardForParticipation: '不设置奖励', | |
| 1532 | + rewardForParticipation: '', | |
| 1530 | 1533 | questionId: '', |
| 1531 | 1534 | responseStatus: '', |
| 1532 | 1535 | reviewStatus: '1', |
| ... | ... | @@ -1596,6 +1599,12 @@ |
| 1596 | 1599 | contentStyle: { |
| 1597 | 1600 | width: '246px' |
| 1598 | 1601 | }, |
| 1602 | + labelStylejiang: { | |
| 1603 | + width: '180px' | |
| 1604 | + }, | |
| 1605 | + contentStylejiang: { | |
| 1606 | + width: '300px' | |
| 1607 | + }, | |
| 1599 | 1608 | timuXiang: false, |
| 1600 | 1609 | timuData: {}, |
| 1601 | 1610 | multipleSelection: [], |
| ... | ... | @@ -1725,9 +1734,13 @@ |
| 1725 | 1734 | iframaShow: false, |
| 1726 | 1735 | iframeWin:null, |
| 1727 | 1736 | jiangli:{ |
| 1728 | - id:1894944771529637890, | |
| 1729 | - name:'商业抽奖活动' | |
| 1730 | - } | |
| 1737 | + id:'1894944771529637890', //活动id | |
| 1738 | + name:'商业抽奖活动', //活动名称 | |
| 1739 | + styles:'1', //抽奖样式 1：大转盘 2：砸金蛋 3：刮刮卡 4：翻牌乐 5：福袋 6：摇一摇 | |
| 1740 | + // id:'', | |
| 1741 | + // name:'' | |
| 1742 | + }, | |
| 1743 | + radioreward:'不设置奖励' | |
| 1731 | 1744 | } |
| 1732 | 1745 | }, |
| 1733 | 1746 | computed: { |
| ... | ... | @@ -1738,21 +1751,18 @@ |
| 1738 | 1751 | }, |
| 1739 | 1752 | mounted() { |
| 1740 | 1753 | // 监听iframe页面点击按钮触发事件 |
| 1741 | - | |
| 1742 | 1754 | window.addEventListener('message', (event) => { |
| 1743 | 1755 | const data = event.data |
| 1744 | 1756 | if (data.code === 'success') { |
| 1745 | 1757 | // alert(data.test) |
| 1746 | 1758 | console.log('id',data.id) |
| 1747 | 1759 | console.log('name',data.name) |
| 1748 | - // this.jiangli = { | |
| 1749 | - // id:data.id, | |
| 1750 | - // name:data.name | |
| 1751 | - // } | |
| 1752 | 1760 | this.jiangli = { |
| 1753 | - id:1894944771529637890, | |
| 1754 | - name:'商业抽奖活动' | |
| 1761 | + id:''+data.id, | |
| 1762 | + name:data.name, | |
| 1763 | + styles:data.style | |
| 1755 | 1764 | } |
| 1765 | + this.iframaShow = false | |
| 1756 | 1766 | } |
| 1757 | 1767 | }) |
| 1758 | 1768 | // this.iframeWin = this.$refs.iframe.contentWindow |
| ... | ... | @@ -1799,23 +1809,15 @@ |
| 1799 | 1809 | }) |
| 1800 | 1810 | return false; |
| 1801 | 1811 | } |
| 1802 | - if (this.formInline.rewardForParticipation == '奖励积分') { | |
| 1803 | - if (this.jifen == '') { | |
| 1812 | + if (this.radioreward == '转盘抽奖') { | |
| 1813 | + if (this.jiangli.id && this.jiangli.id== '') { | |
| 1804 | 1814 | this.$message({ |
| 1805 | - message: '请输入设置的积分', | |
| 1806 | - }) | |
| 1807 | - return false; | |
| 1808 | - } | |
| 1809 | - } else { | |
| 1810 | - // this.formInline.rewardForParticipation = | |
| 1811 | - } | |
| 1812 | - if (this.formInline.rewardForParticipation == '转盘抽奖') { | |
| 1813 | - if (this.choujiang == '') { | |
| 1814 | - this.$message({ | |
| 1815 | - message: '请输入转盘抽奖次数', | |
| 1815 | + message: '请创建转盘活动', | |
| 1816 | 1816 | }) |
| 1817 | 1817 | return false; |
| 1818 | 1818 | } |
| 1819 | + }else{ | |
| 1820 | + this.jiangli.id = '' | |
| 1819 | 1821 | } |
| 1820 | 1822 | let ids = null |
| 1821 | 1823 | if (this.wenConstData.length != 0) { |
| ... | ... | @@ -1827,7 +1829,7 @@ |
| 1827 | 1829 | }) |
| 1828 | 1830 | return false; |
| 1829 | 1831 | } |
| 1830 | - | |
| 1832 | + this.formInline.rewardForParticipation = this.jiangli.id | |
| 1831 | 1833 | this.formInline.createTime = this.currentTime() |
| 1832 | 1834 | TerminaAdd(this.formInline).then(res => { |
| 1833 | 1835 | if (res.data.code == '500') { |
| ... | ... | @@ -1894,7 +1896,7 @@ |
| 1894 | 1896 | item.question = JSON.parse(item.question) |
| 1895 | 1897 | } |
| 1896 | 1898 | const array = this.objectToArray(item.question) |
| 1897 | - | |
| 1899 | + this.jiangli.id = item.rewardForParticipation | |
| 1898 | 1900 | this.wenData = array |
| 1899 | 1901 | // this.secondData.cereQuestionManagements.map((res, index) => { |
| 1900 | 1902 | // if (typeof res.optionSettings == 'string') { |
| ... | ... | @@ -2060,7 +2062,12 @@ |
| 2060 | 2062 | if (typeof item.question === 'string') { |
| 2061 | 2063 | item.question = JSON.parse(item.question) |
| 2062 | 2064 | } |
| 2063 | - | |
| 2065 | + if(item.rewardForParticipation!=''){ | |
| 2066 | + this.radioreward='转盘抽奖' | |
| 2067 | + }else{ | |
| 2068 | + this.radioreward='不设置奖励' | |
| 2069 | + } | |
| 2070 | + this.jiangli.id = item.rewardForParticipation | |
| 2064 | 2071 | this.secondDataTi = item.cereQuestionManagements |
| 2065 | 2072 | this.bainjiBox = true |
| 2066 | 2073 | |
| ... | ... | @@ -2083,6 +2090,17 @@ |
| 2083 | 2090 | if (this.secondDataTi.length != 0) { |
| 2084 | 2091 | ids = this.secondDataTi.map(item => item.id); |
| 2085 | 2092 | } |
| 2093 | + if (this.radioreward == '转盘抽奖') { | |
| 2094 | + if (this.jiangli.id &&this.jiangli.id== '') { | |
| 2095 | + this.$message({ | |
| 2096 | + message: '请创建转盘活动', | |
| 2097 | + }) | |
| 2098 | + return false; | |
| 2099 | + } | |
| 2100 | + }else{ | |
| 2101 | + this.jiangli.id = '' | |
| 2102 | + } | |
| 2103 | + this.secondData.rewardForParticipation = this.jiangli.id | |
| 2086 | 2104 | this.secondData.questionId = ids.join(',') |
| 2087 | 2105 | this.secondData.updateTime = this.currentTime() |
| 2088 | 2106 | |
| ... | ... | @@ -2561,7 +2579,7 @@ |
| 2561 | 2579 | filler: '', |
| 2562 | 2580 | fillingConditions: '可重复填写', |
| 2563 | 2581 | coverImage: '', |
| 2564 | - rewardForParticipation: '不设置奖励', | |
| 2582 | + rewardForParticipation: '', | |
| 2565 | 2583 | questionId: '', |
| 2566 | 2584 | responseStatus: '', |
| 2567 | 2585 | reviewStatus: '1', |
| ... | ... | @@ -2570,8 +2588,13 @@ |
| 2570 | 2588 | needGender: '必填', |
| 2571 | 2589 | needOpinion: '必填', |
| 2572 | 2590 | } |
| 2591 | + // this.jiangli={ | |
| 2592 | + // id:'', | |
| 2593 | + // name:'', | |
| 2594 | + // styles:'' | |
| 2595 | + // } | |
| 2573 | 2596 | this.xuanzheData = [] |
| 2574 | - | |
| 2597 | + this.radioreward='不设置奖励' | |
| 2575 | 2598 | const today = new Date(); |
| 2576 | 2599 | const startOfToday = new Date(today.getFullYear(), today.getMonth(), today.getDate()); |
| 2577 | 2600 | const endOfToday = new Date(today.getFullYear(), today.getMonth(), today.getDate()); |
| ... | ... | @@ -2814,10 +2837,10 @@ |
| 2814 | 2837 | this.iframaUrl = |
| 2815 | 2838 | `https://jy.scjysm.asia:18086/cdwltool/addEmptyLottery?token=${token}&id=${this.jiangli.id}&channel=shangye&thirdPartyUrl=http://localhost:9529/#/investigation/index` |
| 2816 | 2839 | } |
| 2817 | - | |
| 2818 | - // window.location.href = | |
| 2840 | + | |
| 2841 | + // window.location.href = | |
| 2819 | 2842 | }, |
| 2820 | - | |
| 2843 | + | |
| 2821 | 2844 | } |
| 2822 | 2845 | |
| 2823 | 2846 | } |
| ... | ... | @@ -3191,4 +3214,4 @@ |
| 3191 | 3214 | } |
| 3192 | 3215 | |
| 3193 | 3216 | } |
| 3194 | -</style> | |
| 3195 | 3217 | \ No newline at end of file |
| 3218 | +</style> | ... | ... |