调整
@@ -812,27 +812,13 @@
-
@@ -963,7 +949,7 @@
-
-
- {{scope.$index +1}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row.reviewStatus == '1'?'待提交':scope.row.reviewStatus == '2'?'待审核':scope.row.reviewStatus == '3'?'审核通过':scope.row.reviewStatus == '4'?'不通过':'已下架'}}
-
-
+
+
+
+ {{ scope.$index +1 }}
+
+
+
+
+
+ {{ scope.row.reviewStatus == '1'?'待提交':scope.row.reviewStatus == '2'?'待审核':scope.row.reviewStatus == '3'?'审核通过':scope.row.reviewStatus == '4'?'不通过':'已禁用' }}
+
+
-
-
+
+
问卷标题
- {{secondData.title}}
+ {{ secondData.title }}
状态
- {{secondData.reviewStatus == '1'?'待提交':secondData.reviewStatus == '2'?'待审核':secondData.reviewStatus == '3'?'审核通过':secondData.reviewStatus == '4'?'不通过':'已下架'}}
+ {{ secondData.reviewStatus == '1'?'待提交':secondData.reviewStatus == '2'?'待审核':secondData.reviewStatus == '3'?'审核通过':secondData.reviewStatus == '4'?'不通过':'已禁用' }}
开始时间
- {{secondData.startDate}}
+ {{ secondData.startDate }}
结束时间
- {{secondData.endDate}}
+ {{ secondData.endDate }}
预计填写时长
- {{secondData.estimatedTime}}
+ {{ secondData.estimatedTime }}
发布端口
- {{secondData.publishPort}}
+ {{ secondData.publishPort }}
问卷类型
- {{secondData.questionnaireType}}
+ {{ secondData.questionnaireType }}
填写条件
- {{secondData.fillingConditions}}
+ {{ secondData.fillingConditions }}
问卷介绍
- {{secondData.remarks}}
+ {{ secondData.remarks }}
+
提交问卷后
- {{secondData.rewardForParticipation}}
+ {{ secondData.rewardForParticipation }}
@@ -172,24 +191,21 @@
+
- {{scope.$index +1}}
+ {{ scope.$index +1 }}
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
diff --git a/admin-web-master/src/views/investigation/index.vue b/admin-web-master/src/views/investigation/index.vue
index aa89201..20f8ccf 100644
--- a/admin-web-master/src/views/investigation/index.vue
+++ b/admin-web-master/src/views/investigation/index.vue
@@ -1,1222 +1,1336 @@
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
- ![]()
-
-
- {{text}}
- 活动时间：{{tableData1[1].eventTheme}}至{{tableData1[1].planName}}
- 活动地点:{{tableData1[0].planName}}
-
- 修改后
修改前
-
+
方案编号
@@ -1716,10 +1702,14 @@
height:'42px',
},
labelStyleOne:{
- width:'110px',
+ width:'94px',
height:'42px',
color:'#000',
},
+ contentClassNameOne:{
+ width:'219px',
+ // height:'42px',
+ },
lidata:[],
lixiang:{},
duibiList:{},
diff --git a/admin-web-master/src/views/atmosphere/atmosphereHis.vue b/admin-web-master/src/views/atmosphere/atmosphereHis.vue
index e8d8952..8875a5b 100644
--- a/admin-web-master/src/views/atmosphere/atmosphereHis.vue
+++ b/admin-web-master/src/views/atmosphere/atmosphereHis.vue
@@ -90,9 +90,9 @@
-
+
+ ::v-deep .bian_css {
+ .el-dialog__header {
+ padding: 0px;
+ }
+ }
+
+ ::v-deep .buttonHover:hover {
+ color: #3f9b6a !important;
+ border-color: #c5e1d2 !important;
+ background-color: #ecf5f0 !important;
+ outline: none;
+ }
+
+ ::v-deep .el-pagination__total {
+ position: absolute;
+ left: 10px;
+ }
+
+ ::v-deep .diaslog_zhong {
+ .el-dialog__body {
+ padding: 10px 20px 20px 20px;
+ }
+
+ .el-upload--picture-card {
+ width: 130px;
+ height: 130px;
+ }
+ }
+
\ No newline at end of file
diff --git a/admin-web-master/src/views/investigation/answerSheet.vue b/admin-web-master/src/views/investigation/answerSheet.vue
index a820277..a12211e 100644
--- a/admin-web-master/src/views/investigation/answerSheet.vue
+++ b/admin-web-master/src/views/investigation/answerSheet.vue
@@ -3,7 +3,8 @@
调整
diff --git a/admin-web-master/src/views/customer/yixiang/index.vue b/admin-web-master/src/views/customer/yixiang/index.vue
index 2415790..e56042a 100644
--- a/admin-web-master/src/views/customer/yixiang/index.vue
+++ b/admin-web-master/src/views/customer/yixiang/index.vue
@@ -1,77 +1,66 @@
-
-
-
+
+ {{scope.$index+1}}
+
+
+
+
+ {{scope.row.resources.shopIds.length!=0?scope.row.resources.shopIds[0].shopName:scope.row.resources.advIds.length!=0?scope.row.resources.advIds[0].advertisingName:scope.row.resources.siteIds.length!=0?scope.row.resources.siteIds[0].venueName:'无'}}
+
+
+
+
+ {{scope.row.resources.shopIds.length!=0?'商铺':scope.row.resources.advIds.length!=0?'广告位':scope.row.resources.siteIds.length!=0?'场地':'无'}}
+
+
+
+
+ {{scope.row.resources.cereRentalPolicies.leaseTerm?scope.row.resources.cereRentalPolicies.leaseTerm:'无'}}
+
+
+
+
+ {{scope.row.resources.cereRentalPolicies.rentalPrice?scope.row.resources.cereRentalPolicies.rentalPrice:'无'}}
+
+
+
+
+ {{scope.row.resources.shopIds.length!=0?getStatusText(scope.row.resources.shopIds[0].publishStatus):scope.row.resources.advIds.length!=0?getStatusText(scope.row.resources.advIds[0].publishStatus):scope.row.resources.siteIds.length!=0?getStatusText(scope.row.resources.siteIds[0].publishStatus):'无'}}
+
+
+
+
+
+
+
+
-
-
-
-
- 商户意向管理 > 招商意向管理
-
-
-
-
-
- {{scope.$index +1 }}
-
-
-
-
-
-
-
- {{scope.row.shopType=='1'?'移动铺位':scope.row.shopType=='2'?'固定铺位':'无'}}
-
-
-
-
-
-
-
-
- {{scope.row.belongingDepartment || '无'}}
-
-
-
-
- {{scope.row.head || '无'}}
-
-
-
-
-
+
+
+ {{scope.$index +1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
-
-
-
- 一键匹配
-
-
-
- 查看
-
-
- 删除
-
-
+
+
+
+
+ 一键匹配
+
+
+
+ 删除
+
+
-
-
-
+
+
-
+
+
- 匹配记录
-
-
-
+
-
-
- {{scope.$index+1}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
- 返回
- 确定
-
-
-
-
+
+ 问卷调查 > 问卷审核
+ style="color:#000000e6"
+ >问卷审核
@@ -26,143 +27,161 @@
-
- 查询
+ 查询
- 重置
+ 重置
查看
+ 查看
- 审核
+ 审核
-
详情页
基本信息
- 问卷封面
+
- ![]()
+
+
- 参与答卷奖励
- 参与答卷奖励
+ 问卷题目
-
+
-
-
- 审核状态
-
- {{secondData.reviewStatus == '3'?'审核通过':secondData.reviewStatus == '4'?'不通过':''}}
-
-
-
- 审核意见
-
- {{secondData.reviewComments}}
-
+
+
+
+ 审核状态
+
+ {{ secondData.reviewStatus == '3'?'审核通过':secondData.reviewStatus == '4'?'不通过':'' }}
+
+
+
+ 审核意见
+
+ {{ secondData.reviewComments }}
+
-
+
-
{{ index +1 }}：{{ value.answer }}
@@ -201,84 +217,103 @@
+
创建人
- {{secondData.createUser}}
+ {{ secondData.createUser }}
创建时间
- {{secondData.createTime}}
+ {{ secondData.createTime }}
更新时间
-{{secondData.updateTime}}
+ {{ secondData.updateTime }}
-系统信息
- 审核信息
-审核信息
+
- 返回
+ 返回
-
-
-
- 通过
- 不通过
-
-
-
-
-
-
-
-
-
-
- 取消
- 确定
-
-
+
+
+
+ 通过
+ 不通过
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
-
+
+
+
+
+
-
-
+
+
+ 提交问卷后
+
+
+ {{ secondData.rewardForParticipation!=''?'转盘抽奖':'不设置奖励'}}
+
+
+
+ 奖励
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+
+ 创建人
+
+ {{ secondData.createUser }}
+
+
+
+ 创建时间
+
+ {{ secondData.createTime }}
+
+
+
+ 更新时间
+
+ {{ secondData.updateTime }}
+
+
+
+
+
+ 审核状态
+
+ {{ secondData.reviewStatus == '1' ? '待提交' : secondData.reviewStatus == '2' ? '待审核' :
+ secondData.reviewStatus
+ ==
+ '3' ? '审核通过' : secondData.reviewStatus == '4' ?'不通过':'已禁用' }}
+
+
+
+ 审核意见
+
+
+
+
+
+
+
-
-
- 问卷调查 > 问卷管理
-
-
-
-
-
- {{scope.$index +1}}
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
- 重置
-
-
-
-
-
-
-
- 新增
-
-
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{scope.row.reviewStatus == '1'?'待提交':scope.row.reviewStatus == '2'?'待审核':scope.row.reviewStatus == '3'?'已通过':scope.row.reviewStatus == '4'?'不通过':'已禁用'}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 重置
+
+
+
+
+
+
+
+ 新增
+
+ 查看
- 编辑
- 提交审核
- 禁用
- 统计
- 删除
- 预览
-
-
-
+
+
+ {{ scope.row.reviewStatus == '1' ? '待提交' : scope.row.reviewStatus == '2' ? '待审核' : scope.row.reviewStatus
+ ==
+ '3' ? '已通过' : scope.row.reviewStatus == '4' ?'不通过':'已禁用' }}
+
+
+
+
+
+
+
-
- 查看
+ 编辑
+ 提交审核
+
+ 禁用
+ 统计
+ 删除
+ 预览
+
+
+
+
+
- 共 {{ total }} 条
+
-
-
-
-
-
-
- ![]()
-
-
-
-
- 答卷数量：{{total1 || 0}}
- 起止时间：{{secondData.startDate}} 至 {{secondData.endDate}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
-
-
-
-
- {{secondsToMinutesAndSeconds(scope.row.responseTime)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
- 重置
-
-
- 详情
-
-
-
-
-
- 数据概况
-
-
-
-
- 今日新增
- {{tongjiTu.todayNumber}}
-
-
-
- 答卷总数
- {{tongjiTu.countNumber}}
-
-
- 平均答题时长
- {{secondsToMinutesAndSeconds(tongjiTu.averageDuration)}}
- 题目统计
-
-
- 返回
-
-
-
-
-
- 答卷详情
-
-
-
-
- 基本信息
-
-
- 提交人：{{daxiangData.userName}}
- 手机号：{{daxiangData.contactNumber}}
-
- 作答时长：{{secondsToMinutesAndSeconds(daxiangData.responseTime)}}
- 提交时间：{{daxiangData.createTime}}
-
- 填写条件：{{secondData.fillingConditions}}
-
- 问卷分数：{{daxiangData.questionnaireScore}}
- 用户意见：{{daxiangData.opinion}}
-
-
- 答卷详情
-
-
-
-
-
-
-
- *{{index}}.({{item.type}}) - {{item.title}} -
-
-
- {{val.answer}}
-
-
-
-
-
- {{val.answer}}
-
-
-
-
-
- {{item.choose}}
-
-
-
-
+
+ 详情页
-
-
-
-
- 问卷标题
-
- {{secondData.title}}
-
-
-
- 状态
-
- {{secondData.reviewStatus == '1'?'待提交':secondData.reviewStatus == '2'?'待审核':secondData.reviewStatus == '3'?'审核通过':secondData.reviewStatus == '4'?'不通过':'已禁用'}}
-
-
-
-
- 开始时间
-
- {{secondData.startDate}}
-
-
-
- 结束时间
-
- {{secondData.endDate}}
-
-
-
-
- 预计填写时长（分钟）
-
- {{secondData.estimatedTime}}
-
-
-
- 发布端口
-
- {{secondData.publishPort}}
-
-
-
- 问卷类型
-
- {{secondData.questionnaireType}}
-
-
-
- 填写条件
-
- {{secondData.fillingConditions}}
-
-
+
-->
+ 基本信息
-
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ 答卷数量：{{ total1 || 0 }}
+ 起止时间：{{ secondData.startDate }} 至 {{ secondData.endDate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+ {{ secondsToMinutesAndSeconds(scope.row.responseTime) }}
+
+
+
+
+
+
+
+
+
+ 查询
+
+ 重置
+
+
+ 详情
+
+
+
+
+
+ 数据概况
+ 截止{{ tongjiTu.statisticalTime }}
+
+
+
+
+
+ 今日新增
+ {{ tongjiTu.todayNumber || 0 }}
+
+
+
+ 答卷总数
+ {{ tongjiTu.countNumber || 0 }}
+
+
+ 平均答题时长
+
+ {{ secondsToMinutesAndSeconds(tongjiTu.averageDuration) }}
+
+ 题目统计
+
+
+ 返回
+
+
+
+
+ 答卷详情
+
+
+
+
+ 基本信息
+
+
+ 提交人：{{ daxiangData.userName }}
+ 手机号：{{ daxiangData.contactNumber }}
+
+ 作答时长：{{
+ secondsToMinutesAndSeconds(daxiangData.responseTime) }}
+ 提交时间：{{ daxiangData.createTime }}
+
+ 填写条件：{{ secondData.fillingConditions
+ }}
+
+ 问卷分数：{{ daxiangData.questionnaireScore
+ }}
+
+ 用户意见：{{ daxiangData.opinion }}
+
+
+ 答卷详情
+
+
+
+
+
+
+ *{{ index + }}.({{ item.type }}) + {{ item.title }} +
+
+
+ {{ val.answer }}
+
+
+
+
+
+ {{ val.answer }}
+
+
+
+
+
+ {{ item.choose}}
+
+
+
+
-
-
- 提交问卷后
-
- {{secondData.rewardForParticipation}}
-
-
-
- 奖励
-
-
-
-
-
-
-
- {{scope.$index +1}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 创建人
-
- {{secondData.createUser}}
-
-
-
- 创建时间
-
- {{secondData.createTime}}
-
-
-
- 更新时间
-
- {{secondData.updateTime}}
-
-
-
-
-
- 审核状态
-
- {{secondData.reviewStatus == '1'?'待提交':secondData.reviewStatus == '2'?'待审核':secondData.reviewStatus == '3'?'审核通过':secondData.reviewStatus == '4'?'不通过':'已禁用'}}
-
-
-
- 审核意见
-
-
-
-
-
-
- 详情页
+
+
+
+
+ 问卷标题
+
+ {{ secondData.title }}
+
+
+
+ 状态
+
+ {{ secondData.reviewStatus == '1' ? '待提交' : secondData.reviewStatus == '2' ? '待审核' :
+ secondData.reviewStatus
+ ==
+ '3' ? '审核通过' : secondData.reviewStatus == '4' ?'不通过':'已禁用' }}
+
+
+
+
+ 开始时间
+
+ {{ secondData.startDate }}
+
+
+
+ 结束时间
+
+ {{ secondData.endDate }}
+
+
+
+
+ 预计填写时长（分钟）
+
+ {{ secondData.estimatedTime }}
+
+
+
+ 发布端口
+
+ {{ secondData.publishPort }}
+
+
+
+ 问卷类型
+
+ {{ secondData.questionnaireType }}
+
+
+
+ 填写条件
+
+ {{ secondData.fillingConditions }}
+
+
-
- 基本信息
+ 参与答卷奖励
- 问卷题目
-
- {{ index +1 }}：{{ value.answer }}
-
-
- -
-
-
-
- 系统信息
- 审核信息
- {{secondData.reviewComments}}
-
- 返回
-
- 问卷介绍
+
+ 问卷封面
+
+
+ 参与答卷奖励
+
+ {{ secondData.rewardForParticipation!=''?getStatusText(secondData.actStyle):'无'}}
+ 查看
+
+ 问卷题目
+
+ {{ index + 1 }}：{{ value.answer }}
+
+
+ -
+
+
+
+ 系统信息
+ 审核信息
+ {{ secondData.reviewComments }}
+
+ 返回
+
+
-
+
+
+
+
+
+
+ 可重复填写
+ 不可重复填写
+
+
+
+
+
+
+
+
+
+ 必填
+ 不填
+
+
+
+
+ 必填
+ 不填
+
+
+
+
+ 必填
+ 不填
+
+
+
+
+
+ 必填
+ 不填
+
+
+
+
+ 新建问卷
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
- :picker-options="pickerOptions">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 可重复填写
-
-
-
-
-
-
-
-
-
- 必填
- 不填
-
-
-
-
- 必填
- 不填
-
-
-
-
- 必填
- 不填
-
-
-
-
-
- 必填
- 不填
-
-
-
-
-
-
-
- 基本信息
-
-
-
-
-
-
-
- 不设置奖励
- 奖励积分
- 转盘抽奖
- 优惠券
-
-
-
-
-
- 参与答卷奖励
-
-
-
- 奖励
-
-
-
- 奖励
-
-
-
-
-
-
-
-
-
-
-
-
-
- 问卷内容
-
-
-
- 新增
- 从题库中选择
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
+
+
+
+
+
+
+
+ 不设置奖励
+
+ 转盘抽奖
+
+
+
+
+
+
+
+
+ 参与答卷奖励
+
+
+
+
+ {{jiangli.actName}}
+ 查看
+ 编辑
+
+
+ 创建活动
+
+
+
+
+
+
+
+
+ 问卷内容
+
+
+
+ 新增
+ 从题库中选择
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+ ↑
+ ↓
+
+
+
+
+
+
+
+
+
+ 删除
+
+
-
-
-
-
-
-
-
-
- 从题库中选择
-
-
-
-
-
-
-
- 查询
-
- 重置
-
-
-
-
-
-
-
-
-
- {{scope.$index +1 }}
-
-
-
-
-
-
-
-
-
-
-
- 详情
-
-
- 确定
-
-
-
-
- 详情页
-
-
-
-
- 题目
-
- {{timuData.tikuTitle}}
-
-
-
- 题型
-
- {{timuData.questionType}}
-
-
-
- 隶属题库
-
- {{timuData.questionBank}}
-
-
-
-
-
- 默认是否必填
-
- {{timuData.isRequired}}
-
-
-
- 选项
-
-
-
-
-
-
- {{ key }}：{{ value }}
-
-
- 返回
-
-
-
+
- 新增题目
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+ 共 {{ totalTi }} 条
+
+
+ 确定
+
+
+
+
+ 详情页
+
+
+
+
+ 题目
+
+ {{ timuData.tikuTitle }}
+
+
+
+ 题型
+
+ {{ timuData.questionType }}
+
+
+
+ 隶属题库
+
+ {{ timuData.questionBank }}
+
+
+
+
+
+ 默认是否必填
+
+ {{ timuData.isRequired }}
+
+
+
+ 选项
+
+
+
+
+
+
+ {{ key }}：{{ value }}
+
+
+ 返回
+
+
+
-
+ 新增题目
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 垂直布局
+ 自由布局
+
+
+
+
-
- 必填
- 非必填
-
-
-
-
-
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
-
-
-
-
-
-
-
-
- + 添加
-
-
-
- 删除
-
-
- 确定
-
-
-
- 返回
- 确认
-
-
-
-
-
-
+ 必填
+ 非必填
+
+
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+
+ ↑
+ ↓
+
+
+
+
+
+
+ +
+ 添加
+
+
+
+ 删除
+
+
+ 确定
+
+
+
+ 返回
+ 确认
+
+
+
+
+
+
-
- 编辑问卷
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 可重复填写
-
-
-
-
-
-
-
-
- 必填
- 不填
-
-
-
-
- 必填
- 不填
-
-
-
-
- 必填
- 不填
-
-
-
-
-
- 必填
- 不填
-
-
-
-
-
-
- 基本信息
-
-
-
- 不设置奖励
- 奖励积分
- 转盘抽奖
- 优惠券
-
-
-
-
-
- 参与答卷奖励
-
-
-
- 奖励
-
-
-
- 奖励
-
-
-
-
-
-
-
-
-
-
-
-
-
- 问卷内容
-
-
-
- 新增
- 从题库中选择
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
- 从题库中选择
-
-
-
-
-
-
-
-
- 查询
-
- 重置
-
-
-
-
-
-
-
-
-
- {{scope.$index +1 }}
-
-
-
-
-
-
-
-
-
-
-
-
- 详情
-
-
- 确定
-
-
-
-
- 详情页
-
-
-
-
- 题目
-
- {{timuData.tikuTitle}}
-
-
-
- 题型
-
- {{timuData.questionType}}
-
-
-
- 隶属题库
-
- {{timuData.questionBank}}
-
-
-
-
-
- 默认是否必填
-
- {{timuData.isRequired}}
-
-
-
-
- 选项
-
-
-
-
-
-
- {{ key }}：{{ value }}
-
-
- 返回
-
-
-
-
- 新增题目
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 必填
- 非必填
-
-
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
-
-
-
-
-
-
-
-
- + 添加
-
-
-
- 删除
-
-
- 确定
-
-
-
- 返回
- 确认
-
-
-
-
- 禁用
-
-
-
-
-
-
-
-
- 取消
- 确定
-
-
-
+ 预览
-
+
+
+ 问卷作答地址：{{ wenjuanUrl }} 复制
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
-
+
不设置奖励
转盘抽奖
@@ -583,16 +585,16 @@
奖励
-->
-
-
@@ -372,8 +374,9 @@
奖励
@@ -569,8 +572,7 @@
-
-
-
问卷调查 > 题库管理
+
+
+ 问卷调查 >
+ 题库管理
+
-
-
-
+
+
-
-
+
-
-
- 查询
+ 查询
- 重置
+ 重置
+
-
+
- {{scope.$index +1}}
+ {{ scope.$index + 1 }}
-
-
-
-
-
+
-
-
+
-
-
- 新增
+ 新增
查看
- 编辑
+
+ 查看
+
+ 编辑
- 删除
+
+ 删除
+
-
-
-
-
-
+
请填写您的租赁意向
-
- 意向区域
-
- {{formList.belongingRegion ==''?'请选择':formList.belongingRegion}}
-
-
-
- 租金周期
-
- {{formList.zhouqi ==''?'请选择':formList.zhouqi}}
-
+
+ *
+ 意向区域
+
+
+ {{formList.belongingRegion ==''?'请选择':formList.belongingRegion}}
+
-
- 意向租金
-
- {{formList.zujin ==''?'请选择':formList.zujin}}
-
+
+ *租金周期
+
+
+ {{formList.leaseTerm ==''?'请选择':formList.leaseTerm}}
+
-
- 意向面积
-
- {{formList.mianji ==''?'请选择':formList.mianji}}
-
+
+ *意向租金
+
+
+ {{formList.zujin ==''?'请选择':formList.zujin}}
+
-
-
+
确定
@@ -127,53 +136,71 @@
data() {
return {
query: {
- shopName:'',
+ shopName: '',
belongingRegion: '',
- pageNumber: 0,
- pageSize: 10 ,
- publishStatus:2,
- minPrice:0,
- maxPrice:1000000
+ pageNumber: 0,
+ pageSize: 10,
+ publishStatus: 2,
+ minPrice: 0,
+ maxPrice: 1000000
},
pageindex: {
pageNumber: 0,
pageSize: 10,
- publishStatus:2,
- minPrice:0,
- maxPrice:1000000
+ publishStatus: 2,
+ minPrice: 0,
+ maxPrice: 1000000
},
tableData: [],
- areList: [
- {value: '武侯区', label: '武侯区'},
- {value: '锦江区', label: '锦江区'},
- {value: '青羊区', label: '青羊区'},
- {value: '金牛区', label: '金牛区'},
- {value: '双流区', label: '双流区'},
- {value: '郫都区', label: '郫都区'},
- {value: '龙泉驿区', label: '龙泉驿区'},
- {value: '温江区', label: '温江区'},
+ areList: [{
+ value: '武侯区',
+ label: '武侯区'
+ },
+ {
+ value: '锦江区',
+ label: '锦江区'
+ },
+ {
+ value: '青羊区',
+ label: '青羊区'
+ },
+ {
+ value: '金牛区',
+ label: '金牛区'
+ },
+ {
+ value: '双流区',
+ label: '双流区'
+ },
+ {
+ value: '郫都区',
+ label: '郫都区'
+ },
+ {
+ value: '龙泉驿区',
+ label: '龙泉驿区'
+ },
+ {
+ value: '温江区',
+ label: '温江区'
+ },
], // 区域列表
-
- showList:false,
+
+ showList: false,
zidongS: false,
formList: {
- zulei: '',
belongingRegion: '',
- zuqi:'',
zujin: '',
- mianji:'',
- name:'',
- phone:'',
- zhouqi:'',
+ actualUsableArea: '',
+ leaseTerm: '',
pageNumber: 0,
pageSize: 10,
- publishStatus:2
+ publishStatus: 2
},
showSex: false,
- show:false,
- index:1,
- companys: [
- {
+ show: false,
+ index: 1,
+ companys: [{
value: '1',
label: '商铺'
},
@@ -186,9 +213,9 @@
label: '广告位'
}
],
- show1:false,
- list:[],
- xuanval:0,
+ show1: false,
+ list: [],
+ xuanval: 0,
}
},
filters: {
@@ -215,10 +242,10 @@
},
// 查询
search() {
- this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.query, 1).then(res => {
- //成功回调
- this.tableData = res.data.data.content
- })
+ this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.query, 1).then(res => {
+ //成功回调
+ this.tableData = res.data.data.content
+ })
},
queryChange(key, val) {
this.query[`${key}`] = val[0].value;
@@ -230,223 +257,250 @@
url: `/pages/details/details?item=${items}`
})
},
-
-
+
+
// 自动匹配
zidong() {
- this.zidongS = true
+ this.zidongS = true
},
- showS(val){
- this.index = val
- if(val == 1){
- this.companys = [
- {
- value: '1',
- label: '商铺'
- },
- // {
- // value: '2',
- // label: '临铺'
- // },
- // {
- // value: '3',
- // label: '广告位'
- // }
- ]
-
- }else if(val ==2 ){
- this.companys = [
- {
- value: '1',
- label: '成华区'
- },
- {
- value: '2',
- label: '武侯区'
- },
- {
- value: '3',
- label: '锦江区'
- },
- {
- value: '4',
- label: '青羊区'
- },
- {
- value: '5',
- label: '金牛区'
- },
- {
- value: '6',
- label: '双流区'
- },
- {
- value: '7',
- label: '郫都区'
- },
- {
- value: '8',
- label: '龙泉驿区'
- },
- {
- value: '9',
- label: '温江区'
- }
-
-
- ]
- }else if(val == 3){
- this.companys = [
- {
- value: '1',
- label: '年'
- },
- {
- value: '2',
- label: '季'
- },
- {
- value: '3',
- label: '月'
- },
- {
- value: '4',
- label: '日'
- }
- ]
- }else if(val == 4){
- this.companys = [
- {
- value: '1',
- label: '0-2000'
- },
- {
- value: '2',
- label: '2000-5000'
- },
- {
- value: '3',
- label: '5000-10000'
- }
- ]
- }else{
- this.companys = [
- {
- value: '1',
- label: '0-100'
- },
- {
- value: '2',
- label: '100-200'
- },
- {
- value: '3',
- label: '200-300'
- }
- ]
- }
- this.showList = true
- },
- handleCompanyConfirm(e){
- if(this.index == 1){
- this.formList.zulei = e[0].label
- }else if(this.index == 2){
- this.formList.belongingRegion = e[0].label
- }else if(this.index == 3){
- this.formList.zhouqi = e[0].label
- }else if(this.index == 4){
- this.formList.zujin = e[0].label
- if(e[0].value == 1){
- this.formList.minPrice = 0
- this.formList.maxPrice = 2000
- }else if(e[0].value == 2){
- this.formList.minPrice = 2000
- this.formList.maxPrice = 5000
- }else{
- this.formList.minPrice = 5000
- this.formList.maxPrice = 10000
- }
- }else{
- this.formList.mianji = e[0].label
- if(e[0].value == 1){
- this.formList.minActualUsableArea = 0
- this.formList.maxActualUsableArea = 100
- }else if(e[0].value == 2){
- this.formList.minActualUsableArea = 100
- this.formList.maxActualUsableArea = 200
- }else{
- this.formList.minActualUsableArea = 200
- this.formList.maxActualUsableArea = 300
+ showS(val) {
+ this.index = val
+ if (val == 1) {
+ this.companys = [{
+ value: '1',
+ label: '商铺'
+ },
+ // {
+ // value: '2',
+ // label: '临铺'
+ // },
+ // {
+ // value: '3',
+ // label: '广告位'
+ // }
+ ]
+
+ } else if (val == 2) {
+ this.companys = [{
+ value: '1',
+ label: '成华区'
+ },
+ {
+ value: '2',
+ label: '武侯区'
+ },
+ {
+ value: '3',
+ label: '锦江区'
+ },
+ {
+ value: '4',
+ label: '青羊区'
+ },
+ {
+ value: '5',
+ label: '金牛区'
+ },
+ {
+ value: '6',
+ label: '双流区'
+ },
+ {
+ value: '7',
+ label: '郫都区'
+ },
+ {
+ value: '8',
+ label: '龙泉驿区'
+ },
+ {
+ value: '9',
+ label: '温江区'
+ }
+
+
+ ]
+ } else if (val == 3) {
+ this.companys = [{
+ value: '1',
+ label: '年'
+ },
+ {
+ value: '2',
+ label: '季'
+ },
+ {
+ value: '3',
+ label: '月'
+ },
+ {
+ value: '4',
+ label: '日'
+ }
+ ]
+ } else if (val == 4) {
+ this.companys = [{
+ value: '1',
+ label: '0-2000'
+ },
+ {
+ value: '2',
+ label: '2000-5000'
+ },
+ {
+ value: '3',
+ label: '5000-10000'
+ }
+ ]
+ } else {
+ this.companys = [{
+ value: '1',
+ label: '0-100'
+ },
+ {
+ value: '2',
+ label: '100-200'
+ },
+ {
+ value: '3',
+ label: '200-300'
+ }
+ ]
}
-
- }
-
- },
- setList(val){
- this.xuanval = val
- if(val == 0){
- const filteredTableData = this.tableData.filter(item => item.hasOwnProperty('belongingRegion'));
-
- // 提取 belongingRegion 字段并进行去重
- const labeledBelongingRegions = filteredTableData.map(item => ({
- label: item.belongingRegion
- }));
-
- const uniqueBelongingRegions = [...new Set(labeledBelongingRegions)];
- console.log(uniqueBelongingRegions)
- this.list = uniqueBelongingRegions
- }else if(val == 1){
- this.list = []
- }else if(val == 2){
- this.list = []
- }
- this.show1 = true
- },
- confirm(val){
- let page = {
- pageNumber: 0,
- pageSize: 10,
- belongingRegion:val[0].label
- }
- this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', page, 1).then(res => {
- //成功回调
- this.tableData = res.data.data.content
- })
- },
- clearGet(){
- this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.pageindex, 1).then(res => {
- //成功回调
- this.tableData = res.data.data.content
- })
- },
- request(){
- this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.formList, 1).then(res => {
- //成功回调
- this.tableData = res.data.data.content
- if(res.data.data.content.length!=0){
- let obj={
- type:2,
- matchingRecord:JSON.stringify(res.data.data.content)
+ this.showList = true
+ },
+ handleCompanyConfirm(e) {
+ if (this.index == 1) {
+ this.formList.zulei = e[0].label
+ } else if (this.index == 2) {
+ this.formList.belongingRegion = e[0].label
+ } else if (this.index == 3) {
+ this.formList.leaseTerm = e[0].label
+ } else if (this.index == 4) {
+ this.formList.zujin = e[0].label
+ if (e[0].value == 1) {
+ this.formList.minPrice = 0
+ this.formList.maxPrice = 2000
+ } else if (e[0].value == 2) {
+ this.formList.minPrice = 2000
+ this.formList.maxPrice = 5000
+ } else {
+ this.formList.minPrice = 5000
+ this.formList.maxPrice = 10000
}
- this.$http.sendRequest('/resourceStrategyMatchingRecord/insert', 'POST', obj, 1).then(res => {
- })
+ } else {
+ this.formList.actualUsableArea = e[0].label
+ // if (e[0].value == 1) {
+ // this.formList.minActualUsableArea = 0
+ // this.formList.maxActualUsableArea = 100
+ // } else if (e[0].value == 2) {
+ // this.formList.minActualUsableArea = 100
+ // this.formList.maxActualUsableArea = 200
+ // } else {
+ // this.formList.minActualUsableArea = 200
+ // this.formList.maxActualUsableArea = 300
+ // }
+
}
-
- })
- this.formList = {
- zulei: '',
- belongingRegion: '',
- zujin: '',
- mianji:'',
- name:'',
- phone:'',
+
+ },
+ setList(val) {
+ this.xuanval = val
+ if (val == 0) {
+ const filteredTableData = this.tableData.filter(item => item.hasOwnProperty('belongingRegion'));
+
+ // 提取 belongingRegion 字段并进行去重
+ const labeledBelongingRegions = filteredTableData.map(item => ({
+ label: item.belongingRegion
+ }));
+
+ const uniqueBelongingRegions = [...new Set(labeledBelongingRegions)];
+ console.log(uniqueBelongingRegions)
+ this.list = uniqueBelongingRegions
+ } else if (val == 1) {
+ this.list = []
+ } else if (val == 2) {
+ this.list = []
+ }
+ this.show1 = true
+ },
+ confirm(val) {
+ let page = {
pageNumber: 0,
pageSize: 10,
- publishStatus:2
-
+ belongingRegion: val[0].label
+ }
+ this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', page, 1).then(res => {
+ //成功回调
+ this.tableData = res.data.data.content
+ })
+ },
+ clearGet() {
+ this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.pageindex, 1).then(res => {
+ //成功回调
+ this.tableData = res.data.data.content
+ })
+ },
+ request() {
+ if (!this.formList.belongingRegion) {
+ uni.showToast({
+ icon: 'none',
+ title: '请选择意向区域'
+ });
+ return false;
+ }
+ if (!this.formList.leaseTerm) {
+ uni.showToast({
+ icon: 'none',
+ title: '请选择租金周期'
+ });
+ return false;
+ }
+ if (!this.formList.zujin) {
+ uni.showToast({
+ icon: 'none',
+ title: '请选择意向租金'
+ });
+ return false;
+ }
+ if (!this.formList.actualUsableArea) {
+ uni.showToast({
+ icon: 'none',
+ title: '请选择意向面积'
+ });
+ return false;
+ }
+ this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.formList, 1).then(res => {
+ //成功回调
+ this.tableData = res.data.data.content
+ if (res.data.data.content.length != 0) {
+ let obj = {
+ leaseTerm: this.formList.leaseTerm,
+ rentalPrice:this.formList.zujin,
+ actualUsableArea:this.formList.actualUsableArea,
+ belongingRegion:this.formList.belongingRegion,
+ applicableResources:'商铺',
+ matchingRecord: JSON.stringify(res.data.data.content),
+ type:2
+ }
+ this.$http.sendRequest('/resourceStrategyMatchingRecord/insert', 'POST', obj, 1).then(
+ res => {
+ this.formList = {
+ belongingRegion: '',
+ zujin: '',
+ actualUsableArea: '',
+ leaseTerm: '',
+ pageNumber: 0,
+ pageSize: 10,
+ publishStatus: 2
+ }
+ })
+ }
+
+ })
+
+ this.zidongS = false
}
- this.zidongS = false
- }
}
}
diff --git a/wenjuan-h5/pages_category_page1/question/question.vue b/wenjuan-h5/pages_category_page1/question/question.vue
index 0d90e37..2aa7a8c 100644
--- a/wenjuan-h5/pages_category_page1/question/question.vue
+++ b/wenjuan-h5/pages_category_page1/question/question.vue
@@ -697,14 +697,12 @@
// console.log(result)
// console.log(JSON.stringify(result))
// console.log(tijiaoObj)
- // console.log(JSON.stringify(tijiaoObj))
+ // console.log(this.wenjuan)
// return
NET.request(API.wenjuanUp, tijiaoObj, 'post').then(res => {
// this.show =true
- // if(){
- // https://jy.scjysm.asia:18086/h5-web/#/activity/pages/lottery/index?detailId=1892112909937541122&style=2
- // }
+
if (res.data == 'false') {
uni.reLaunch({
url: `/pages_category_page1/question/succe?chonfu=true`
@@ -713,6 +711,11 @@
uni.reLaunch({
url: `/pages_category_page1/question/succe?ids=${this.wenjuanIds}`
})
+ if(this.wenjuan.rewardForParticipation !=''){
+ // window.location.replace( `https://jy.scjysm.asia:18086/h5-web/#/activity/pages/lottery/index?detailId=${this.wenjuan.rewardForParticipation}&style=${this.wenjuan.style}`);
+ window.location.replace( `https://jy.scjysm.asia:18086/h5-web/#/activity/pages/lottery/index?detailId=${this.wenjuan.rewardForParticipation}&style=${this.wenjuan.actStyle}`);
+
+ }
}
})
diff --git a/wenjuan-pc/src/views/investigation/index.vue b/wenjuan-pc/src/views/investigation/index.vue
index 7566e51..20f8ccf 100644
--- a/wenjuan-pc/src/views/investigation/index.vue
+++ b/wenjuan-pc/src/views/investigation/index.vue
@@ -189,7 +189,8 @@
详情页
+
+
-
-
-
-
-
\ No newline at end of file
diff --git a/ceres-uniapp-master/pages_category_page1/question/question.vue b/ceres-uniapp-master/pages_category_page1/question/question.vue
index 9eee1e1..2aa7a8c 100644
--- a/ceres-uniapp-master/pages_category_page1/question/question.vue
+++ b/ceres-uniapp-master/pages_category_page1/question/question.vue
@@ -697,12 +697,12 @@
// console.log(result)
// console.log(JSON.stringify(result))
// console.log(tijiaoObj)
- // console.log(JSON.stringify(tijiaoObj))
+ // console.log(this.wenjuan)
// return
NET.request(API.wenjuanUp, tijiaoObj, 'post').then(res => {
// this.show =true
-
+
if (res.data == 'false') {
uni.reLaunch({
url: `/pages_category_page1/question/succe?chonfu=true`
@@ -711,6 +711,11 @@
uni.reLaunch({
url: `/pages_category_page1/question/succe?ids=${this.wenjuanIds}`
})
+ if(this.wenjuan.rewardForParticipation !=''){
+ // window.location.replace( `https://jy.scjysm.asia:18086/h5-web/#/activity/pages/lottery/index?detailId=${this.wenjuan.rewardForParticipation}&style=${this.wenjuan.style}`);
+ window.location.replace( `https://jy.scjysm.asia:18086/h5-web/#/activity/pages/lottery/index?detailId=${this.wenjuan.rewardForParticipation}&style=${this.wenjuan.actStyle}`);
+
+ }
}
})
diff --git a/ceres-uniapp-master/static/images/cjwt.png b/ceres-uniapp-master/static/images/cjwt.png
new file mode 100644
index 0000000..3802e18
--- /dev/null
+++ b/ceres-uniapp-master/static/images/cjwt.png
diff --git a/ceres-uniapp-master/static/images/fxzx.png b/ceres-uniapp-master/static/images/fxzx.png
new file mode 100644
index 0000000..1f18fc5
--- /dev/null
+++ b/ceres-uniapp-master/static/images/fxzx.png
diff --git a/ceres-uniapp-master/static/images/llzj.png b/ceres-uniapp-master/static/images/llzj.png
index 549650e..dc42cc3 100644
--- a/ceres-uniapp-master/static/images/llzj.png
+++ b/ceres-uniapp-master/static/images/llzj.png
diff --git a/ceres-uniapp-master/static/images/sjrz.png b/ceres-uniapp-master/static/images/sjrz.png
index c72728a..843d196 100644
--- a/ceres-uniapp-master/static/images/sjrz.png
+++ b/ceres-uniapp-master/static/images/sjrz.png
diff --git a/ceres-uniapp-master/static/images/wdsc.png b/ceres-uniapp-master/static/images/wdsc.png
index 009798c..7a93499 100644
--- a/ceres-uniapp-master/static/images/wdsc.png
+++ b/ceres-uniapp-master/static/images/wdsc.png
diff --git a/ceres-uniapp-master/static/images/yhq.png b/ceres-uniapp-master/static/images/yhq.png
index a90f23e..176ce8d 100644
--- a/ceres-uniapp-master/static/images/yhq.png
+++ b/ceres-uniapp-master/static/images/yhq.png
diff --git a/lvdao-miniapp/pages/shops/shops.vue b/lvdao-miniapp/pages/shops/shops.vue
index 59895b8..2d98da2 100644
--- a/lvdao-miniapp/pages/shops/shops.vue
+++ b/lvdao-miniapp/pages/shops/shops.vue
@@ -1,20 +1,25 @@
+ 详情页
+
-
-
-
- 题目
-
- {{secondData.tikuTitle}}
-
-
-
- 题型
-
- {{secondData.questionType}}
-
-
-
- 隶属题库
-
- {{secondData.questionBank}}
-
-
-
-
-
- 默认是否必填
-
- {{secondData.isRequired}}
-
-
-
- 设置内容
-
-
-
-
+
+
+ 题目
+ {{ secondData.tikuTitle }}
+
+
+ 题型
+ {{ secondData.questionType }}
+
+
+ 最多可选
+ {{ secondData.maxChoose || '0' }}
+
+
+ 隶属题库
+ {{ secondData.questionBank }}
+
+
+
+
+ 默认是否必填
+ {{ secondData.isRequired }}
+
+
+ 设置内容
+
+
-
- {{ key }}：{{ value }}
-
-
+ {{ key }}：{{ value }}
+
+
- 返回
+
-
-
+ 返回
-
-
新增题目
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 垂直布局
+ 自由布局
+
+
+
+
-
- 必填
- 非必填
-
-
-
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
-
-
-
-
-
-
-
-
- + 添加
-
-
-
-
- 删除
-
-
- 返回
- 确认
+
+ 必填
+ 非必填
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+
+ ↑
+ ↓
+
+
+
+
+
+
+ +
+ 添加
+
+
+
+
+ 删除
+
+
+
+ 返回
+ 确认
-
编辑问卷
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 垂直布局
+ 自由布局
+
+
+
+
-
- 必填
- 非必填
-
-
-
-
-
-
-
- {{scope.$index + 1}}
-
-
-
-
-
-
-
-
-
-
-
-
- + 添加
-
-
-
-
- 删除
-
-
- 返回
- 确认
+
+ 必填
+ 非必填
+
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+
+ ↑
+ ↓
+
+
+
+
+
+
+
+
+ +
+ 添加
+
+
+
+
+
+ 删除
+
+
+
+ 返回
+ 确认
平均答题时长
- {{ secondsToMinutesAndSeconds(tongjiTu.averageDuration) }}
+ {{ secondsToMinutesAndSeconds(tongjiTu.averageDuration) }}
+ 题目统计
@@ -365,6 +366,7 @@
提交问卷后
+
{{ secondData.rewardForParticipation!=''?'转盘抽奖':'不设置奖励'}}
- {{ secondData.rewardForParticipation!=''?'转盘抽奖活动':''}}
- 查看
+ {{ secondData.rewardForParticipation!=''?getStatusText(secondData.actStyle):'无'}}
+ 查看
-
-
+
不设置奖励
转盘抽奖
-
-
- {{jiangli.name}}
- 查看
- 编辑
+
+
@@ -996,23 +998,22 @@
+ {{jiangli.actName}}
+ 查看
+ 编辑
-
-
+ 创建活动
参与答卷奖励
-
- {{jiangli.name}}
- 查看
- 编辑
+
+
+ {{jiangli.actName}}
+ 查看
+ 编辑
- 创建活动
@@ -1365,7 +1366,8 @@
- {{ val.answer }}
+ {{ val.answer }}
+
- {{ val.answer }}
+ {{ val.answer }}
+
@@ -1732,15 +1735,16 @@
shujuloading: false,
iframaUrl: '',
iframaShow: false,
- iframeWin:null,
- jiangli:{
- id:'1894944771529637890', //活动id
- name:'商业抽奖活动', //活动名称
- styles:'1', //抽奖样式 1：大转盘 2：砸金蛋 3：刮刮卡 4：翻牌乐 5：福袋 6：摇一摇
+ iframeWin: null,
+ jiangli: {
+ id: '1895043663592030209', //活动id
+ actName: '商业测试活动1', //活动名称
+ actStyle: '1', //抽奖样式 1：大转盘 2：砸金蛋 3：刮刮卡 4：翻牌乐 5：福袋 6：摇一摇
// id:'',
- // name:''
+ // actName:'',
+ // actStyle:'', //抽奖样式 1：大转盘 2：砸金蛋 3：刮刮卡 4：翻牌乐 5：福袋 6：摇一摇
},
- radioreward:'不设置奖励'
+ radioreward: '不设置奖励'
}
},
computed: {
@@ -1749,24 +1753,25 @@
created() {
this.getAll()
},
- mounted() {
- // 监听iframe页面点击按钮触发事件
- window.addEventListener('message', (event) => {
- const data = event.data
- if (data.code === 'success') {
- // alert(data.test)
- console.log('id',data.id)
- console.log('name',data.name)
- this.jiangli = {
- id:''+data.id,
- name:data.name,
- styles:data.style
- }
- this.iframaShow = false
- }
- })
- // this.iframeWin = this.$refs.iframe.contentWindow
- },
+ mounted() {
+ // 监听iframe页面点击按钮触发事件
+ window.addEventListener('message', (event) => {
+ const data = event.data
+ if (data.code === 'success') {
+ // alert(data.test)
+ console.log('id', data.id)
+ console.log('name', data.name)
+ console.log('styles', data.style)
+ this.jiangli = {
+ id: '' + data.id,
+ actName: data.name,
+ actStyle: data.style
+ }
+ this.iframaShow = false
+ }
+ })
+ // this.iframeWin = this.$refs.iframe.contentWindow
+ },
methods: {
input(e, e1) {
// this.formInline[e1] = e
@@ -1810,14 +1815,16 @@
return false;
}
if (this.radioreward == '转盘抽奖') {
- if (this.jiangli.id && this.jiangli.id== '') {
+ if (this.jiangli.id && this.jiangli.id == '') {
this.$message({
message: '请创建转盘活动',
})
return false;
}
- }else{
+ } else {
this.jiangli.id = ''
+ this.jiangli.actName = ''
+ this.jiangli.actStyle = ''
}
let ids = null
if (this.wenConstData.length != 0) {
@@ -1830,6 +1837,8 @@
return false;
}
this.formInline.rewardForParticipation = this.jiangli.id
+ this.formInline.actStyle = this.jiangli.actStyle
+ this.formInline.actName = this.jiangli.actName
this.formInline.createTime = this.currentTime()
TerminaAdd(this.formInline).then(res => {
if (res.data.code == '500') {
@@ -1896,7 +1905,7 @@
item.question = JSON.parse(item.question)
}
const array = this.objectToArray(item.question)
- this.jiangli.id = item.rewardForParticipation
+ this.jiangli.id = item.rewardForParticipation
this.wenData = array
// this.secondData.cereQuestionManagements.map((res, index) => {
// if (typeof res.optionSettings == 'string') {
@@ -2062,12 +2071,13 @@
if (typeof item.question === 'string') {
item.question = JSON.parse(item.question)
}
- if(item.rewardForParticipation!=''){
- this.radioreward='转盘抽奖'
- }else{
- this.radioreward='不设置奖励'
+ if (item.rewardForParticipation != '') {
+ this.radioreward = '转盘抽奖'
+ } else {
+ this.radioreward = '不设置奖励'
}
- this.jiangli.id = item.rewardForParticipation
+ this.jiangli.id = item.rewardForParticipation
+ this.jiangli.actName = item.actName
this.secondDataTi = item.cereQuestionManagements
this.bainjiBox = true
@@ -2091,16 +2101,20 @@
ids = this.secondDataTi.map(item => item.id);
}
if (this.radioreward == '转盘抽奖') {
- if (this.jiangli.id &&this.jiangli.id== '') {
+ if (this.jiangli.id && this.jiangli.id == '') {
this.$message({
message: '请创建转盘活动',
})
return false;
}
- }else{
+ } else {
this.jiangli.id = ''
+ this.jiangli.actStyle = ''
+ this.jiangli.actName = ''
}
this.secondData.rewardForParticipation = this.jiangli.id
+ this.secondData.actStyle = this.jiangli.actStyle
+ this.secondData.actName = this.jiangli.actName
this.secondData.questionId = ids.join(',')
this.secondData.updateTime = this.currentTime()
@@ -2588,13 +2602,13 @@
needGender: '必填',
needOpinion: '必填',
}
- // this.jiangli={
- // id:'',
- // name:'',
- // styles:''
- // }
+ this.jiangli = {
+ id: '',
+ actName: '',
+ actStyle: ''
+ }
this.xuanzheData = []
- this.radioreward='不设置奖励'
+ this.radioreward = '不设置奖励'
const today = new Date();
const startOfToday = new Date(today.getFullYear(), today.getMonth(), today.getDate());
const endOfToday = new Date(today.getFullYear(), today.getMonth(), today.getDate());
@@ -2825,22 +2839,40 @@
if (token && token.startsWith('Bearer')) {
token = token.substring(7);
}
- token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJqd3RfdXNlcl9pbmZvIjoie1wiYXBwSWRcIjoxLFwiYXJlYUNvZGVzXCI6W10sXCJjb21wYW55QWRtaW5cIjpmYWxzZSxcImNvbXBhbnlDb2RlXCI6XCJKSkxEXzAwMVwiLFwiZGVwdENvZGVcIjpcIjAwMlwiLFwiZGVwdFRhZ1wiOlwiXCIsXCJsb2dpblR5cGVcIjpcIlBDXCIsXCJtYWluRGVwdENvZGVcIjpcIjAwMlwiLFwibWFuYWdlclwiOnRydWUsXCJuYW1lXCI6XCLotoXnuqfnrqHnkIblkZhcIixcInBob25lXCI6XCIxMzU0MTMwNDkxMFwiLFwicm9sZXNcIjpbXCJyb2xlX3N1cGVyX2FkbWluXCIsXCJ2aXAtYWRtaW5cIl0sXCJzdXBlckFkbWluXCI6dHJ1ZSxcInRvcERlcHRDb2RlXCI6XCIwMDJcIixcInVzZXJJZFwiOjEsXCJ1c2VybmFtZVwiOlwic3VwZXItampsZFwifSIsImp0aSI6IjA4ZWVmYzQyLWRmNzktNDc5Zi05MjcwLTdkNGI5OTcwM2I5NSIsImV4cCI6MTc0MDYzOTI1OSwiaWF0IjoxNzQwNjI0ODU5LCJzdWIiOiJDRFdMIiwiaXNzIjoiT0EifQ.t4sL7LQ7pQrVBl1juvV6crqsYZUmrHsINH78YsYpgi4'
+ token =
+ 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJqd3RfdXNlcl9pbmZvIjoie1wiYXBwSWRcIjoxLFwiYXJlYUNvZGVzXCI6W10sXCJjb21wYW55QWRtaW5cIjpmYWxzZSxcImNvbXBhbnlDb2RlXCI6XCJKSkxEXzAwMVwiLFwiZGVwdENvZGVcIjpcIjAwMlwiLFwiZGVwdFRhZ1wiOlwiXCIsXCJsb2dpblR5cGVcIjpcIlBDXCIsXCJtYWluRGVwdENvZGVcIjpcIjAwMlwiLFwibWFuYWdlclwiOnRydWUsXCJuYW1lXCI6XCLotoXnuqfnrqHnkIblkZhcIixcInBob25lXCI6XCIxMzU0MTMwNDkxMFwiLFwicm9sZXNcIjpbXCJyb2xlX3N1cGVyX2FkbWluXCIsXCJ2aXAtYWRtaW5cIl0sXCJzdXBlckFkbWluXCI6dHJ1ZSxcInRvcERlcHRDb2RlXCI6XCIwMDJcIixcInVzZXJJZFwiOjEsXCJ1c2VybmFtZVwiOlwic3VwZXItampsZFwifSIsImp0aSI6ImMxMWQ5ZjJjLTc1ZjItNDM5Yy05NjMzLTliYzU4MTc2NmZmYiIsImV4cCI6MTc0MDY2Mjg2NywiaWF0IjoxNzQwNjQ4NDY3LCJzdWIiOiJDRFdMIiwiaXNzIjoiT0EifQ.-2jv7Vq8pqn8PehIpd1lMXJrSqPsmCfhXp7fddL56qI'
this.iframaShow = true
- if(val == 0){
+ if (val == 0) {
this.iframaUrl =
`https://jy.scjysm.asia:18086/cdwltool/addEmptyLottery?token=${token}&channel=shangye&thirdPartyUrl=http://localhost:9529/#/investigation/index`
- }else if(val == 1){
+ } else if (val == 1) {
this.iframaUrl =
`https://jy.scjysm.asia:18086/cdwltool/addEmptyLottery?token=${token}&id=${this.jiangli.id}&title=活动详情&channel=shangye&thirdPartyUrl=http://localhost:9529/#/investigation/index`
- }else if(val == 2){
+ } else if (val == 2) {
this.iframaUrl =
`https://jy.scjysm.asia:18086/cdwltool/addEmptyLottery?token=${token}&id=${this.jiangli.id}&channel=shangye&thirdPartyUrl=http://localhost:9529/#/investigation/index`
}
// window.location.href =
},
-
+ getStatusText(val) {
+ switch (val) {
+ case '1':
+ return '大转盘';
+ case '2':
+ return '砸金蛋';
+ case '3':
+ return '刮刮卡';
+ case '4':
+ return '翻牌乐';
+ case '5':
+ return '福袋';
+ case '6':
+ return '摇一摇';
+ default:
+ return '无';
+ }
+ }
}
}
@@ -3214,4 +3246,4 @@
}
}
-
+
\ No newline at end of file
diff --git a/yanshouban/src/views/customer/yixiang/index.vue b/yanshouban/src/views/customer/yixiang/index.vue
index 505ebac..3dce5b9 100644
--- a/yanshouban/src/views/customer/yixiang/index.vue
+++ b/yanshouban/src/views/customer/yixiang/index.vue
@@ -348,8 +348,13 @@
匹配记录
-
-
+
+